fix: 处理g显示问题

src/pages/ServiceGoods/components/FormPriceOrStock.jsx

@@ -315,7 +315,7 @@ const FormPriceOrStock = forwardRef((props, ref) => {
         inputType: 'text',
       });
     }
-
+    // console.log('customer.isGold :>> ', customer.isGold);
     // isGoodsManage用来判断是否是popGoodsManage页面,这个页面是用来应付审计团队的,没有实际功能,这里删掉了供货价字段,正常业务逻辑不用考虑这个字段,这就用第一个数据就好了
     const isGoodsManage = window.location.pathname.indexOf('popGoodsManage') < 0;
     const dynamicColumns = [
@@ -456,7 +456,7 @@ const FormPriceOrStock = forwardRef((props, ref) => {
       setMergeTable(Boolean(editData.secondSpecValue && editData.secondSpecValue.length));
       setTableData(fliterSkuListSortData(skuList) || []);
     }
-  }, [customer.isEdit, customer.isUseCache, editData, skuList]);
+  }, [customer.isEdit, customer.isUseCache, editData, skuList, customer.isGold]);
 
   useEffect(() => {
     if (!editData) {

src/pages/ServiceGoods/config.js

@@ -159,170 +159,173 @@ export const WeeksList = [
     value: 7,
   },
 ];
-export const StaticColumns = customer => [
-  {
-    title: '供货价',
-    dataIndex: 'supplyPrice',
-    editable: true,
-    batchRole: [1, 2, 3, 4],
-    roleProps: {
-      precision: 2,
-      min: 0,
-    },
-    batchProps: {
-      precision: 2,
-      min: 0,
-    },
-    roleRules: { required: true },
-    disabeldRender: () => customer.isDisabled,
-  },
-  {
-    title: '佣金费率',
-    dataIndex: 'commissionRate',
-    editable: true,
-    role: [4],
-    roleRules: { required: false },
-    roleProps: {
-      min: 0,
-    },
-    // batchProps: {
-    //   min: 0,
-    // },
-  },
-  {
-    title: '市场价',
-    dataIndex: 'marketPrice',
-    editable: true,
-    batchRole: [1, 2, 3, 4],
-    roleProps: {
-      precision: 2,
-      min: 0,
-    },
-    batchProps: {
-      precision: 2,
-      min: 0,
+export const StaticColumns = customer =>
+  // console.log('StaticColumns customer.isGold :>> ', customer.isGold);
+  [
+    {
+      title: '供货价',
+      dataIndex: 'supplyPrice',
+      editable: true,
+      batchRole: [1, 2, 3, 4],
+      roleProps: {
+        precision: 2,
+        min: 0,
+      },
+      batchProps: {
+        precision: 2,
+        min: 0,
+      },
+      roleRules: { required: true },
+      disabeldRender: () => customer.isDisabled,
     },
-    roleRules: { required: true },
-    disabeldRender: () => customer.isDisabled,
-  },
-  {
-    title: '销售价',
-    dataIndex: 'salePrice',
-    editable: true,
-    batchRole: [4],
-    role: [4],
-    roleRules: { required: true },
-    roleProps: {
-      precision: 2,
-      min: 0,
+    {
+      title: '佣金费率',
+      dataIndex: 'commissionRate',
+      editable: true,
+      role: [4],
+      roleRules: { required: false },
+      roleProps: {
+        min: 0,
+      },
+      // batchProps: {
+      //   min: 0,
+      // },
     },
-    batchProps: {
-      precision: 2,
-      min: 0,
+    {
+      title: '市场价',
+      dataIndex: 'marketPrice',
+      editable: true,
+      batchRole: [1, 2, 3, 4],
+      roleProps: {
+        precision: 2,
+        min: 0,
+      },
+      batchProps: {
+        precision: 2,
+        min: 0,
+      },
+      roleRules: { required: true },
+      disabeldRender: () => customer.isDisabled,
     },
-    disabeldRender: () => customer.isDisabled,
-  },
-  {
-    title: `重量(${customer.isGold ? 'g' : 'kg'})`,
-    dataIndex: 'weight',
-    editable: true,
-    batchRole: [1],
-    batchProps: {
-      min: 0,
-      precision: customer.isGold ? 2 : 3,
-      max: customer.isGold ? 100 : 999999.999,
+    {
+      title: '销售价',
+      dataIndex: 'salePrice',
+      editable: true,
+      batchRole: [4],
+      role: [4],
+      roleRules: { required: true },
+      roleProps: {
+        precision: 2,
+        min: 0,
+      },
+      batchProps: {
+        precision: 2,
+        min: 0,
+      },
+      disabeldRender: () => customer.isDisabled,
     },
-    role: [1],
-    roleRules: { required: true },
-    roleProps: {
-      min: 0,
-      precision: customer.isGold ? 2 : 3,
-      max: customer.isGold ? 100 : 999999.999,
+    {
+      title: `重量(${customer.isGold ? 'g' : 'kg'})`,
+      dataIndex: 'weight',
+      editable: true,
+      batchRole: [1],
+      batchProps: {
+        min: 0,
+        precision: customer.isGold ? 2 : 3,
+        max: customer.isGold ? 100 : 999999.999,
+      },
+      role: [1],
+      roleRules: { required: true },
+      roleProps: {
+        min: 0,
+        precision: customer.isGold ? 2 : 3,
+        max: customer.isGold ? 100 : 999999.999,
+      },
+      disabeldRender: () => customer.isDisabled,
     },
-    disabeldRender: () => customer.isDisabled,
-  },
-  {
-    title: '库存',
-    dataIndex: 'productStock',
-    editable: true,
-    role: [1, 2, 4],
-    batchRole: [1, 2, 4],
-    batchProps: {
-      precision: 0,
-      step: 1,
-      min: 0,
+    {
+      title: '库存',
+      dataIndex: 'productStock',
+      editable: true,
+      role: [1, 2, 4],
+      batchRole: [1, 2, 4],
+      batchProps: {
+        precision: 0,
+        step: 1,
+        min: 0,
+      },
+      roleProps: {
+        min: 0,
+        step: 1,
+        precision: 0,
+      },
+      roleRules: { required: true },
+      disabeldRender: record => {
+        if (record.stock === null) return false;
+        return customer.isEdit && customer.isNormal;
+      },
     },
-    roleProps: {
-      min: 0,
-      step: 1,
-      precision: 0,
+    {
+      title: '库存预警',
+      dataIndex: 'productStockWarning',
+      editable: true,
+      batchRole: [1],
+      role: [1, 4],
+      roleProps: {
+        min: 0,
+        precision: 0,
+        maxLength: 5,
+      },
+      batchProps: {
+        min: 0,
+        precision: 0,
+        maxLength: 5,
+      },
+      disabeldRender: () => customer.isDisabled,
     },
-    roleRules: { required: true },
-    disabeldRender: record => {
-      if (record.stock === null) return false;
-      return customer.isEdit && customer.isNormal;
+    {
+      title: '商品自编码',
+      dataIndex: 'thirdSkuNo',
+      editable: true,
+      role: [1, 2],
+      inputType: 'input',
+      roleRules: { required: true },
+      disabeldRender: () => customer.isDisabled,
     },
-  },
-  {
-    title: '库存预警',
-    dataIndex: 'productStockWarning',
-    editable: true,
-    batchRole: [1],
-    role: [1, 4],
-    roleProps: {
-      min: 0,
-      precision: 0,
-      maxLength: 5,
+    {
+      title: '京东链接',
+      dataIndex: 'skuLink',
+      editable: true,
+      role: [1, 2],
+      inputType: 'input',
+      roleRules: { required: false },
+      disabeldRender: () => customer.isDisabled,
     },
-    batchProps: {
-      min: 0,
-      precision: 0,
-      maxLength: 5,
+    {
+      title: 'sku名称',
+      dataIndex: 'name',
+      editable: true,
+      role: customer.isEdit && customer.isJDGoods ? [1, 2] : [],
+      inputType: 'btnText',
+      roleRules: { required: false },
+      disabeldRender: () => customer.isDisabled,
     },
-    disabeldRender: () => customer.isDisabled,
-  },
-  {
-    title: '商品自编码',
-    dataIndex: 'thirdSkuNo',
-    editable: true,
-    role: [1, 2],
-    inputType: 'input',
-    roleRules: { required: true },
-    disabeldRender: () => customer.isDisabled,
-  },
-  {
-    title: '京东链接',
-    dataIndex: 'skuLink',
-    editable: true,
-    role: [1, 2],
-    inputType: 'input',
-    roleRules: { required: false },
-    disabeldRender: () => customer.isDisabled,
-  },
-  {
-    title: 'sku名称',
-    dataIndex: 'name',
-    editable: true,
-    role: customer.isEdit && customer.isJDGoods ? [1, 2] : [],
-    inputType: 'btnText',
-    roleRules: { required: false },
-    disabeldRender: () => customer.isDisabled,
-  },
-  {
-    title: '操作',
-    editable: true,
-    dataIndex: 'option',
-    role: [1, 2],
-    inputType: 'option',
-    roleProps: {
-      isJDGoods: customer.isJDGoods,
-      disabled: customer.isDisabled,
-      min: 0,
+    {
+      title: '操作',
+      editable: true,
+      dataIndex: 'option',
+      role: [1, 2],
+      inputType: 'option',
+      roleProps: {
+        isJDGoods: customer.isJDGoods,
+        disabled: customer.isDisabled,
+        min: 0,
+      },
+      roleRules: { required: false },
+      disabeldRender: () => customer.isDisabled,
     },
-    roleRules: { required: false },
-    disabeldRender: () => customer.isDisabled,
-  },
-];
+  ];
+
 // 这部分是用来应付审计团队的,没有实际功能,这里删掉了供货价字段,正常业务逻辑不用考虑这里
 export const StaticColumnsPop = customer => [
   {

src/pages/ServiceGoods/index.jsx

@@ -527,6 +527,7 @@ const ServiceGoods = options => {
     isUseCache, // 是否使用缓存数据
     onEventBus,
   };
+  // console.log('providerValue.isGold :>> ', providerValue.isGold);
 
   return (
     <Modal