diff --git a/src/App.vue b/src/App.vue index dc21618..ee93970 100644 --- a/src/App.vue +++ b/src/App.vue @@ -11,7 +11,7 @@ data() { return { query: {}, - version: '1.2.11' + version: '1.2.12' } }, created() { diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 65d5c28..d2f4119 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -47,6 +47,7 @@ + 机台编号: @@ -199,6 +200,9 @@ + + + @@ -218,6 +222,7 @@ import { } from '@/api/yieldReport/produce_order.js'; /*引入组件*/ +import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/ import comSwitchOperator from "./com_switch_operator";/*切换操作员*/ import comProduceReportNormal from "./com_produce_report_normal";/* 报工的组件*/ import comFinishSchedule from "./com_finish_schedule";/*结束派工的组件*/ @@ -251,7 +256,7 @@ export default { orderNo: '', seqNo: '', planStartTime1: '', - planStartTime2: this.dayjs(new Date()).format('YYYY-MM-DD'), + planStartTime2: '', closedFlag: 'N', status: 1, username: this.$store.state.user.name, @@ -1104,6 +1109,7 @@ export default { } }, components: { + Chooselist,/*选择的组件*/ Com_split_schedule, comSwitchOperator,/*切换用户的组件*/ comProduceReportNormal,/*报工页面的组件*/ @@ -1925,7 +1931,26 @@ export default { this.$refs.comProduceReportNormal.init(this.currentRow.seqNo, this.operatorData); }); }) - } + }, + + /*列表方法的回调*/ + getBaseData(val){ + if (this.tagNo === 88){ + this.searchData.resourceId = val.ResourceID; + } + }, + + // 获取基础数据列表 + getBaseList(val){ + this.tagNo = val + this.$nextTick(() => { + let strVal = ""; + if (val === 88){ + strVal = this.searchData.resourceId; + } + this.$refs.baseList.init(val,strVal, " AND WorkCenterNo <> 'FQC'"); + }) + }, }, created() { //不查询