From 3e7271cf6503522e4505f30205bb757abe7e2627 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 16 Oct 2025 18:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E8=BD=AC=EF=BC=8C=E6=96=B0=E8=B4=AD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/businessHandling/directApply.vue      | 14 ++++++++------
 src/views/material/purchase/goodsAccept/index.vue  |  6 +++---
 .../purchase/goodsArrived/component/home.vue       |  6 +++---
 src/views/material/purchase/goodsEntry/index.vue   |  3 ++-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/views/business/businessHandling/directApply.vue b/src/views/business/businessHandling/directApply.vue
index 3c99f4e4..fa59ca78 100644
--- a/src/views/business/businessHandling/directApply.vue
+++ b/src/views/business/businessHandling/directApply.vue
@@ -394,6 +394,8 @@ export default {
                 { label: '设备编码', prop: 'maCode' },
                 { label: '计量单位', prop: 'unitName' },
                 { label: '在用数量', prop: 'useNum' },
+                { label: '待转数量', prop: 'waitTransNum' },
+                { label: '可转数量', prop:'transNum' },
                 { label: '领料人', prop: 'leasePerson' },
                 { label: '领料日期', prop: 'startTime' },
                 { label: '备注', prop: 'remark' },
@@ -911,7 +913,7 @@ export default {
             currentPageSelectedRows.forEach(row => {
                 const completeRow = {
                     ...row,
-                    directNum: row.directNum || row.useNum,
+                    directNum: row.directNum || row.transNum,
                     isActive: true
                 }
                 this.selectedDataArray.push(completeRow)
@@ -922,8 +924,8 @@ export default {
             this.equipmentList.forEach(item => {
                 const isSelected = currentPageSelectedRows.some(selectedRow => this.getRowKey(selectedRow) === this.getRowKey(item))
                 item.isActive = isSelected
-                if (isSelected && !item.directNum && item.useNum) {
-                    item.directNum = item.useNum
+                if (isSelected && !item.directNum && item.transNum) {
+                    item.directNum = item.transNum
                 } else if (!isSelected && !this.isEdit && !this.isDetail) {
                     item.directNum = undefined
                 }
@@ -946,10 +948,10 @@ export default {
             } else {
                 row.directNum = Number(String(row.directNum).replace(/[^\d]/g, ''))
             }
-            if (row.directNum > row.useNum) {
-                this.$message.error('直转数量不能大于领料数量')
+            if (row.directNum > row.transNum) {
+                this.$message.error('直转数量不能大于可转数量')
                 this.$nextTick(() => {
-                    row.directNum = row.useNum
+                    row.directNum = row.transNum
                 })
             }
 
diff --git a/src/views/material/purchase/goodsAccept/index.vue b/src/views/material/purchase/goodsAccept/index.vue
index 1a49a63d..fcc612f8 100644
--- a/src/views/material/purchase/goodsAccept/index.vue
+++ b/src/views/material/purchase/goodsAccept/index.vue
@@ -213,7 +213,7 @@
                             <div style="width: 30%;">供应科：</div>
                             <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;">
-                                    <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>
@@ -222,7 +222,7 @@
                             <div style="width: 45%;">生产技术科：</div>
                             <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;">
-                                    <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>
@@ -230,7 +230,7 @@
                             <div style="width: 30%;">库管班：</div>
                             <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;">
-                                    <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>
diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue
index 8e86ec73..7d037028 100644
--- a/src/views/material/purchase/goodsArrived/component/home.vue
+++ b/src/views/material/purchase/goodsArrived/component/home.vue
@@ -217,7 +217,7 @@
                             <div style="width: 30%;">供应科：</div>
                             <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;">
-                                    <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>
@@ -226,7 +226,7 @@
                             <div style="width: 45%;">生产技术科：</div>
                             <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;">
-                                    <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>
@@ -234,7 +234,7 @@
                             <div style="width: 30%;">库管班：</div>
                             <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;">
-                                    <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>
diff --git a/src/views/material/purchase/goodsEntry/index.vue b/src/views/material/purchase/goodsEntry/index.vue
index 40c9d7b0..d36c78d0 100644
--- a/src/views/material/purchase/goodsEntry/index.vue
+++ b/src/views/material/purchase/goodsEntry/index.vue
@@ -280,7 +280,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        keyWord: undefined
+        keyWord: undefined,
+        isFinish: undefined,
         // taskStatus: 4,
       },
       openPrint: false,