bug修复
This commit is contained in:
parent
c97eae3931
commit
e58619abef
|
|
@ -59,6 +59,7 @@
|
||||||
"qrcodejs2": "0.0.2",
|
"qrcodejs2": "0.0.2",
|
||||||
"quill": "1.3.7",
|
"quill": "1.3.7",
|
||||||
"screenfull": "5.0.2",
|
"screenfull": "5.0.2",
|
||||||
|
"sm-crypto": "^0.3.13",
|
||||||
"sortablejs": "1.10.2",
|
"sortablejs": "1.10.2",
|
||||||
"uuid": "^9.0.1",
|
"uuid": "^9.0.1",
|
||||||
"vue": "2.6.12",
|
"vue": "2.6.12",
|
||||||
|
|
|
||||||
|
|
@ -1270,6 +1270,12 @@ export default {
|
||||||
},
|
},
|
||||||
/* 抱杆成套设备change事件 */
|
/* 抱杆成套设备change事件 */
|
||||||
async onChangeWholeTypeName(val) {
|
async onChangeWholeTypeName(val) {
|
||||||
|
console.log("rrrrrrrrrrrrrrrr",val)
|
||||||
|
console.log("ppppppppppppppp",this.holdingPoleSelList)
|
||||||
|
val = val.filter(e => e !== null && e !== undefined);
|
||||||
|
if (val.length == 0) {
|
||||||
|
this.wholeTypeNameList = []
|
||||||
|
}else{
|
||||||
val.forEach((e) => {
|
val.forEach((e) => {
|
||||||
const selLable = this.holdingPoleSelList.find((j) => j.id === e)
|
const selLable = this.holdingPoleSelList.find((j) => j.id === e)
|
||||||
const isPush = this.wholeTypeNameList.some((z) => z.id == e)
|
const isPush = this.wholeTypeNameList.some((z) => z.id == e)
|
||||||
|
|
@ -1295,6 +1301,7 @@ export default {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
// 移除时触发
|
// 移除时触发
|
||||||
|
|
|
||||||
|
|
@ -751,8 +751,11 @@ export default {
|
||||||
taskName: this.queryParams.taskName,
|
taskName: this.queryParams.taskName,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
if(this.wholeTypeNameList.length == 0){
|
||||||
this.wholeTypeNameList.push(ctList)
|
this.wholeTypeNameList.push(ctList)
|
||||||
}
|
}
|
||||||
|
// this.wholeTypeNameList.push(ctList)
|
||||||
|
}
|
||||||
|
|
||||||
console.log(this.wholeTypeNameList, ' this.wholeTypeNameList')
|
console.log(this.wholeTypeNameList, ' this.wholeTypeNameList')
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -134,17 +134,17 @@
|
||||||
type="index"
|
type="index"
|
||||||
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
|
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
|
||||||
/>
|
/>
|
||||||
<el-table-column label="退料单号" align="center" prop="code" show-overflow-tooltip />
|
<el-table-column label="退料单号" align="center" prop="code" show-overflow-tooltip width="150px"/>
|
||||||
<el-table-column label="退料单位" align="center" prop="unitName" show-overflow-tooltip />
|
<el-table-column label="退料单位" align="center" prop="unitName" show-overflow-tooltip width="150px"/>
|
||||||
<el-table-column label="退料工程" align="center" prop="lotName" show-overflow-tooltip />
|
<el-table-column label="退料工程" align="center" prop="lotName" show-overflow-tooltip width="150px"/>
|
||||||
<el-table-column label="退料类型名称" align="center" prop="typeName" show-overflow-tooltip />
|
<el-table-column label="退料类型名称" align="center" prop="typeName" show-overflow-tooltip width="170px"/>
|
||||||
<el-table-column label="退料人员" align="center" prop="backPerson" show-overflow-tooltip />
|
<el-table-column label="退料人员" align="center" prop="backPerson" show-overflow-tooltip width="100px"/>
|
||||||
<el-table-column label="联系电话" align="center" prop="phone" show-overflow-tooltip />
|
<el-table-column label="联系电话" align="center" prop="phone" show-overflow-tooltip width="120px"/>
|
||||||
<el-table-column label="申请时间" align="center" prop="backTime" show-overflow-tooltip />
|
<el-table-column label="申请时间" align="center" prop="backTime" show-overflow-tooltip width="100px"/>
|
||||||
<el-table-column label="协议号" align="center" prop="agreementCode" show-overflow-tooltip />
|
<el-table-column label="协议号" align="center" prop="agreementCode" show-overflow-tooltip width="150px"/>
|
||||||
<el-table-column label="退料状态" align="center" prop="taskName" show-overflow-tooltip></el-table-column>
|
<el-table-column label="退料状态" align="center" prop="taskName" show-overflow-tooltip width="100px"></el-table-column>
|
||||||
|
|
||||||
<el-table-column label="操作" align="center" width="200">
|
<el-table-column label="操作" align="center" width="230" fixed="right">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
<el-button
|
||||||
size="medium"
|
size="medium"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue