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-10-15 01:27:20 +08:00
parent 2e2978f24b 2048f5ba83
commit 0bd067695f
3 changed files with 86 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/views/material/purchase/goodsArrived/component/home.vue
View File

@ -211,7 +211,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;" > <div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;" >
<div class="item" style="width: 33%;display: flex;align-items: center;"> <div class="item" style="width: 33%;display: flex;align-items: center;">
<div style="width: 30%;">供应科：</div> <div style="width: 30%;">供应科：</div>
@ -293,24 +293,50 @@
</tbody> </tbody>
</table> </table>
<div class="fillIn" style="margin-top: 20px; display: flex; justify-content: space-between"> <div class="fillIn" style="margin-top: 50px; display: flex; justify-content: space-between">
<div class="item" style="width: 33%"> <!-- <div class="item" style="width: 33%">-->
<div> <!-- <div>-->
<span>审核：{{ printData.reviewer }}</span> <!-- <span>审核：{{ printData.reviewer }}</span>-->
<!-- </div>-->
<!-- </div>-->
<div class="item" style="width: 33%; display: flex; align-items: flex-start">
<div style="width: 25%">审核：</div>
<div
style="width: 75%; margin-left: 20px; transform: translateY(-30px)"
v-if="printData.signUrl"
>
<img
:src="printData.signUrl"
style="width: 40px; height: 90px; max-width: 100%"
:style="{ transform: printData.signType == 0 ? 'rotate(-90deg)' : '' }"
alt=""
/>
</div> </div>
</div> </div>
<!-- <div class="item" style="width: 33%">
<div>
<span>生产技术科：{{ printData.productionTechDept }}</span>
</div>
</div> -->
<div class="item" style="width: 33%"> <!-- <div class="item" style="width: 33%">-->
<div> <!-- <div>-->
<span>库管员：{{ printData.warehouseTeam }}</span> <!-- <span>库管员：{{ printData.warehouseTeam }}</span>-->
<!-- </div>-->
<!-- </div>-->
<div class="item" style="width: 33%; display: flex; align-items: flex-start">
<div style="width: 35%">库管员：</div>
<div
style="width: 65%; margin-left: 20px; transform: translateY(-30px)"
v-if="printData.signUrlKg"
>
<img
:src="printData.signUrlKg"
style="width: 40px; height: 90px; max-width: 100%"
:style="{ transform: printData.signTypeKg == 0 ? 'rotate(-90deg)' : '' }"
alt=""
/>
</div> </div>
</div> </div>
</div> </div>
</vue-easy-print> </vue-easy-print>
</div> </div>

51
src/views/material/purchase/goodsEntry/index.vue
View File

@ -186,24 +186,50 @@
</tbody> </tbody>
</table> </table>
<div class="fillIn" style="margin-top: 20px; display: flex; justify-content: space-between"> <div class="fillIn" style="margin-top: 50px; display: flex; justify-content: space-between">
<div class="item" style="width: 33%"> <!-- <div class="item" style="width: 33%">-->
<div> <!-- <div>-->
<span>审核：{{ printData.reviewer }}</span> <!-- <span>审核：{{ printData.reviewer }}</span>-->
<!-- </div>-->
<!-- </div>-->
<div class="item" style="width: 33%; display: flex; align-items: flex-start">
<div style="width: 25%">审核：</div>
<div
style="width: 75%; margin-left: 20px; transform: translateY(-30px)"
v-if="printData.signUrl"
>
<img
:src="printData.signUrl"
style="width: 40px; height: 90px; max-width: 100%"
:style="{ transform: printData.signType == 0 ? 'rotate(-90deg)' : '' }"
alt=""
/>
</div> </div>
</div> </div>
<!-- <div class="item" style="width: 33%">
<div>
<span>生产技术科：{{ printData.productionTechDept }}</span>
</div>
</div> -->
<div class="item" style="width: 33%"> <!-- <div class="item" style="width: 33%">-->
<div> <!-- <div>-->
<span>库管员：{{ printData.warehouseTeam }}</span> <!-- <span>库管员：{{ printData.warehouseTeam }}</span>-->
<!-- </div>-->
<!-- </div>-->
<div class="item" style="width: 33%; display: flex; align-items: flex-start">
<div style="width: 35%">库管员：</div>
<div
style="width: 65%; margin-left: 20px; transform: translateY(-30px)"
v-if="printData.signUrlKg"
>
<img
:src="printData.signUrlKg"
style="width: 40px; height: 90px; max-width: 100%"
:style="{ transform: printData.signTypeKg == 0 ? 'rotate(-90deg)' : '' }"
alt=""
/>
</div> </div>
</div> </div>
</div> </div>
</vue-easy-print> </vue-easy-print>
</div> </div>
@ -346,6 +372,7 @@ export default {
//获取验收单数据 //获取验收单数据
getPrintTable(taskId) { getPrintTable(taskId) {
getPurchaseCheckFormByTaskId(taskId).then(response => { getPurchaseCheckFormByTaskId(taskId).then(response => {
console.log("112233:",response.data)
this.printData = response.data this.printData = response.data
this.printTableData = response.data.materialList this.printTableData = response.data.materialList
// let supplierList = [] // let supplierList = []

10
src/views/materialsStation/straight/straightTransfer/index.vue
View File

@ -726,8 +726,14 @@ export default {
} }
}, },
isTeamSelected(teamName) { isTeamSelected(teamName) {
// 判断转出班组的teamName是否已经在选中的班组列表中 // 如果转出班组已选择，且当前遍历的转入班组的 teamName 与选中的转出班组的 teamName 相同，则禁用
return this.maForm.backTeamId && this.uniteList.some(item => item.teamName === teamName); if (this.maForm.backTeamId) {
const selectedBackTeam = this.uniteList.find(item => item.id === this.maForm.backTeamId);
if (selectedBackTeam && selectedBackTeam.teamName === teamName) {
return true; // 禁用相同的班组
}
}
return false; // 不禁用
}, },
// 获取物资类型 // 获取物资类型
async getMaTypeOpt() { async getMaTypeOpt() {