diff --git a/src/api/repair/repair.js b/src/api/repair/repair.js index a8004014..93eb5d3c 100644 --- a/src/api/repair/repair.js +++ b/src/api/repair/repair.js @@ -104,7 +104,7 @@ export function getRepairCodeList(query) { export function getRepairRecord(query) { return request({ - url: '/material/repair/getRepairRecord', + url: '/material/repair/getTestRecordData', method: 'get', params: query }) diff --git a/src/assets/img/yes.png b/src/assets/img/yes.png new file mode 100644 index 00000000..bd3d94a4 Binary files /dev/null and b/src/assets/img/yes.png differ diff --git a/src/views/material/repair/repairManage/component/view.vue b/src/views/material/repair/repairManage/component/view.vue index 74f5f1ad..256bf0ea 100644 --- a/src/views/material/repair/repairManage/component/view.vue +++ b/src/views/material/repair/repairManage/component/view.vue @@ -109,7 +109,7 @@ @@ -140,27 +140,27 @@
- 退料单号:{{}} + 退料单号:{{this.printInfo.code}}
- 提交日期:{{}} + 提交日期:{{this.printInfo.createTime}}
- 设备编号:{{}} + 设备编号:{{this.printInfo.maCode}}
-
{{'手动角磨机' }}
+
{{this.printInfo.typeName }}
- {{ row.name || '' }} + {{ row.partName || '' }}
{{ row.status || '' }} @@ -171,8 +171,16 @@
空载试验
- 维修提交合格( ) - 维修提交报废( ) + + 维修提交合格( + + √ + ) + 维修提交报废( + + √ + )
@@ -180,8 +188,8 @@
标识等
二维码( ) - 铭牌 - 档位( ) + 铭牌√ + 档位( )
@@ -189,7 +197,7 @@
-
额定负载(T/MPa)
+
额定负载
试验负载(T/MPa)
持荷时间(分/秒)
@@ -207,9 +215,9 @@
-
{{ '2025-06-14' }}
-
{{ '张三' }}
-
{{ '李四' }}
+
{{ this.printInfo.createTime }}
+
{{ this.printInfo.repairer }}
+
{{ this.printInfo.userName }}
@@ -334,7 +342,8 @@ export default { dialogList: [], openRepair: false, repairRecord: [], - printTableData: [{'name':'角磨1','status':'合格'},{'name':'角磨2','status':'合格'},{'name':'角磨3','status':'合格'},{'name':'角磨4','status':'合格'},{'name':'角磨5','status':'合格'}], + printTableData: [], + printInfo:{}, testResult1: '', testResult2: '', testResult3: '', @@ -347,11 +356,12 @@ export default { computed: { groupPrintData() { const result = []; + console.log("xxxxxxxxxxxxx",this.printTableData.length) for (let i = 0; i < this.printTableData.length; i += 2) { const group = this.printTableData.slice(i, i + 2); // 若分组不足 2 个元素,补充空对象 while (group.length < 2) { - group.push({ name: '', status: '' }); + group.push({ partName: '', status: '' }); } result.push(group); } @@ -393,10 +403,31 @@ export default { async handleRecord(row){ this.dialogVisible = true; - // let param = { - // taskId:this.repairRow.taskId, - // } - // const res = await getRepairRecord(param) + let param = { + id:row.id, + } + const res = await getRepairRecord(param) + this.printInfo = res.data[0] + if(this.printInfo && this.printInfo.ratedLoad) { + this.testResult1 = this.printInfo.ratedLoad + '(T/MPa)' + } else { + this.testResult1 = '' + } + if(this.printInfo && this.printInfo.testLoad) { + this.testResult2 = this.printInfo.testLoad + '(T/MPa)' + } else { + this.testResult2 = '' + } + if(this.printInfo && this.printInfo.holdingTime) { + this.testResult3 = this.printInfo.holdingTime + '(分/秒)' + } else { + this.testResult3 = '' + } + if(res.data[0].partTypeList&& res.data[0].partTypeList.length != 0){ + res.data[0].partTypeList.forEach((e) => { + this.printTableData.push({'partName':e.partName,'status':'合格'}) + }) + } }, // 打印 @@ -417,3 +448,4 @@ export default { }, } +