From 52580cae6bf2a56d05e8e994477e64a0339c2708 Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Thu, 21 May 2026 14:41:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8E=A5=E6=94=B6=E3=80=81?= =?UTF-8?q?=E9=95=80=E5=89=8D=E5=85=A5=E5=BA=93=E3=80=81=E9=95=80=E5=89=8D?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/plan/operationReceiving.vue | 34 +++++------- pages/production/warehousing.vue | 65 +++++----------------- pages/production/warehousingIssue.vue | 80 ++++++++------------------- 3 files changed, 53 insertions(+), 126 deletions(-) diff --git a/pages/plan/operationReceiving.vue b/pages/plan/operationReceiving.vue index ec39f51..53799b0 100644 --- a/pages/plan/operationReceiving.vue +++ b/pages/plan/operationReceiving.vue @@ -70,7 +70,7 @@ {{ tableObj.currentWpTitle }} --> - + > --> @@ -117,6 +117,10 @@ export default { this.getData(code); }, confirm(e) { + uni.showLoading({ + title: "接收中...", + mask: true, + }); this.getBarCode(e.target.value, true); }, getData(code) { @@ -128,33 +132,25 @@ export default { .then((res) => { this.value = ""; this.tableObj = res.data; - uni.showToast({ - title: "数据获取成功", - }); - console.log(898989898, res); + // uni.showToast({ + // title: "数据获取成功", + // }); + this.submitClick() }) - .catch((err) => {}); + .catch((err) => { + this.value = ""; + this.tableObj = {}; + }); }, submitClick() { this.$u.api.workPlanReceive({ wpIds: this.tableObj.wpId }).then((res) => { - console.log(898989898, res); this.tableObj = {}; + this.hideLoading(); uni.showToast({ title: "接收成功", }); this.twoInputFcous = true; }); - // this.$ajax.request({ - // url: "prWorkPlan/workPlanReceive/" + this.tableObj.wpId, - // method: "POST", - // success: (data) => { - // this.tableObj = {}; - // uni.showToast({ - // title: "接收成功", - // }); - // this.twoInputFcous = true; - // }, - // }); }, }, }; diff --git a/pages/production/warehousing.vue b/pages/production/warehousing.vue index 72ff71b..c2adec4 100644 --- a/pages/production/warehousing.vue +++ b/pages/production/warehousing.vue @@ -65,7 +65,7 @@ {{ prWorkOrder.nextTeamCode }} - + @@ -113,6 +113,10 @@ export default { this.getData(code); }, confirm(e) { + uni.showLoading({ + title: "镀前入库中...", + mask: true, + }); this.getBarCode(e.target.value, true); }, getData(code) { @@ -124,38 +128,13 @@ export default { this.prWorkPlan = data; this.prWorkOrder = data; this.quantity = data.inQuantity; - - // if (!data.oem) { - // this.makeTeam = data.makeTeam; - // } - // if (data.oemCustomer) { - // this.oemCustomer = data.oemCustomer; - // } - - uni.showToast({ - title: "数据获取成功", - }); - }); - // this.$ajax.request({ - // url: "pdaLoad/loadPlateFe/" + code, - // method: "GET", - // success: (data) => { - // this.value = ""; - // this.prWorkPlan = data; - // this.prWorkOrder = data.prWorkOrder; - // console.log(data.prWorkOrder); - // this.quantity = data.prWorkOrder.makeQty; - // if (!data.oem) { - // this.makeTeam = data.makeTeam; - // } - // if (data.oemCustomer) { - // this.oemCustomer = data.oemCustomer; - // } - // uni.showToast({ - // title: "数据获取成功", - // }); - // }, - // }); + this.submitClick() + + }).catch(err=>{ + this.value = ""; + this.setData(); + }) + }, submitClick() { let query = []; @@ -169,6 +148,7 @@ export default { console.log(query,'query'); this.$u.api.savePlateFrontEnter(query).then((res) => { + uni.hideLoading() uni.showToast({ title: "入库成功", }); @@ -176,22 +156,7 @@ export default { this.setData(); }); - // this.$ajax.request({ - // url: "pdaSave/savePlateFe", - // method: "POST", - // data: { - // prWorkPlan: this.prWorkPlan, - // quantity: this.quantity, - // makeTeam: this.makeTeam, - // }, - // success: (data) => { - // uni.showToast({ - // title: "入库成功", - // }); - // this.value = ""; - // this.setData(); - // }, - // }); + }, setData() { this.prWorkPlan = {}; diff --git a/pages/production/warehousingIssue.vue b/pages/production/warehousingIssue.vue index fd5bda5..441a9e6 100644 --- a/pages/production/warehousingIssue.vue +++ b/pages/production/warehousingIssue.vue @@ -44,9 +44,7 @@ 上序班组/供应商 - {{ - prWorkOrder.nextTeamCode || prWorkOrder.ocName - }} + {{ prWorkOrder.nextTeamCode || prWorkOrder.ocName }} 工序号 @@ -65,7 +63,7 @@ {{ prWorkOrder.inQuantity }} - - + --> @@ -114,49 +112,31 @@ export default { this.getData(code); }, confirm(e) { + uni.showLoading({ + title: "镀前出库中...", + mask: true, + }); this.getBarCode(e.target.value, true); }, getData(code) { if (!code) return; this.value = code; - this.$u.api.getBeforePlatOutCardNo({ cardNo: code }).then((res) => { - let data = res.data; - console.log(data,'8787878878'); - this.value = ""; - this.prPlateAround = data; - this.prWorkPlan = data; - this.prWorkOrder = data; - this.quantity = data.inQuantity; - // if (!data.prWorkPlan.oem) { - // this.makeTeam = data.prWorkPlan.makeTeam; - // } - // if (data.oemCustomer) { - // this.oemCustomer = data.prWorkPlan.oemCustomer; - // } - uni.showToast({ - title: "数据获取成功", + this.$u.api + .getBeforePlatOutCardNo({ cardNo: code }) + .then((res) => { + let data = res.data; + this.value = ""; + this.prPlateAround = data; + this.prWorkPlan = data; + this.prWorkOrder = data; + this.quantity = data.inQuantity; + + this.submitClick(); + }) + .catch((err) => { + this.value = ""; + this.setData(); }); - }); - // this.$ajax.request({ - // url: "pdaLoad/loadPlateFi/" + code, - // method: "GET", - // success: (data) => { - // this.value = ""; - // this.prPlateAround = data; - // this.prWorkPlan = data.prWorkPlan; - // this.prWorkOrder = data.prWorkPlan.prWorkOrder; - // this.quantity = data.prWorkPlan.quantity; - // if (!data.prWorkPlan.oem) { - // this.makeTeam = data.prWorkPlan.makeTeam; - // } - // if (data.oemCustomer) { - // this.oemCustomer = data.prWorkPlan.oemCustomer; - // } - // uni.showToast({ - // title: "数据获取成功", - // }); - // }, - // }); }, submitClick() { let query = []; @@ -167,28 +147,14 @@ export default { id: this.prWorkPlan.id, quantity: this.prWorkPlan.inQuantity, }); - console.log(query,'query'); this.$u.api.savePlateFrontEnterIssue(query).then((res) => { + uni.hideLoading(); uni.showToast({ title: "出库成功", }); this.value = ""; this.setData(); }); - - - // this.$ajax.request({ - // url: 'pdaSave/savePlateFi', - // method: 'POST', - // data: this.prPlateAround, - // success: data => { - // uni.showToast({ - // title: '出库成功' - // }); - // this.value = ''; - // this.setData(); - // } - // }); }, setData() { this.prWorkPlan = {