From 56f241f0c3743576d9f9373a16238a5cf37862e4 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Sun, 15 Jun 2025 11:13:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/repair/repair.js | 17 ++ src/views/material/ma/device/index.vue | 16 +- .../repair/repairManage/component/view.vue | 233 +++++++++++++++++- 3 files changed, 264 insertions(+), 2 deletions(-) diff --git a/src/api/repair/repair.js b/src/api/repair/repair.js index 2952ad6e..a8004014 100644 --- a/src/api/repair/repair.js +++ b/src/api/repair/repair.js @@ -91,4 +91,21 @@ export function getRepairDocumentInfo(taskId) { url: '/material/repair/getRepairDocumentInfo/?taskId=' + taskId, method: 'get', }) +} + +//获取维修记录 +export function getRepairCodeList(query) { + return request({ + url: '/material/repair/getRepairCodeList', + method: 'get', + params: query + }) +} + +export function getRepairRecord(query) { + return request({ + url: '/material/repair/getRepairRecord', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/views/material/ma/device/index.vue b/src/views/material/ma/device/index.vue index f2cabd2d..de3472d2 100644 --- a/src/views/material/ma/device/index.vue +++ b/src/views/material/ma/device/index.vue @@ -39,6 +39,7 @@ /> + @@ -51,6 +52,16 @@ + + + + + 查询 重置 @@ -383,6 +394,7 @@ import html2canvas from 'html2canvas'; export default { name: "Device", + dicts: ["ma_machine_status"], data() { return { // 遮罩层 @@ -431,7 +443,8 @@ pageNum: 1, pageSize: 10, keyWord:undefined, - isAssets:undefined + isAssets:undefined, + maStatus:null, }, // 查询参数 queryTeam: { @@ -735,6 +748,7 @@ resetQuery() { this.resetForm("queryForm"); this.queryParams.keyWord=null; + this.queryParams.maStatus=null; this.handleQuery(); }, diff --git a/src/views/material/repair/repairManage/component/view.vue b/src/views/material/repair/repairManage/component/view.vue index fde94d36..74f5f1ad 100644 --- a/src/views/material/repair/repairManage/component/view.vue +++ b/src/views/material/repair/repairManage/component/view.vue @@ -106,20 +106,183 @@
数量管理
+ + + + + + + + + + + + + + + + 关闭 + + + + + +
+ +
机具（物流）分公司动力设备维修及试验记录单
+
+
+ 退料单号：{{}} +
+
+ 提交日期：{{}} +
+
+ 设备编号：{{}} +
+
+ +
+
+
{{'手动角磨机' }}
+
+
+ +
+
+ {{ row.name || '' }} +
+
+ {{ row.status || '' }} +
+
+
+
+
+
空载试验
+
+ 维修提交合格（ ） + 维修提交报废（ ） +
+
+ +
+
标识等
+
+ 二维码（ ） + 铭牌（√） + 档位（ ） +
+
+ +
+
+ +
+
额定负载(T/MPa)
+
试验负载(T/MPa)
+
持荷时间(分/秒)
+
+ +
+
{{ testResult1 || '' }}
+
{{ testResult2 || '' }}
+
{{ testResult3 || '' }}
+
+ +
+
试验日期
+
检修人员
+
试验人员
+
+ +
+
{{ '2025-06-14' }}
+
{{ '张三' }}
+
{{ '李四' }}
+
+
+ +
+ +
+ 试验结论 +
+ +
+ +
+
+
+
+
+ +
+
+
+ 审核：{{ }} +
+
+ +
+
+ 检验员：{{ '高民' }} +
+
+
+ +
+ +
+ 打 印 + 关 闭 +
+ + + + From 2e9cf9f89ff917e16d9cacd9abd2a6f706679764 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Sun, 15 Jun 2025 11:15:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=85=8D=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/part/partAcceptTwo/index.vue | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/views/material/part/partAcceptTwo/index.vue b/src/views/material/part/partAcceptTwo/index.vue index a18cc190..88c88e6c 100644 --- a/src/views/material/part/partAcceptTwo/index.vue +++ b/src/views/material/part/partAcceptTwo/index.vue @@ -249,6 +249,7 @@ import { getListNewBuy,getInBoundForm } from '@/api/part/partArrived'; import { passAll, rejectAll } from '@/api/part/partAccept'; import vueEasyPrint from "vue-easy-print"; +import printJS from 'print-js' import { downloadFile } from '@/utils/download' import { getToken } from '@/utils/auth' export default { @@ -419,16 +420,16 @@ import { getToken } from '@/utils/auth' }); }, //打印 - // print() { - // // this.$refs.remarksPrintRef.print() - // printJS({ - // printable: 'checkId', - // type: 'html', - // targetStyles: ['*'], - // maxWidth:'1400' - // // 其他配置选项 - // }); - // }, + print() { + // this.$refs.remarksPrintRef.print() + printJS({ + printable: 'checkId', + type: 'html', + targetStyles: ['*'], + maxWidth:'1400' + // 其他配置选项 + }); + }, handleExport() { const formatTime = (date) => { const year = date.getFullYear(); From a1ee47320505343790ac906e32ddbb15fff805d4 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Sun, 15 Jun 2025 13:19:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/repair/repair.js | 2 +- src/assets/img/yes.png | Bin 0 -> 3288 bytes .../repair/repairManage/component/view.vue | 72 +++++++++++++----- 3 files changed, 53 insertions(+), 21 deletions(-) create mode 100644 src/assets/img/yes.png 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 0000000000000000000000000000000000000000..bd3d94a49872aa7df3f8fae46c48b4a6592e161e GIT binary patch literal 3288 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 literal 0 HcmV?d00001 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 { }, } +