From b84e0438b71efd7a69643d8e7f5a306026911164 Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Thu, 2 Dec 2021 15:56:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 19 + src/i18n/lang/en.ts | 50 ++- src/manifest.json | 11 + src/pages.json | 50 ++- .../product/warehouse/wholeTransfer/index.vue | 166 +++++-- .../product/warehouse/wholeTransfer/model.ts | 78 +++- src/pages/raw/commission/entrant/detail.vue | 89 +--- src/pages/raw/commission/entrant/index.vue | 423 +++-------------- src/pages/raw/commission/entrant/model.ts | 9 + src/pages/raw/commission/goOut/detail.vue | 80 +--- src/pages/raw/commission/goOut/index.vue | 425 +++--------------- src/pages/raw/commission/goOut/model.ts | 9 + src/pages/raw/commission/index.vue | 34 +- src/pages/raw/handover/feeding/Location.vue | 55 ++- src/pages/raw/handover/feeding/model.ts | 10 +- src/pages/raw/handover/picking/ByOrder.vue | 57 ++- src/pages/raw/handover/picking/BySummary.vue | 47 +- src/pages/raw/handover/picking/config.ts | 47 ++ src/pages/raw/handover/picking/model.ts | 9 + src/pages/raw/index.vue | 28 +- src/pages/raw/ingoods/dnReceipt/ImportDN.vue | 96 ++-- .../raw/ingoods/dnReceipt/dnReceiving.vue | 97 ++-- src/pages/raw/ingoods/dnReceipt/model.ts | 9 + src/utils/location.ts | 95 ++-- src/utils/page.ts | 6 + src/utils/url.ts | 22 +- vue.config.js | 3 +- 27 files changed, 887 insertions(+), 1137 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index b9fa899..95cd9d1 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -51,6 +51,7 @@ export default { rawMenu_InTheLibrary: "库内", rawMenu_ReturnGoods: "退货", rawMenu_SignOut: "退出", + Purchase: "采购单", //po收货 po_ReceivingGoods: "PO收货", @@ -75,11 +76,14 @@ export default { po_Continue: "继续", po_Return: "返回", po_MaterielNo: "物料号", + Materiel: "物料", po_MaterielDes: "物料描述", po_DemandQuantity: "需求数量", + DemandQuantity: "需求", po_ActualQuantity: "实际数量", po_ReturnGoodsQuantity: "退货数量", po_RemainingQuantity: "剩余数量", + Cumulative: "累计", //dn收货 dn_ReceivingGoods: "DN收货", @@ -109,6 +113,7 @@ export default { Pi_factory: "工厂", Pi_materielNo: "物料号", Pi_order: "订单查询", + Query: "查询", Pi_InputMrp: "请输入MRP", Pi_InputFactory: "请输入工厂代码", Pi_OrderNoNotSelected: "未选中订单号", @@ -188,6 +193,8 @@ export default { CollectionAndBorrowing: "成品领用借用", Inventory: "成品盘点", raw_Inventory: "原材料盘点", + Transfer: "移库码", + generate: "生成", RowWarehouse: "原材料库内", SemiProductZC: "半成品转储", @@ -215,11 +222,20 @@ export default { CommissionedNumber: "入库数量", CommissionedEntrantDetails: "入库明细", CommissionedReceiptQuantity: "收货数量", + subcontract: "委外", // 委外-出库 CommissionGoOut: "委外出库", CommissionedGoOutDetails: "出库明细", CommissionedGoOutNumber: "出库数量", + // 委外-提示 + Commission_tips1: "请输入单号", + Commission_tips2: "请输入正确的库位和数量", + Commission_tips3: "请输入大于0的数量", + Commission_tips4: "不能大于需求数量", + Commission_tips5: "请确保所选物料已分配库位", + _tips5: "请选择相同库位", + _tips6: "请先输入要查询的单号", //移库 Warehouse_QueryCriteria: "查询条件", Warehouse_TransferOrderNo: "移库单号", @@ -228,6 +244,9 @@ export default { Warehouse_OriginalLocation: "原库位", Warehouse_TargetLocation: "目标库位", Warehouse_Tip: "请输入移库单号", + transfer_barcode:'移库批次', + Product_code:'产品编码', + Access_type:'出入类型', //报废 Scrap_ScrapNo: "报废单号", diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 2105000..d1b380a 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -37,7 +37,7 @@ export default { workArea_Title: "Work area list", workArea_SubTitle: "Hello, Please select your work area from the list～", workArea_SelelctOne: "Please select one work area from the list", - workArea_Selelct: "Please selelct", + workArea_Selelct: "selelct", workArea_Warehouse: "WH", workArea_WarehouseName: "WH name", workArea_RegionName: "Region name", @@ -75,8 +75,10 @@ export default { po_Continue: "Continue", po_Return: "Return", po_MaterielNo: "MAT code", + Materiel: "MAT", po_MaterielDes: "MAT desc", po_DemandQuantity: "Request Qty", + DemandQuantity: "Request", po_ActualQuantity: "Receive Qty", po_ReturnGoodsQuantity: "Return Qty", po_RemainingQuantity: "Remaining Qty", @@ -95,6 +97,7 @@ export default { dn_Tip: "Receive Qty cannot be greater than the request Qty", dn_Tip2: "Return Qty cannot be greater than the request Qty", dn_Tip3: "Receive Qty is less than the request Qty", + Purchase: "Purchase", //交接菜单页 Handover: "Handover", Pick: "Pick up", @@ -108,6 +111,7 @@ export default { Pi_factory: "Factory", Pi_materielNo: "MAT code", Pi_order: "Order Query", + Query: "Query", Pi_InputMrp: "Please input MRP", Pi_InputFactory: "Please input factory code", Pi_OrderNoNotSelected: "Order number not selected", @@ -145,6 +149,7 @@ export default { Pi_PickedQuantity: "Picked Qty", Pi_QuantityHandedOver: "Handedover Qty", Pi_distribution: "distribution", + Cumulative: "Cumulative", //汇总交接 Summary_Query: "Summary Query", @@ -192,6 +197,8 @@ export default { CollectionAndBorrowing: "FG cost center", Inventory: "FG PSV", raw_Inventory: "raw Inventory", + Transfer: "Library Code", + generate: "generate", RowWarehouse: "RAW WH", SemiProductZC: "SFG transfer", @@ -208,22 +215,32 @@ export default { InventoryFinish: "Finish", // 委外-入库 - CommissionEntrant: "委外入库", - CommissionedSingleNumber: "单号", - CommissionedMaterielNo: "物料号", - CommissionedMaterielDesc: "物料描述", - CommissionedDemandData: "需求数据", - CommissionedCumulativeData: "累计数据", - CommissionedLocation: "库位", - CommissionedThisNumber: "本次数量", - CommissionedNumber: "入库数量", - CommissionedEntrantDetails: "入库明细", - CommissionedReceiptQuantity: "收货数量", + CommissionEntrant: "Subcontracting receipt", + CommissionedSingleNumber: "single", + CommissionedMaterielNo: "code", + CommissionedMaterielDesc: "describe", + CommissionedDemandData: "Demand", + CommissionedCumulativeData: "total", + CommissionedLocation: "Location", + CommissionedThisNumber: "quantity", + CommissionedNumber: "Receipt quantity", + CommissionedEntrantDetails: "Warehousing", + CommissionedReceiptQuantity: "Receipt quantity", + subcontract: "subcontract", // 委外-出库 - CommissionGoOut: "委外出库", - CommissionedGoOutDetails: "出库明细", - CommissionedGoOutNumber: "出库数量", + CommissionGoOut: "Subcontracting issue", + CommissionedGoOutDetails: "Delivery details", + CommissionedGoOutNumber: "Outbound quantity", + // 委外-提示 + Commission_tips1: "Please enter the order No", + Commission_tips2: "Please enter the correct location and quantity", + Commission_tips3: "Please enter a quantity greater than 0", + Commission_tips4: "Cannot be greater than the required quantity", + Commission_tips5: + "Please ensure that the selected material has been assigned a location", + _tips5: "Please select the same location", + _tips6: "Please enter the order number to query first", //移库 Warehouse_QueryCriteria: "Query criteria", @@ -233,6 +250,9 @@ export default { Warehouse_OriginalLocation: "Original Loc", Warehouse_TargetLocation: "Target Loc", Warehouse_Tip: "Please input the transfer order No", + transfer_barcode: "Library transfer barcode", + Product_code: "Product code", + Access_type: "Access type", //报废 Scrap_ScrapNo: "Scrap No", diff --git a/src/manifest.json b/src/manifest.json index 746299d..1cac0c3 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -69,5 +69,16 @@ }, "mp-qq" : { "usingComponents" : true + }, + "h5" : { + "optimization" : { + "treeShaking" : { + "enable" : false + } + }, + "router" : { + "mode" : "hash", + "base" : "/nwp" + } } } diff --git a/src/pages.json b/src/pages.json index 6d389fb..01fb4ce 100644 --- a/src/pages.json +++ b/src/pages.json @@ -65,6 +65,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/product/warehouse/wholeTransfer/Local-details", + "style": { + "navigationBarTitleText": "移库明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/product/warehouse/wholeScrap/index", "style": { @@ -97,6 +105,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/product/outbound/stoOutbound/DN-delivergoods", + "style": { + "navigationBarTitleText": "DN发货", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/product/outbound/stoOutbound/detail", "style": { @@ -273,6 +289,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/ingoods/dnReceipt/Local-details", + "style": { + "navigationBarTitleText": "本地DN收货明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/ingoods/dnReceipt/ImportDN", "style": { @@ -401,6 +425,22 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/handover/picking/Local-details", + "style": { + "navigationBarTitleText": "本地DN收货明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/handover/picking/Summary-details", + "style": { + "navigationBarTitleText": "本地DN收货明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/handover/feeding/index", "style": { @@ -417,7 +457,15 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, - { + { + "path": "pages/raw/handover/feeding/Local-details", + "style": { + "navigationBarTitleText": "补料明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { "path": "pages/raw/handover/feeding/Location", "style": { "navigationBarTitleText": "补料明细", diff --git a/src/pages/product/warehouse/wholeTransfer/index.vue b/src/pages/product/warehouse/wholeTransfer/index.vue index 4d6d7ac..37403c9 100644 --- a/src/pages/product/warehouse/wholeTransfer/index.vue +++ b/src/pages/product/warehouse/wholeTransfer/index.vue @@ -1,14 +1,30 @@ @@ -748,7 +438,7 @@ export default class stoOutboundDom extends BasePage { line-height: 100rpx; } .input { - width: 200rpx; + width: 100rpx; height: 70rpx; margin-top: 15rpx; margin-left: 15rpx; @@ -767,6 +457,9 @@ export default class stoOutboundDom extends BasePage { width: 100rpx; line-height: 100rpx; } + .search { + text-align: center; + } } .library-right { width: 50%; diff --git a/src/pages/raw/commission/entrant/model.ts b/src/pages/raw/commission/entrant/model.ts index 9190c6d..3cea728 100644 --- a/src/pages/raw/commission/entrant/model.ts +++ b/src/pages/raw/commission/entrant/model.ts @@ -30,6 +30,7 @@ export class ReturningModule extends VuexModule { * 月台列表 */ returningTypeList: any[] = []; + detailedList: any; /** * 物料列表 @@ -221,6 +222,14 @@ export class ReturningModule extends VuexModule { let res = await http.post(url.outbound.stoOutbound.submit, upload); return res; } + //查询明细 + @Action({ commit: "updateCheckedOrderInInfoListKw" }) + async querydetaildlist(content: any) { + let res: any = await http.post("/material/outsourcing/into/info", content); + console.log("明细》》》》》》》》》", res.list); + this.detailedList = res.data; + return res; + } } export default getModule(ReturningModule); diff --git a/src/pages/raw/commission/goOut/detail.vue b/src/pages/raw/commission/goOut/detail.vue index 03c3be8..5975e58 100644 --- a/src/pages/raw/commission/goOut/detail.vue +++ b/src/pages/raw/commission/goOut/detail.vue @@ -4,7 +4,7 @@ - {{ $t("message.CommissionedGoOutDetails") }} + {{ $t("message.Pi_QueryResults") }} @@ -12,76 +12,26 @@ class="table" ref="table" width="100%" - enable-check="multiple" show-left-and-right-border :headers="headers" - :contents="model.materielList" + :contents="model.detailedList" :show-vert-border="false" > - -
- - {{ $t("message.po_Total") }} {{ model.materielList.length }} - {{ $t("message.po_Records") }} - -
- - - diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue index 457620b..78b7748 100644 --- a/src/pages/raw/commission/goOut/index.vue +++ b/src/pages/raw/commission/goOut/index.vue @@ -8,30 +8,31 @@ - {{ $t("message.dn_ReceivingGoods") }} + {{ $t("message.CommissionGoOut") }} -<<<<<<< HEAD - {{ $t("message.dn_OddNumbers") }} + {{ $t("message.CommissionedSingleNumber") }} - 查询 + {{ + $t("message.Query") + }} - 物料号 + {{ $t("message.CommissionedMaterielNo") }} - 物料描述 + {{ + $t("message.CommissionedMaterielDesc") + }} {{ every.materialDesc }} - 需求数量 + {{ + $t("message.CommissionedDemandData") + }} - 累计数量 + {{ + $t("message.CommissionedCumulativeData") + }} - 库位 + {{ $t("message.CommissionedLocation") }} - 本次数量 + {{ + $t("message.CommissionedThisNumber") + }} -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{$t('message.product_add')}} - - - - - - - {{ $t("message.CommissionedLocation") }} - {{ $t("message.CommissionedGoOutNumber") }} - {{ $t("message.operation") }} - - - {{ item.locationCode }} - {{ item.scanAmount }} - -
- {{ $t("message.product_Delete") }} -
- - - ->>>>>>> 74ef32f2cb5f9041e0e6ce27215dabf1d9c4b846 - 添加 + {{ + $t("message.product_add") + }} @@ -230,34 +134,25 @@ -<<<<<<< HEAD - 收货明细 + {{ + $t("message.CommissionedGoOutDetails") + }} - 提交 + {{ + $t("message.product_Upload") + }} - 返回 -======= - - {{ - $t('message.CommissionedGoOutDetails') - }} - - - - {{ $t('message.product_Upload') }} - - - {{ $t('message.po_Return') }} ->>>>>>> 74ef32f2cb5f9041e0e6ce27215dabf1d9c4b846 + {{ + $t("message.po_Return") + }}