diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 31283a4..441c52f 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -538,5 +538,8 @@ export default { Transferissue: '调拨出库', Transferreceipt: '调拨入库', Pleasecenter: '请选择成本中心', + LocalDNreceiving: '本地DN收货', + SOdelivery: 'SO 发货', + SONO: 'SO单号', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index c354d2d..79039d0 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -537,5 +537,8 @@ export default { Transferissue: 'Transfer issue', Transferreceipt: 'Transfer receipt', Pleasecenter: 'Please select cost center', + LocalDNreceiving: 'Local DN receiving', + SOdelivery: 'SO delivery', + SONO: 'SO NO', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 08939eb..eb9e57d 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -537,5 +537,8 @@ export default { Transferissue: 'распределительный склад', Transferreceipt: 'переброска на склад', Pleasecenter: 'Выберите центр затрат', + LocalDNreceiving: 'локальный получатель DN', + SOdelivery: 'SO отгрузка', + SONO: 'SO NO', }, }; diff --git a/src/pages.json b/src/pages.json index 9ca12c1..512e6f3 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1327,6 +1327,22 @@ "navigationStyle": "custom", // 隐藏系统导航栏 "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } + }, + { + "path": "pages/raw/ingoods/RUS-dnReceipt/ImportDN", + "style": { + "navigationBarTitleText": "俄罗斯海外DN收货", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/product/outbound/stoOutbound/RUSDN-delivergoods", + "style": { + "navigationBarTitleText": "俄罗斯SO发货", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } } ], "globalStyle": { diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index e3ba01d..5f5223f 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -171,9 +171,9 @@ export default class LoginPage extends BasePage { console.log('......', server.serverAddress); if (server.serverAddress.includes('https://eurmom.haier.net')) { //修改俄罗斯版本号 - this.Version = '1.1.10'; + this.Version = '1.1.12'; } else { - this.Version = '1.0.43'; + this.Version = '1.0.45'; } console.log('////', this.Version); } diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue index 57837c2..9a35301 100644 --- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue +++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue @@ -165,12 +165,11 @@ export default class stoOutboundDom extends BasePage { await this.model.findProdInfoByDN(this.form.orderNo); console.log('model.DNcode', this.model.DNcode); if (this.model.DNcode == '1') { - uni.showToast({ - //icon: 'success', - title: this.$t('message.successful') as any, - duration: 2000, - image: '/static/icons/icon-51.png', - }); + // uni.showToast({ + // title: this.$t('message.successful') as any, + // duration: 2000, + // image: '/static/icons/icon-51.png', + // }); if (this.rowItemIndex == null) { this.form.productCode = this.model.materielList[0].materialCode; this.form.productDescZh = this.model.materielList[0].materialDesc; @@ -317,12 +316,11 @@ export default class stoOutboundDom extends BasePage { await this.model.confirmMove(selctlist).then(async () => { if (this.model.code == '1') { this.materialList = []; - uni.showToast({ - //icon: 'success', - title: 'success', - duration: 2000, - image: '/static/icons/icon-51.png', - }); + // uni.showToast({ + // title: 'success', + // duration: 2000, + // image: '/static/icons/icon-51.png', + // }); this.form.barCode = ''; this.form.productCode = ''; model.orderInInfo.stoAmount = 0; @@ -332,8 +330,7 @@ export default class stoOutboundDom extends BasePage { this.selectMaterielList = []; this.form.rowItem = ''; this.query(); - } - if (this.model.code == '2') { + } else if (this.model.code == '2') { uni.showModal({ content: this.$t('message.sweep') as any, cancelText: this.$t('message.Cancel') as any, @@ -363,6 +360,8 @@ export default class stoOutboundDom extends BasePage { } }, }); + } else { + this.form.barCode = ''; } }); }); diff --git a/src/pages/product/outbound/stoOutbound/RUSDN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/RUSDN-delivergoods.vue new file mode 100644 index 0000000..10be838 --- /dev/null +++ b/src/pages/product/outbound/stoOutbound/RUSDN-delivergoods.vue @@ -0,0 +1,461 @@ + + + + + diff --git a/src/pages/product/outbound/stoOutbound/model.ts b/src/pages/product/outbound/stoOutbound/model.ts index c72ce03..85d3ef9 100644 --- a/src/pages/product/outbound/stoOutbound/model.ts +++ b/src/pages/product/outbound/stoOutbound/model.ts @@ -25,6 +25,7 @@ export class ReturningModule extends VuexModule { */ returningTypeList: any[] = []; PostingCode: any = ''; + RusPostingCode: any = ''; /** * 物料列表 */ @@ -225,6 +226,13 @@ export class ReturningModule extends VuexModule { const PostingCode = res.code; return { PostingCode }; } + //俄罗斯过账 + @MutationAction + async RusPosting(params: any) { + const res: any = await http.post(url.outbound.stoOutbound.RusPosting, params); + const RusPostingCode = res.code; + return { RusPostingCode }; + } @MutationAction async empty() { const orderInInfo = {}; diff --git a/src/pages/raw/handover/RUS-picking/index.vue b/src/pages/raw/handover/RUS-picking/index.vue index 43d4217..c222bc7 100644 --- a/src/pages/raw/handover/RUS-picking/index.vue +++ b/src/pages/raw/handover/RUS-picking/index.vue @@ -119,11 +119,12 @@ export default class pickingDom extends BasePage { sendSpotList: '', requireDateRegion: '', }; - CategoryList = [ - { lable: 'L1CA', value: 'L1CA' }, - { lable: 'L1DA', value: 'L1DA' }, - { lable: 'L1FA', value: 'L1FA' }, - ]; + CategoryList = []; + // CategoryList = [ + // { lable: 'L1CA', value: 'L1CA' }, + // { lable: 'L1DA', value: 'L1DA' }, + // { lable: 'L1FA', value: 'L1FA' }, + // ]; startParams = { year: true, month: true, @@ -217,6 +218,19 @@ export default class pickingDom extends BasePage { startConfirm(startParams: any) { this.form.requireDateRegion = startParams.year + '-' + startParams.month + '-' + startParams.day; } + async onLoad() { + this.getLoc(); + } + async getLoc() { + await this.model.getSendSpotList2({ + loginName: session.loginName, + factoryCode: session.factoryCode, + }); + if (this.model.CategoryList.length != 0) { + this.CategoryList = []; + this.CategoryList = this.model.CategoryList; + } + } bookTypeChange(e: any) { console.log('///', e); this.formone.aimWl = e.pickerName; @@ -267,11 +281,12 @@ export default class pickingDom extends BasePage { } ondelete() { this.formone.aimWl.value = ''; - this.CategoryList = [ - { lable: 'L1CA', value: 'L1CA' }, - { lable: 'L1DA', value: 'L1DA' }, - { lable: 'L1FA', value: 'L1FA' }, - ]; + this.getLoc(); + // this.CategoryList = [ + // { lable: 'L1CA', value: 'L1CA' }, + // { lable: 'L1DA', value: 'L1DA' }, + // { lable: 'L1FA', value: 'L1FA' }, + // ]; } } diff --git a/src/pages/raw/handover/RUS-picking/model.ts b/src/pages/raw/handover/RUS-picking/model.ts index 799abec..77eb1bd 100644 --- a/src/pages/raw/handover/RUS-picking/model.ts +++ b/src/pages/raw/handover/RUS-picking/model.ts @@ -26,6 +26,7 @@ export class PickingModule extends VuexModule { lockCode: any = ''; // 容器码返回 ContainerCode: any = ''; + CategoryList: any = []; /** * 查询结果列表（按单列表） @@ -282,6 +283,22 @@ export class PickingModule extends VuexModule { }); return { proOrderResultList }; } + //查询目标库位 + @MutationAction + async getSendSpotList2(params: any = {}) { + const res: any = await http.post(url.sumscan.query.getSendSpotList, params); + const CategoryList = []; + res.data.forEach((item: any) => { + const arr: any = { + label: item.sendSpot, + value: item.sendSpot, + }; + CategoryList.push(arr); + }); + console.log('res', res); + console.log('LocList', CategoryList); + return { CategoryList }; + } /** * 查询结果-汇总列表 diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue index 3a74349..bd9bc91 100644 --- a/src/pages/raw/handover/aggregating/index.vue +++ b/src/pages/raw/handover/aggregating/index.vue @@ -139,11 +139,12 @@ export default class Aggregating extends BasePage { minute: false, second: false, }; - CategoryList = [ - { lable: 'L1CA', value: 'L1CA' }, - { lable: 'L1DA', value: 'L1DA' }, - { lable: 'L1FA', value: 'L1FA' }, - ]; + CategoryList = []; + // CategoryList = [ + // { lable: 'L1CA', value: 'L1CA' }, + // { lable: 'L1DA', value: 'L1DA' }, + // { lable: 'L1FA', value: 'L1FA' }, + // ]; /** * 表单是否改变 */ @@ -208,6 +209,20 @@ export default class Aggregating extends BasePage { this.form.sapFactoryCode = session.factoryCode; //this.form.requestTime = this.getNowFormatDate(); } + async onLoad() { + this.getLoc(); + } + async getLoc() { + //debugger; + await this.model.getSendSpotList1({ + loginName: session.loginName, + factoryCode: session.factoryCode, + }); + if (this.model.CategoryList.length != 0) { + this.CategoryList = []; + this.CategoryList = this.model.CategoryList; + } + } bookTypeChange(e: any) { console.log('///', e); this.formone.aimWl = e.pickerName; @@ -232,11 +247,12 @@ export default class Aggregating extends BasePage { } ondelete() { this.formone.aimWl.value = ''; - this.CategoryList = [ - { lable: 'L1CA', value: 'L1CA' }, - { lable: 'L1DA', value: 'L1DA' }, - { lable: 'L1FA', value: 'L1FA' }, - ]; + this.getLoc(); + // this.CategoryList = [ + // { lable: 'L1CA', value: 'L1CA' }, + // { lable: 'L1DA', value: 'L1DA' }, + // { lable: 'L1FA', value: 'L1FA' }, + // ]; } /** * 确认 diff --git a/src/pages/raw/handover/aggregating/model.ts b/src/pages/raw/handover/aggregating/model.ts index b339325..59f3185 100644 --- a/src/pages/raw/handover/aggregating/model.ts +++ b/src/pages/raw/handover/aggregating/model.ts @@ -23,6 +23,7 @@ export class AggregatingModule extends VuexModule { */ proOrderResultList = []; isFormChange: any; + CategoryList: any = []; /** * 查询结果汇总列表 @@ -218,7 +219,22 @@ export class AggregatingModule extends VuexModule { const { list: proOrderResultList }: any = await http.post(url.sumscan.query.ordoutlist, params); return { proOrderResultList }; } - + //查询目标库位 + @MutationAction + async getSendSpotList1(params: any = {}) { + const res: any = await http.post(url.sumscan.query.getSendSpotList, params); + const CategoryList = []; + res.data.forEach((item: any) => { + const arr: any = { + label: item.sendSpot, + value: item.sendSpot, + }; + CategoryList.push(arr); + }); + console.log('res', res); + console.log('LocList', CategoryList); + return { CategoryList }; + } /** * 查询结果-汇总列表 * @param params diff --git a/src/pages/raw/handover/virtual/index.vue b/src/pages/raw/handover/virtual/index.vue index 4ae5015..98160dd 100644 --- a/src/pages/raw/handover/virtual/index.vue +++ b/src/pages/raw/handover/virtual/index.vue @@ -123,11 +123,12 @@ export default class Virtual extends BasePage { materialCodeList: '', sendSpotList: '', }; - CategoryList = [ - { lable: 'L1CA', value: 'L1CA' }, - { lable: 'L1DA', value: 'L1DA' }, - { lable: 'L1FA', value: 'L1FA' }, - ]; + CategoryList = []; + // CategoryList = [ + // { lable: 'L1CA', value: 'L1CA' }, + // { lable: 'L1DA', value: 'L1DA' }, + // { lable: 'L1FA', value: 'L1FA' }, + // ]; /** * 表单是否改变 @@ -191,6 +192,19 @@ export default class Virtual extends BasePage { model.clearProOrderList(); this.form.sapFactoryCode = session.factoryCode; } + async onLoad() { + this.getLoc(); + } + async getLoc() { + await this.model.getSendSpotList1({ + loginName: session.loginName, + factoryCode: session.factoryCode, + }); + if (this.model.CategoryList.length != 0) { + this.CategoryList = []; + this.CategoryList = this.model.CategoryList; + } + } bookTypeChange(e: any) { console.log('///', e); this.formone.aimWl = e.pickerName; @@ -242,11 +256,12 @@ export default class Virtual extends BasePage { } ondelete() { this.formone.aimWl.value = ''; - this.CategoryList = [ - { lable: 'L1CA', value: 'L1CA' }, - { lable: 'L1DA', value: 'L1DA' }, - { lable: 'L1FA', value: 'L1FA' }, - ]; + this.getLoc(); + // this.CategoryList = [ + // { lable: 'L1CA', value: 'L1CA' }, + // { lable: 'L1DA', value: 'L1DA' }, + // { lable: 'L1FA', value: 'L1FA' }, + // ]; } } diff --git a/src/pages/raw/handover/virtual/model.ts b/src/pages/raw/handover/virtual/model.ts index 6c6c9e9..23b38cf 100644 --- a/src/pages/raw/handover/virtual/model.ts +++ b/src/pages/raw/handover/virtual/model.ts @@ -34,6 +34,7 @@ export class VirtualModule extends VuexModule { */ sapFactoryCode = ''; nextQueryParams: any = {}; + CategoryList: any = []; /** * 查询列表 @@ -136,6 +137,22 @@ export class VirtualModule extends VuexModule { }); return { proOrderResultList }; } + //查询目标库位 + @MutationAction + async getSendSpotList1(params: any = {}) { + const res: any = await http.post(url.sumscan.query.getSendSpotList, params); + const CategoryList = []; + res.data.forEach((item: any) => { + const arr: any = { + label: item.sendSpot, + value: item.sendSpot, + }; + CategoryList.push(arr); + }); + console.log('res', res); + console.log('LocList', CategoryList); + return { CategoryList }; + } /** * 汇总-查询列表 diff --git a/src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue index 7bc69b1..ae11b32 100644 --- a/src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue +++ b/src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue @@ -5,7 +5,7 @@ - {{ $t('message.dn_ReceivingGoods') }} + {{ $t('message.OverseasShipping') }} @@ -59,7 +59,7 @@ {{ $t('message.CommissionedThisNumber') }} - + diff --git a/src/pages/raw/ingoods/RUS-dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/RUS-dnReceipt/dnReceiving.vue index 5fc8b3f..f27d45c 100644 --- a/src/pages/raw/ingoods/RUS-dnReceipt/dnReceiving.vue +++ b/src/pages/raw/ingoods/RUS-dnReceipt/dnReceiving.vue @@ -5,7 +5,7 @@ - {{ $t('message.dn_ReceivingGoods') }} + {{ $t('message.LocalDNreceiving') }} diff --git a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue index 7bc69b1..d1460af 100644 --- a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue +++ b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue @@ -5,7 +5,7 @@ - {{ $t('message.dn_ReceivingGoods') }} + {{ $t('message.OverseasShipping') }} diff --git a/src/pages/raw/warehouse/RUS-rowScrap/index.vue b/src/pages/raw/warehouse/RUS-rowScrap/index.vue index 764f502..a9ab24c 100644 --- a/src/pages/raw/warehouse/RUS-rowScrap/index.vue +++ b/src/pages/raw/warehouse/RUS-rowScrap/index.vue @@ -140,6 +140,7 @@ export default class KanDanHandOver extends BasePage { label: item.productCode, value: item.productCode, }; + this.MaterialList = []; this.MaterialList.push(arr); }); this.Some = this.model.orderInInfoList[0]; diff --git a/src/utils/url.ts b/src/utils/url.ts index a993b0e..4ba61bf 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -165,6 +165,7 @@ export const url = { scanBarcodeDN: '/wmspda/fg/scanBarcodeDN/del', queryAmount: '/wmspda/fg/queryAmountByDn', Posting: '/wmspda/fg/dnPosting', + RusPosting: '/wmspda/fg/dnPosting/russia', }, }, inbound: { @@ -216,6 +217,7 @@ export const url = { ordoutlist: '/wmspda/sumscan/query/ordoutlist', hzlist: '/wmspda/sumscan/query/hzlist', fllist: '/wmspda/sumscan/query/fllist', + getSendSpotList: '/wmspda/material/getSendSpotList', }, lock: { list: '/wmspda/sumscan/lock/list',