From 5022e805982370412c16d3b630780595fe9f6cb1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 05 一月 2026 09:51:27 +0800
Subject: [PATCH] 双奇点 1.修改采购、销售相关字段

---
 src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue b/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
index e956cbc..a6e7880 100644
--- a/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
+++ b/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
@@ -29,7 +29,7 @@
               accept="image/*"
               :data="{ type: 9 }"
             >
-              <img v-if="scope.row.url" :src="javaApiUrl+scope.row.url"></img>
+              <img class="upload-img" v-if="scope.row.url" :src="javaApiUrl+scope.row.url"></img>
               <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
             </el-upload>
           </template>
@@ -51,7 +51,7 @@
         </el-table-column>
         <el-table-column label="绾哥瑙勬牸" prop="cartonSpecifications" width="200">
           <template #default="scope">
-            <el-input v-model="scope.row.cartonSpecifications" placeholder="璇疯緭鍏ヤ骇鍝侀珮搴�" />
+            <el-input v-model="scope.row.cartonSpecifications" placeholder="璇疯緭鍏ョ焊绠辫鏍�" />
           </template>
         </el-table-column>
         <!-- <el-table-column label="渚涘簲鍟�" prop="supplierName" width="200">
@@ -81,7 +81,7 @@
             <el-input-number :step="1" :min="0" style="width: 100%" v-model="scope.row.boxNum" @change="() => calculateTotalPrice(scope.row)" />
           </template>
         </el-table-column>
-        <el-table-column label="鍗曚环(鍏�)/鏀�" prop="taxInclusiveUnitPrice" width="150">
+        <el-table-column label="鍗曚环(缇庡厓)/浠�" prop="taxInclusiveUnitPrice" width="150">
          <template #default="scope">
            <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.taxInclusiveUnitPrice" @change="() => calculateTotalPrice(scope.row)" />
          </template>
@@ -219,7 +219,7 @@
     taxInclusiveTotalPrice: 0,
     taxRate: null,
     taxExclusiveTotalPrice: 0,
-    boxNum: 0
+    boxNum: 0,
   });
 };
 
@@ -257,17 +257,21 @@
     for (let i = 0; i < productList.value.length; i++) {
       const product = productList.value[i];
       if (!product.productCategory || !product.specificationModel || !product.unit) {
-        proxy.$modal.msgError(`绗�${i + 1}琛屼骇鍝佹暟鎹湭濉啓瀹屾暣锛堜骇鍝佸ぇ绫汇�佽鏍煎瀷鍙枫�佸崟浣嶄负蹇呭~锛塦)
+        proxy.$modal.msgError(`绗�${i + 1}琛屼骇鍝佹暟鎹湭濉啓瀹屾暣锛堜骇鍝併�佷骇鍝侀珮搴︺�侀珮搴﹀崟浣嶄负蹇呭~锛塦)
+        return
+      }
+      if (!product.url) {
+        proxy.$modal.msgError(`绗�${i + 1}琛屼骇鍝佹湭涓婁紶浜у搧鍥剧墖`)
+        return
+      }
+      if (!product.cartonSpecifications) {
+        proxy.$modal.msgError(`绗�${i + 1}琛屼骇鍝佹湭濉啓绾哥瑙勬牸`)
         return
       }
       // if (!product.itemType) {
       //   proxy.$modal.msgError(`绗�${i + 1}琛岃閫夋嫨鐗╁搧绫诲瀷`)
       //   return
       // }
-      if (!product.inboundDate) {
-        proxy.$modal.msgError(`绗�${i + 1}琛岃閫夋嫨鍏ュ簱鏃ユ湡`)
-        return
-      }
       const stock = Number(product?.inboundNum ?? 0);
       if (!Number.isFinite(stock) || stock <= 0) {
         proxy.$modal.msgError(`绗�${i + 1}琛屾湰娆″叆搴撴暟閲忛渶澶т簬0`)
@@ -275,7 +279,16 @@
       }
       const boxNum = Number(product?.boxNum ?? 0);
       if (!Number.isFinite(boxNum) || boxNum <= 0) {
-        proxy.$modal.msgError(`绗�${i + 1}姣忕洅鏁伴噺闇�澶т簬0`)
+        proxy.$modal.msgError(`绗�${i + 1}琛屾瘡浠舵暟閲�/鏀渶澶т簬0`)
+        return
+      }
+      const taxInclusiveUnitPrice = Number(product?.taxInclusiveUnitPrice ?? 0);
+      if (!Number.isFinite(taxInclusiveUnitPrice) || taxInclusiveUnitPrice <= 0) {
+        proxy.$modal.msgError(`绗�${i + 1}琛屽崟浠凤紙鍏冿級闇�澶т簬0`)
+        return
+      }
+      if (!product.inboundDate) {
+        proxy.$modal.msgError(`绗�${i + 1}琛岃閫夋嫨鍏ュ簱鏃ユ湡`)
         return
       }
       
@@ -296,7 +309,7 @@
 			taxInclusiveTotalPrice: Number(product.taxInclusiveTotalPrice || 0),
       boxNum:Number(product.boxNum),
       cartonSpecifications: product.cartonSpecifications,
-      url: product.url||'/src/assets/logo/logo.png',
+      url: product.url||'',
     }));
     loading.value = true
     if (operationType.value === 'edit') {
@@ -391,6 +404,9 @@
       taxInclusiveUnitPrice: Number(row?.taxInclusiveUnitPrice ?? 0),
       taxInclusiveTotalPrice: Number(row?.taxInclusiveTotalPrice ?? 0),
       taxExclusiveTotalPrice: Number(row?.taxExclusiveTotalPrice ?? 0),
+      boxNum: Number(row?.boxNum ?? 0),
+      cartonSpecifications: row?.cartonSpecifications ?? '',
+      url: row?.url ?? '',
     }]
   }
 }
@@ -400,5 +416,11 @@
 })
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+  .upload-img{
+    width: 80px;
+    height: 80px;
+    object-fit: contain;
+  }
+</style>
 

--
Gitblit v1.9.3