From 54103d3371fe0451c4289a82c3a4fff47f94d2a7 Mon Sep 17 00:00:00 2001 From: mhsnet Date: Thu, 22 Aug 2024 14:11:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jnpf-app/api/yys/dayWork.js | 19 ++ .../pages/yys/dayWork/components/PopSure.vue | 250 ++++++++++++++---- jnpf-app/pages/yys/dayWork/index.vue | 2 +- 3 files changed, 224 insertions(+), 47 deletions(-) diff --git a/jnpf-app/api/yys/dayWork.js b/jnpf-app/api/yys/dayWork.js index 0b3959d..85dd56c 100644 --- a/jnpf-app/api/yys/dayWork.js +++ b/jnpf-app/api/yys/dayWork.js @@ -18,3 +18,22 @@ export function userList() { method: "POST", }); } +// 物料信息列表-app +export function materialInformationList() { + return request({ + url: "/api/system/DataInterface/596288337614995461/Actions/Preview", + method: "POST", + }); +} +// 报工确认-app +export function sure(params) { + let data = { + ...params + }; + console.log(data) + return request({ + url: "/api/example/YysDayWork/sure", + method: "POST", + data, + }); +} diff --git a/jnpf-app/pages/yys/dayWork/components/PopSure.vue b/jnpf-app/pages/yys/dayWork/components/PopSure.vue index 87a983e..98a1db0 100644 --- a/jnpf-app/pages/yys/dayWork/components/PopSure.vue +++ b/jnpf-app/pages/yys/dayWork/components/PopSure.vue @@ -107,7 +107,24 @@ > - {{ prodReportItem.reportMember }} + + @@ -127,7 +144,12 @@ - + @@ -186,7 +208,26 @@ :key="packageReportIndex" > - {{ packageReportItem.reportMember }} + + + + {{ dataItem.defectiveNum }} @@ -203,7 +244,12 @@ - + @@ -257,28 +303,60 @@ ) in dataItem.requisitionReportList" :key="requisitionReportIndex" > - {{ - requisitionReportItem.materialCode - }} - - + + + + + + + + + + + + + + + - - + + + + - @@ -309,7 +387,7 @@ import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js"; import { mapGetters } from "vuex"; import { toProd } from "@/api/yys/materialProcurementOrder.js"; -import { userList } from "@/api/yys/dayWork.js"; +import { userList, materialInformationList, sure } from "@/api/yys/dayWork.js"; import dayjs from "dayjs"; export default { components: {}, @@ -321,6 +399,8 @@ export default { dataItem: {}, productionTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), isShowPickerA: false, + isShowReportMember: false, + isShowMaterialCode: false, pickerParams: { year: true, month: true, @@ -329,16 +409,24 @@ export default { minute: true, second: true, }, + reportMemberList: [], + materialList: [], prodReportItemO: { reportMember: undefined, + reportMemberIndex: [], + reportMemberShow: undefined, compensatoryHour: undefined, }, packageReportItemO: { + reportMemberShow: undefined, + reportMemberIndex: [], reportMember: undefined, compensatoryHour: undefined, }, requisitionReportItemO: { materialCode: undefined, + materialCodeIndex: [], + materialName: undefined, duty: undefined, classBalance: undefined, }, @@ -359,7 +447,8 @@ export default { if (!dataItem.requisitionReportList) { dataItem.requisitionReportList = []; } - this.fnUserList(); + this.fnReportMemberList(); + this.fnMaterialInformationList(); this.dataItem = dataItem; this.productionNumber = undefined; this.productionTime = dayjs().format("YYYY-MM-DD HH:mm:ss"); @@ -370,21 +459,8 @@ export default { this.isShow = false; }, fnOk() { - if (!this.productionNumber) { - this.$refs.uTips.show({ - title: "数量不能为空", - type: "error", - duration: "2300", - }); - console.log(this.productionNumber); - return true; - } - let _params = { - orderNumber: this.dataItem.orderNumber, - productionTime: dayjs(this.productionTime), - productionNumber: this.productionNumber, - }; - toProd(_params) + let _params = { ...this.dataItem }; + sure(_params) .then((res) => { if (res.code == 200) { this.$emit("evtRefresh"); @@ -412,11 +488,11 @@ export default { ":" + timeObj.second; }, - fnUserList() { + fnReportMemberList() { userList() .then((res) => { if (res.code == 200) { - console.log(res); + this.reportMemberList = res.data; } }) .catch((err) => { @@ -424,13 +500,95 @@ export default { }); }, fnProdReportItemAdd() { - this.dataItem.prodReportList.push(this.prodReportItemO); + this.dataItem.prodReportList.push({ ...this.prodReportItemO }); + }, + fnProdReportItemDel(index) { + this.dataItem.prodReportList.splice(index, 1); + }, + fnProReportMemberSltd(row, index) { + this.dataItem.prodReportList[index]["reportMember"] = row[0]["value"]; + this.fnProReportMemberFind( + this.dataItem.prodReportList[index]["reportMember"], + index + ); + }, + fnProReportMemberFind(reportMember, index) { + let _list = [...this.reportMemberList]; + let _reportMember = _list.find((o1) => { + return o1.id == reportMember; + }); + let _reportMemberIndex = _list.indexOf(_reportMember); + this.dataItem.prodReportList[index]["reportMemberIndex"] = [ + _reportMemberIndex, + ]; + this.dataItem.prodReportList[index]["reportMemberShow"] = + _reportMember.realName; }, fnPackageReportItemAdd() { - this.dataItem.packageReportList.push(this.packageReportItemO); + this.dataItem.packageReportList.push({ ...this.packageReportItemO }); + }, + fnPackageReportItemDel(index) { + this.dataItem.packageReportList.splice(index, 1); + }, + fnPackageReportMemberSltd(row, index) { + this.dataItem.packageReportList[index]["reportMember"] = row[0]["value"]; + this.fnPackageReportMemberFind( + this.dataItem.packageReportList[index]["reportMember"], + index + ); + }, + fnPackageReportMemberFind(reportMember, index) { + let _list = [...this.reportMemberList]; + let _reportMember = _list.find((o1) => { + return o1.id == reportMember; + }); + let _reportMemberIndex = _list.indexOf(_reportMember); + this.dataItem.packageReportList[index]["reportMemberIndex"] = [ + _reportMemberIndex, + ]; + this.dataItem.packageReportList[index]["reportMemberShow"] = + _reportMember.realName; }, fnRequisitionReportItemAdd() { - this.dataItem.requisitionReportList.push(this.requisitionReportItemO); + this.dataItem.requisitionReportList.push({ + ...this.requisitionReportItemO, + }); + }, + fnRequisitionReportItemDel(index) { + this.dataItem.requisitionReportList.splice(index, 1); + }, + fnMaterialInformationList() { + materialInformationList() + .then((res) => { + if (res.code == 200) { + console.log(res); + this.materialList = res.data; + //this.reportMemberList = res.data; + } + }) + .catch((err) => { + console.log(err); + }); + }, + fnMaterialCodeSltd(row, index) { + this.dataItem.requisitionReportList[index]["materialCode"] = + row[0]["value"]; + this.fnMaterialCodeFind( + this.dataItem.requisitionReportList[index]["materialCode"], + index + ); + }, + fnMaterialCodeFind(materialCode, index) { + let _list = [...this.materialList]; + let _material = _list.find((o1) => { + return o1.materialCode == materialCode; + }); + let _materialCodeIndex = _list.indexOf(_material); + this.dataItem.requisitionReportList[index]["materialCodeIndex"] = [ + _materialCodeIndex, + ]; + this.dataItem.requisitionReportList[index]["materialName"] = + _material.materialName; }, }, }; diff --git a/jnpf-app/pages/yys/dayWork/index.vue b/jnpf-app/pages/yys/dayWork/index.vue index a24c49a..08212b2 100644 --- a/jnpf-app/pages/yys/dayWork/index.vue +++ b/jnpf-app/pages/yys/dayWork/index.vue @@ -124,7 +124,7 @@ export default { }, fnRefreshA() { this.$refs.uTips.show({ - title: "投产提交成功", + title: "报工确认提交成功", type: "success", duration: "2300", });