bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
bb_pan 2025-04-11 18:12:32 +08:00
parent 71c2819059
commit 6368a3afb6
2 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
View File

@ -251,7 +251,7 @@
scope.row.taskStatus == 98 scope.row.taskStatus == 98
" "
>{{ >{{
scope.row.leaseApplyInfoList[0] scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0]
.companyAuditRemark || '' .companyAuditRemark || ''
}} }}
</span> </span>
@ -261,7 +261,7 @@
scope.row.taskStatus == 99 scope.row.taskStatus == 99
" "
>{{ >{{
scope.row.leaseApplyInfoList[0].deptAuditRemark || scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].deptAuditRemark ||
'' ''
}} }}
</span> </span>
@ -271,7 +271,7 @@
scope.row.taskStatus == 100 scope.row.taskStatus == 100
" "
>{{ >{{
scope.row.leaseApplyInfoList[0].directAuditRemark || scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark ||
'' ''
}} }}
</span> </span>
@ -281,19 +281,19 @@
scope.row.taskStatus < 98 scope.row.taskStatus < 98
" "
>{{ >{{
scope.row.leaseApplyInfoList[0].directAuditRemark || scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark ||
'' ''
}}</span }}</span
> >
<span v-if="scope.row.taskStatus > 100">{{ <span v-if="scope.row.taskStatus > 100">{{
scope.row.leaseApplyInfoList[0].directAuditRemark || '' scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark || ''
}}</span> }}</span>
<!-- <span v-else>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> --> <!-- <span v-else>{{ scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" show-overflow-tooltip> <el-table-column label="备注" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.leaseApplyInfoList[0].remark || '' }} {{ scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].remark || '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="180"> <el-table-column label="操作" align="center" width="180">
@ -460,6 +460,7 @@ export default {
} }
const res = await getLeaseAuditListAll(params) const res = await getLeaseAuditListAll(params)
console.log('🚀 ~ getList ~ res:', res)
res.data.rows.forEach(item => { res.data.rows.forEach(item => {
switch (item.typeId) { switch (item.typeId) {
case '0': case '0':

49
sgzb-ui/src/views/repairTest/testExamine/index.vue
View File

@ -481,6 +481,47 @@
width="1200px" width="1200px"
> >
<el-table :data="repairRecordList" height="450px"> <el-table :data="repairRecordList" height="450px">
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :data="scope.row.repairPartList" style="width: 100%">
<el-table-column
label="维修内容"
align="center"
prop="repairContent"
:show-overflow-tooltip="true"
/>
<el-table-column
label="配件名称"
align="center"
prop="partName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="配件数量"
align="center"
prop="partNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="配件单价"
align="center"
prop="partPrice"
:show-overflow-tooltip="true"
/>
<el-table-column
label="类型"
align="center"
prop="partType"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<span v-if="scope.row.partType == '0'">不收费</span>
<span v-if="scope.row.partType == '1'">收费</span>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column <el-table-column
label="序号" label="序号"
align="center" align="center"
@ -495,12 +536,12 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
label="维修内容" label="维修内容"
align="center" align="center"
prop="repairContent" prop="repairContent"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> /> -->
<el-table-column <el-table-column
label="维修数量" label="维修数量"
align="center" align="center"
@ -554,7 +595,7 @@
<span v-if="scope.row.scrapType == '1'">人为报废</span> <span v-if="scope.row.scrapType == '1'">人为报废</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
label="配件名称" label="配件名称"
align="center" align="center"
prop="partName" prop="partName"
@ -582,7 +623,7 @@
<span v-if="scope.row.partType == '0'">不收费</span> <span v-if="scope.row.partType == '0'">不收费</span>
<span v-if="scope.row.partType == '1'">收费</span> <span v-if="scope.row.partType == '1'">收费</span>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
<pagination <pagination
v-show="repairRecordTotal > 0" v-show="repairRecordTotal > 0"