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

Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui

This commit is contained in:
hongchao 2025-11-20 14:36:33 +08:00
parent d8b0c68bd7 91a8785075
commit b2d05098c1
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/material/cost/component/examHome.vue
View File

@ -127,7 +127,7 @@
<div style="height: 600px; overflow-y: scroll">
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div style="text-align: center; font-weight: 600; font-size: 16px">
机具设备有偿使用费结算协议书
{{ dialogTitle || '机具设备' }}有偿使用费结算协议书
</div>
<div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
<div class="item" style="width: 65%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px"></div>
@ -203,7 +203,7 @@
<span>部门负责人：</span>
<img :src="initImgPath(agreementContent.auditorSignUrl)"
<img v-if="agreementContent.auditorSignUrl" :src="initImgPath(agreementContent.auditorSignUrl)"
style="width: 40px; height: 90px;margin-left: 20px; max-width: 100%;"
:style="{ transform: agreementContent.signType == 0 ? 'rotate(-90deg)' : '' }" alt="" />
@ -337,7 +337,8 @@ export default {
reductionCost: '', // 减免费用
costAll: '', // 合计费用
costAllUpper: '' // 合计费用大写
}
},
dialogTitle: ''
}
},
created() {
@ -495,6 +496,7 @@ export default {
},
async openPrintDialog(row) {
this.dialogTitle = row.settlementType == 2 ? '安全工器具' : '机具设备'
row.enableQuerySltData = true
this.openPrint = true
try {
@ -980,7 +982,7 @@ export default {
// 判断path前四位是否为http 如果是则直接返回 如果不是则是base64
if (path.startsWith('http')) {
return path; // 是http开头，直接返回
} else {
} else if (!path.startsWith('data:image')) {
return `data:image/png;base64,${path}`; // 不是则拼接base64前缀（假设为png格式，可根据实际调整）
}
}

10
src/views/material/cost/component/reportHome.vue
View File

@ -162,7 +162,7 @@
<el-table-column label="单位" align="center" prop="unit" width="80" />
<el-table-column label="单价（元）" align="center" prop="unitPrice" width="100" />
<el-table-column label="数量" align="center" prop="quantity" width="80" />
<el-table-column label="归还数量" align="center" prop="returnQuantity" width="100" />
<!-- <el-table-column label="归还数量" align="center" prop="returnQuantity" width="100" /> -->
<el-table-column label="租赁日期" align="center" prop="leaseDate" width="120" />
<el-table-column label="退还日期" align="center" prop="returnDate" width="120" />
<el-table-column label="天数" align="center" prop="days" width="80" />
@ -263,11 +263,11 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="归还数量" align="center" width="100">
<!-- <el-table-column label="归还数量" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.costType === 'lease' ? (scope.row.returnQuantity || 0) : '-' }}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="租赁日期" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.costType === 'lease' ? (scope.row.leaseDate || '-') : '-' }}
@ -763,7 +763,7 @@ export default {
{ key: 'unit', title: '单位' },
{ key: 'unitPrice', title: '单价（元）' },
{ key: 'quantity', title: '数量' },
{ key: 'returnQuantity', title: '归还数量' },
// { key: 'returnQuantity', title: '归还数量' },
{ key: 'leaseDate', title: '租赁日期' },
{ key: 'returnDate', title: '退还日期' },
{ key: 'days', title: '天数' },
@ -812,7 +812,7 @@ export default {
{ key: 'unit', title: '单位' },
{ key: 'unitPrice', title: '单价（元）' },
{ key: 'quantity', title: '数量' },
{ key: 'returnQuantity', title: '归还数量' },
// { key: 'returnQuantity', title: '归还数量' },
{ key: 'leaseDate', title: '租赁日期' },
{ key: 'returnDate', title: '退还日期' },
{ key: 'days', title: '天数' },