Merge branch 'material-ui' of http://14.103.246.124:16000/bonus/bonus-ui into material-ui

This commit is contained in:
hongchao 2025-08-06 17:50:27 +08:00
commit 6b555d6103
1 changed files with 12 additions and 3 deletions

View File

@ -183,15 +183,22 @@
<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: 50%">发料</div> <div style="width: 50%">发料</div>
<img
v-if="leaseApplyOutData.outSignUrl"
:src="leaseApplyOutData.outSignUrl"
style="width: 40px; height: 90px"
:style="{ transform: leaseApplyOutData.outSignType == 0 ? 'rotate(-90deg)' : '' }"
alt=""
/>
</div> </div>
<div class="item" style="width: 50%; display: flex; align-items: center; flex-wrap: wrap"> <div class="item" style="width: 50%; display: flex; align-items: center; flex-wrap: wrap">
<div style="display: flex; align-items: center"> <div style="display: flex; align-items: center">
<div style="width: 50px;margin-right: 18px">领料</div> <div style="width: 50px; margin-right: 18px">领料</div>
<img <img
v-if="leaseApplyData.leaseSignUrl" v-if="leaseApplyData.leaseSignUrl"
:src="leaseApplyData.leaseSignUrl" :src="leaseApplyData.leaseSignUrl"
style="width: 40px; height: 90px" style="width: 40px; height: 90px"
:style="{transform: leaseApplyData.leaseSignType == 0 ? 'rotate(-90deg)' : ''}" :style="{ transform: leaseApplyData.leaseSignType == 0 ? 'rotate(-90deg)' : '' }"
alt="" alt=""
/> />
</div> </div>
@ -288,6 +295,7 @@ export default {
leaseApplyDetails: [], leaseApplyDetails: [],
// //
leaseApplyData: {}, leaseApplyData: {},
leaseApplyOutData: {},
// //
showView: false, showView: false,
titleView: '', titleView: '',
@ -360,9 +368,10 @@ export default {
this.leaseApplyData = {} this.leaseApplyData = {}
this.title = '领料单' this.title = '领料单'
this.open = true this.open = true
const res = await getPickListApi({ id: row.id}) const res = await getPickListApi({ id: row.id })
this.leaseApplyDetails = res.data.leaseApplyDetailsList this.leaseApplyDetails = res.data.leaseApplyDetailsList
this.leaseApplyData = res.data.leaseApplyInfo this.leaseApplyData = res.data.leaseApplyInfo
this.leaseApplyOutData = res.data.leaseOutSign
}, },
// //