diff --git a/src/api/quality/materialGroup.js b/src/api/quality/materialGroup.js index 0c63965..3db129e 100644 --- a/src/api/quality/materialGroup.js +++ b/src/api/quality/materialGroup.js @@ -50,3 +50,11 @@ export function delMaterialGroup(id) { method: 'delete' }); } + +export function getOriginalGroupList(query) { + return request({ + url: '/quality/materialGroup/getOriginalGroupList', + method: 'get', + params: query + }); +} 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/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue index 11886dc..8271e28 100644 --- a/src/views/device/inspectionPlan/index.vue +++ b/src/views/device/inspectionPlan/index.vue @@ -926,10 +926,13 @@ export default { // 获取设备组线信息 getGroupLine().then(response => { this.groupLineList = response.data; - this.equipmentQuery.groupLine = response.data[0].equipmentCode; - this.getEquList(); + // this.equipmentQuery.groupLine = response.data[0].equipmentCode; + }) + //获取设备 + getEquList().then(response => { + this.equTotal = response.total; + this.queryEquipment = response.rows; }) - this.selectEqu = true; }, // 编辑标准确认按钮 @@ -1058,7 +1061,7 @@ export default { equipmentCode: null, equipmentName: null, workshopCode: null, - groupLine:this.groupLineList[0].equipmentCode, + groupLine:null, pageNum: 1, pageSize: 10, }; diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue index b01ec06..0a2d3de 100644 --- a/src/views/device/item/index.vue +++ b/src/views/device/item/index.vue @@ -661,7 +661,7 @@ export default { // 数据校验 if (this.form.itemName == null) { this.$message({ - message: "请输入检查项!", + message: "请输入检查项名称!", type: "warning" }) return @@ -673,13 +673,20 @@ export default { }) return } - if (this.selectEquipmentList.length == 0) { + if (this.form.itemMethod == null) { this.$message({ - message: "请关联设备!", + message: "请输入检查方法!", type: "warning" }) return } + // if (this.selectEquipmentList.length == 0) { + // this.$message({ + // message: "请关联设备!", + // type: "warning" + // }) + // return + // } for (let i = 0; i < this.formStandard.length; i++) { // 如果为定性 if (this.formStandard[i].standardType == 'qualitative') { diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue index 882dc8b..47b5d03 100644 --- a/src/views/device/spotCheckPlan/index.vue +++ b/src/views/device/spotCheckPlan/index.vue @@ -971,10 +971,13 @@ export default { // 获取设备组线信息 getGroupLine().then(response => { this.groupLineList = response.data; - this.equipmentQuery.groupLine = response.data[0].equipmentCode; - this.getEquList(); }) + //获取设备 + getEquList().then(response => { + this.equTotal = response.total; + this.queryEquipment = response.rows; + }) this.selectEqu = true; }, // 编辑标准确认按钮 @@ -1103,7 +1106,7 @@ export default { equipmentCode: null, equipmentName: null, workshopCode: null, - groupLine:this.groupLineList[0].equipmentCode, + groupLine : null, pageNum: 1, pageSize: 10, }; 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/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue index 7457be5..13fcdf7 100644 --- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue +++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue @@ -55,9 +55,27 @@ - - - + + + + + + + + + + + + + + + + +