diff --git a/src/components/TaskSelect/taskSelectSingle.vue b/src/components/TaskSelect/taskSelectSingle.vue index 860ce75..8736fcb 100644 --- a/src/components/TaskSelect/taskSelectSingle.vue +++ b/src/components/TaskSelect/taskSelectSingle.vue @@ -213,6 +213,10 @@ this.getProcess(); }, methods: { + handleOpen(id) { + this.showFlag = true + this.selectedTaskId = id + }, /** 查询生产任务列表 */ getList() { this.loading = true; diff --git a/src/components/clientSelect/single.vue b/src/components/clientSelect/single.vue index 7b2c97a..64608cd 100644 --- a/src/components/clientSelect/single.vue +++ b/src/components/clientSelect/single.vue @@ -95,7 +95,7 @@ - + \ No newline at end of file + diff --git a/src/components/machinerySelect/single.vue b/src/components/machinerySelect/single.vue index c401130..934a54c 100644 --- a/src/components/machinerySelect/single.vue +++ b/src/components/machinerySelect/single.vue @@ -174,6 +174,10 @@ export default { this.getTreeselect(); }, methods: { + handleOpen(id) { + this.showFlag = true + this.selectedMachineryId = id + }, /** 查询物料编码列表 */ getList() { this.loading = true; @@ -262,4 +266,4 @@ export default { } } }; - \ No newline at end of file + diff --git a/src/components/noticeSelect/single.vue b/src/components/noticeSelect/single.vue index 30714ec..0ddf052 100644 --- a/src/components/noticeSelect/single.vue +++ b/src/components/noticeSelect/single.vue @@ -153,6 +153,10 @@ export default { }) }, methods: { + handleOpen(id) { + this.showFlag = true + this.selectedId = id + }, /** 查询到货通知单列表 */ getList() { this.loading = true; diff --git a/src/components/stockSelect/single.vue b/src/components/stockSelect/single.vue index 27d4c7c..6a5bb16 100644 --- a/src/components/stockSelect/single.vue +++ b/src/components/stockSelect/single.vue @@ -94,7 +94,7 @@ clearable @keyup.enter.native="handleQuery" /> - + @@ -103,7 +103,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -132,7 +132,7 @@ - + - + - + 搜索 重置 @@ -74,7 +74,7 @@ - + @@ -105,7 +105,7 @@ dicts: ['mes_order_status','mes_workorder_sourcetype'], props:{ workorder: { - type: Object, + type: Object, default: function(){ return {'workorderType': 'SELF'} }} //外部传入的工单过滤信息 @@ -163,6 +163,10 @@ this.getList(); }, methods:{ + handleOpen(id) { + this.showFlag = true + this.selectedWorkorderId = id + }, /** 查询生产工单列表 */ getList() { this.loading = true; @@ -214,4 +218,4 @@ } } } - \ No newline at end of file + diff --git a/src/components/workstationSelect/simpletableSingle.vue b/src/components/workstationSelect/simpletableSingle.vue index 2e11c06..c740b70 100644 --- a/src/components/workstationSelect/simpletableSingle.vue +++ b/src/components/workstationSelect/simpletableSingle.vue @@ -68,7 +68,7 @@ - + { + listAllWorkshop().then( response => { this.workshopOptions = response.data; }); }, diff --git a/src/views/mes/dv/repair/index.vue b/src/views/mes/dv/repair/index.vue index 9d55297..bc7eaf4 100644 --- a/src/views/mes/dv/repair/index.vue +++ b/src/views/mes/dv/repair/index.vue @@ -483,7 +483,7 @@ export default { }, //设备资源选择弹出 handleMachineryAdd(){ - this.$refs.machinerySelect.showFlag = true; + this.$refs.machinerySelect.handleOpen(this.form.machineryId) }, //设备资源选择回调 onMachineryAdd(row){ diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue index 5e1671e..2155083 100644 --- a/src/views/mes/pro/feedback/index.vue +++ b/src/views/mes/pro/feedback/index.vue @@ -582,7 +582,7 @@ export default { }, //选择生产工单 handleWorkorderSelect(){ - this.$refs.woSelect.showFlag = true; + this.$refs.woSelect.handleOpen(this.form.workorderId) }, onWorkorderSelected(row){ if(row != undefined && row != null){ @@ -597,8 +597,7 @@ export default { } }, handleTaskSelect(){ - this.$refs.taskSelect.showFlag = true; - this.$refs.taskSelect.getList(); + this.$refs.taskSelect.handleOpen(this.form.taskId) }, onTaskSelected(row){ debugger; diff --git a/src/views/mes/pro/procard/index.vue b/src/views/mes/pro/procard/index.vue index 797616b..b7b3a0e 100644 --- a/src/views/mes/pro/procard/index.vue +++ b/src/views/mes/pro/procard/index.vue @@ -353,7 +353,7 @@ export default { }, //选择生产工单 handleWorkorderSelect(){ - this.$refs.woSelect.showFlag = true; + this.$refs.woSelect.handleOpen(this.form.workorderId) }, onWorkorderSelected(row){ if(row != undefined && row != null){ diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue index 91eed4d..e2e0cd1 100644 --- a/src/views/mes/pro/workorder/index.vue +++ b/src/views/mes/pro/workorder/index.vue @@ -710,7 +710,7 @@ export default { }).catch(() => {}); }, handleSelectProduct(){ - this.$refs.itemSelect.showFlag = true; + this.$refs.itemSelect.handleOpen(this.form.productId) }, handleSelectClient(){ this.$refs.clientSelect.showFlag = true; diff --git a/src/views/mes/qc/ipqc/index.vue b/src/views/mes/qc/ipqc/index.vue index 8a175e0..9b096ed 100644 --- a/src/views/mes/qc/ipqc/index.vue +++ b/src/views/mes/qc/ipqc/index.vue @@ -665,11 +665,10 @@ export default { }, //选择生产工单 handleWorkorderSelect(){ - this.$refs.woSelect.showFlag = true; + this.$refs.woSelect.handleOpen(this.form.workorderId) }, onWorkorderSelected(row){ if(row != undefined && row != null){ - debugger; this.form.workorderId = row.workorderId; this.form.workorderCode = row.workorderCode; this.form.workorderName = row.workorderName; @@ -682,7 +681,7 @@ export default { } }, handleWorkstationSelect(){ - this.$refs.wsSelect.showFlag = true; + this.$refs.wsSelect.handleOpen(this.form.workstationId) }, onWorkstationSelected(row){ if(row != undefined && row != null){ diff --git a/src/views/mes/qc/oqc/index.vue b/src/views/mes/qc/oqc/index.vue index ef4546a..5640bc1 100644 --- a/src/views/mes/qc/oqc/index.vue +++ b/src/views/mes/qc/oqc/index.vue @@ -637,7 +637,7 @@ export default { }).catch(() => {}); }, handleSelectProduct(){ - this.$refs.itemSelect.showFlag = true; + this.$refs.itemSelect.handleOpen(this.form.itemId) }, //物料选择弹出框 onItemSelected(obj){ @@ -650,7 +650,7 @@ export default { } }, handleSelectClient(){ - this.$refs.clientSelect.showFlag = true; + this.$refs.clientSelect.handleOpen(this.form.clientId) }, //客户选择弹出框 onClientSelected(obj){ diff --git a/src/views/mes/wm/arrivalnotice/index.vue b/src/views/mes/wm/arrivalnotice/index.vue index ca474fd..d8f3afc 100644 --- a/src/views/mes/wm/arrivalnotice/index.vue +++ b/src/views/mes/wm/arrivalnotice/index.vue @@ -419,7 +419,7 @@ export default { //供应商选择 handleSelectVendor(){ this.resetForm("form"); - this.$refs.vendorSelect.showFlag = true; + this.$refs.vendorSelect.handleOpen(this.form.vendorId) }, //供应商选择弹出框 onVendorSelected(obj){ diff --git a/src/views/mes/wm/arrivalnotice/line.vue b/src/views/mes/wm/arrivalnotice/line.vue index 9acd4a8..2169082 100644 --- a/src/views/mes/wm/arrivalnotice/line.vue +++ b/src/views/mes/wm/arrivalnotice/line.vue @@ -301,7 +301,7 @@ export default { }, `arrivalnoticeline_${new Date().getTime()}.xlsx`) }, handleSelectProduct(){ - this.$refs.itemSelect.showFlag = true; + this.$refs.itemSelect.handleOpen(this.form.itemId) }, //物料选择弹出框 onItemSelected(obj){ diff --git a/src/views/mes/wm/issue/index.vue b/src/views/mes/wm/issue/index.vue index 55f356f..3b79c50 100644 --- a/src/views/mes/wm/issue/index.vue +++ b/src/views/mes/wm/issue/index.vue @@ -529,7 +529,7 @@ export default { }, //选择工作站 handleWorkstationSelect(){ - this.$refs.wsSelect.showFlag = true; + this.$refs.wsSelect.handleOpen(this.form.workstationId) }, onWorkstationSelected(row){ debugger; @@ -541,7 +541,7 @@ export default { }, //选择生产工单 handleWorkorderSelect(){ - this.$refs.woSelect.showFlag = true; + this.$refs.woSelect.handleOpen(this.form.workorderId) }, onWorkorderSelected(row){ if(row != undefined && row != null){ diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue index 570b355..85ac2ca 100644 --- a/src/views/mes/wm/itemrecpt/index.vue +++ b/src/views/mes/wm/itemrecpt/index.vue @@ -541,7 +541,7 @@ export default { //供应商选择 handleSelectVendor(){ this.$refs.form.resetFields() - this.$refs.vendorSelect.showFlag = true; + this.$refs.vendorSelect.handleOpen(this.form.vendorId) }, //供应商选择弹出框 onVendorSelected(obj){ @@ -550,11 +550,12 @@ export default { this.form.vendorCode = obj.vendorCode; this.form.vendorName = obj.vendorName; this.form.vendorNick = obj.vendorNick; + console.log(this.form, '----this.form----') } }, //到货通知单选择 handleSelectNotice(){ - this.$refs.noticeSelect.showFlag = true; + this.$refs.noticeSelect.handleOpen(this.form.noticeId) }, //到货通知单选择弹出框 onNoticeSelected(obj){ diff --git a/src/views/mes/wm/outsourceissue/index.vue b/src/views/mes/wm/outsourceissue/index.vue index 711f665..98d2d11 100644 --- a/src/views/mes/wm/outsourceissue/index.vue +++ b/src/views/mes/wm/outsourceissue/index.vue @@ -473,7 +473,7 @@ export default { }, //选择生产工单 handleWorkorderSelect(){ - this.$refs.woSelect.showFlag = true; + this.$refs.woSelect.handleOpen(this.form.workorderId) }, onWorkorderSelected(row){ if(row != undefined && row != null){ diff --git a/src/views/mes/wm/outsourcerecpt/index.vue b/src/views/mes/wm/outsourcerecpt/index.vue index e53a020..326a572 100644 --- a/src/views/mes/wm/outsourcerecpt/index.vue +++ b/src/views/mes/wm/outsourcerecpt/index.vue @@ -446,7 +446,7 @@ export default { }, //选择生产工单 handleWorkorderSelect(){ - this.$refs.woSelect.showFlag = true; + this.$refs.woSelect.handleOpen(this.form.workorderId) }, onWorkorderSelected(row){ if(row != undefined && row != null){ diff --git a/src/views/mes/wm/package/index.vue b/src/views/mes/wm/package/index.vue index 187e403..8995658 100644 --- a/src/views/mes/wm/package/index.vue +++ b/src/views/mes/wm/package/index.vue @@ -480,7 +480,7 @@ export default { }, //选择客户 handleSelectClient(){ - this.$refs.clientSelect.showFlag = true; + this.$refs.clientSelect.handleOpen(this.form.clientId) }, //客户选择弹出框 onClientSelected(obj){ diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue index ecc96d5..0834df5 100644 --- a/src/views/mes/wm/productrecpt/index.vue +++ b/src/views/mes/wm/productrecpt/index.vue @@ -448,11 +448,10 @@ export default { }, //选择生产工单 handleWorkorderSelect(){ - this.$refs.woSelect.showFlag = true; + this.$refs.woSelect.handleOpen(this.form.workorderId) }, onWorkorderSelected(row){ if(row != undefined && row != null){ - debugger; this.form.workorderId = row.workorderId; this.form.workorderCode = row.workorderCode; this.form.workorderName = row.workorderName; diff --git a/src/views/mes/wm/productsalse/index.vue b/src/views/mes/wm/productsalse/index.vue index e8e6d4e..d2b9893 100644 --- a/src/views/mes/wm/productsalse/index.vue +++ b/src/views/mes/wm/productsalse/index.vue @@ -520,7 +520,7 @@ export default { } }, handleSelectClient(){ - this.$refs.clientSelect.showFlag = true; + this.$refs.clientSelect.handleOpen(this.form.clientId) }, //客户选择弹出框 onClientSelected(obj){ diff --git a/src/views/mes/wm/productsalse/line.vue b/src/views/mes/wm/productsalse/line.vue index c6bbe56..820fd6e 100644 --- a/src/views/mes/wm/productsalse/line.vue +++ b/src/views/mes/wm/productsalse/line.vue @@ -395,8 +395,7 @@ export default { }, `productsalseline_${new Date().getTime()}.xlsx`) }, handleSelectStock(){ - this.$refs.stockSelect.showFlag = true; - this.$refs.stockSelect.getList(); + this.$refs.stockSelect.handleOpen(this.form.materialStockId) }, //物料选择弹出框 onStockSelected(obj){ diff --git a/src/views/mes/wm/rtissue/index.vue b/src/views/mes/wm/rtissue/index.vue index 59e4479..f59a339 100644 --- a/src/views/mes/wm/rtissue/index.vue +++ b/src/views/mes/wm/rtissue/index.vue @@ -479,7 +479,7 @@ export default { }, //选择生产工单 handleWorkorderSelect(){ - this.$refs.woSelect.showFlag = true; + this.$refs.woSelect.handleOpen(this.form.workorderId) }, onWorkorderSelected(row){ if(row != undefined && row != null){ diff --git a/src/views/mes/wm/rtsalse/index.vue b/src/views/mes/wm/rtsalse/index.vue index 36201b0..64f3e00 100644 --- a/src/views/mes/wm/rtsalse/index.vue +++ b/src/views/mes/wm/rtsalse/index.vue @@ -457,7 +457,7 @@ export default { }, //客户选择事件 handleSelectClient(){ - this.$refs.clientSelect.showFlag = true; + this.$refs.clientSelect.handleOpen(this.form.clientId) }, //客户选择 handleClientSelect(obj){ diff --git a/src/views/mes/wm/rtvendor/index.vue b/src/views/mes/wm/rtvendor/index.vue index a288412..9ec67b6 100644 --- a/src/views/mes/wm/rtvendor/index.vue +++ b/src/views/mes/wm/rtvendor/index.vue @@ -449,7 +449,7 @@ export default { }, //供应商选择 handleSelectVendor(){ - this.$refs.vendorSelect.showFlag = true; + this.$refs.vendorSelect.handleOpen(this.form.vendorId) }, //供应商选择弹出框 onVendorSelected(obj){ diff --git a/src/views/mes/wm/rtvendor/line.vue b/src/views/mes/wm/rtvendor/line.vue index e6128c1..9acc5dc 100644 --- a/src/views/mes/wm/rtvendor/line.vue +++ b/src/views/mes/wm/rtvendor/line.vue @@ -332,8 +332,7 @@ export default { }).catch(() => {}); }, handleSelectStock(){ - this.$refs.stockSelect.showFlag = true; - this.$refs.stockSelect.getList(); + this.$refs.stockSelect.handleOpen(this.form.materialStockId) }, //物料选择弹出框 onStockSelected(obj){