From 373e650ac306293cc4088c0d4647cd27f58e01c2 Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Wed, 24 Nov 2021 15:36:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 14 +- src/i18n/lang/en.ts | 37 ++- src/pages.json | 9 - src/pages/raw/handover/returning/index.vue | 31 ++- src/pages/raw/handover/returning/model.ts | 44 ++-- src/pages/raw/ingoods/index.vue | 20 +- .../raw/warehouse/rowCollect/details.vue | 50 ++-- src/pages/raw/warehouse/rowInventory/model.ts | 213 +++++++++--------- src/pages/raw/warehouse/rowScrap/details.vue | 46 ++-- src/utils/page.ts | 14 -- 10 files changed, 257 insertions(+), 221 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 454c39a..8c70565 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -195,25 +195,13 @@ export default { RowRelocation: "原材料移库", RowCollectionAndBorrowing: "原材料领用借用", -<<<<<<< Updated upstream - // 原材料盘点 - InventoryOrderNo:'单号', - InventoryMaterielNo:'物料号', - InventoryMateriel:'物料名', - InventoryTotalNumber:'盘点总数', - InventoryPleaseScan: "请扫描单号", -<<<<<<< HEAD -======= - InventoryFinish: "完成", ->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f -======= // 原材料盘点 InventoryOrderNo: "单号", InventoryMaterielNo: "物料号", InventoryMateriel: "物料名", InventoryTotalNumber: "盘点总数", InventoryPleaseScan: "请扫描单号", ->>>>>>> Stashed changes + InventoryFinish: "完成", // 委外-入库 CommissionEntrant: "委外入库", diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index e2e95a1..fffaa1e 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -191,7 +191,7 @@ export default { Scrap: "FG scrap", CollectionAndBorrowing: "FG cost center", Inventory: "FG PSV", - raw_Inventory:'raw Inventory', + raw_Inventory: "raw Inventory", RowWarehouse: "RAW WH", SemiProductZC: "SFG transfer", @@ -200,30 +200,27 @@ export default { RowCollectionAndBorrowing: "RAW cost center", // 原材料盘点 - InventoryOrderNo:'单号', - InventoryMaterielNo:'MAT code', - InventoryMateriel:'MAT name', - InventoryTotalNumber:'Total', + InventoryOrderNo: "单号", + InventoryMaterielNo: "MAT code", + InventoryMateriel: "MAT name", + InventoryTotalNumber: "Total", InventoryPleaseScan: "Please scan No.", -<<<<<<< HEAD -======= InventoryFinish: "Finish", ->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f // 委外-入库 - CommissionEntrant:'委外入库', - CommissionedSingleNumber:'单号', - CommissionedMaterielNo:'物料号', - CommissionedMaterielDesc:'物料描述', - CommissionedDemandData:'需求数据', - CommissionedCumulativeData:'累计数据', - CommissionedLocation:'库位', - CommissionedThisNumber:'本次数量', - CommissionedEntrantDetails:'入库明细', + CommissionEntrant: "委外入库", + CommissionedSingleNumber: "单号", + CommissionedMaterielNo: "物料号", + CommissionedMaterielDesc: "物料描述", + CommissionedDemandData: "需求数据", + CommissionedCumulativeData: "累计数据", + CommissionedLocation: "库位", + CommissionedThisNumber: "本次数量", + CommissionedEntrantDetails: "入库明细", - // 委外-出库 - CommissionGoOut:'委外出库', - CommissionedGoOutDetails:'出库明细', + // 委外-出库 + CommissionGoOut: "委外出库", + CommissionedGoOutDetails: "出库明细", //移库 Warehouse_QueryCriteria: "Query criteria", diff --git a/src/pages.json b/src/pages.json index 9e1ba71..aaa626c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -242,7 +242,6 @@ } }, { -<<<<<<< HEAD "path": "pages/raw/ingoods/poReceipt/poReceiving", "style": { "navigationBarTitleText": "PO单收货", @@ -251,8 +250,6 @@ } }, { -======= ->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f "path": "pages/raw/ingoods/poReceipt/idetailed", "style": { "navigationBarTitleText": "PO退货", @@ -277,7 +274,6 @@ } }, { -<<<<<<< HEAD "path": "pages/raw/ingoods/dnReceipt/ImportDN", "style": { "navigationBarTitleText": "海外DN收货", @@ -294,8 +290,6 @@ } }, { -======= ->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f "path": "pages/raw/ingoods/dnReceipt/idetailed", "style": { "navigationBarTitleText": "DN单收货", @@ -352,7 +346,6 @@ } }, { -<<<<<<< HEAD "path": "pages/raw/handover/picking/ByOrder", "style": { "navigationBarTitleText": "拣配查询", @@ -369,8 +362,6 @@ } }, { -======= ->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f "path": "pages/raw/handover/picking/idetailed", "style": { "navigationBarTitleText": "DN退货", diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue index fb079ed..1930dc2 100644 --- a/src/pages/raw/handover/returning/index.vue +++ b/src/pages/raw/handover/returning/index.vue @@ -28,13 +28,13 @@ :label="this.$t('message.Pi_OrderNo')" prop="prdOrder" > - - + >>>>>>>>>>>>>>>>>>>>>>>", e); + this.form.wlCode = e.pickerName.label; } // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕 async onReady() { this.$form.setRules(this.rules); // this.model.queryReturningTypeList(); this.form.sapFactoryCode = await this.model.queryDefaultFactoryCode(); + //页面初始化 获取可选库位 + let means: any = JSON.parse( + localStorage.getItem("__GWMS_APP_STATE_DATA__") as any + ); + let user: any = session.user; + let sendSpot = JSON.parse(localStorage.getItem("sendSpot") as any); + let content = { + loginName: means.session.user.loginName, + sendSpot: sendSpot, + factoryCode: means.session.user.factoryCode, + workArea: user.list[0].workareaCode, + }; + let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content); + res.forEach((item: any) => { + let pickerName: any = {}; + pickerName.label = item.locationCode; + pickerName.value = item.locationCode + "(" + item.sendSpot + ")"; + pickerName.sendSpot = item.sendSpot; + this.Location.push(pickerName); + }); } cnoso() { console.log(1); diff --git a/src/pages/raw/handover/returning/model.ts b/src/pages/raw/handover/returning/model.ts index 0ab978e..00a7c90 100644 --- a/src/pages/raw/handover/returning/model.ts +++ b/src/pages/raw/handover/returning/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 { auth } from '@/store/modules/auth'; -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 { auth } from "@/store/modules/auth"; +import { session } from "@/store/modules/session"; class OrderInInfo { amount?: any; @@ -14,7 +20,7 @@ class OrderInInfo { namespaced: true, dynamic: true, store, - name: 'raw.handover.returning', + name: "raw.handover.returning", }) export class ReturningModule extends VuexModule { /** @@ -55,11 +61,11 @@ export class ReturningModule extends VuexModule { this.materielList = []; const { data }: any = await http.post(url.material.prdOrder.info, { prdOrderFrom, - page: '1', - rows: '50', + page: "1", + rows: "50", loginName: session.loginName, }); - console.log('qqqqqqqqq', data); + console.log("qqqqqqqqq", data); const materielList = data.map((item: any) => ({ label: item.materialCode, value: item.materialCode, @@ -67,8 +73,8 @@ export class ReturningModule extends VuexModule { wkposCode: item.wkposCode, sendSpot: item.sendSpot, })); - console.log('物料列表', data); - console.log('物料名列表', materielList); + console.log("物料列表", data); + console.log("物料名列表", materielList); const orderInInfo = data[0] || {}; return { orderInInfo, materielList }; } @@ -99,14 +105,22 @@ export class ReturningModule extends VuexModule { operatorPass: params.operator, factoryCode: session.factoryCode, loginName: session.loginName, - unit: '', + unit: "", ...params, }); uni.showToast({ - icon: 'success', - title: 'success', + icon: "success", + title: "success", }); } + @Action({ commit: "updateCheckedOrderInInfoListKw" }) + async queryByFactoryCodeAndWorkAreaCode(content: any) { + let res = await http.post( + "/wmspda/fg/queryByFactoryCodeAndWorkAreaCode", + content + ); + return res; + } } export default getModule(ReturningModule); diff --git a/src/pages/raw/ingoods/index.vue b/src/pages/raw/ingoods/index.vue index 6c590cd..7b277a2 100644 --- a/src/pages/raw/ingoods/index.vue +++ b/src/pages/raw/ingoods/index.vue @@ -27,16 +27,7 @@ > -<<<<<<< Updated upstream -<<<<<<< HEAD - DN收货 - PO收货 - 海外DN -======= - ->>>>>>> 908d8a2f172057491172510bf10bf949d527de9f -======= ->>>>>>> Stashed changes +