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-06-21 13:28:15 +08:00
parent 66905bc929 2a651224a6
commit 9c77edb6be
3 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,14 +92,19 @@
<!-- <div>审核人：</div> --> <!-- <div>审核人：</div> -->
<div class="item" style="width: 28%;display: flex;align-items: center;flex-wrap: wrap;"> <div class="item" style="width: 28%;display: flex;align-items: center;flex-wrap: wrap;">
<div style="width: 35%;">审核人：</div> <div style="width: 35%;">审核人：</div>
<div style="width: 65%;display: flex;align-items: center;flex-wrap: wrap;" v-if="directAuditSignUrl"> <!-- <div style="width: 65%;display: flex;align-items: center;flex-wrap: wrap;" v-if="directAuditSignUrl">
<div style="width: 80%;margin-left: 10px;"> <div style="width: 80%;margin-left: 10px;">
<img :src="directAuditSignUrl" style="width: 40px;height: 100px;transform: rotate(-90deg);max-width: 100%;" alt=""> <img :src="directAuditSignUrl" style="width: 40px;height: 100px;transform: rotate(-90deg);max-width: 100%;" alt="">
</div> </div>
</div> </div> -->
</div> </div>
<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;">
<span>退料人：</span> <div style="width: 30%;">退料人：</div>
<div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="rowObj.backSignUrl">
<div style="width: 80%;margin-left: 20px;">
<img :src="rowObj.backSignUrl" style="width: 40px;height: 100px;max-width: 100%;" :class="{'is-rotate': rowObj.backSignType == 0}" alt="">
</div>
</div>
</div> </div>
<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;">
<span>制单：</span> <span>制单：</span>
@ -543,6 +548,9 @@ export default {
// } // }
// } // }
// } // }
.is-rotate {
transform: rotate(-90deg);
}
.order_footer { .order_footer {
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;

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

@ -563,7 +563,7 @@ export default {
const res = await getApplyInfo(ids); const res = await getApplyInfo(ids);
this.leaseApplyDetails = res.data.leaseApplyDetailsList; this.leaseApplyDetails = res.data.leaseApplyDetailsList;
this.leaseApplyData = res.data.leaseApplyInfo; this.leaseApplyData = res.data.leaseApplyInfo;
this.kgSignList = res.data.kgSignList this.kgSignList = res.data.kgSignList || []
console.log('🚀 ~ handleLld ~ this.kgSignList:', this.kgSignList) console.log('🚀 ~ handleLld ~ this.kgSignList:', this.kgSignList)
}, },

31
src/views/material/lease/outBound/index.vue
View File

@ -390,7 +390,7 @@
</el-dialog> </el-dialog>
<!-- 领料单弹窗 --> <!-- 领料单弹窗 -->
<el-dialog :visible.sync="open" width="800px" :title="title" append-to-body> <el-dialog :visible.sync="open" width="1090px" :title="title" append-to-body>
<div style="height: 500px; overflow-y: scroll; padding: 0 20px"> <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
<vue-easy-print tableShow ref="remarksPrintRef" class="print"> <vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div class="title" style="text-align: center; font-weight: 600; font-size: 16px">领料单</div> <div class="title" style="text-align: center; font-weight: 600; font-size: 16px">领料单</div>
@ -434,8 +434,8 @@
</el-table> </el-table>
<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 <!-- <div
style="width: 75%; display: flex; align-items: center; flex-wrap: wrap" style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"
v-if="leaseApplyData.directAuditSignUrl" v-if="leaseApplyData.directAuditSignUrl"
> >
@ -446,18 +446,20 @@
alt="" alt=""
/> />
</div> </div>
</div> </div> -->
</div> </div>
<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">
<span>领料：</span> <div style="width: 30%;">领料：</div>
<div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="leaseApplyData.leaseSignUrl">
<div style="width: 80%;margin-left: 20px;">
<img :src="leaseApplyData.leaseSignUrl" style="width: 40px;height: 100px;max-width: 100%;" :class="{'is-rotate': leaseApplyData.leaseSignType == 0}" alt="">
</div>
</div>
</div> </div>
<div class="item" style="width: 28%; display: flex; align-items: center"> <div class="item" style="width: 28%; display: flex; align-items: center">
<div style="width: 25%">库管：</div> <div style="width: 25%;">库管：</div>
<div style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"> <div style="width: 75%;display: flex;align-items: center;flex-wrap: wrap;" v-if="kgSignList.length > 0">
<img src="../../../../assets/signTemp.png" style="width: 45%; height: 30px" alt="" /> <img v-for="(item, index) in kgSignList" :key="index" :src="item.outSignUrl" :class="{'is-rotate': leaseApplyData.outSignType == 0}" style="width: 45%;height: 30px;" alt="">
<img src="../../../../assets/signTemp.png" style="width: 45%; height: 30px" alt="" />
<img src="../../../../assets/signTemp.png" style="width: 45%; height: 30px" alt="" />
<img src="../../../../assets/signTemp.png" style="width: 45%; height: 30px" alt="" />
</div> </div>
</div> </div>
<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">
@ -648,7 +650,8 @@ export default {
showView: false, showView: false,
getListViewInfo: [], getListViewInfo: [],
idTemp: '', idTemp: '',
publishTask: '' publishTask: '',
kgSignList: []
} }
}, },
created() { created() {
@ -925,6 +928,7 @@ export default {
const res = await getApplyInfo(ids) const res = await getApplyInfo(ids)
this.leaseApplyDetails = res.data.leaseApplyDetailsList this.leaseApplyDetails = res.data.leaseApplyDetailsList
this.leaseApplyData = res.data.leaseApplyInfo this.leaseApplyData = res.data.leaseApplyInfo
this.kgSignList = res.data.kgSignList || []
}, },
//出库检验单打印 //出库检验单打印
@ -1093,4 +1097,7 @@ export default {
width: 70px !important; width: 70px !important;
margin-bottom: 10px; margin-bottom: 10px;
} }
.is-rotate {
transform: rotate(-90deg);
}
</style> </style>