From 658efba7a625e19fca58d655ace635ee93fa1f3d Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Tue, 21 Jun 2022 15:21:38 +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=E7=A7=BB=E5=BA=93?= =?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/pages.json | 34 +- .../raw/warehouse/RUS-rowScrap/config.ts | 53 +++ .../raw/warehouse/RUS-rowScrap/details.vue | 163 +++++++++ .../raw/warehouse/RUS-rowScrap/index.vue | 243 ++++++++++++++ src/pages/raw/warehouse/RUS-rowScrap/model.ts | 79 +++++ .../raw/warehouse/RUS-rowTransfer/config.ts | 67 ++++ .../raw/warehouse/RUS-rowTransfer/details.vue | 185 +++++++++++ .../raw/warehouse/RUS-rowTransfer/index.vue | 312 ++++++++++++++++++ .../raw/warehouse/RUS-rowTransfer/model.ts | 79 +++++ src/pages/raw/warehouse/rowTransfer/index.vue | 6 - src/utils/url.ts | 1 + 11 files changed, 1215 insertions(+), 7 deletions(-) create mode 100644 src/pages/raw/warehouse/RUS-rowScrap/config.ts create mode 100644 src/pages/raw/warehouse/RUS-rowScrap/details.vue create mode 100644 src/pages/raw/warehouse/RUS-rowScrap/index.vue create mode 100644 src/pages/raw/warehouse/RUS-rowScrap/model.ts create mode 100644 src/pages/raw/warehouse/RUS-rowTransfer/config.ts create mode 100644 src/pages/raw/warehouse/RUS-rowTransfer/details.vue create mode 100644 src/pages/raw/warehouse/RUS-rowTransfer/index.vue create mode 100644 src/pages/raw/warehouse/RUS-rowTransfer/model.ts diff --git a/src/pages.json b/src/pages.json index 73754c6..7065ae1 100644 --- a/src/pages.json +++ b/src/pages.json @@ -242,6 +242,22 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/warehouse/RUS-rowTransfer/index", + "style": { + "navigationBarTitleText": "俄罗斯移库", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/warehouse/RUS-rowTransfer/details", + "style": { + "navigationBarTitleText": "俄罗斯移库明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/warehouse/rowScrap/index", "style": { @@ -258,6 +274,22 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/warehouse/RUS-rowScrap/index", + "style": { + "navigationBarTitleText": "俄罗斯报废", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/warehouse/RUS-rowScrap/details", + "style": { + "navigationBarTitleText": "俄罗斯报废明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/warehouse/rowCollect/index", "style": { @@ -959,4 +991,4 @@ "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8" } -} \ No newline at end of file +} diff --git a/src/pages/raw/warehouse/RUS-rowScrap/config.ts b/src/pages/raw/warehouse/RUS-rowScrap/config.ts new file mode 100644 index 0000000..0815c81 --- /dev/null +++ b/src/pages/raw/warehouse/RUS-rowScrap/config.ts @@ -0,0 +1,53 @@ +/** + * 看单交接明细表格列 + */ +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.Warehouse_TargetLocation'), + key: 'aimWl', + }, + { + label: vm.$t('message.product_costCenter'), + key: 'costCenter', + }, + { + label: vm.$t('message.DocumentNumber'), + key: 'fileNo', + }, + // { + // label: '库存地点', + // key: 'wkposCode', + // }, + // { + // label: '校验状态', + // key: 'checkResult', + // }, + // { + // label: '看单号', + // key: 'kdOrderNo', + // }, +]; diff --git a/src/pages/raw/warehouse/RUS-rowScrap/details.vue b/src/pages/raw/warehouse/RUS-rowScrap/details.vue new file mode 100644 index 0000000..d00bd48 --- /dev/null +++ b/src/pages/raw/warehouse/RUS-rowScrap/details.vue @@ -0,0 +1,163 @@ + + + + + diff --git a/src/pages/raw/warehouse/RUS-rowScrap/index.vue b/src/pages/raw/warehouse/RUS-rowScrap/index.vue new file mode 100644 index 0000000..4979b81 --- /dev/null +++ b/src/pages/raw/warehouse/RUS-rowScrap/index.vue @@ -0,0 +1,243 @@ + + + + diff --git a/src/pages/raw/warehouse/RUS-rowScrap/model.ts b/src/pages/raw/warehouse/RUS-rowScrap/model.ts new file mode 100644 index 0000000..6945c64 --- /dev/null +++ b/src/pages/raw/warehouse/RUS-rowScrap/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.rowScrap', +}) +export class rowScrap extends VuexModule { + /** + * sap库存地点列表 + */ + cboPlaceList = []; + /** + * 隐藏看单号 + */ + poNo = ''; + /** + * 看单号查询结果 + */ + orderInInfo: OrderInInfo = new OrderInInfo(); + /** + * 看单明细 + */ + orderInInfoList: OrderInInfo[] = []; + code: any = ''; + /** + * 看单明细未通过明细 + */ + // orderInInfoListEx: OrderInInfo[] = []; + + /** + // * 查询看单号 + * @param poNo + */ + @MutationAction + async takeOrder(order3: any) { + try { + const records: any = await http.post(url.warehouse.rowTransfer.list, { + ...order3, + orderType: 'BF', + 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(rowScrap); diff --git a/src/pages/raw/warehouse/RUS-rowTransfer/config.ts b/src/pages/raw/warehouse/RUS-rowTransfer/config.ts new file mode 100644 index 0000000..0134afe --- /dev/null +++ b/src/pages/raw/warehouse/RUS-rowTransfer/config.ts @@ -0,0 +1,67 @@ +/** + * 看单交接明细表格列 + */ +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.Warehouse_TargetLocation'), + key: 'aimWl', //目标库位 + }, +]; +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-rowTransfer/details.vue b/src/pages/raw/warehouse/RUS-rowTransfer/details.vue new file mode 100644 index 0000000..36fe550 --- /dev/null +++ b/src/pages/raw/warehouse/RUS-rowTransfer/details.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/src/pages/raw/warehouse/RUS-rowTransfer/index.vue b/src/pages/raw/warehouse/RUS-rowTransfer/index.vue new file mode 100644 index 0000000..1e827a2 --- /dev/null +++ b/src/pages/raw/warehouse/RUS-rowTransfer/index.vue @@ -0,0 +1,312 @@ + + + diff --git a/src/pages/raw/warehouse/RUS-rowTransfer/model.ts b/src/pages/raw/warehouse/RUS-rowTransfer/model.ts new file mode 100644 index 0000000..8d20067 --- /dev/null +++ b/src/pages/raw/warehouse/RUS-rowTransfer/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 { 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.RUSrowTransfer', +}) +export class rowTransfer extends VuexModule { + cboPlaceList = []; + poNo = ''; + orderInInfo: OrderInInfo = new OrderInInfo(); + orderInInfoList: OrderInInfo[] = []; + materielList = []; + code = ''; + ContainerCode: any = ''; + //单号查询数据 + @MutationAction + async takeYKOrder(order3: any) { + try { + const records: any = await http.post(url.warehouse.rowTransfer.list, { + ...order3, + orderType: 'YK', + page: 1, + rows: 50, + factoryCode: session.factoryCode, + loginName: session.loginName, + }); + const code = records.code; + const orderInInfoList = records.data.records; + const materielList = orderInInfoList.map((item: any) => ({ + label: item.productCode, + value: item.productCode, + ...item, + })); + return { orderInInfoList, materielList, code }; + } catch { + vm.customToast(vm.$t('message.Warehouse_Tip11') as any); + } + } + //提交移库数据 + @MutationAction + async onTakeoutConfirm(list: any) { + const records: any = await http.post(url.warehouse.rowTransfer.russia, list); + const code = records.code; + return { code }; + } + //将数据置空 + @MutationAction + async empty() { + const materielList = null; + return { materielList }; + } + @MutationAction + async searchBarcode(params: any) { + const res: any = await http.post(url.auth.query.barcode, { + factoryCode: session.factoryCode, + loginName: session.loginName, + barcode: params.barcode, + productCode: params.productCode, + locCode: params.locCode, + }); + const ContainerCode = res.data; + return { ContainerCode }; + } +} + +export default getModule(rowTransfer); diff --git a/src/pages/raw/warehouse/rowTransfer/index.vue b/src/pages/raw/warehouse/rowTransfer/index.vue index 48026b6..e395d0d 100644 --- a/src/pages/raw/warehouse/rowTransfer/index.vue +++ b/src/pages/raw/warehouse/rowTransfer/index.vue @@ -129,20 +129,14 @@ export default class KanDanHandOver extends BasePage { arr.push(this.orderlist); await model.onTakeoutConfirm(arr); if (model.code == '1') { - //this.customToast(this.$t('message.Warehouse_Tip9') as string); uni.showToast({ - //icon: 'success', title: this.$t('message.Warehouse_Tip9') as string, duration: 2000, image: '/static/icons/icon-51.png', }); - //model.empty(); this.orderlist = {}; this.model.materielList.length = 0; this.NEWqty = ''; - // setTimeout(() => { - // this.toPage(this.page.raw.warehouse.rowTransfer.index); - // }, 2000); this.query(); } } diff --git a/src/utils/url.ts b/src/utils/url.ts index 5b7c4ad..419599c 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -213,6 +213,7 @@ export const url = { rowTransfer: { list: '/wmspda/fg/listByOrder', commit: '/wmspda/fg/confirmMove', + russia: '/wmspda/fg/confirmMove/russia', getMaterialByCode: '/wmspda/fg/getMaterialByCode', getCode: '/wmspda/fg/getCpMoveBatchNo', queryGroupLis: '/wmspda/fg/queryGroupListByMoveCode',