From 2048f5ba835b511da9b71858c1a48b6191ae0a2c Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Wed, 15 Oct 2025 00:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/goodsArrived/component/home.vue  | 52 ++++++++++++++-----
 .../material/purchase/goodsEntry/index.vue    | 51 +++++++++++++-----
 .../straight/straightTransfer/index.vue       | 10 +++-
 3 files changed, 86 insertions(+), 27 deletions(-)

diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue
index 333ae10a..8e86ec73 100644
--- a/src/views/material/purchase/goodsArrived/component/home.vue
+++ b/src/views/material/purchase/goodsArrived/component/home.vue
@@ -211,7 +211,7 @@
                             </tr>
                         </tbody>
                     </table>
-                    
+
                     <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 style="width: 30%;">供应科：</div>
@@ -293,24 +293,50 @@
             </tbody>
           </table>
 
-          <div class="fillIn" style="margin-top: 20px; display: flex; justify-content: space-between">
-            <div class="item" style="width: 33%">
-              <div>
-                <span>审核：{{ printData.reviewer }}</span>
+          <div class="fillIn" style="margin-top: 50px; display: flex; justify-content: space-between">
+            <!--            <div class="item" style="width: 33%">-->
+            <!--              <div>-->
+            <!--                <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 class="item" style="width: 33%">
-              <div>
-                <span>生产技术科：{{ printData.productionTechDept }}</span>
-              </div>
-            </div> -->
 
-            <div class="item" style="width: 33%">
-              <div>
-                <span>库管员：{{ printData.warehouseTeam }}</span>
+            <!--            <div class="item" style="width: 33%">-->
+            <!--              <div>-->
+            <!--                <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>
         </vue-easy-print>
       </div>
diff --git a/src/views/material/purchase/goodsEntry/index.vue b/src/views/material/purchase/goodsEntry/index.vue
index 284222a7..40c9d7b0 100644
--- a/src/views/material/purchase/goodsEntry/index.vue
+++ b/src/views/material/purchase/goodsEntry/index.vue
@@ -186,24 +186,50 @@
             </tbody>
           </table>
 
-          <div class="fillIn" style="margin-top: 20px; display: flex; justify-content: space-between">
-            <div class="item" style="width: 33%">
-              <div>
-                <span>审核：{{ printData.reviewer }}</span>
+          <div class="fillIn" style="margin-top: 50px; display: flex; justify-content: space-between">
+<!--            <div class="item" style="width: 33%">-->
+<!--              <div>-->
+<!--                <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 class="item" style="width: 33%">
-              <div>
-                <span>生产技术科：{{ printData.productionTechDept }}</span>
-              </div>
-            </div> -->
 
-            <div class="item" style="width: 33%">
-              <div>
-                <span>库管员：{{ printData.warehouseTeam }}</span>
+<!--            <div class="item" style="width: 33%">-->
+<!--              <div>-->
+<!--                <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>
         </vue-easy-print>
       </div>
@@ -346,6 +372,7 @@ export default {
     //获取验收单数据
     getPrintTable(taskId) {
       getPurchaseCheckFormByTaskId(taskId).then(response => {
+        console.log("112233:",response.data)
         this.printData = response.data
         this.printTableData = response.data.materialList
         // let supplierList = []
diff --git a/src/views/materialsStation/straight/straightTransfer/index.vue b/src/views/materialsStation/straight/straightTransfer/index.vue
index 1345c129..bf0b528e 100644
--- a/src/views/materialsStation/straight/straightTransfer/index.vue
+++ b/src/views/materialsStation/straight/straightTransfer/index.vue
@@ -726,8 +726,14 @@ export default {
       }
     },
     isTeamSelected(teamName) {
-      // 判断转出班组的teamName是否已经在选中的班组列表中
-      return this.maForm.backTeamId && this.uniteList.some(item => item.teamName === teamName);
+      // 如果转出班组已选择，且当前遍历的转入班组的 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() {