diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index a37d3b9..e424557 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -249,7 +249,8 @@ export default { LibraryCode: '请生成移库码', generate: '生成', TargetLocation: '请选择不同目标库位', - + NowTime: '时间', + SelectTime: '请选择时间', RowWarehouse: '原材料库内', SemiProductZC: '半成品转储', RowScrap: '原材料报废', diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 7f90b47..963a457 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -28,6 +28,8 @@ export default { success: 'Success', selected: 'Insufficient stock of selected material', error: 'Error', + NowTime: 'Time', + SelectTime: 'Please select the time', successful: 'Query was successful', operation: 'Operation', Pi_tip13: 'Please select the material to submit', diff --git a/src/pages/raw/handover/aggregating/config.ts b/src/pages/raw/handover/aggregating/config.ts index 7c292cb..837f72e 100644 --- a/src/pages/raw/handover/aggregating/config.ts +++ b/src/pages/raw/handover/aggregating/config.ts @@ -23,6 +23,11 @@ export const headers = [ key: 'materialDesc', //物料描述 width: 300, }, + { + label: vm.$t('message.Summary_ProductionDate'), + key: 'requireDate', //生产日期 + width: 300, + }, ]; /** diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue index ff8b161..39675d9 100644 --- a/src/pages/raw/handover/aggregating/index.vue +++ b/src/pages/raw/handover/aggregating/index.vue @@ -10,35 +10,18 @@ + - - - + + @@ -49,74 +32,20 @@ - + + + + + + + {{ $t('message.workArea_Selelct') }} + + @@ -167,6 +96,7 @@ export default class Aggregating extends BasePage { * 表头 */ headers = headers; + startShow = false; /** * 表单数据 */ @@ -180,8 +110,17 @@ export default class Aggregating extends BasePage { wkposCode: '', batchNumberList: '', materialCodeList: '', + requestTime: '', sendSpotList: '', }; + startParams = { + year: true, + month: true, + day: true, + hour: false, + minute: false, + second: false, + }; /** * 表单是否改变 */ @@ -232,6 +171,11 @@ export default class Aggregating extends BasePage { } else { delete params.sendSpotList; } + if (this.form.requestTime) { + params.requestTime = this.form.requestTime.split('-').join('').toString(); + } else { + delete params.sendSpotList; + } return params; } // 必须要在onReady生命周期,因为onLoad生命周期组件可能尚未创建完毕 @@ -239,6 +183,25 @@ export default class Aggregating extends BasePage { this.$form.setRules(this.rules); model.clearProOrderList(); this.form.sapFactoryCode = session.factoryCode; + this.form.requestTime = this.getNowFormatDate(); + } + getNowFormatDate() { + var date = new Date(); + var seperator1 = '-'; + var year = date.getFullYear(); + var month: any = date.getMonth() + 1; + var strDate: any = date.getDate(); + if (month >= 1 && month <= 9) { + month = '0' + month; + } + if (strDate >= 0 && strDate <= 9) { + strDate = '0' + strDate; + } + var currentdate = year + seperator1 + month + seperator1 + strDate; + return currentdate; + } + startConfirm(startParams: any) { + this.form.requestTime = startParams.year + '-' + startParams.month + '-' + startParams.day; } /** * 确认 diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue index a49a2f9..beab675 100644 --- a/src/pages/raw/handover/feeding/Location.vue +++ b/src/pages/raw/handover/feeding/Location.vue @@ -207,7 +207,7 @@ export default class RawReceiptDetail extends BasePage { let params = { inPrdOrderList, }; - await await this.model.queryBlDetailList(params).then(() => { + await this.model.queryBlDetailList(params).then(() => { this.model.blDetailList.forEach((item: any) => { let arr = { label: item.materialCode, diff --git a/src/pages/raw/handover/picking/config.ts b/src/pages/raw/handover/picking/config.ts index 358b944..3bd6345 100644 --- a/src/pages/raw/handover/picking/config.ts +++ b/src/pages/raw/handover/picking/config.ts @@ -23,6 +23,11 @@ export const headers = [ key: 'materialDesc', //物料描述 width: 300, }, + { + label: vm.$t('message.Summary_ProductionDate'), + key: 'requireDate', //生产日期 + width: 300, + }, ]; /** diff --git a/src/pages/raw/handover/picking/index.vue b/src/pages/raw/handover/picking/index.vue index 2c7db74..82fc772 100644 --- a/src/pages/raw/handover/picking/index.vue +++ b/src/pages/raw/handover/picking/index.vue @@ -26,6 +26,12 @@ + + + + + {{ $t('message.workArea_Selelct') }} + @@ -81,6 +87,7 @@ export default class pickingDom extends BasePage { * 表头 */ headers = headers; + startShow = false; /** * 表单数据 */ @@ -95,8 +102,16 @@ export default class pickingDom extends BasePage { batchNumberList: '', materialCodeList: '', sendSpotList: '', + requireDateRegion: '', + }; + startParams = { + year: true, + month: true, + day: true, + hour: false, + minute: false, + second: false, }; - /** * 表单是否改变 */ @@ -150,6 +165,11 @@ export default class pickingDom extends BasePage { } else { delete params.sendSpotList; } + if (this.form.requireDateRegion) { + params.requireDateRegion = this.form.requireDateRegion.split('-').join('').toString(); + } else { + delete params.sendSpotList; + } return params; } // 必须要在onReady生命周期,因为onLoad生命周期组件可能尚未创建完毕 @@ -157,8 +177,26 @@ export default class pickingDom extends BasePage { this.$form.setRules(this.rules); model.clearProOrderList(); this.form.sapFactoryCode = session.factoryCode; + this.form.requireDateRegion = this.getNowFormatDate(); + } + getNowFormatDate() { + var date = new Date(); + var seperator1 = '-'; + var year = date.getFullYear(); + var month: any = date.getMonth() + 1; + var strDate: any = date.getDate(); + if (month >= 1 && month <= 9) { + month = '0' + month; + } + if (strDate >= 0 && strDate <= 9) { + strDate = '0' + strDate; + } + var currentdate = year + seperator1 + month + seperator1 + strDate; + return currentdate; + } + startConfirm(startParams: any) { + this.form.requireDateRegion = startParams.year + '-' + startParams.month + '-' + startParams.day; } - /** * 确认 */ diff --git a/src/pages/raw/handover/virtual/result.vue b/src/pages/raw/handover/virtual/result.vue index 63bb2db..c78169f 100644 --- a/src/pages/raw/handover/virtual/result.vue +++ b/src/pages/raw/handover/virtual/result.vue @@ -112,6 +112,7 @@ export default class AggregatingResult extends BasePage { bottom: 0; left: 0; right: 0; + z-index: 1000; .container { background: #ffffff; diff --git a/src/pages/raw/handover/virtual/summary.vue b/src/pages/raw/handover/virtual/summary.vue index 5ec40fe..b957496 100644 --- a/src/pages/raw/handover/virtual/summary.vue +++ b/src/pages/raw/handover/virtual/summary.vue @@ -408,6 +408,7 @@ export default class VirtualSummary extends BasePage { bottom: 0; left: 0; right: 0; + z-index: 1000; .container { background: #ffffff;