|
|
|
@ -203,7 +203,11 @@ |
|
|
|
@open="opens()" |
|
|
|
size="900px" |
|
|
|
> |
|
|
|
<ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB> |
|
|
|
<ScrapMB |
|
|
|
v-if="drawerMBDelete" |
|
|
|
v-bind:customerInfosMB="customerInfosMB" |
|
|
|
:handleDeleteCallBack="handleFilter" |
|
|
|
></ScrapMB> |
|
|
|
</el-drawer> |
|
|
|
<!--柱护板重打--> |
|
|
|
<el-drawer |
|
|
|
@ -256,6 +260,7 @@ |
|
|
|
@sort-change="sortChange" |
|
|
|
@selection-change="handleSelectionChange" |
|
|
|
@row-click="handleRowClick" |
|
|
|
:row-class-name="tableRowClassName" |
|
|
|
> |
|
|
|
<el-table-column |
|
|
|
label="底盘号" |
|
|
|
@ -704,12 +709,12 @@ export default { |
|
|
|
width: 150, |
|
|
|
}); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "M100上线时间", |
|
|
|
label: "E001上线时间", |
|
|
|
prop: "onlineTime", |
|
|
|
width: 150, |
|
|
|
}); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "M100接收时间", |
|
|
|
label: "E001接收时间", |
|
|
|
prop: "receiveTime", |
|
|
|
width: 180, |
|
|
|
}); |
|
|
|
@ -723,16 +728,16 @@ export default { |
|
|
|
// prop: "version", |
|
|
|
// width: 150, |
|
|
|
// }); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "R100上线时间", |
|
|
|
prop: "r100OnlineTime", |
|
|
|
width: 150, |
|
|
|
}); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "R100接收时间", |
|
|
|
prop: "r100ReceiveTime", |
|
|
|
width: 180, |
|
|
|
}); |
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "R100上线时间", |
|
|
|
// prop: "r100OnlineTime", |
|
|
|
// width: 150, |
|
|
|
// }); |
|
|
|
// tempsTabs.push({ |
|
|
|
// label: "R100接收时间", |
|
|
|
// prop: "r100ReceiveTime", |
|
|
|
// width: 180, |
|
|
|
// }); |
|
|
|
tempsTabs.push({ |
|
|
|
label: "产线", |
|
|
|
prop: "productLine", |
|
|
|
@ -765,6 +770,12 @@ export default { |
|
|
|
...mapGetters(["userInfo"]), //获取当前用户信息 |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
tableRowClassName({row, rowIndex}) { |
|
|
|
if(row.billStatus == 1){ |
|
|
|
return 'error-row'; |
|
|
|
} |
|
|
|
return ''; |
|
|
|
}, |
|
|
|
// 更改主表格高度 |
|
|
|
changeMainTableHeight(){ |
|
|
|
this.$nextTick(()=>{ |
|
|
|
@ -978,7 +989,6 @@ export default { |
|
|
|
}, |
|
|
|
//抽屉 |
|
|
|
handleDrawerOpen(param) { |
|
|
|
debugger |
|
|
|
this.drawer = true; |
|
|
|
var parentId = param.assemblyID; //主键id |
|
|
|
this.customerInfos = [ |
|
|
|
@ -1002,7 +1012,6 @@ export default { |
|
|
|
}, |
|
|
|
/** 导出功能 assembly-cfg-erp/export */ |
|
|
|
handleDownload() { |
|
|
|
debugger |
|
|
|
this.listLoading = true; |
|
|
|
|
|
|
|
this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode; |
|
|
|
@ -1109,7 +1118,7 @@ export default { |
|
|
|
/** 格式化字段 */ |
|
|
|
fieldFormatter(row, column) { |
|
|
|
if (column.property === "billStatus") { |
|
|
|
return { 1: "未解析", 2: "已解析", 3: "已打印", 4: "断号" }[row[column.property]]; |
|
|
|
return { 1: "未匹配", 2: "已解析", 3: "已打印", 4: "断号" }[row[column.property]]; |
|
|
|
} |
|
|
|
if (column.property === "zHBBillStatus") { |
|
|
|
return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]]; |
|
|
|
@ -1171,7 +1180,6 @@ export default { |
|
|
|
.then((response) => { |
|
|
|
this.list = response.items; |
|
|
|
this.totalCount = response.totalCount; |
|
|
|
debugger |
|
|
|
setTimeout(() => { |
|
|
|
//大数据量加载时 |
|
|
|
this.listLoading = false; |
|
|
|
@ -1209,7 +1217,6 @@ export default { |
|
|
|
}, |
|
|
|
// 向子组件更新值 |
|
|
|
valueselectChange(val) { |
|
|
|
debugger |
|
|
|
this.$forceUpdate(); |
|
|
|
|
|
|
|
|
|
|
|
@ -1892,7 +1899,6 @@ export default { |
|
|
|
|
|
|
|
//获取所有产线 |
|
|
|
getProductLine() { |
|
|
|
debugger |
|
|
|
this.listPLQuery.UserId = this.userInfo == null ? null : this.userInfo.userId; |
|
|
|
// console.log( |
|
|
|
// "this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" + |
|
|
|
@ -2080,6 +2086,14 @@ export default { |
|
|
|
padding: 10px; |
|
|
|
line-height: 20px; |
|
|
|
} |
|
|
|
|
|
|
|
/deep/ .el-table .error-row { |
|
|
|
background: #fbd6d6 !important; |
|
|
|
|
|
|
|
td{ |
|
|
|
background: #fbd6d6 !important; |
|
|
|
} |
|
|
|
} |
|
|
|
</style> |
|
|
|
|
|
|
|
|
|
|
|
|
