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

直转，新购问题修复

This commit is contained in:
hongchao 2025-10-16 18:07:49 +08:00
parent d98b052928
commit 3e7271cf65
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/business/businessHandling/directApply.vue
View File

@ -394,6 +394,8 @@ export default {
{ label: '设备编码', prop: 'maCode' }, { label: '设备编码', prop: 'maCode' },
{ label: '计量单位', prop: 'unitName' }, { label: '计量单位', prop: 'unitName' },
{ label: '在用数量', prop: 'useNum' }, { label: '在用数量', prop: 'useNum' },
{ label: '待转数量', prop: 'waitTransNum' },
{ label: '可转数量', prop:'transNum' },
{ label: '领料人', prop: 'leasePerson' }, { label: '领料人', prop: 'leasePerson' },
{ label: '领料日期', prop: 'startTime' }, { label: '领料日期', prop: 'startTime' },
{ label: '备注', prop: 'remark' }, { label: '备注', prop: 'remark' },
@ -911,7 +913,7 @@ export default {
currentPageSelectedRows.forEach(row => { currentPageSelectedRows.forEach(row => {
const completeRow = { const completeRow = {
...row, ...row,
directNum: row.directNum || row.useNum, directNum: row.directNum || row.transNum,
isActive: true isActive: true
} }
this.selectedDataArray.push(completeRow) this.selectedDataArray.push(completeRow)
@ -922,8 +924,8 @@ export default {
this.equipmentList.forEach(item => { this.equipmentList.forEach(item => {
const isSelected = currentPageSelectedRows.some(selectedRow => this.getRowKey(selectedRow) === this.getRowKey(item)) const isSelected = currentPageSelectedRows.some(selectedRow => this.getRowKey(selectedRow) === this.getRowKey(item))
item.isActive = isSelected item.isActive = isSelected
if (isSelected && !item.directNum && item.useNum) { if (isSelected && !item.directNum && item.transNum) {
item.directNum = item.useNum item.directNum = item.transNum
} else if (!isSelected && !this.isEdit && !this.isDetail) { } else if (!isSelected && !this.isEdit && !this.isDetail) {
item.directNum = undefined item.directNum = undefined
} }
@ -946,10 +948,10 @@ export default {
} else { } else {
row.directNum = Number(String(row.directNum).replace(/[^\d]/g, '')) row.directNum = Number(String(row.directNum).replace(/[^\d]/g, ''))
} }
if (row.directNum > row.useNum) { if (row.directNum > row.transNum) {
this.$message.error('直转数量不能大于领料数量') this.$message.error('直转数量不能大于可转数量')
this.$nextTick(() => { this.$nextTick(() => {
row.directNum = row.useNum row.directNum = row.transNum
}) })
} }

6
src/views/material/purchase/goodsAccept/index.vue
View File

@ -213,7 +213,7 @@
<div style="width: 30%;">供应科：</div> <div style="width: 30%;">供应科：</div>
<div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.gySignUrl"> <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.gySignUrl">
<div v-for="(sign, index) in printData.gySignUrl" :key="index" style="width: 35%;margin-left: 5px;"> <div v-for="(sign, index) in printData.gySignUrl" :key="index" style="width: 35%;margin-left: 5px;">
<img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt=""> <img v-if="sign.signUrl" :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
</div> </div>
</div> </div>
</div> </div>
@ -222,7 +222,7 @@
<div style="width: 45%;">生产技术科：</div> <div style="width: 45%;">生产技术科：</div>
<div style="width: 55%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.scSignUrl"> <div style="width: 55%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.scSignUrl">
<div v-for="(sign, index) in printData.scSignUrl" :key="index" style="width: 35%;margin-left: 5px;"> <div v-for="(sign, index) in printData.scSignUrl" :key="index" style="width: 35%;margin-left: 5px;">
<img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt=""> <img v-if="sign.signUrl" :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
</div> </div>
</div> </div>
</div> </div>
@ -230,7 +230,7 @@
<div style="width: 30%;">库管班：</div> <div style="width: 30%;">库管班：</div>
<div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.kgSignUrl"> <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.kgSignUrl">
<div v-for="(sign, index) in printData.kgSignUrl" :key="index" style="width: 35%;margin-left: 5px;"> <div v-for="(sign, index) in printData.kgSignUrl" :key="index" style="width: 35%;margin-left: 5px;">
<img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt=""> <img v-if="sign.signUrl" :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
</div> </div>
</div> </div>
<!-- <div> <!-- <div>

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

@ -217,7 +217,7 @@
<div style="width: 30%;">供应科：</div> <div style="width: 30%;">供应科：</div>
<div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.gySignUrl"> <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.gySignUrl">
<div v-for="(sign, index) in printData.gySignUrl" :key="index" style="width: 35%;margin-left: 5px;"> <div v-for="(sign, index) in printData.gySignUrl" :key="index" style="width: 35%;margin-left: 5px;">
<img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt=""> <img v-if="sign.signUrl" :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
</div> </div>
</div> </div>
</div> </div>
@ -226,7 +226,7 @@
<div style="width: 45%;">生产技术科：</div> <div style="width: 45%;">生产技术科：</div>
<div style="width: 55%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.scSignUrl"> <div style="width: 55%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.scSignUrl">
<div v-for="(sign, index) in printData.scSignUrl" :key="index" style="width: 35%;margin-left: 5px;"> <div v-for="(sign, index) in printData.scSignUrl" :key="index" style="width: 35%;margin-left: 5px;">
<img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt=""> <img v-if="sign.signUrl" :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
</div> </div>
</div> </div>
</div> </div>
@ -234,7 +234,7 @@
<div style="width: 30%;">库管班：</div> <div style="width: 30%;">库管班：</div>
<div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.kgSignUrl"> <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.kgSignUrl">
<div v-for="(sign, index) in printData.kgSignUrl" :key="index" style="width: 35%;margin-left: 5px;"> <div v-for="(sign, index) in printData.kgSignUrl" :key="index" style="width: 35%;margin-left: 5px;">
<img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt=""> <img v-if="sign.signUrl" :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
</div> </div>
</div> </div>
<!-- <div> <!-- <div>

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

@ -280,7 +280,8 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
keyWord: undefined keyWord: undefined,
isFinish: undefined,
// taskStatus: 4, // taskStatus: 4,
}, },
openPrint: false, openPrint: false,