From 245525ee790a8cd7745e2b9ff7f7d41be725f083 Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Wed, 19 Jan 2022 18:48:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9dn=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 6 +- src/i18n/lang/en.ts | 4 +- src/pages/raw/commission/goOut/index.vue | 34 ++- src/pages/raw/commission/goOut/model.ts | 75 ++--- src/pages/raw/ingoods/dnReceipt/ImportDN.vue | 256 +++++++++--------- src/pages/raw/ingoods/dnReceipt/config.ts | 22 +- .../raw/ingoods/dnReceipt/dnReceiving.vue | 200 +++++++------- src/pages/raw/ingoods/dnReceipt/model.ts | 1 - 8 files changed, 294 insertions(+), 304 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index ea77d66..deb26c9 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -66,7 +66,7 @@ export default { po_Supplier: '供应商', po_OrderType: '订单类型', po_Location: '库存地点', - SAPLocation:'所选物料没有SAP库位，请重新选择', + SAPLocation: '所选物料没有SAP库位，请重新选择', po_PleaseScan: '请扫描PO单号', po_PleaseScanMATcode: '请扫描物料条码', PleaseScan: '请扫描', @@ -251,7 +251,7 @@ export default { CommissionedDemandData: '需求数据', CommissionedCumulativeData: '累计数据', CommissionedLocation: '库位', - CommissionedThisNumber: '本次数量', + CommissionedThisNumber: '本次', CommissionedNumber: '入库数量', CommissionedEntrantDetails: '入库明细', CommissionedReceiptQuantity: '收货数量', @@ -354,6 +354,7 @@ export default { product_Tip7: '同一条码不可重复录入！', product_Tip8: '扫码成功', product_Tip9: '该条码未入库', + repeatedly: '请勿重复添加', //半成品冰箱下线 product_unit1: '件/个', @@ -384,6 +385,7 @@ export default { product_Tip5: '条码不规范', product_Tip6: '扫描出库数量不可大于物料总数', product_StoListDetails: 'STO单明细', + delete: '删除', //领用借用 Warehouse_Tip1: '请输入DN单号', diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 7442075..3d58531 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -243,7 +243,7 @@ export default { finishedProduct: 'Please select finished product code first', CommissionedDemandData: 'Demand', CommissionedCumulativeData: 'total', - CommissionedLocation: 'Location', + CommissionedLocation: 'Loc', CommissionedThisNumber: 'quantity', CommissionedNumber: 'Receipt quantity', CommissionedEntrantDetails: 'Warehousing', @@ -351,6 +351,8 @@ export default { product_FGDes: 'FG desc', product_MaterialDes: 'MAT desc', product_Number: 'Qty', + repeatedly: 'Do not add repeatedly', + delete: 'delete', product_costCenter: 'Cost center', product_Unit: 'Unit', product_Cancel: 'Cancel', diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue index a837194..3db908a 100644 --- a/src/pages/raw/commission/goOut/index.vue +++ b/src/pages/raw/commission/goOut/index.vue @@ -187,6 +187,13 @@ export default class dnReceiptDom extends BasePage { } //点击添加 Add() { + if (!this.every) { + uni.showToast({ + icon: 'none', + title: this.$t('message.Commission_tips6') as any, + }); + return; + } if (this.nowAmount == '' || this.wlCode == '') { uni.showToast({ icon: 'none', @@ -214,10 +221,15 @@ export default class dnReceiptDom extends BasePage { success: (res) => { if (res.confirm) { let arr = { + poNo: this.form.documentNo, + materialCode: this.every.materialCode, + loginName: this.session.loginName, + factoryCode: this.session.factoryCode, wlCode: this.wlCode.label, nowAmount: this.nowAmount, }; this.list.push(arr); + console.log('this.list', this.list); this.business(); } else if (res.cancel) { return; @@ -226,15 +238,21 @@ export default class dnReceiptDom extends BasePage { }); } else { let arr = { + poNo: this.form.documentNo, + materialCode: this.every.materialCode, + loginName: this.session.loginName, + factoryCode: this.session.factoryCode, wlCode: this.wlCode.label, nowAmount: this.nowAmount, }; this.list.push(arr); + console.log('this.list', this.list); this.business(); } } deleteItem(index: any) { this.list.splice(index, 1); + console.log('this.list', this.list); this.business(); } async onSubmit() { @@ -244,14 +262,14 @@ export default class dnReceiptDom extends BasePage { title: this.$t('message.Commission_tips5') as any, }); } - let upload = { - poNo: this.form.documentNo, - materialCode: this.every.materialCode, - loginName: session.loginName, - factoryCode: session.factoryCode, - list: this.list, - }; - await this.model.submitOutsourcing(upload); + // let upload = { + // poNo: this.form.documentNo, + // materialCode: this.every.materialCode, + // loginName: session.loginName, + // factoryCode: session.factoryCode, + // list: this.list, + // }; + await this.model.submitOutsourcing(this.list); this.empty(); } async bill() { diff --git a/src/pages/raw/commission/goOut/model.ts b/src/pages/raw/commission/goOut/model.ts index 5a61185..2ca9de3 100644 --- a/src/pages/raw/commission/goOut/model.ts +++ b/src/pages/raw/commission/goOut/model.ts @@ -1,14 +1,8 @@ -import { - Action, - getModule, - Module, - MutationAction, - VuexModule, -} from "vuex-module-decorators"; -import store from "@/store"; -import http from "@/utils/request"; -import { url } from "@/utils/url"; -import { session } from "@/store/modules/session"; +import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; // import vm from '@/main'; class OrderInInfo { @@ -23,7 +17,7 @@ class OrderInInfo { namespaced: true, dynamic: true, store, - name: "product.outbound.stoOutbound", + name: 'product.outbound.stoOutbound', }) export class ReturningModule extends VuexModule { /** @@ -43,7 +37,7 @@ export class ReturningModule extends VuexModule { */ orderInInfo: OrderInInfo = new OrderInInfo(); //记账按钮的code码 - code = ""; + code = ''; /** * 委外出库单号查询 * @param orderNo @@ -99,15 +93,12 @@ export class ReturningModule extends VuexModule { */ @Action async materialComplete(form: any) { - const res = await http.post( - url.material.commission.goOut.materialComplete, - { - factoryCode: session.factoryCode, - loginName: session.loginName, - ...form, - } - ); - console.log(res, ">>>>>res"); + const res = await http.post(url.material.commission.goOut.materialComplete, { + factoryCode: session.factoryCode, + loginName: session.loginName, + ...form, + }); + console.log(res, '>>>>>res'); } /** @@ -120,15 +111,12 @@ export class ReturningModule extends VuexModule { loginName: session.loginName, }; let oneMaterielDetail: any = {}; - const { data }: any = await http.post( - url.outbound.stoOutbound.checkScan, - obj - ); - console.log("shneme a ", data.records); + const { data }: any = await http.post(url.outbound.stoOutbound.checkScan, obj); + console.log('shneme a ', data.records); oneMaterielDetail = data.records[0]; data.records[0].materialCode = list[0].productCode; data.records[0].materialDesc = list[0].productDescZh; - console.log("aaaaa", oneMaterielDetail); + console.log('aaaaa', oneMaterielDetail); return oneMaterielDetail; } /** @@ -137,11 +125,8 @@ export class ReturningModule extends VuexModule { */ @MutationAction async confirm(list: any[]) { - const { code, data } = await http.post( - url.outbound.stoOutbound.Bookkeeping, - list - ); - console.log("res数据", data, code); + const { code, data } = await http.post(url.outbound.stoOutbound.Bookkeeping, list); + console.log('res数据', data, code); // if (code == '1') { // uni.showToast({ icon: 'success', title: msg }); // } else { @@ -150,13 +135,11 @@ export class ReturningModule extends VuexModule { const materielList: any = []; return { code, materielList }; } - - @Action({ commit: "updateCheckedOrderInInfoListKw" }) + //委外出库 初始化获取库位 + @Action({ commit: 'updateCheckedOrderInInfoListKw' }) async queryByFactoryCodeAndWorkAreaCode(content: any) { - let res = await http.post( - "/wmspda/fg/queryByFactoryCodeAndWorkAreaCode", - content - ); + let res = await http.post('/wmspda/fg/queryByFactoryCodeAndWorkAreaCode', content); + console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', res); return res; } @@ -172,20 +155,14 @@ export class ReturningModule extends VuexModule { @Action async submitOutsourcing(upload: any) { - let res = await http.post( - url.outbound.stoOutbound.materialComplete, - upload - ); + let res = await http.post(url.outbound.stoOutbound.materialComplete, upload); return res; } //查询明细 - @Action({ commit: "updateCheckedOrderInInfoListKw" }) + @Action({ commit: 'updateCheckedOrderInInfoListKw' }) async querydetaildlist(content: any) { - let res: any = await http.post( - "/wmspda/material/outsourcing/outInfo", - content - ); - console.log("明细》》》》》》》》》", res.list); + let res: any = await http.post('/wmspda/material/outsourcing/outInfo', content); + console.log('明细》》》》》》》》》', res.list); this.detailedList = res.data; return res; } diff --git a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue index b5a7e89..4ec02a2 100644 --- a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue +++ b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue @@ -55,7 +55,7 @@ {{ $t('message.CommissionedLocation') }} - + {{ $t('message.CommissionedThisNumber') }} @@ -66,21 +66,7 @@ {{ $t('message.product_add') }} - - - - {{ $t('message.product_Location') }} - {{ $t('message.product_Number') }} - {{ $t('message.operation') }} - - - {{ item.wlCode }} - {{ item.receiptAmount }} - - {{ $t('message.product_Delete') }} - - - + @@ -99,12 +85,13 @@ @@ -571,7 +606,7 @@ export default class dnReceiptDom extends BasePage { line-height: 100rpx; } .search { - padding-left: 1px; + padding-left: 20px; } } .library-right { From e06fba98009bdb7923f4a67091d1f3e4224bdb07 Mon Sep 17 00:00:00 2001 From: zhoulei Date: Thu, 20 Jan 2022 18:00:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E5=BC=B9=E7=AA=97=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E3=80=81=E8=BE=93=E5=85=A5=E8=BF=87=E6=BB=A4=E7=9A=84?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=96=B9=E6=A1=88=E7=A4=BA=E4=BE=8B=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 24 +++++++++++++++++------- src/components/base/page.ts | 18 ++++++++++++++---- src/pages/login/login/index.vue | 19 +++++++++++++++---- src/utils/mixin.ts | 27 +++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 15 deletions(-) create mode 100644 src/utils/mixin.ts diff --git a/src/App.vue b/src/App.vue index c997206..afef0a8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,28 +1,38 @@ +