From 3c7a10f31cec1841fd20cbe42b6b2ac5a2a0353b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Mon, 14 Sep 2026 16:43:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/srmSupplier/supplierList.vue      | 26 ++++++++++++-------
 .../modules/supplier/priceSheetReport.vue     |  1 -
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/srmSupplier/supplierList.vue b/src/views/modules/srmSupplier/supplierList.vue
index cb1f9c7..de4cd32 100644
--- a/src/views/modules/srmSupplier/supplierList.vue
+++ b/src/views/modules/srmSupplier/supplierList.vue
@@ -67,7 +67,7 @@
             <span v-else-if="item.columnProp === 'status'" :class="getStatusClass(scope.row.status)">
               {{ scope.row.status }}
             </span>
-            <span v-else-if="item.columnProp === 'minShipAccount' || item.columnProp === 'handlingCharge'">
+            <span v-else-if="item.columnProp === 'handlingCharge'">
               {{ formatSupplierNumberDisplay(scope.row[item.columnProp]) }}
             </span>
             <span v-else>{{ scope.row[item.columnProp] }}</span>
@@ -275,9 +275,14 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <!-- 最低出货金额排在小单费前一格；新增/编辑均可填写，默认 0，不强制固定小数位 - rqrq -->
+                <!-- 最低出货金额改为字典选择，保存 sys_dict_data.dict_value；空表示未配置 - rqrq -->
                 <el-form-item label="最低出货金额">
-                  <el-input v-model="currentSupplier.minShipAccount" type="number"></el-input>
+                  <sys-dict-select
+                    v-model="currentSupplier.minShipAccount"
+                    dict-type="min_ship_account"
+                    placeholder="请选择"
+                    width="100%"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -1280,7 +1285,7 @@ export default {
         taxCode:'',
         paymentTerm:'',
         deliveryTerm:'',
-        minShipAccount: 0,
+        minShipAccount: '',
         handlingCharge: 0,
         contract:'',
         phoneNo: '',
@@ -1353,8 +1358,9 @@ export default {
       }
     },
     /**
-     * 查询列表数值去尾零。
-     * 业务意图：最低出货金额/小单费按“去尾零”展示，整数显示为 1 而不是 1.000。
+     * 查询列表小单费去尾零。
+     * 业务意图：handling_charge 按“去尾零”展示，整数显示为 1 而不是 1.000。
+     * 最低出货金额已改为字典字符串，列表直接显示字段值，不走本方法。
      * 边界：空值显示空；非数字原样返回。
      */
     formatSupplierNumberDisplay (value) {
@@ -1702,7 +1708,7 @@ export default {
         taxCode:'',
         paymentTerm:'',
         deliveryTerm:'',
-        minShipAccount: 0,
+        minShipAccount: '',
         handlingCharge: 0,
         contract:'',
         phoneNo: '',
@@ -1741,9 +1747,9 @@ export default {
         buyer: this.currentRow.buyerAccount || this.currentRow.buyer || '',
         sourcingStaff: this.currentRow.sourcingStaffAccount || this.currentRow.sourcingStaff || '',
         planner: this.currentRow.plannerAccount || this.currentRow.planner || '',
-        // 价格字段空值按 0 回填，避免编辑框出现 null - rqrq
-        minShipAccount: this.currentRow.minShipAccount === null || this.currentRow.minShipAccount === undefined || this.currentRow.minShipAccount === ''
-          ? 0
+        // 最低出货金额为字典值，空串表示未选；小单费空值按 0 回填 - rqrq
+        minShipAccount: this.currentRow.minShipAccount === null || this.currentRow.minShipAccount === undefined
+          ? ''
           : this.currentRow.minShipAccount,
         handlingCharge: this.currentRow.handlingCharge === null || this.currentRow.handlingCharge === undefined || this.currentRow.handlingCharge === ''
           ? 0
diff --git a/src/views/modules/supplier/priceSheetReport.vue b/src/views/modules/supplier/priceSheetReport.vue
index 939ee1d..584e21a 100644
--- a/src/views/modules/supplier/priceSheetReport.vue
+++ b/src/views/modules/supplier/priceSheetReport.vue
@@ -94,7 +94,6 @@
           <el-table-column prop="priceTier8" label="Price_Tier_8" min-width="125" header-align="center" align="right" :formatter="formatDollarCell" />
           <el-table-column prop="fsc" label="FSC" min-width="120" header-align="center" align="left" show-overflow-tooltip />
           <el-table-column prop="fscClaim" label="FSC claim" min-width="150" header-align="center" align="left" show-overflow-tooltip />
-          <el-table-column prop="leadFreePellet" label="Lead free Pellet" min-width="160" header-align="center" align="left" show-overflow-tooltip />
           <el-table-column prop="awareDpp" label="AWARE DPP" min-width="140" header-align="center" align="left" show-overflow-tooltip />
           <el-table-column prop="coo" label="COO" min-width="120" header-align="center" align="left" show-overflow-tooltip />
         </el-table>