From 4fe22d715d948662c2b7c03d4c9b1ec28ea4b457 Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Tue, 21 Jun 2022 18:07:20 +0800 Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E4=BF=84=E7=BD=97=E6=96=AF?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=9F=E6=9D=90=E6=96=99=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 2 - src/pages.json | 16 ++ .../raw/warehouse/RUS-rowCollect/config.ts | 45 ++++ .../raw/warehouse/RUS-rowCollect/details.vue | 163 ++++++++++++ .../raw/warehouse/RUS-rowCollect/index.vue | 241 ++++++++++++++++++ .../raw/warehouse/RUS-rowCollect/model.ts | 79 ++++++ .../raw/warehouse/RUS-rowScrap/config.ts | 46 +++- .../raw/warehouse/RUS-rowScrap/index.vue | 138 +++++++++- src/pages/raw/warehouse/RUS-rowScrap/model.ts | 37 +-- 9 files changed, 717 insertions(+), 50 deletions(-) create mode 100644 src/pages/raw/warehouse/RUS-rowCollect/config.ts create mode 100644 src/pages/raw/warehouse/RUS-rowCollect/details.vue create mode 100644 src/pages/raw/warehouse/RUS-rowCollect/index.vue create mode 100644 src/pages/raw/warehouse/RUS-rowCollect/model.ts diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 34379ff..65f802f 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -202,7 +202,6 @@ export default { Pi_tip17: '请选择一条DN单', Pi_tip18: '请选中要移库的数据', Pi_tip19: '只能选择一条修改数量', - Pi_tip20: '本次添加数量超过最大可添加数量', //汇总交接 Summary_Query: '汇总查询', Summary_Contain: '包含', @@ -474,7 +473,6 @@ export default { AppendMateriel3: '不能大于需求数量，请重新输入', AppendMateriel4: '请选择正确的库位', AppendMateriel5: '请先选择一个物料', - AppendMateriel6: '请先选择一条数据', demandQuantity: '总数量大于需求数量', //俄罗斯海外PO ImportPO: 'PO海外收货', diff --git a/src/pages.json b/src/pages.json index 7065ae1..d008616 100644 --- a/src/pages.json +++ b/src/pages.json @@ -306,6 +306,22 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/warehouse/RUS-rowCollect/index", + "style": { + "navigationBarTitleText": "俄罗斯成本中心", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/warehouse/RUS-rowCollect/details", + "style": { + "navigationBarTitleText": "俄罗斯成本中心明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/ingoods/poReceipt/index", "style": { diff --git a/src/pages/raw/warehouse/RUS-rowCollect/config.ts b/src/pages/raw/warehouse/RUS-rowCollect/config.ts new file mode 100644 index 0000000..e766571 --- /dev/null +++ b/src/pages/raw/warehouse/RUS-rowCollect/config.ts @@ -0,0 +1,45 @@ +/** + * 看单交接明细表格列 + */ +import vm from '@/main'; +export const headers = [ + { + label: vm.$t('message.Warehouse_OrderNo'), + key: 'orderNo', + // width: '15%', + }, + { + label: vm.$t('message.po_MaterielNo'), + key: 'productCode', + // width: '15%', + }, + { + label: vm.$t('message.po_MaterielDes'), + key: 'productDescZh', + width: 350, + }, + { + label: vm.$t('message.dn_Number'), + key: 'qty', + }, + { + label: vm.$t('message.Warehouse_OriginalLocation'), + key: 'originWl', + }, + { + label: vm.$t('message.product_costCenter'), + key: 'costCenter', + }, + // { + // label: '库存地点', + // key: 'wkposCode', + // }, + // { + // label: '校验状态', + // key: 'checkResult', + // }, + // { + // label: '看单号', + // key: 'kdOrderNo', + // }, +]; diff --git a/src/pages/raw/warehouse/RUS-rowCollect/details.vue b/src/pages/raw/warehouse/RUS-rowCollect/details.vue new file mode 100644 index 0000000..34adc1f --- /dev/null +++ b/src/pages/raw/warehouse/RUS-rowCollect/details.vue @@ -0,0 +1,163 @@ + + + + + diff --git a/src/pages/raw/warehouse/RUS-rowCollect/index.vue b/src/pages/raw/warehouse/RUS-rowCollect/index.vue new file mode 100644 index 0000000..b6d1873 --- /dev/null +++ b/src/pages/raw/warehouse/RUS-rowCollect/index.vue @@ -0,0 +1,241 @@ + + + + + diff --git a/src/pages/raw/warehouse/RUS-rowCollect/model.ts b/src/pages/raw/warehouse/RUS-rowCollect/model.ts new file mode 100644 index 0000000..6d0a362 --- /dev/null +++ b/src/pages/raw/warehouse/RUS-rowCollect/model.ts @@ -0,0 +1,79 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +// import { page } from '@/utils/page'; +import { session } from '@/store/modules/session'; +import vm from '@/main'; + +class OrderInInfo { + checked?: boolean; + poNo?: string; + kw?: string; + userDefined10?: string; + orderStatus?: string; +} + +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'raw.warehouse.rowCollect', +}) +export class rowCollect extends VuexModule { + /** + * sap库存地点列表 + */ + cboPlaceList = []; + /** + * 隐藏看单号 + */ + poNo = ''; + /** + * 看单号查询结果 + */ + orderInInfo: OrderInInfo = new OrderInInfo(); + /** + * 看单明细 + */ + orderInInfoList: OrderInInfo[] = []; + code: any = ''; + /** + * 看单明细未通过明细 + */ + // orderInInfoListEx: OrderInInfo[] = []; + + /** + // * 查询看单号 + * @param poNo + */ + @MutationAction + async takeLYOrder(order3: any) { + try { + const records: any = await http.post(url.warehouse.rowTransfer.list, { + ...order3, + orderType: 'LY', + page: 1, + rows: 50, + factoryCode: session.factoryCode, + loginName: session.loginName, + }); + const orderInInfoList = records.data.records; + const code = records.code; + console.log('获取来的数据', orderInInfoList); + return { orderInInfoList, code }; + } catch { + //uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip11') as any }); + vm.customToast(vm.$t('message.Warehouse_Tip11') as any); + } + } + + @MutationAction + async onTakeoutConfirm(list: any) { + const records: any = await http.post(url.warehouse.rowTransfer.commit, list); + const code = records.code; + return { code }; + } +} + +export default getModule(rowCollect); diff --git a/src/pages/raw/warehouse/RUS-rowScrap/config.ts b/src/pages/raw/warehouse/RUS-rowScrap/config.ts index 0815c81..f6bf800 100644 --- a/src/pages/raw/warehouse/RUS-rowScrap/config.ts +++ b/src/pages/raw/warehouse/RUS-rowScrap/config.ts @@ -38,16 +38,38 @@ export const headers = [ label: vm.$t('message.DocumentNumber'), key: 'fileNo', }, - // { - // label: '库存地点', - // key: 'wkposCode', - // }, - // { - // label: '校验状态', - // key: 'checkResult', - // }, - // { - // label: '看单号', - // key: 'kdOrderNo', - // }, +]; +export const RUSdetailHeader = [ + { + label: vm.$t('message.Warehouse_OrderNo'), + key: 'orderNo', //单号 + width: 270, + }, + { + label: vm.$t('message.po_MaterielNo'), + key: 'productCode', //物料号 + width: 270, + }, + { + label: vm.$t('message.po_MaterielDes'), + key: 'productDescZh', //物料描述 + width: 520, + }, + { + label: vm.$t('message.Container'), + key: 'barCode', //物料描述 + width: 400, + }, + { + label: vm.$t('message.dn_Number'), + key: 'qty', //数量 + }, + { + label: vm.$t('message.Warehouse_OriginalLocation'), + key: 'originWl', //原库位 + }, + { + label: vm.$t('message.Warehouse_TargetLocation'), + key: 'aimWl', //目标库位 + }, ]; diff --git a/src/pages/raw/warehouse/RUS-rowScrap/index.vue b/src/pages/raw/warehouse/RUS-rowScrap/index.vue index 4979b81..3826633 100644 --- a/src/pages/raw/warehouse/RUS-rowScrap/index.vue +++ b/src/pages/raw/warehouse/RUS-rowScrap/index.vue @@ -26,10 +26,6 @@ - - - - @@ -46,6 +42,22 @@ + + + + {{ $t('message.Container') }}: + + + + + + {{ $t('message.product_add') }} + + + + + + {{ $t('message.po_Return') }} @@ -58,6 +70,7 @@