bonus
/
nw-cqdevicemgt-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
hongchao 2025-06-18 14:10:29 +08:00
parent 92ef22e9d2
commit b4aeada7d5
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/views/repairTest/testExamine/index.vue
View File

@ -133,6 +133,7 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核人" align="center" prop="auditBy" show-overflow-tooltip width="120px"/>
<el-table-column label="不通过原因" align="center" prop="remark" show-overflow-tooltip width="120px"/> <el-table-column label="不通过原因" align="center" prop="remark" show-overflow-tooltip width="120px"/>
<el-table-column label="操作" align="center" width="250px" fixed="right"> <el-table-column label="操作" align="center" width="250px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
@ -419,7 +420,7 @@
</el-dialog> </el-dialog>
<!-- 维修记录表 --> <!-- 维修记录表 -->
<el-dialog title="维修记录表" :visible.sync="upkeepVisible" width="46%"> <el-dialog title="维修记录表" :visible.sync="upkeepVisible" width="50%">
<vue-easy-print tableShow ref="printRef"> <vue-easy-print tableShow ref="printRef">
<div style="padding: 0 30px"> <div style="padding: 0 30px">
<h2 style="text-align: center; font-size: 33px">重庆市送变电工程有限公司</h2> <h2 style="text-align: center; font-size: 33px">重庆市送变电工程有限公司</h2>
@ -437,20 +438,23 @@
> >
<!-- 第一行 --> <!-- 第一行 -->
<div style="display: flex; border-bottom: 1px solid #000"> <div style="display: flex; border-bottom: 1px solid #000">
<div style="text-align: center; border-right: 1px solid #000; width: 25%">设备名称</div> <div style="text-align: center; border-right: 1px solid #000; width: 20%">设备名称</div>
<div style="text-align: center; border-right: 1px solid #000; width: 29%">型号/厂家</div> <div style="text-align: center; border-right: 1px solid #000; width: 20%">型号</div>
<!-- <div style="text-align: center; border-right: 1px solid #000; width: 18%">编号</div> --> <div style="text-align: center; border-right: 1px solid #000; width: 20%">编号</div>
<div style="text-align: center; border-right: 1px solid #000; width: 10%">数量</div> <div style="text-align: center; border-right: 1px solid #000; width: 10%">数量</div>
<div style="text-align: center; border-right: 1px solid #000; width: 18%">主修人</div> <div style="text-align: center; border-right: 1px solid #000; width: 15%">主修人</div>
<div style="text-align: center; width: 18%">验收人</div> <div style="text-align: center; width: 15%">验收人</div>
</div> </div>
<!-- 第二行 --> <!-- 第二行 -->
<div style="display: flex; border-bottom: 1px solid #000"> <div style="display: flex; border-bottom: 1px solid #000">
<div style="text-align: center; border-right: 1px solid #000; width: 25%">{{ <div style="text-align: center; border-right: 1px solid #000; width: 20%">{{
upkeepObj.type || '-' upkeepObj.typeName || '-'
}}</div> }}</div>
<div style="text-align: center; border-right: 1px solid #000; width: 29%">{{ <div style="text-align: center; border-right: 1px solid #000; width: 20%">{{
upkeepObj.typeName upkeepObj.type
}}</div>
<div style="text-align: center; border-right: 1px solid #000; width: 20%">{{
upkeepObj.maCode
}}</div> }}</div>
<!-- <div <!-- <div
style=" style="
@ -463,35 +467,31 @@
><span style="margin: 0 5px; font-size: 15px">{{ upkeepObj.maCode }}</span></div ><span style="margin: 0 5px; font-size: 15px">{{ upkeepObj.maCode }}</span></div
> --> > -->
<div style="text-align: center; border-right: 1px solid #000; width: 10%">{{ <div style="text-align: center; border-right: 1px solid #000; width: 10%">{{
upkeepObj.repairedNum upkeepObj.repairNum
}}</div> }}</div>
<div style="text-align: center; border-right: 1px solid #000; width: 18%">{{ <div style="text-align: center; border-right: 1px solid #000; width: 15%">{{
upkeepObj.createBy upkeepObj.repairer
}}</div> }}</div>
<div style="text-align: center; width: 18%">{{ upkeepObj.checkMan }}</div> <div style="text-align: center; width: 15%">{{ upkeepObj.auditBy }}</div>
</div> </div>
<!-- 第三行 --> <!-- 第三行 -->
<div style="display: flex; border-bottom: 1px solid #000"> <div style="display: flex; border-bottom: 1px solid #000">
<div style="padding-left: 10px; border-right: 1px solid #000; width: 25%">使用单位</div> <div style="padding-left: 10px; border-right: 1px solid #000; width: 20%">使用单位</div>
<div style="padding-left: 10px">{{ upkeepObj.unitName }}-{{ upkeepObj.projectName }}</div> <div style="padding-left: 10px"></div>
</div> </div>
<!-- 第四行 --> <!-- 第四行 -->
<div style="width: 100%; min-height: 200px; border-bottom: 1px solid #000; padding-left: 10px" <div style="width: 100%; min-height: 200px; border-bottom: 1px solid #000; padding-left: 10px"
>设备维修前情况: <span>{{ upkeepObj.repairRemark }}</span> >设备维修前情况: <span>{{ upkeepObj.repairRemarkBefore }}</span>
</div> </div>
<!-- 第五行 --> <!-- 第五行 -->
<div style="width: 100%; min-height: 200px; border-bottom: 1px solid #000; padding-left: 10px" <div style="width: 100%; min-height: 200px; border-bottom: 1px solid #000; padding-left: 10px"
>技术鉴定情况: >技术鉴定情况:
<span v-for="item in upkeepObj.records" :key="item.repairRemark" <span>{{ upkeepObj.repairRemark }}</span>
>{{ item.repairRemark ? item.repairRemark + ', ' : '' }}
</span>
</div> </div>
<!-- 第六行 --> <!-- 第六行 -->
<div style="width: 100%; min-height: 200px; padding-left: 10px" <div style="width: 100%; min-height: 200px; padding-left: 10px"
>维修处理情况: >维修处理情况:
<span v-for="item in upkeepObj.records" :key="item.repairContent" <span>{{ upkeepObj.remark }}</span>
>{{ item.repairContent ? '更换' + item.repairContent + ', ' : '' }}
</span>
</div> </div>
<div <div
style=" style="
@ -502,7 +502,7 @@
bottom: 20px; bottom: 20px;
left: 0; left: 0;
" "
>验收情况: {{ upkeepObj.taskStatus }} > 验收情况: {{ upkeepObj.taskStatus === 0 ? '待审核' : upkeepObj.taskStatus === 1 ? '已通过' : upkeepObj.taskStatus === 2 ? '维修驳回' : upkeepObj.taskStatus === 3 ? '报废驳回' : upkeepObj.taskStatus }}
</div> </div>
</div> </div>
<div style="text-align: end; font-size: 20px; margin: 20px 50px 50px 0"> <div style="text-align: end; font-size: 20px; margin: 20px 50px 50px 0">
@ -875,20 +875,14 @@ export default {
openUpkeep(row) { openUpkeep(row) {
console.log('🚀 ~ openUpkeep ~ row:', row) console.log('🚀 ~ openUpkeep ~ row:', row)
this.upkeepVisible = true this.upkeepVisible = true
if (row.taskStatus == 47) { this.getUpkeepList(row.parentId)
// this.upkeepObj.taskStatus = '合格'
this.isTaskStatus = '合格'
} else {
this.isTaskStatus = ''
}
this.getUpkeepList(row.taskId)
}, },
// 获取保养记录表数据 // 获取保养记录表数据
async getUpkeepList(taskId) { async getUpkeepList(parentId) {
try { try {
const res = await getMaintenanceRecordsApi({ taskId }) const res = await getMaintenanceRecordsApi({ parentId })
console.log('🚀 ~ getUpkeepList ~ res:', res) console.log('🚀 ~ getUpkeepList ~ res:', res)
this.upkeepObj = { ...res.data, taskStatus: this.isTaskStatus } this.upkeepObj = res.data
} catch (error) { } catch (error) {
console.log('🚀 ~ getUpkeepList ~ error:', error) console.log('🚀 ~ getUpkeepList ~ error:', error)
this.upkeepObj = {} this.upkeepObj = {}

6
src/views/stquery/backRecord.vue
View File

@ -177,6 +177,12 @@
prop="backNum" prop="backNum"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column
label="损坏情况"
align="center"
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column <el-table-column
label="退料人" label="退料人"
align="center" align="center"