From 5c7956f2dae7f245234cb02ab5b26c039004414b Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Mon, 4 Jul 2022 16:34:18 +0800 Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=96=B0=E5=A2=9E=E5=8D=8A?= =?UTF-8?q?=E6=88=90=E5=93=81=E4=B8=8B=E7=BA=BF=E5=85=A5=E5=BA=93?= 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 | 2 + src/pages.json | 8 + .../product/outbound/stoOutbound/detail.vue | 4 +- .../product/outbound/stoOutbound/model.ts | 7 +- .../Semi-finished-offline/config.ts | 21 ++ .../Semi-finished-offline/index.vue | 319 ++++++++++++++++++ .../Semi-finished-offline/model.ts | 121 +++++++ src/pages/raw/index.vue | 3 + .../raw/ingoods/RUS-dnReturnGoods/config.ts | 2 +- src/utils/url.ts | 2 + 11 files changed, 485 insertions(+), 6 deletions(-) create mode 100644 src/pages/raw/Semi-finished/Semi-finished-offline/config.ts create mode 100644 src/pages/raw/Semi-finished/Semi-finished-offline/index.vue create mode 100644 src/pages/raw/Semi-finished/Semi-finished-offline/model.ts diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 3c465de..93c4249 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -496,5 +496,7 @@ export default { Pi_tipqty: '请确保等于需求数量', SemiFinished: '半成品', SemiFinished_SO: '半成品SO', + SemiFinishedOffline: '半成品下线', + sweepCode: '请先扫码', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 6272bc9..8da2cfc 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -503,5 +503,7 @@ export default { Pi_tipqty: 'Please make sure it is equal to the required quantity', SemiFinished: 'Semi-finished', SemiFinished_SO: 'Semi-finished SO', + SemiFinishedOffline: 'Semi-finished offline', + sweepCode: 'Please sweep the code first', }, }; diff --git a/src/pages.json b/src/pages.json index ec59fb2..f0d86dc 100644 --- a/src/pages.json +++ b/src/pages.json @@ -962,6 +962,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/Semi-finished/Semi-finished-offline/index", + "style": { + "navigationBarTitleText": "半成品下线", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/ingoods/SpareInbound/Inbound/index", "style": { diff --git a/src/pages/product/outbound/stoOutbound/detail.vue b/src/pages/product/outbound/stoOutbound/detail.vue index f4bd7df..3030aea 100644 --- a/src/pages/product/outbound/stoOutbound/detail.vue +++ b/src/pages/product/outbound/stoOutbound/detail.vue @@ -8,12 +8,12 @@ - +
- {{ $t('message.po_Total') }} {{ model.materielList.length }} {{ $t('message.po_Records') }} + {{ $t('message.po_Total') }} {{ model.detailmaterielList.length }} {{ $t('message.po_Records') }}
diff --git a/src/pages/product/outbound/stoOutbound/model.ts b/src/pages/product/outbound/stoOutbound/model.ts index 4610e61..4e01b53 100644 --- a/src/pages/product/outbound/stoOutbound/model.ts +++ b/src/pages/product/outbound/stoOutbound/model.ts @@ -29,6 +29,7 @@ export class ReturningModule extends VuexModule { * 物料列表 */ materielList: any[] = []; + detailmaterielList: any = []; //条码扫描的返回的结果 oneMaterielDetail: any = {}; @@ -194,9 +195,9 @@ export class ReturningModule extends VuexModule { factoryCode: session.factoryCode, }); console.log('res数据', data, code); - const materielList = data; - console.log('>>>>>>>', materielList); - return { code, materielList }; + const detailmaterielList = data; + console.log('>>>>>>>', detailmaterielList); + return { code, detailmaterielList }; } //退扫接口 diff --git a/src/pages/raw/Semi-finished/Semi-finished-offline/config.ts b/src/pages/raw/Semi-finished/Semi-finished-offline/config.ts new file mode 100644 index 0000000..b618d93 --- /dev/null +++ b/src/pages/raw/Semi-finished/Semi-finished-offline/config.ts @@ -0,0 +1,21 @@ +/** + * 拣配查询表格列 + */ +import vm from '@/main'; +export const headers = [ + { + label: vm.$t('message.product_barCode'), + key: 'barcode', + width: 320, + }, + { + label: vm.$t('message.product_FGCode'), + key: 'productCode', + width: 300, + }, + { + label: vm.$t('message.product_Location'), + key: 'locCode', + width: 300, + }, +]; diff --git a/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue b/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue new file mode 100644 index 0000000..b4a073f --- /dev/null +++ b/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue @@ -0,0 +1,319 @@ + + + + diff --git a/src/pages/raw/Semi-finished/Semi-finished-offline/model.ts b/src/pages/raw/Semi-finished/Semi-finished-offline/model.ts new file mode 100644 index 0000000..26cf391 --- /dev/null +++ b/src/pages/raw/Semi-finished/Semi-finished-offline/model.ts @@ -0,0 +1,121 @@ +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'; +// import { order } from '@/pages/raw/handover/kan-dan/model'; +class OrderInInfo { + stoAmount?: 0; + stoNo?: string; //STO采购单号 + orderAmount?: string; //单据总数 + Allocated?: string; //已分配 + Unallocated?: string; //未分配 +} +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'Semi-finished-offline', +}) +export class PickingModule extends VuexModule { + /** + * 库位列表 + */ + returningTypeList: any[] = []; + firstLocation: any = {}; + searchCode: any = ''; + /** + * 物料列表 + */ + materielList: any = []; + /** + * 条码查询结果 + */ + orderInInfo: OrderInInfo = new OrderInInfo(); + //确认按钮的code码 + code = ''; + //data + data: any = {}; + /** + * 查询库位列表 + */ + @MutationAction + async queryReturningTypeList() { + const data: any = await http.get(url.inbound.finishProductOffline.kuwei, { + params: { + factoryCode: session.factoryCode, + loginName: session.loginName, + warehouseCode: session.warehouseCode, //仓库编码 + }, + }); + console.log('data', data.data); + const returningTypeList = data.data.map((item: any) => ({ + label: item.locationCode, + value: item.locationCode + '(' + item.sendSpot + ')', + })); + const firstLocation = returningTypeList[0]; + // const firstLocation = data.data[0]; + // firstLocation.label = firstLocation.locationCode; + // firstLocation.value = firstLocation.locationCode + '(' + firstLocation.sendSpot + ')'; + return { returningTypeList, firstLocation }; + } + //根据扫描的条码推荐库位 + @MutationAction + async queryTypeList(prodCode: any) { + const res: any = await http.post(url.inbound.finishProductOffline.SearchKuwei, { + factoryCode: session.factoryCode, + loginName: session.loginName, + prodCode: prodCode, + }); + console.log('data', res.data); + const returningTypeList = res.data.map((item: any) => ({ + label: item.locationCode, + value: item.locationCode + '(' + item.sendSpot + ')', + })); + const firstLocation = returningTypeList[0]; + return { returningTypeList, firstLocation }; + } + /** + * 查询条码号 + * @param orderNo + */ + @MutationAction + async queryOrderInInfo(barcode: any) { + const { data, code }: any = await http.post(url.inbound.finishProductOffline.finished, { + barcode, + loginName: session.loginName, + }); + const searchCode = code; + const materielList2 = []; + materielList2.push(data); + const materielList = materielList2; + return { searchCode, materielList }; + } + @MutationAction + async setSearchCode() { + const searchCode = ''; + return { searchCode }; + } + /** + * 确认按钮 + * @param orderNo + */ + @MutationAction + async confirm(list: any[]) { + const { code, data, msg } = (await http.post(url.inbound.finishProductOffline.batchOffline, list)) as any; + console.log('res数据', code, data, msg); + if (code == '1') { + uni.showToast({ + title: msg, + duration: 2000, + image: '/static/icons/icon-51.png', + }); + } else { + vm.customToast(msg); + } + return { code, data }; + } +} + +export default getModule(PickingModule); diff --git a/src/pages/raw/index.vue b/src/pages/raw/index.vue index 9a65c13..f57c734 100644 --- a/src/pages/raw/index.vue +++ b/src/pages/raw/index.vue @@ -22,6 +22,7 @@ > {{ session.lang == 'en' ? index + 1 + ' ' + item.engResourceName : index + 1 + ' ' + item.resourceName }} +