Merge branch 'feat-fake-pop-order-mession' into feature-20250212-fake-long-number

src/pages/PopGoodsManage/SearchForm/index.jsx

@@ -202,7 +202,7 @@ class goodsManage extends Component {
                 ))}
               </Select>
             </FormItem>
-            <FormItem label="供货价区间">
+            {/* <FormItem label="供货价区间">
               <FormItem name="supplyPriceMin" className={styles.iptNumRight} noStyle>
                 <InputNumber placeholder="请输入" min={0} max={999999999} style={iptNumWidth} />
               </FormItem>
@@ -218,7 +218,7 @@ class goodsManage extends Component {
                   onChange={this.valueMin}
                 />
               </FormItem>
-            </FormItem>
+            </FormItem> */}
             <FormItem name="thirdSkuNo" label="第三方SKU编码">
               <Input placeholder="请输入第三方SKU编码" allowClear style={selectW} />
             </FormItem>

src/pages/ServiceGoods/components/FormPriceOrStock.jsx

@@ -12,7 +12,7 @@ import React, {
   memo,
 } from 'react';
 // import { unstable_batchedUpdates } from 'react-dom';
-import { formItemLayout, StaticColumns } from '../config';
+import { formItemLayout, StaticColumns, StaticColumnsPop } from '../config';
 import EditFormTable from './EditFormTable';
 import FormPackage from './FormPackage';
 import {
@@ -316,7 +316,13 @@ const FormPriceOrStock = forwardRef((props, ref) => {
         inputType: 'text',
       });
     }
-    const dynamicColumns = [...columsData, ...StaticColumns(customer)];
+
+    // isGoodsManage用来判断是否是popGoodsManage页面,这个页面是用来应付审计团队的,没有实际功能,这里删掉了供货价字段,正常业务逻辑不用考虑这个字段,这就用第一个数据就好了
+    const isGoodsManage = window.location.pathname.indexOf('popGoodsManage') < 0;
+    const dynamicColumns = [
+      ...columsData,
+      ...(isGoodsManage ? StaticColumns(customer) : StaticColumnsPop(customer)),
+    ];
     setDefaultColumns(dynamicColumns);
   };
 

src/pages/ServiceGoods/config.js

@@ -159,11 +159,7 @@ export const WeeksList = [
     value: 7,
   },
 ];
-// isGoodsManage用来判断是否是popGoodsManage页面,这个页面是用来应付审计团队的,没有实际功能,这里删掉了供货价字段,正常业务逻辑不用考虑这个字段,这就用第一个数据就好了
-const isGoodsManage = window.location.pathname.indexOf('popGoodsManage') < 0;
-export const StaticColumns = customer =>
-  isGoodsManage
-    ? [
+export const StaticColumns = customer => [
   {
     title: '供货价',
     dataIndex: 'supplyPrice',
@@ -326,9 +322,9 @@ export const StaticColumns = customer =>
     roleRules: { required: false },
     disabeldRender: () => customer.isDisabled,
   },
-      ]
-    : [
-        // 这部分是用来应付审计团队的,没有实际功能,这里删掉了供货价字段,正常业务逻辑不用考虑这里
+];
+// 这部分是用来应付审计团队的,没有实际功能,这里删掉了供货价字段,正常业务逻辑不用考虑这里
+export const StaticColumnsPop = customer => [
   {
     title: '佣金费率',
     dataIndex: 'commissionRate',
@@ -475,7 +471,7 @@ export const StaticColumns = customer =>
     roleRules: { required: false },
     disabeldRender: () => customer.isDisabled,
   },
-      ];
+];
 export const ENUM_REPERTORY = [{ label: '单规格', value: '1' }, { label: '多规格', value: '2' }];
 export const ENUM_SET_REPERTORY = [{ label: '清零', value: '0' }, { label: '最大', value: '1' }];
 export const ENUM_WEEK = [