fix:生产工单-"生成工单“功能优化(二级dialog关闭后,一级dialog不关闭)
This commit is contained in:
parent
6e5b8747d8
commit
e47de51f09
@ -228,7 +228,7 @@
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- 添加或修改生产工单对话框 -->
|
<!-- 添加或修改生产工单对话框 -->
|
||||||
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
|
<el-dialog :title="title" :visible.sync="open" width="960px" @close="cancel" append-to-body>
|
||||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="16">
|
<el-col :span="16">
|
||||||
@ -486,6 +486,10 @@ export default {
|
|||||||
},
|
},
|
||||||
// 表单参数
|
// 表单参数
|
||||||
form: {},
|
form: {},
|
||||||
|
formStatus: "parent",
|
||||||
|
// 生成工单后的表单
|
||||||
|
secondaryForm: {},
|
||||||
|
primaryForm: {},
|
||||||
// 表单校验
|
// 表单校验
|
||||||
rules: {
|
rules: {
|
||||||
workorderCode: [
|
workorderCode: [
|
||||||
@ -565,8 +569,26 @@ export default {
|
|||||||
},
|
},
|
||||||
// 取消按钮
|
// 取消按钮
|
||||||
cancel() {
|
cancel() {
|
||||||
this.open = false;
|
if (this.formStatus == 'parent') {
|
||||||
this.reset();
|
this.open = false;
|
||||||
|
this.reset();
|
||||||
|
} else {
|
||||||
|
this.reset()
|
||||||
|
this.formStatus = 'parent'
|
||||||
|
this.getTreeselect();
|
||||||
|
const workorderId = this.primaryForm.workorderId;
|
||||||
|
getWorkorder(workorderId).then(response => {
|
||||||
|
this.form = response.data
|
||||||
|
this.open = true;
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.$refs.barcodeImg.getBarcode();
|
||||||
|
|
||||||
|
})
|
||||||
|
this.title = "查看工单信息";
|
||||||
|
this.optType = "view";
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
// 表单重置
|
// 表单重置
|
||||||
reset() {
|
reset() {
|
||||||
@ -615,6 +637,8 @@ export default {
|
|||||||
},
|
},
|
||||||
//从BOM行中直接新增
|
//从BOM行中直接新增
|
||||||
handleSubAdd(row){
|
handleSubAdd(row){
|
||||||
|
this.primaryForm = this.form
|
||||||
|
this.formStatus = "child"
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.reset();
|
this.reset();
|
||||||
this.getTreeselect();
|
this.getTreeselect();
|
||||||
@ -657,7 +681,6 @@ export default {
|
|||||||
this.form = response.data
|
this.form = response.data
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
console.log("2232",this.$refs.barcodeImg)
|
|
||||||
this.$refs.barcodeImg.getBarcode();
|
this.$refs.barcodeImg.getBarcode();
|
||||||
|
|
||||||
})
|
})
|
||||||
@ -675,7 +698,6 @@ export default {
|
|||||||
getWorkorder(row.workorderId).then(response => {
|
getWorkorder(row.workorderId).then(response => {
|
||||||
this.form = response.data;
|
this.form = response.data;
|
||||||
|
|
||||||
console.log("3232",this.form)
|
|
||||||
this.form.workorderCode = response.data.workorderCode
|
this.form.workorderCode = response.data.workorderCode
|
||||||
this.form.workorderId = response.data.workorderId
|
this.form.workorderId = response.data.workorderId
|
||||||
this.open = true;
|
this.open = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user