|
|
|
|
@ -18,22 +18,6 @@ |
|
|
|
|
@on-load="onLoad" |
|
|
|
|
:beforeOpen="beforeOpen" |
|
|
|
|
> |
|
|
|
|
<template #leaderUser-form="{ type, disabled }"> |
|
|
|
|
<el-select v-if="type == 'add' || type == 'edit'" placeholder="请选择 主管工艺员" |
|
|
|
|
filterable |
|
|
|
|
remote |
|
|
|
|
:remote-method="getLeaderUser" |
|
|
|
|
v-model="form.leaderUser"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in leaderUsers" |
|
|
|
|
:key="item.id" |
|
|
|
|
:label="item.realName" |
|
|
|
|
:value="item.id"> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</template> |
|
|
|
|
<!-- <template #userName="{ row }">{{ row.leaderUser.userName }}</template> |
|
|
|
|
<template #jcName="{ row }">{{ row.bsJfCenter.jcName }}</template> --> |
|
|
|
|
<template #menu-left> |
|
|
|
|
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" |
|
|
|
|
>删除</el-button |
|
|
|
|
@ -77,10 +61,16 @@ |
|
|
|
|
@select="selectChange" |
|
|
|
|
> |
|
|
|
|
<el-table-column type="selection" width="55px"></el-table-column> |
|
|
|
|
<el-table-column align="center" label="工艺能力" prop="id"> |
|
|
|
|
<el-table-column align="center" label="*工艺能力" prop="id"> |
|
|
|
|
<template #default="scope"> |
|
|
|
|
<el-select v-model="scope.row.id"> |
|
|
|
|
<el-option v-for="item in abilityList" :key="item.id" :label="item.caName" :value="item.id"></el-option> |
|
|
|
|
<el-select v-model="scope.row.id" filterable @change="handleAbilityChange"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in abilityList" |
|
|
|
|
:key="item.id" |
|
|
|
|
:label="item.caName" |
|
|
|
|
:value="item.id" |
|
|
|
|
:disabled="isAbilitySelected(item.id, scope.$index)"> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</template> |
|
|
|
|
</el-table-column> |
|
|
|
|
@ -265,7 +255,7 @@ export default { |
|
|
|
|
type: "select", |
|
|
|
|
span: 24, |
|
|
|
|
overflow: true, |
|
|
|
|
search: true, |
|
|
|
|
// search: true, |
|
|
|
|
addDisplay:false, |
|
|
|
|
editDisplay:false, |
|
|
|
|
rules: [ |
|
|
|
|
@ -278,6 +268,7 @@ export default { |
|
|
|
|
filterable:true, |
|
|
|
|
remote:true, |
|
|
|
|
dicUrl:"/api/blade-system/user/page?current=1&size=9999&realName={{key}}", |
|
|
|
|
// dicUrl:"/blade-system/user/page?size=999999¤t=1", |
|
|
|
|
props: { |
|
|
|
|
label: "realName", |
|
|
|
|
value: "id", |
|
|
|
|
@ -301,7 +292,10 @@ export default { |
|
|
|
|
], |
|
|
|
|
filterable:true, |
|
|
|
|
remote:true, |
|
|
|
|
dicUrl:"/api/blade-system/user/page?current=1&size=300&realName={{key}}", |
|
|
|
|
dicUrl:"/api/blade-system/user/page?current=1&size=9999&realName={{key}}", |
|
|
|
|
|
|
|
|
|
// dicUrl:"/blade-system/user/page?size=999999¤t=1", |
|
|
|
|
|
|
|
|
|
props: { |
|
|
|
|
label: "realName", |
|
|
|
|
value: "id", |
|
|
|
|
@ -420,28 +414,7 @@ export default { |
|
|
|
|
this.getAbilityData() |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
getLeaderUser(query){ |
|
|
|
|
console.log('query------------',query) |
|
|
|
|
console.log('leaderUsers------------',this.leaderUsers.length) |
|
|
|
|
if(query == ''){ |
|
|
|
|
console.log('111111111111111111111') |
|
|
|
|
if(this.leaderUsers.length == 0){ |
|
|
|
|
getAllUser({ |
|
|
|
|
current:1,size:300 |
|
|
|
|
}).then(res =>{ |
|
|
|
|
this.leaderUsers = res.data.data.records |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
|
getAllUser({ |
|
|
|
|
current:1,size:300, |
|
|
|
|
realName:query |
|
|
|
|
}).then(res =>{ |
|
|
|
|
this.leaderUsers = res.data.data.records |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
searchChange(params, done){ |
|
|
|
|
this.query = params; |
|
|
|
|
this.page.currentPage = 1; |
|
|
|
|
@ -466,7 +439,6 @@ export default { |
|
|
|
|
this.form.checkout = this.form.checkout == 1 ? [1] : [] |
|
|
|
|
this.form.bigBatch = this.form.bigBatch == 1 ? [1] : [] |
|
|
|
|
this.form.whetherPlate = this.form.whetherPlate == 1 ? [1] : [] |
|
|
|
|
// this.getLeaderUser(this.form.leaderUserName) |
|
|
|
|
getAllUser({current:1,size:300}).then(res => { |
|
|
|
|
this.leaderUsers = res.data.data.records |
|
|
|
|
let tmp = this.leaderUsers.find(item => item.id == this.form.leaderUser) |
|
|
|
|
@ -550,6 +522,12 @@ export default { |
|
|
|
|
this.$message.error('请至少填写一条数据') |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
// 校验工艺能力是否必选 |
|
|
|
|
const emptyAbility = this.capacityList.find(item => !item.id); |
|
|
|
|
if(emptyAbility){ |
|
|
|
|
this.$message.error('工艺能力为必选项，请选择工艺能力') |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
// console.log('this.capacityList-----------',this.capacityList) |
|
|
|
|
// 校验通过：准备提交数据（过滤无用字段） |
|
|
|
|
const submitData = this.capacityList.map(row => { |
|
|
|
|
@ -587,6 +565,16 @@ export default { |
|
|
|
|
const record = { _select: false }; |
|
|
|
|
this.capacityList.push(record); |
|
|
|
|
}, |
|
|
|
|
// 判断工艺能力是否已被其他行选中 |
|
|
|
|
isAbilitySelected(abilityId, currentIndex) { |
|
|
|
|
return this.capacityList.some((item, index) => { |
|
|
|
|
return index !== currentIndex && item.id === abilityId; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
// 处理工艺能力选择变化 |
|
|
|
|
handleAbilityChange() { |
|
|
|
|
// 可以在这里添加额外的逻辑，比如清空其他字段 |
|
|
|
|
}, |
|
|
|
|
selectChange(list, row) { |
|
|
|
|
row._select = !row._select; |
|
|
|
|
}, |
|
|
|
|
|
