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

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

This commit is contained in:
zzyuan 2025-01-17 11:13:06 +08:00
parent e49680f9ab 9f98a65dea
commit e9b83fe835
3 changed files with 85 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/views/material/back/component/dialogFormByCq.vue
View File

@ -87,9 +87,21 @@
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
<div class="order_footer"> <div class="order_footer">
<div>审核人：</div> <!-- <div>审核人：</div> -->
<div>退料人：</div> <div class="item" style="width: 28%;display: flex;align-items: center;flex-wrap: wrap;">
<div>制单：</div> <div style="width: 35%;">审核人：</div>
<div style="width: 65%;display: flex;align-items: center;flex-wrap: wrap;" v-if="directAuditSignUrl">
<div style="width: 80%;margin-left: 10px;">
<img :src="directAuditSignUrl" style="width: 40px;height: 100px;transform: rotate(-90deg);max-width: 100%;" alt="">
</div>
</div>
</div>
<div class="item" style="width: 24%;display: flex;align-items: center;flex-wrap: wrap;">
<span>退料人：</span>
</div>
<div class="item" style="width: 24%;display: flex;align-items: center;flex-wrap: wrap;">
<span>制单：</span>
</div>
</div> </div>
</vue-easy-print> </vue-easy-print>
<div> <div>
@ -132,9 +144,20 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="order_footer"> <div class="order_footer">
<div>审核人：</div> <div class="item" style="width: 28%;display: flex;align-items: center;flex-wrap: wrap;">
<div>退料人：</div> <div style="width: 35%;">审核人：</div>
<div>制单：</div> <div style="width: 65%;display: flex;align-items: center;flex-wrap: wrap;" v-if="directAuditSignUrl">
<div style="width: 80%;margin-left: 10px;">
<img :src="directAuditSignUrl" style="width: 40px;height: 100px;transform: rotate(-90deg);max-width: 100%;" alt="">
</div>
</div>
</div>
<div class="item" style="width: 24%;display: flex;align-items: center;flex-wrap: wrap;">
<span>退料人：</span>
</div>
<div class="item" style="width: 24%;display: flex;align-items: center;flex-wrap: wrap;">
<span>制单：</span>
</div>
</div> </div>
</vue-easy-print> </vue-easy-print>
</div> </div>
@ -197,7 +220,8 @@ export default {
tableData: [], tableData: [],
tableSubData: [], tableSubData: [],
open: false, open: false,
title: "" title: "",
directAuditSignUrl: '',
}; };
}, },
methods: { methods: {
@ -209,6 +233,8 @@ export default {
getBackApplyInfo(this.rowObj.id).then(res => { getBackApplyInfo(this.rowObj.id).then(res => {
console.log(res) console.log(res)
this.tableData = res.data.backApplyDetailsList this.tableData = res.data.backApplyDetailsList
this.directAuditSignUrl = res.data.backApplyInfo.directAuditSignUrl
console.log('222222222',this.directAuditSignUrl)
}) })
}, },
// 取消按钮 // 取消按钮

60
src/views/material/cost/component/applyDetail.vue
View File

@ -51,13 +51,29 @@
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/> <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/> <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true"/> <el-table-column label="租赁单价" align="center" prop="leasePrice" :show-overflow-tooltip="true">
<el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true"/> <template slot-scope="scope">
{{ scope.row.leasePrice.toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="租赁数量" align="center" prop="num" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.num.toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="租赁日期" align="center" prop="startTime" :show-overflow-tooltip="true"/> <el-table-column label="租赁日期" align="center" prop="startTime" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="归还数量" align="center" prop="" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="归还数量" align="center" prop="" :show-overflow-tooltip="true" /> -->
<el-table-column label="归还日期 " align="center" prop="endTime" :show-overflow-tooltip="true"/> <el-table-column label="归还日期 " align="center" prop="endTime" :show-overflow-tooltip="true"/>
<el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true"/> <el-table-column label="租赁天数" align="center" prop="leaseDays" :show-overflow-tooltip="true">
<el-table-column label="租赁费用（元）" align="center" prop="costs" :show-overflow-tooltip="true"/> <template slot-scope="scope">
{{ Number(scope.row.leaseDays).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="租赁费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.costs.toFixed(2) }}
</template>
</el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -76,9 +92,17 @@
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/> <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/> <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="维修数量" align="center" prop="num" :show-overflow-tooltip="true"/> <el-table-column label="维修数量" align="center" prop="num" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.num.toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/> <el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/>
<el-table-column label="维修费用（元）" align="center" prop="costs" :show-overflow-tooltip="true"/> <el-table-column label="维修费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.costs.toFixed(2) }}
</template>
</el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="tabelAll"> <div class="tabelAll">
@ -96,9 +120,17 @@
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/> <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/> <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true"/> <el-table-column label="报废数量" align="center" prop="num" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.num.toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/> <el-table-column label="是否收费" align="center" prop="partType" :show-overflow-tooltip="true"/>
<el-table-column label="报废费用（元）" align="center" prop="costs" :show-overflow-tooltip="true"/> <el-table-column label="报废费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.costs.toFixed(2) }}
</template>
</el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="tabelAll"> <div class="tabelAll">
@ -116,8 +148,16 @@
<el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/> <el-table-column label="设备名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"/>
<el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/> <el-table-column label="计量单位" align="center" prop="mtUnitName" :show-overflow-tooltip="true"/>
<el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true"/> <el-table-column label="丢失数量" align="center" prop="num" :show-overflow-tooltip="true">
<el-table-column label="丢失费用（元）" align="center" prop="costs" :show-overflow-tooltip="true"/> <template slot-scope="scope">
{{ scope.row.num.toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="丢失费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.costs.toFixed(2) }}
</template>
</el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="tabelAllBottom"> <div class="tabelAllBottom">

4
src/views/material/lease/apply/component/homeApply.vue
View File

@ -247,8 +247,8 @@
</div> </div>
<div class="fillIn" style="margin-top: 30px;display: flex;justify-content: space-between;"> <div class="fillIn" style="margin-top: 30px;display: flex;justify-content: space-between;">
<div class="item" style="width: 24%;display: flex;align-items: center;flex-wrap: wrap;"> <div class="item" style="width: 24%;display: flex;align-items: center;flex-wrap: wrap;">
<div style="width: 25%;">审核：</div> <div style="width: 30%;">审核：</div>
<div style="width: 75%;display: flex;align-items: center;flex-wrap: wrap;" v-if="leaseApplyData.directAuditSignUrl"> <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="leaseApplyData.directAuditSignUrl">
<div style="width: 80%;margin-left: 20px;"> <div style="width: 80%;margin-left: 20px;">
<img :src="leaseApplyData.directAuditSignUrl" style="width: 40px;height: 100px;transform: rotate(-90deg);max-width: 100%;" alt=""> <img :src="leaseApplyData.directAuditSignUrl" style="width: 40px;height: 100px;transform: rotate(-90deg);max-width: 100%;" alt="">
</div> </div>