suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

Browse Source
dev-scheduling
zhangdi 1 month ago
parent 16d951c9ab
commit d7a5ee8f05
3 changed files with 99 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/views/basicData/teamManagement.vue
  2. 3
      src/views/oem/oemCustomer/index.vue
  3. 150
      src/views/oem/oemCustomer/setCraftAbility.vue

11
src/views/basicData/teamManagement.vue
Unescape View File

@ -520,16 +520,7 @@ export default {
}, },
], ],
}, },
{
label: '修改时间',
prop: 'updateTime',
span: 12,
overflow: true,
search: false,
width: 150,
addDisplay: false,
editDisplay: false,
},
], ],
}, },
selectionList: [], selectionList: [],

3
src/views/oem/oemCustomer/index.vue
Unescape View File

@ -160,6 +160,7 @@ export default {
sortable: true, sortable: true,
search: true, search: true,
overHidden: true, overHidden: true,
width: 120,
rules: [ rules: [
{ {
required: true, required: true,
@ -175,6 +176,7 @@ export default {
search: false, search: false,
overHidden: true, overHidden: true,
hide: true, hide: true,
width: 120,
rules: [ rules: [
{ {
required: true, required: true,
@ -189,6 +191,7 @@ export default {
sortable: true, sortable: true,
search: false, search: false,
overHidden: true, overHidden: true,
width: 120,
rules: [ rules: [
{ {
required: true, required: true,

150
src/views/oem/oemCustomer/setCraftAbility.vue
Unescape View File

@ -36,16 +36,52 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="计划员" prop="planner"> <el-table-column align="center" label="计划员" prop="planner">
<template #default="scope"> <template #default="scope">
<el-select v-model="scope.row.planner" remote filterable :remote-method="getPlanner"> <jhSelect
:value="scope.row.planner"
@input="val => (scope.row.planner = val)"
placeholder="请搜索选择"
api-url="/blade-system/user/page"
echo-api="/blade-system/user/page"
echoParamsKey="ids"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="realName"
value-key="id"
search-key="id"
:debounce-time="500"
@change="changeTeacher"
:title="'修改'"
/>
<!-- <el-select v-model="scope.row.planner" remote filterable :remote-method="getPlanner">
<el-option v-for="item in plannerList" :key="item.id" :label="item.realName" :value="item.id"></el-option> <el-option v-for="item in plannerList" :key="item.id" :label="item.realName" :value="item.id"></el-option>
</el-select> </el-select> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="调度员" prop="dispatcher"> <el-table-column align="center" label="调度员" prop="dispatcher">
<template #default="scope"> <template #default="scope">
<el-select v-model="scope.row.dispatcher" remote filterable :remote-method="getDispatcher"> <!-- <el-select v-model="scope.row.dispatcher" remote filterable :remote-method="getDispatcher">
<el-option v-for="item in dispatcherList" :key="item.id" :label="item.realName" :value="item.id"></el-option> <el-option v-for="item in dispatcherList" :key="item.id" :label="item.realName" :value="item.id"></el-option>
</el-select> </el-select> -->
<jhSelect
:value="scope.row.dispatcher"
@input="val => (scope.row.dispatcher = val)"
placeholder="请搜索选择"
api-url="/blade-system/user/page"
echo-api="/blade-system/user/page"
echoParamsKey="ids"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="realName"
value-key="id"
search-key="id"
:debounce-time="500"
@change="changeTeacher"
:title="'修改'"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="是否大批量" prop="isBatch"> <el-table-column align="center" label="是否大批量" prop="isBatch">
@ -66,6 +102,7 @@
</template> </template>
<script> <script>
import {getCraftAbility,getAbility,getAllUser,saveCraft} from "@/api/basicData/oemCustomer" import {getCraftAbility,getAbility,getAllUser,saveCraft} from "@/api/basicData/oemCustomer"
import jhSelect from '@/components/jh-select/index.vue';
export default { export default {
props: { props: {
setCraftAbilityOpen: { setCraftAbilityOpen: {
@ -77,6 +114,9 @@ export default {
default: null default: null
} }
}, },
components: {
jhSelect
},
data() { data() {
return { return {
setCrewShow: false, setCrewShow: false,
@ -104,66 +144,66 @@ export default {
id:this.ocId id:this.ocId
}) })
this.capacityList = res.data.data this.capacityList = res.data.data
const user = await getAllUser({current:1,size:9999}) // const user = await getAllUser({current:1,size:9999})
this.plannerList = user.data.data.records // this.plannerList = user.data.data.records
this.dispatcherList = user.data.data.records // this.dispatcherList = user.data.data.records
this.capacityList.map(item =>{ this.capacityList.map(item =>{
item.dispatcher = item.dispatcher + '' item.dispatcher = item.dispatcher==null||item.dispatcher==-1?'':item.dispatcher + ''
item.planner = item.planner + '' item.planner = item.planner==null||item.planner==-1?'':item.planner + ''
item.isBatch = item.isBatch == '1' ? true : false item.isBatch = item.isBatch == '1' ? true : false
item._select = false item._select = false
if(item.dispatcherName != ''){ // if(item.dispatcherName != ''){
getAllUser({realName:item.dispatcherName}).then(res =>{ // getAllUser({realName:item.dispatcherName}).then(res =>{
const mergedData = [...this.dispatcherList, ...res.data.data.records]; // const mergedData = [...this.dispatcherList, ...res.data.data.records];
const uniqueData = Array.from( // const uniqueData = Array.from(
new Map(mergedData.map(item => [item.id, item])).values() // new Map(mergedData.map(item => [item.id, item])).values()
); // );
this.dispatcherList = uniqueData // this.dispatcherList = uniqueData
}) // })
} // }
if(item.plannerName != ''){ // if(item.plannerName != ''){
getAllUser({realName:item.plannerName}).then(res =>{ // getAllUser({realName:item.plannerName}).then(res =>{
const mergedData = [...this.plannerList, ...res.data.data.records]; // const mergedData = [...this.plannerList, ...res.data.data.records];
const uniqueData = Array.from( // const uniqueData = Array.from(
new Map(mergedData.map(item => [item.id, item])).values() // new Map(mergedData.map(item => [item.id, item])).values()
); // );
this.plannerList = uniqueData // this.plannerList = uniqueData
}) // })
} // }
}) })
this.setCrewShow = this.setCraftAbilityOpen this.setCrewShow = this.setCraftAbilityOpen
}, },
getPlanner(query){ getPlanner(query){
if(query == ''){ // if(query == ''){
getAllUser({ // getAllUser({
current:1, // current:1,
size:9999 // size:9999
}).then(res =>{ // }).then(res =>{
this.plannerList = res.data.data.records // this.plannerList = res.data.data.records
}) // })
}else{ // }else{
getAllUser({ // getAllUser({
realName:query // realName:query
}).then(res =>{ // }).then(res =>{
this.plannerList = res.data.data.records // this.plannerList = res.data.data.records
}) // })
} // }
}, },
getDispatcher(query){ getDispatcher(query){
if(query == ''){ // if(query == ''){
getAllUser({ // getAllUser({
current:1, // current:1,
size:9999 // size:9999
}).then(res =>{ // }).then(res =>{
this.dispatcherList = res.data.data.records // this.dispatcherList = res.data.data.records
}) // })
}else{ // }else{
getAllUser({ // getAllUser({
realName:query // realName:query
}).then(res =>{ // }).then(res =>{
this.dispatcherList = res.data.data.records // this.dispatcherList = res.data.data.records
}) // })
} // }
}, },
insertEvent(){ insertEvent(){
const record = { _select: false }; const record = { _select: false };

Write Preview
Loading…
Cancel
Save