Commit 57275431 authored by 528360026@qq.com's avatar 528360026@qq.com

编排单号做成和组合单号一致的功能可用进行穿透出编排信息进行调整

parent ecc0a3e5
...@@ -334,17 +334,28 @@ ...@@ -334,17 +334,28 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="编排单号" label="编排单号"
align="center"
width="100px" width="100px"
align="center"
prop="arrangeCode" prop="arrangeCode"
/> :show-overflow-tooltip="true"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="showArrangDetail(scope.row.arrangeCode)"
>{{ scope.row.arrangeCode }}
</el-button
>
</template>
</el-table-column>
<el-table-column <el-table-column
label="订单编号" label="订单编号"
width="140" width="140"
align="center" align="center"
prop="sourceCode" prop="sourceCode"
/> />
<el-table-column <el-table-column
label="产品编号" label="产品编号"
width="120" width="120"
align="center" align="center"
...@@ -937,7 +948,10 @@ export default { ...@@ -937,7 +948,10 @@ export default {
this.combOpen = true; this.combOpen = true;
this.combinationCodes = [combinationCode]; this.combinationCodes = [combinationCode];
}, },
showArrangDetail(arrangeCode) {
this.arrangeOpen = true;
this.arrangeCode = arrangeCode;
},
async handleArrange() { async handleArrange() {
let params = [] let params = []
this.selectedRows.forEach((item, index) => { this.selectedRows.forEach((item, index) => {
...@@ -985,9 +999,13 @@ export default { ...@@ -985,9 +999,13 @@ export default {
}); });
batchAddCombination(params).then(response => { batchAddCombination(params).then(response => {
this.combOpen = true if (response && response.length > 0) {
this.combinationCodes = response this.combOpen = true
this.$modal.msgSuccess("新增组合单成功"); this.combinationCodes = response
this.$modal.msgSuccess("新增组合单成功");
} else {
this.$modal.msgError("新增组合单失败,组合规则不同,不允许组合!");
}
this.getList(); this.getList();
}); });
} }
...@@ -1192,8 +1210,8 @@ export default { ...@@ -1192,8 +1210,8 @@ export default {
// }); // });
}, },
handleMake() { handleMake() {
if(this.selectedRows[0].workorderType == 'product'&& this.selectedRows[0].status == "SCHEDULED" if (this.selectedRows[0].workorderType == 'product' && this.selectedRows[0].status == "SCHEDULED"
) { ) {
const workorderId = this.selectedRows[0].workorderId const workorderId = this.selectedRows[0].workorderId
this.$router.push("/mes/pro/workorder/make?workorderId=" + workorderId); this.$router.push("/mes/pro/workorder/make?workorderId=" + workorderId);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment