diff --git a/src/api/repair/repair.js b/src/api/repair/repair.js index 3782efe1..ef98adfc 100644 --- a/src/api/repair/repair.js +++ b/src/api/repair/repair.js @@ -84,9 +84,9 @@ export function auditPass(data) { } //获取维修任务单信息 -export function getRepairInfo(taskId) { +export function getRepairDocumentInfo(taskId) { return request({ - url: '/material/repair/getRepairTicketInfo/?taskId=' + taskId, + url: '/material/repair/getRepairDocumentInfo/?taskId=' + taskId, method: 'get', }) } \ No newline at end of file diff --git a/src/api/repair/testedInBound.js b/src/api/repair/testedInBound.js new file mode 100644 index 00000000..f989f7cc --- /dev/null +++ b/src/api/repair/testedInBound.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' + +// 查询修试后入库的列表 +export function getListTested(query) { + return request({ + url: '/material/repair/getRepairedList', + method: 'get', + params: query + }) +} +// // 查询修试审核详细列表 +// export function getAuditInfo(query) { +// return request({ +// url: '/material/repair_audit_details/getRepairAuditList', +// method: 'get', +// params: query +// }) +// } + +// //修试审核二级-通过,驳回 +// export function auditPass(data) { +// return request({ +// url: '/material/repair_audit_details', +// method: 'put', +// data: data, +// }) +// } + + + + diff --git a/src/views/material/repair/repairManage/component/edit.vue b/src/views/material/repair/repairManage/component/edit.vue index d98389c4..1b7958ec 100644 --- a/src/views/material/repair/repairManage/component/edit.vue +++ b/src/views/material/repair/repairManage/component/edit.vue @@ -224,18 +224,21 @@ 内部维修 返场维修 待报废 @@ -1366,7 +1369,7 @@ export default { this.partTableList = []; this.typeTemp = row.type; this.typeNameTemp = row.typeName; - this.disrepairNumTemp = row.repairNum - row.repairedNum; + this.disrepairNumTemp = row.typeRepairNum - row.typeRepairedNum; this.repairRowData = row; this.repairDeviceList = []; const params = {}; diff --git a/src/views/material/repair/repairManage/component/home.vue b/src/views/material/repair/repairManage/component/home.vue index 03ac1667..60d21e82 100644 --- a/src/views/material/repair/repairManage/component/home.vue +++ b/src/views/material/repair/repairManage/component/home.vue @@ -428,7 +428,7 @@ import { getRepaiDocumentInfo, rejectRepair, sendList, - getRepairInfo, + getRepairDocumentInfo, } from '@/api/repair/repair.js' import { getInfo, h } from '@/api/login' @@ -592,9 +592,9 @@ export default { }, //查看维修任务单 async handlePrint(row) { - const res = await getRepairInfo(row.taskId); + const res = await getRepairDocumentInfo(row.taskId); this.repairTicketlLevelOne = res.data.repairTaskInfo; - this.repairTicketDevice = res.data.repairDeviceArray; + this.repairTicketDevice = res.data.repairDeviceSummaryList; //维修设备列表计算 if(this.repairTicketDevice.length>0){ let num1 = 0; //报废数量 diff --git a/src/views/material/repair/repairManage/component/view.vue b/src/views/material/repair/repairManage/component/view.vue index 2d38060a..5bc0197f 100644 --- a/src/views/material/repair/repairManage/component/view.vue +++ b/src/views/material/repair/repairManage/component/view.vue @@ -77,13 +77,13 @@ + > +