diff --git a/src/api/repair/repair.js b/src/api/repair/repair.js index 2952ad6e..93eb5d3c 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/getTestRecordData', + method: 'get', + params: query + }) } \ No newline at end of file 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/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/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(); diff --git a/src/views/material/repair/repairManage/component/view.vue b/src/views/material/repair/repairManage/component/view.vue index fde94d36..256bf0ea 100644 --- a/src/views/material/repair/repairManage/component/view.vue +++ b/src/views/material/repair/repairManage/component/view.vue @@ -106,20 +106,191 @@
数量管理
+ + + + + + + + + + + + + + + + 关闭 + + + + + +
+ +
机具（物流）分公司动力设备维修及试验记录单
+
+
+ 退料单号：{{this.printInfo.code}} +
+
+ 提交日期：{{this.printInfo.createTime}} +
+
+ 设备编号：{{this.printInfo.maCode}} +
+
+ +
+
+
{{this.printInfo.typeName }}
+
+
+ +
+
+ {{ row.partName || '' }} +
+
+ {{ row.status || '' }} +
+
+
+
+
+
空载试验
+
+ + 维修提交合格（ + + √ + ） + 维修提交报废（ + + √ + ） +
+
+ +
+
标识等
+
+ 二维码（ ） + 铭牌（√） + 档位（ ） +
+
+ +
+
+ +
+
额定负载
+
试验负载(T/MPa)
+
持荷时间(分/秒)
+
+ +
+
{{ testResult1 || '' }}
+
{{ testResult2 || '' }}
+
{{ testResult3 || '' }}
+
+ +
+
试验日期
+
检修人员
+
试验人员
+
+ +
+
{{ this.printInfo.createTime }}
+
{{ this.printInfo.repairer }}
+
{{ this.printInfo.userName }}
+
+
+ +
+ +
+ 试验结论 +
+ +
+ +
+
+
+
+
+ +
+
+
+ 审核：{{ }} +
+
+ +
+
+ 检验员：{{ '高民' }} +
+
+
+ +
+ +
+ 打 印 + 关 闭 +
+ + + + +