diff --git a/src/api/quality/produceReport.js b/src/api/quality/produceReport.js index 9b81f2b..3458906 100644 --- a/src/api/quality/produceReport.js +++ b/src/api/quality/produceReport.js @@ -43,9 +43,10 @@ export function delProduce(recordId) { }); } -export function getProduceReportXJ(orderNo) { +export function getProduceReportXJ(orderNo,shiftId) { const data = { - orderNo + orderNo, + shiftId } return request({ url: '/quality/qcProduceReport/getProduceReportXJ', diff --git a/src/views/plan/workorderBP/index.vue b/src/views/plan/workorderBP/index.vue index 36b9efc..e46ac9a 100644 --- a/src/views/plan/workorderBP/index.vue +++ b/src/views/plan/workorderBP/index.vue @@ -1322,8 +1322,8 @@ export default { var statusesArray = this.statuses; for (var i = 0; i < statusesArray.length; i++) { - if (statusesArray[i] != 'w0') {//已经下达的不允许操作 - this.$modal.msgError("已经派发的订单不允许操作"); + if (statusesArray[i] == 'w2') { + this.$modal.msgError("已经活动的订单不允许操作"); return } } diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index 6a747e0..522f234 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -183,7 +183,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -543,6 +702,7 @@ export default { formRef: 'form', newWorkerLoading: false, refreshNewWorkerTable:true, + refreshNewWorkerTableNight:true, validateRules: [], checkList: [], standardNo: null, @@ -760,18 +920,32 @@ export default { this.queryParams.recordId = recordId; this.getCheckedProjectList(); }else { - const orderNo = row.orderNo; - getProduceReportXJ(orderNo).then(response => { - this.form = response; - //巡检报告 - this.form.printable = 'printForm'; //打印时需要 - this.form.ignore = ['no-print'];//打印时需要 - this.open = true; - this.title = "巡检检验报告"; - this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格 - this.newWorkerLoading = false // 设置加载状态为false，表示加载完成 - }) + if(row.shiftId == '5'){ + getProduceReportXJ(orderNo,row.shiftId).then(response => { + this.form = response; + //巡检报告 + this.form.printable = 'printForm'; //打印时需要 + this.form.ignore = ['no-print'];//打印时需要 + this.open = true; + this.title = "巡检检验报告"; + this.refreshNewWorkerTable = true ;// 立即将refreshProTable设置为true，显示表格 + this.refreshNewWorkerTableNight = false ; + this.newWorkerLoading = false ;// 设置加载状态为false，表示加载完成 + }) + }else if(row.shiftId == '2'){ + getProduceReportXJ(orderNo,row.shiftId).then(response => { + this.form = response; + //巡检报告 + this.form.printable = 'printForm'; //打印时需要 + this.form.ignore = ['no-print'];//打印时需要 + this.open = true; + this.title = "巡检检验报告"; + this.refreshNewWorkerTableNight = true ;// 立即将refreshProTable设置为true，显示表格 + this.refreshNewWorkerTable = false ; + this.newWorkerLoading = false ;// 设置加载状态为false，表示加载完成 + }) + } } }, diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue index f430bbe..162ddb9 100644 --- a/src/views/quality/qcIncome/index.vue +++ b/src/views/quality/qcIncome/index.vue @@ -141,7 +141,9 @@ - + @@ -470,6 +472,11 @@ export default { this.handleDefectType(); }, methods: { + productCodeFormate(row, column, cellValue){ + if(cellValue != null){ + return cellValue.slice(7,18); //返回值 + } + }, /****/ getCheckTypes() { getCheckTypes('material').then(response => { diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue index fe49f59..c08e1de 100644 --- a/src/views/quality/qcProduce/index.vue +++ b/src/views/quality/qcProduce/index.vue @@ -563,7 +563,9 @@ export default { methods: { //产品编码格式化 productCodeFormate(row, column, cellValue){ - return cellValue.slice(7,18); //返回值 + if(cellValue != null){ + return cellValue.slice(7,18); //返回值 + } }, /****/ //获取检验节点