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);
   };