diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 0335a24..4192cf1 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -23,7 +23,7 @@ - 机台编号: + *机台编号: @@ -1808,6 +1808,11 @@ export default { /* 查询派工单 */ getProduceScheduleList() { + // 校验机台编号必填 + if (!this.searchData.resourceId || this.searchData.resourceId.trim() === '') { + this.$message.warning('请输入机台编号!') + return + } // 开始真的查询; this.searchData.searchFlag = true getProduceScheduleList(this.searchData).then(({data}) => { @@ -2224,6 +2229,11 @@ export default { //导出excel async createExportData() { + // 校验机台编号必填 + if (!this.searchData.resourceId || this.searchData.resourceId.trim() === '') { + this.$message.warning('请输入机台编号!') + return [] + } // 开始真的查询; this.searchData.searchFlag = true; this.searchData.exportFlag = "Y"; @@ -2258,14 +2268,15 @@ export default { } // 等待getResourceByUser执行完成后,再查询生产排程列表 - this.searchData.searchFlag = true; - // 不查询 - getProduceScheduleList(this.searchData).then(({data}) => { - // 设置查询数据 - //this.searchData.searchFlag = false; - this.searchData.exportFlag = 'N'; - this.produceScheduleList = data.rows - }) + // 只有当机台编号有值时才查询 + if (this.searchData.resourceId && this.searchData.resourceId.trim() !== '') { + this.searchData.searchFlag = true; + getProduceScheduleList(this.searchData).then(({data}) => { + // 设置查询数据 + this.searchData.exportFlag = 'N'; + this.produceScheduleList = data.rows + }) + } }) /* 获取报工的特殊权限 */