From f6dbc3c20c7cd02011012c11bf6a0fe72595ac38 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 12 Sep 2025 14:26:11 +0800
Subject: [PATCH] ui

---
 .../outsourcing-issue/outsourcingPicking.vue  |  8 +--
 src/views/modules/recv/recv.vue               | 57 +++++++++++++------
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/outsourcing-issue/outsourcingPicking.vue b/src/views/modules/outsourcing-issue/outsourcingPicking.vue
index c88dcc6..beab1c4 100644
--- a/src/views/modules/outsourcing-issue/outsourcingPicking.vue
+++ b/src/views/modules/outsourcing-issue/outsourcingPicking.vue
@@ -104,7 +104,7 @@ export default {
         type: 'outsourcing'
       }
       console.log('params', params);
-      
+
       // 使用现有的 PO API 来获取委外订单数据
       getPoList(params).then(({ data }) => {
         this.loading = false;
@@ -116,7 +116,7 @@ export default {
             pickedLabels: item.pickedLabels || 0,
             totalLabels: item.totalLabels || 0,
             requestQty: item.requestQty || item.qty,
-            remainQty: item.remainQty || item.thisRecvQty
+            remainQty: item.remainQty || item.invQtyToReceive
           }));
         } else {
           this.$message.error(data.msg || '获取数据失败');
@@ -151,7 +151,7 @@ export default {
             pickedLabels: item.pickedLabels || 0,
             totalLabels: item.totalLabels || 0,
             requestQty: item.requestQty || item.qty,
-            remainQty: item.remainQty || item.thisRecvQty
+            remainQty: item.remainQty || item.invQtyToReceive
           }));
         } else {
           this.$message.error(data.msg || '查询失败');
@@ -399,4 +399,4 @@ export default {
     min-width: 50px;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/recv/recv.vue b/src/views/modules/recv/recv.vue
index 238b722..2621f4b 100644
--- a/src/views/modules/recv/recv.vue
+++ b/src/views/modules/recv/recv.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="pda-container">
+    <div class="pda-container" v-loading.fullscreen.lock="fullscreenLoading">
       <div class="status-bar">
         <div class="goBack" @click="handleBack"><i class="el-icon-arrow-left"></i>上一页</div>
         <div class="goBack">采购订单接收</div>
@@ -32,16 +32,16 @@
                 <el-col :span="24">
                   <el-form-item label="商品描述"><span>{{ poDetail.description }}</span></el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="6" :class="{ mt10: getTextWidth(poDetail.description) > 34 }">
                   <el-form-item label="订单数量"><span>{{ poDetail.purchaseQty }}</span></el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="6" :class="{ mt10: getTextWidth(poDetail.description) > 34 }">
                   <el-form-item label="待收数量"><span>{{ poDetail.qtyToReceive }}</span></el-form-item>
                 </el-col>
-                <el-col :span="6">
-                  <el-form-item label="此次接收数量"><span>{{ poDetail.thisRecvQty }}</span></el-form-item>
+                <el-col :span="6" :class="{ mt10: getTextWidth(poDetail.description) > 34 }">
+                  <el-form-item label="此次接收数量"><span>{{ poDetail.invQtyToReceive }}</span></el-form-item>
                 </el-col>
-                <el-col :span="6" >
+                <el-col :span="6" :class="{ mt10: getTextWidth(poDetail.description) > 34 }">
                   <el-form-item style="margin-left: 20px" label="单位"><span>{{ poDetail.purchaseUOM }}</span></el-form-item>
                 </el-col>
               </el-row>
@@ -126,7 +126,8 @@ export default {
       recvItem: {},
       handlingUnit: [],
       hanlingItem: { code: '', qty: '', perQty: '', packageQty: '' },
-      site:localStorage.getItem('site')
+      site:localStorage.getItem('site'),
+      fullscreenLoading: false  // 控制全屏loading
     };
   },
   computed: {
@@ -143,6 +144,20 @@ export default {
     }
   },
   methods: {
+    // 计算“显示宽度”
+    getTextWidth(text) {
+      if (!text) return 0
+      let len = 0
+      for (let char of text) {
+        // 中文、全角符号
+        if (/[\u4e00-\u9fa5\u3000-\u303F\uFF00-\uFFEF]/.test(char)) {
+          len += 2
+        } else {
+          len += 1
+        }
+      }
+      return len
+    },
     handleBack() {
       if (this.processFlag === 1) this.$router.back();
       else if (this.processFlag === 3) this.processFlag = 2;
@@ -168,8 +183,8 @@ export default {
       this.recvItem = {
         ...row,
         poNo: row.poNumber || this.scanCode,
-        dueinQty: row.qtyToReceive || row.thisRecvQty,
-        transQty: row.thisRecvQty || 0
+        dueinQty: row.qtyToReceive || row.invQtyToReceive,
+        transQty: row.invQtyToReceive || 0
       };
       this.processFlag = 2;
     },
@@ -194,8 +209,11 @@ export default {
       localStorage.setItem(this.huKey, JSON.stringify(this.handlingUnit));
     },
     receivePo() {
+      if (this.fullscreenLoading) return; // 防止重复点
+      this.fullscreenLoading = true;
       const item = this.recvItem;
       if (!item.transQty || !item.locationNo || !item.batchNo) {
+        this.fullscreenLoading = false;
         return this.$message.error("请填写完整信息");
       }
 
@@ -213,16 +231,17 @@ export default {
         poNo: item.poNumber || item.poNo,
         orderNo: item.orderNo,
         lineNo: item.lineNo,
-        relNo: item.relNo,
+        releaseNo: item.releaseNo,
         receiptNo: item.receiptNo,
         orderRef1: item.orderNo,
+        supplierNo: item.supplierNo,
+        purchaseUOM: item.purchaseUOM,
+        receiveCase: item.receiveCase,
+        receiveCaseDB: item.receiveCaseDB,
         // 业务控制字段
-        needHandlingUnit: item.needHandlingUnit || 'N',
-        needCheck: item.needCheck || 'N',
-        warehouseType: item.warehouseType || 'MANUAL',
-        needPallet: item.needPallet || 'N',
-        workshopFlag: item.workshopFlag || 'N',
-        cuttingFlag: item.cuttingFlag || 'N',
+        needHandlingUnit: item.needHandlingUnit ,
+        needCheck: item.needCheck ,
+        warehouseType: item.warehouseType ,
         // 日期字段
         manufactureDate: item.manufactureDate,
         // 处理单元列表
@@ -231,7 +250,6 @@ export default {
           packageQty: 1
         })) : []
       };
-
       receivePo(receiveData).then(({ data }) => {
         if (data.code === 0) {
           this.$message.success("操作成功");
@@ -247,6 +265,8 @@ export default {
       }).catch(error => {
         console.error('接收失败:', error);
         this.$message.error('网络错误，请重试');
+      }).finally(() => {
+        this.fullscreenLoading = false; // 结束后关闭loading
       });
     }
   },
@@ -257,6 +277,9 @@ export default {
 </script>
 
 <style scoped>
+.mt10 {
+  margin-top: 10px;
+}
 .scan-box input {
   width: 100%;
   padding: 12px;