From 02e1a3cb5f4b38125097682f62dff8b2591fcd97 Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Wed, 8 Dec 2021 16:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=20=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 2 + src/i18n/lang/en.ts | 3 +- .../product/warehouse/wholeCollect/model.ts | 53 ++++++++++-------- .../product/warehouse/wholeLnventory/model.ts | 55 ++++++++++++------- .../product/warehouse/wholeScrap/model.ts | 55 +++++++++++-------- .../warehouse/wholeTransfer/Local-details.vue | 6 +- .../product/warehouse/wholeTransfer/model.ts | 2 +- src/pages/raw/ingoods/dnReturnGoods/model.ts | 2 +- src/pages/raw/ingoods/poReceipt/model.ts | 2 +- src/pages/raw/ingoods/receipt/model.ts | 37 +++++++------ src/pages/raw/warehouse/rowInventory/model.ts | 2 +- 11 files changed, 130 insertions(+), 89 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index a55e812..b7bb602 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -245,6 +245,8 @@ export default { start: "开始时间", _tips5: "请选择相同库位", _tips6: "请先输入要查询的单号", + Out: "出", + enter: "入", //移库 Warehouse_QueryCriteria: "查询条件", Warehouse_TransferOrderNo: "移库单号", diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 0690b96..036f154 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -247,7 +247,8 @@ export default { start: "start time", _tips5: "Please select the same location", _tips6: "Please enter the order number to query first", - + Out: "Out", + enter: "enter", //移库 Warehouse_QueryCriteria: "Query criteria", Warehouse_TransferOrderNo: "Transfer order No", diff --git a/src/pages/product/warehouse/wholeCollect/model.ts b/src/pages/product/warehouse/wholeCollect/model.ts index 0f23053..7507cca 100644 --- a/src/pages/product/warehouse/wholeCollect/model.ts +++ b/src/pages/product/warehouse/wholeCollect/model.ts @@ -1,10 +1,16 @@ -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 { page } from '@/utils/page'; -import vm from '@/main'; +import vm from "@/main"; class OrderInInfo { productDescZh?: string; @@ -20,7 +26,7 @@ class OrderInInfo { namespaced: true, dynamic: true, store, - name: 'product.warehouse.wholeCollect', + name: "product.warehouse.wholeCollect", }) export class wholeCollect extends VuexModule { /** @@ -40,7 +46,7 @@ export class wholeCollect extends VuexModule { /** * 隐藏看单号 */ - dnNo = ''; + dnNo = ""; /** * 看单号查询结果 */ @@ -89,25 +95,28 @@ export class wholeCollect extends VuexModule { factoryCode: session.factoryCode, loginName: session.loginName, }); - console.log('获取来的数据', res.data.records); + console.log("获取来的数据", res.data.records); const orderInInfo = res.data.records[0] || {}; - if (orderInInfo.custCode == '0') { - orderInInfo.custCodeName = vm.$t('message.Warehouse_NX') as any; - } else if (orderInInfo.custCode == '1') { - orderInInfo.custCodeName = vm.$t('message.Warehouse_WX') as any; - } else if (orderInInfo.custCode == '2') { - orderInInfo.custCodeName = vm.$t('message.Warehouse_YJ') as any; - } else if (orderInInfo.custCode == '4') { - orderInInfo.custCodeName = vm.$t('message.Warehouse_BCP') as any; + if (orderInInfo.custCode == "0") { + orderInInfo.custCodeName = vm.$t("message.Warehouse_NX") as any; + } else if (orderInInfo.custCode == "1") { + orderInInfo.custCodeName = vm.$t("message.Warehouse_WX") as any; + } else if (orderInInfo.custCode == "2") { + orderInInfo.custCodeName = vm.$t("message.Warehouse_YJ") as any; + } else if (orderInInfo.custCode == "4") { + orderInInfo.custCodeName = vm.$t("message.Warehouse_BCP") as any; } return { orderInInfo }; } @MutationAction async onTakeoutConfirm(list: any[]) { - const records: any = await http.post(url.warehouse.rowTransfer.commit, list); + const records: any = await http.post( + url.warehouse.rowTransfer.commit, + list + ); if (records.code == 1) { - uni.showToast({ icon: 'success', title: 'success' }); + uni.showToast({ icon: "success", title: "success" }); // uni.navigateTo({ url: page.product.warehouse.index }); } return {}; @@ -141,11 +150,11 @@ export class wholeCollect extends VuexModule { /** * 修改库位 */ - @Action({ commit: 'updateCheckedOrderInInfoListKw' }) + @Action({ commit: "updateCheckedOrderInInfoListKw" }) async changeOrderInLocation(kw: string) { - await http.post('/material/orderin/enter', { + await http.post("/wmspda/material/orderin/enter", { loginName: session.loginName, - warehouseCode: '', + warehouseCode: "", factoryCode: session.factoryCode, locationCode: kw, }); diff --git a/src/pages/product/warehouse/wholeLnventory/model.ts b/src/pages/product/warehouse/wholeLnventory/model.ts index 8e7caa4..6b861ea 100644 --- a/src/pages/product/warehouse/wholeLnventory/model.ts +++ b/src/pages/product/warehouse/wholeLnventory/model.ts @@ -1,10 +1,16 @@ -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 { page } from '@/utils/page'; -import vm from '@/main'; +import vm from "@/main"; class OrderInInfo { productDescZh?: string; @@ -16,7 +22,7 @@ class OrderInInfo { namespaced: true, dynamic: true, store, - name: 'product.warehouse.wholeLnventory', + name: "product.warehouse.wholeLnventory", }) export class wholeLnventory extends VuexModule { /** @@ -36,9 +42,9 @@ export class wholeLnventory extends VuexModule { /** * 隐藏看单号 */ - dnNo = ''; + dnNo = ""; records = { - code: '', + code: "", }; /** * 看单号查询结果 @@ -92,20 +98,23 @@ export class wholeLnventory extends VuexModule { }); const WlListaa = res.data; const WlList = res.data.map((_: any) => ({ - label: _.productCode + '-' + _.locCode, + label: _.productCode + "-" + _.locCode, value: _.locCode, })); - console.log('WlList', WlList); + console.log("WlList", WlList); return { WlList, WlListaa }; } @MutationAction async onTakeoutConfirm(list: any) { - const records: any = await http.post(url.warehouse.wholeLnventory.commit, list); + const records: any = await http.post( + url.warehouse.wholeLnventory.commit, + list + ); if (records.code == 1) { uni.showToast({ - icon: 'success', - title: 'success', + icon: "success", + title: "success", }); // uni.navigateTo({ url: page.product.warehouse.index }); } @@ -114,10 +123,16 @@ export class wholeLnventory extends VuexModule { @MutationAction async toScanCode(list: any) { - const records: any = await http.post(url.warehouse.wholeLnventory.scanCode, list); + const records: any = await http.post( + url.warehouse.wholeLnventory.scanCode, + list + ); if (records.code == 1) { - console.log('数据啊啊啊', records); - uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip9') as any }); + console.log("数据啊啊啊", records); + uni.showToast({ + icon: "none", + title: vm.$t("message.Warehouse_Tip9") as any, + }); return { records }; } // if (records.code == 0) { @@ -128,12 +143,12 @@ export class wholeLnventory extends VuexModule { /** * 修改库位 */ - @Action({ commit: 'updateCheckedOrderInInfoListKw' }) + @Action({ commit: "updateCheckedOrderInInfoListKw" }) async changeOrderInLocation(kw: string) { - await http.post('/material/orderin/enter', { + await http.post("/wmspda/material/orderin/enter", { // loginName: '1999', loginName: session.loginName, - warehouseCode: '', + warehouseCode: "", // factoryCode: '1999', factoryCode: session.factoryCode, locationCode: kw, diff --git a/src/pages/product/warehouse/wholeScrap/model.ts b/src/pages/product/warehouse/wholeScrap/model.ts index 09b348c..0a17d69 100644 --- a/src/pages/product/warehouse/wholeScrap/model.ts +++ b/src/pages/product/warehouse/wholeScrap/model.ts @@ -1,9 +1,15 @@ -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'; +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"; // import { page } from '@/utils/page'; class OrderInInfo { @@ -21,7 +27,7 @@ class OrderInInfo { namespaced: true, dynamic: true, store, - name: 'product.warehouse.wholeScrap', + name: "product.warehouse.wholeScrap", }) export class wholeScrap extends VuexModule { /** @@ -41,7 +47,7 @@ export class wholeScrap extends VuexModule { /** * 隐藏看单号 */ - dnNo = ''; + dnNo = ""; /** * 看单号查询结果 */ @@ -94,27 +100,30 @@ export class wholeScrap extends VuexModule { loginName: session.loginName, // loginName: '1999', }); - console.log('获取来的数据', res.data.records); + console.log("获取来的数据", res.data.records); const orderInInfo = res.data.records[0]; - if (orderInInfo.custCode == '0') { - orderInInfo.custCodeName = vm.$t('message.Warehouse_NX') as any; - } else if (orderInInfo.custCode == '1') { - orderInInfo.custCodeName = vm.$t('message.Warehouse_WX') as any; - } else if (orderInInfo.custCode == '2') { - orderInInfo.custCodeName = vm.$t('message.Warehouse_YJ') as any; - } else if (orderInInfo.custCode == '4') { - orderInInfo.custCodeName = vm.$t('message.Warehouse_BCP') as any; + if (orderInInfo.custCode == "0") { + orderInInfo.custCodeName = vm.$t("message.Warehouse_NX") as any; + } else if (orderInInfo.custCode == "1") { + orderInInfo.custCodeName = vm.$t("message.Warehouse_WX") as any; + } else if (orderInInfo.custCode == "2") { + orderInInfo.custCodeName = vm.$t("message.Warehouse_YJ") as any; + } else if (orderInInfo.custCode == "4") { + orderInInfo.custCodeName = vm.$t("message.Warehouse_BCP") as any; } return { orderInInfo }; } @MutationAction async onTakeoutConfirm(list: any) { - const records: any = await http.post(url.warehouse.rowTransfer.commit, list); + const records: any = await http.post( + url.warehouse.rowTransfer.commit, + list + ); if (records.code == 1) { uni.showToast({ - icon: 'success', - title: 'success', + icon: "success", + title: "success", }); // uni.navigateTo({ url: page.product.warehouse.index }); } @@ -149,12 +158,12 @@ export class wholeScrap extends VuexModule { /** * 修改库位 */ - @Action({ commit: 'updateCheckedOrderInInfoListKw' }) + @Action({ commit: "updateCheckedOrderInInfoListKw" }) async changeOrderInLocation(kw: string) { - await http.post('/material/orderin/enter', { + await http.post("/wmspda/material/orderin/enter", { loginName: session.loginName, // loginName: '1999', - warehouseCode: '', + warehouseCode: "", factoryCode: session.factoryCode, // factoryCode: '1999', locationCode: kw, diff --git a/src/pages/product/warehouse/wholeTransfer/Local-details.vue b/src/pages/product/warehouse/wholeTransfer/Local-details.vue index 2a5465b..c5c1734 100644 --- a/src/pages/product/warehouse/wholeTransfer/Local-details.vue +++ b/src/pages/product/warehouse/wholeTransfer/Local-details.vue @@ -52,7 +52,7 @@ export default class RawReceiptDetail extends BasePage { if (this.cpRef4 == "") { uni.showToast({ icon: "none", - title: "请先输入要查询的单号" as any, + title: this.$t("message._tips6") as any, }); return; } @@ -67,9 +67,9 @@ export default class RawReceiptDetail extends BasePage { let arr = this.model.detailedList; arr.forEach((item: any) => { if (item.oiType == 10 || item.oiType == "10") { - item.oiType = "入"; + item.oiType = this.$t("message.enter"); } else { - item.oiType = "出"; + item.oiType = this.$t("message.Out"); } }); this.detailedList = arr; diff --git a/src/pages/product/warehouse/wholeTransfer/model.ts b/src/pages/product/warehouse/wholeTransfer/model.ts index 1ddad87..4ab7a7c 100644 --- a/src/pages/product/warehouse/wholeTransfer/model.ts +++ b/src/pages/product/warehouse/wholeTransfer/model.ts @@ -180,7 +180,7 @@ export class wholeTransfer extends VuexModule { */ @Action({ commit: "updateCheckedOrderInInfoListKw" }) async changeOrderInLocation(kw: string) { - await http.post("/material/orderin/enter", { + await http.post("/wmspda/material/orderin/enter", { loginName: session.loginName, // loginName: '1999', warehouseCode: "", diff --git a/src/pages/raw/ingoods/dnReturnGoods/model.ts b/src/pages/raw/ingoods/dnReturnGoods/model.ts index eb75562..804c463 100644 --- a/src/pages/raw/ingoods/dnReturnGoods/model.ts +++ b/src/pages/raw/ingoods/dnReturnGoods/model.ts @@ -186,7 +186,7 @@ export class ReceiptModule extends VuexModule { */ @Action({ commit: "updateCheckedOrderInInfoListKw" }) async changeOrderInLocation(kw: string) { - await http.post("/material/orderin/enter", { + await http.post("/wmspda/material/orderin/enter", { warehouseCode: session.warehouseCode, factoryCode: session.factoryCode, loginName: session.loginName, diff --git a/src/pages/raw/ingoods/poReceipt/model.ts b/src/pages/raw/ingoods/poReceipt/model.ts index 5a79f2b..a1ea9b9 100644 --- a/src/pages/raw/ingoods/poReceipt/model.ts +++ b/src/pages/raw/ingoods/poReceipt/model.ts @@ -187,7 +187,7 @@ export class ReceiptModule extends VuexModule { */ @Action({ commit: "updateCheckedOrderInInfoListKw" }) async changeOrderInLocation(kw: string) { - await http.post("/material/orderin/enter", { + await http.post("/wmspda/material/orderin/enter", { factoryCode: session.factoryCode, loginName: session.loginName, warehouseCode: session.warehouseCode, diff --git a/src/pages/raw/ingoods/receipt/model.ts b/src/pages/raw/ingoods/receipt/model.ts index 0e3b7f2..b844f24 100644 --- a/src/pages/raw/ingoods/receipt/model.ts +++ b/src/pages/raw/ingoods/receipt/model.ts @@ -5,11 +5,11 @@ import { Mutation, 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'; +} from "vuex-module-decorators"; +import store from "@/store"; +import http from "@/utils/request"; +import { url } from "@/utils/url"; +import { session } from "@/store/modules/session"; class OrderInInfo { checked?: boolean; @@ -23,7 +23,7 @@ class OrderInInfo { namespaced: true, dynamic: true, store, - name: 'raw.ingoods.receipt', + name: "raw.ingoods.receipt", }) export class ReceiptModule extends VuexModule { /** @@ -33,7 +33,7 @@ export class ReceiptModule extends VuexModule { /** * 隐藏看单号 */ - hideKdOrderNo = ''; + hideKdOrderNo = ""; /** * 看单号查询结果 */ @@ -134,8 +134,12 @@ export class ReceiptModule extends VuexModule { loginName: session.loginName, }); const orderInInfo = list[0] || {}; - const orderInInfoList = list.filter((_: OrderInInfo) => _.userDefined10 === '1'); - const orderInInfoListEx = list.filter((_: OrderInInfo) => _.userDefined10 === '0'); + const orderInInfoList = list.filter( + (_: OrderInInfo) => _.userDefined10 === "1" + ); + const orderInInfoListEx = list.filter( + (_: OrderInInfo) => _.userDefined10 === "0" + ); return { hideKdOrderNo, orderInInfo, orderInInfoList, orderInInfoListEx }; } @@ -145,8 +149,8 @@ export class ReceiptModule extends VuexModule { @MutationAction async submitOrderInEnter() { const list = (this.state as any).orderInInfoList.map((item: any) => { - item.orderStatus = item.checked ? '2' : '1'; - item.requestAmount = item.checked ? item.y : '0'; + item.orderStatus = item.checked ? "2" : "1"; + item.requestAmount = item.checked ? item.y : "0"; return item; }); const result: any = await http.post(url.material.POorderin.enter, { @@ -156,11 +160,12 @@ export class ReceiptModule extends VuexModule { list, }); uni.showToast({ - icon: 'none', + icon: "none", title: result.msg, }); const orderInInfoList = result.list.sort( - (a: any, b: any) => Number(a.accountingStatus) - Number(b.accountingStatus), + (a: any, b: any) => + Number(a.accountingStatus) - Number(b.accountingStatus) ); return { orderInInfoList }; } @@ -168,11 +173,11 @@ export class ReceiptModule extends VuexModule { /** * 修改库位 */ - @Action({ commit: 'updateCheckedOrderInInfoListKw' }) + @Action({ commit: "updateCheckedOrderInInfoListKw" }) async changeOrderInLocation(kw: string) { - await http.post('/material/orderin/enter', { + await http.post("/wmspda/material/orderin/enter", { loginName: session.loginName, - warehouseCode: '', + warehouseCode: "", factoryCode: session.factoryCode, locationCode: kw, }); diff --git a/src/pages/raw/warehouse/rowInventory/model.ts b/src/pages/raw/warehouse/rowInventory/model.ts index a08dde6..366ca7a 100644 --- a/src/pages/raw/warehouse/rowInventory/model.ts +++ b/src/pages/raw/warehouse/rowInventory/model.ts @@ -310,7 +310,7 @@ export class ReceiptModule extends VuexModule { */ @Action({ commit: "updateCheckedOrderInInfoListKw" }) async changeOrderInLocation(kw: string) { - await http.post("/material/orderin/enter", { + await http.post("/wmspda/material/orderin/enter", { warehouseCode: session.warehouseCode, factoryCode: session.factoryCode, loginName: session.loginName,