diff --git a/src/api/device/repairOrder.js b/src/api/device/repairOrder.js index 42ef4d8..de607b4 100644 --- a/src/api/device/repairOrder.js +++ b/src/api/device/repairOrder.js @@ -70,4 +70,13 @@ export function getMaintenancePersonList(query) { }); } +// 传故障类型 +export function queryEquFaultTypeTree(query) { + return request({ + url: '/device/repairOrder/queryEquFaultTypeTree', + method: 'get', + params: query + }); +} + diff --git a/src/api/quality/income.js b/src/api/quality/income.js index 177511a..0527800 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -120,11 +120,12 @@ export function commitActualValue(recordId, actualValues) { } //审核结果提交 -export function commitCheckResult(recordId,typeCode,checkType) { +export function commitCheckResult(recordId,typeCode,checkType,orderNo) { const data = { recordId, typeCode, - checkType + checkType, + orderNo } return request({ url: '/quality/qcIncome/commitCheckResult', @@ -142,4 +143,22 @@ export function getDefectList(defectType) { method: 'put', data: data }); -} \ No newline at end of file +} + +// 查询来料单列表 +export function getLLWorkOrder(query) { + return request({ + url: '/quality/qcIncome/getLLWorkOrder', + method: 'get', + params: query + }); + } + +// 查询生产过程-工单列表 +export function getWorkOrder(query) { + return request({ + url: '/quality/qcIncome/getWorkOrder', + method: 'get', + params: query + }); + } diff --git a/src/api/quality/project.js b/src/api/quality/project.js index c23c159..3c56e50 100644 --- a/src/api/quality/project.js +++ b/src/api/quality/project.js @@ -9,6 +9,16 @@ export function listProject(query) { }); } +// 查询检验项目维护列表 +export function getProjectList(query) { + return request({ + url: '/quality/project/getProjectList', + method: 'get', + params: query + }); +} + + // 查询检验项目维护详细 export function getProject(id) { return request({ diff --git a/src/api/quality/qcProduce.js b/src/api/quality/qcProduce.js index 70dc437..b980cec 100644 --- a/src/api/quality/qcProduce.js +++ b/src/api/quality/qcProduce.js @@ -77,3 +77,15 @@ export function changeProduceStatus(recordId, status) { data: data }) } + +//获取批次 +export function getBatchList(workorderCode) { + const data = { + workorderCode + } + return request({ + url: '/quality/qcIncome/getBatchList', + method: 'put', + data: data + }); +} \ No newline at end of file diff --git a/src/api/wms/equipment.js b/src/api/wms/equipment.js index c7a4ccf..3030ae8 100644 --- a/src/api/wms/equipment.js +++ b/src/api/wms/equipment.js @@ -96,3 +96,12 @@ export function changeEquipmentStatus(equipmentId, status) { data: data }) } + +// 查询人员列表 +export function getPersonList(query) { + return request({ + url: '/wms/equipment/getPersonList', + method: 'get', + params: query + }); +} diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index 48846ae..8cdbc73 100644 --- a/src/views/device/deviceOrder/index.vue +++ b/src/views/device/deviceOrder/index.vue @@ -637,8 +637,7 @@ - 取 消 - 确 定 + 关 闭 diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue index 5b4b81a..14e7567 100644 --- a/src/views/device/inspectionPlan/index.vue +++ b/src/views/device/inspectionPlan/index.vue @@ -892,7 +892,7 @@ export default { for (let i = 0; i < response.data.length; i++) { this.personList.push({ label: response.data[i].nickName + '(' + response.data[i].userName + ')', - key: response.data[i].userId, + key: response.data[i].userName, }) } }); @@ -1231,7 +1231,11 @@ export default { } this.planLoading = true; if (this.form.planId != null) { - this.form.personList = this.selectPersonList; + this.form.personList = this.selectPersonList.map(item => { + return{ + userName: item.toString() + } + }); updatePlan(this.form).then(response => { this.planLoading = false; this.$modal.msgSuccess("修改成功"); @@ -1239,7 +1243,11 @@ export default { this.getList(); }); } else { - this.form.personList = this.selectPersonList; + this.form.personList = this.selectPersonList.map(item => { + return{ + userName: item.toString() + } + }); addPlan(this.form).then(response => { this.planLoading = false; this.$modal.msgSuccess("新增成功"); diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue index 03bff7e..cebbbd5 100644 --- a/src/views/device/inspectionWork/index.vue +++ b/src/views/device/inspectionWork/index.vue @@ -512,8 +512,7 @@ - 取 消 - 确 定 + 关 闭 diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue index ea3eb90..2c4b78b 100644 --- a/src/views/device/item/index.vue +++ b/src/views/device/item/index.vue @@ -20,7 +20,7 @@ @@ -616,6 +616,7 @@ export default { // 重置日期范围 this.queryParams.createTimeArray = []; this.queryParams.updateTimeArray = []; + this.queryParams.itemTools = null; this.handleQuery(); }, // 多选框选中数据 diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue index be4ac95..a29fc2e 100644 --- a/src/views/device/maintenanceWork/index.vue +++ b/src/views/device/maintenanceWork/index.vue @@ -591,8 +591,7 @@ - 取 消 - 确 定 + 关 闭 diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 8ee458c..45d07a4 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -751,7 +751,12 @@ append-to-body > - + {{ form.equipmentCode }} @@ -801,7 +806,12 @@ - + {{ form.workCode }} @@ -864,7 +874,11 @@ }} - + - + - + @@ -909,7 +933,10 @@ width="110" >