diff --git a/src/pages/raw/commission/RUS-Out/config.ts b/src/pages/raw/commission/RUS-Out/config.ts index 00022da..24a85df 100644 --- a/src/pages/raw/commission/RUS-Out/config.ts +++ b/src/pages/raw/commission/RUS-Out/config.ts @@ -37,6 +37,11 @@ export const headers = [ key: 'wlCode', width: 200, }, + { + label: vm.$t('message.Container'), + key: 'user_defined6', + width: 400, + }, ]; export const detailHeader = [ diff --git a/src/pages/raw/commission/RUS-Out/detail.vue b/src/pages/raw/commission/RUS-Out/detail.vue index a0e89c3..5d28ef7 100644 --- a/src/pages/raw/commission/RUS-Out/detail.vue +++ b/src/pages/raw/commission/RUS-Out/detail.vue @@ -17,7 +17,6 @@ import { Component } from 'vue-property-decorator'; import { BasePage } from '@/components/base/page'; import { headers } from './config'; import model from './model'; - @Component export default class RawReceiptDetail extends BasePage { model = model; diff --git a/src/pages/raw/commission/RUS-Out/index.vue b/src/pages/raw/commission/RUS-Out/index.vue index 5b35d58..64dab68 100644 --- a/src/pages/raw/commission/RUS-Out/index.vue +++ b/src/pages/raw/commission/RUS-Out/index.vue @@ -351,14 +351,13 @@ export default class dnReceiptDom extends BasePage { this.customToast(this.$t('message._tips6') as any); return; } - let person = JSON.parse(uni.getStorageSync('__GWMS_APP_STATE_DATA__') as any); let content = { - loginName: person.session.user.loginName, + loginName: session.loginName, poNo: this.form.documentNo, - factoryCode: person.session.user.factoryCode, + factoryCode: session.factoryCode, }; await this.model.querydetaildlist(content); - this.toPage(this.page.raw.commission.goOut.detail); + this.toPage(this.page.raw.commission.RUSgoOut.detail); } } diff --git a/src/pages/raw/commission/RUS-entrant/config.ts b/src/pages/raw/commission/RUS-entrant/config.ts index d101737..745c044 100644 --- a/src/pages/raw/commission/RUS-entrant/config.ts +++ b/src/pages/raw/commission/RUS-entrant/config.ts @@ -37,6 +37,11 @@ export const headers = [ key: 'sendSpot', width: 200, }, + { + label: vm.$t('message.Container'), + key: 'sn', + width: 400, + }, ]; export const detailHeader = [ { diff --git a/src/pages/raw/commission/RUS-entrant/detail.vue b/src/pages/raw/commission/RUS-entrant/detail.vue index 0f97457..4292c27 100644 --- a/src/pages/raw/commission/RUS-entrant/detail.vue +++ b/src/pages/raw/commission/RUS-entrant/detail.vue @@ -26,7 +26,6 @@ import { Component } from 'vue-property-decorator'; import { BasePage } from '@/components/base/page'; import { headers } from './config'; import model from './model'; - @Component export default class RawReceiptDetail extends BasePage { model = model; diff --git a/src/pages/raw/commission/RUS-entrant/index.vue b/src/pages/raw/commission/RUS-entrant/index.vue index 1850c6d..89cbfc2 100644 --- a/src/pages/raw/commission/RUS-entrant/index.vue +++ b/src/pages/raw/commission/RUS-entrant/index.vue @@ -507,13 +507,12 @@ export default class dnReceiptDom extends BasePage { this.customToast(this.$t('message._tips6') as any); return; } - let person = JSON.parse(uni.getStorageSync('__GWMS_APP_STATE_DATA__') as any); let content = { - loginName: person.session.user.loginName, + loginName: session.loginName, dnNo: this.form.documentNo, }; await this.model.queryBill(content); - this.toPage(this.page.raw.commission.entrant.detail); + this.toPage(this.page.raw.commission.RUSentrant.detail); } } diff --git a/src/pages/raw/handover/RUS-picking/BySummary.vue b/src/pages/raw/handover/RUS-picking/BySummary.vue index adc7f6a..0d13909 100644 --- a/src/pages/raw/handover/RUS-picking/BySummary.vue +++ b/src/pages/raw/handover/RUS-picking/BySummary.vue @@ -323,7 +323,6 @@ export default class RawReceiptDetail extends BasePage { TEM.wlList = null; TEM.wlCode = this.wlCode.label; TEM.qty = this.qty; - /// TEM.barcode = this.Barcode; this.model.aggregateList[this.someIndex].wlList.push(TEM); this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty); diff --git a/src/utils/page.ts b/src/utils/page.ts index dc96239..03fbfb3 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -189,6 +189,14 @@ export const page = { index: '/pages/raw/commission/goOut/index', detail: '/pages/raw/commission/goOut/detail', }, + RUSentrant: { + index: '/pages/raw/commission/RUS-entrant/index', + detail: '/pages/raw/commission/RUS-entrant/detail', + }, + RUSgoOut: { + index: '/pages/raw/commission/RUS-Out/index', + detail: '/pages/raw/commission/RUS-Out/detail', + }, }, SemiFinished: { SemiFinishedSO: {