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 @@
{{ scope.row.status }}
-
+
{{ formatSupplierNumberDisplay(scope.row[item.columnProp]) }}
{{ scope.row[item.columnProp] }}
@@ -275,9 +275,14 @@
-
+
-
+
@@ -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 @@
-