Merge branch 'feature-0430-gold' into 'master'

Feature 0430 gold

See merge request !121

src/pages/ServiceGoods/components/FormPriceOrStock.jsx

@@ -233,6 +233,7 @@ const FormPriceOrStock = forwardRef((props, ref) => {
   const editRef = useRef(null);
   const packageRef = useRef(null);
   const customer = useContext(ServiceContext);
+  const customerRef = useRef(customer);
   const [form] = Form.useForm();
   const [specInitValue, setSpecInitValue] = useState(initSpecReced());
 
@@ -321,7 +322,9 @@ const FormPriceOrStock = forwardRef((props, ref) => {
     const isGoodsManage = window.location.pathname.indexOf('popGoodsManage') < 0;
     const dynamicColumns = [
       ...columsData,
-      ...(isGoodsManage ? StaticColumns(customer) : StaticColumnsPop(customer)),
+      ...(isGoodsManage
+        ? StaticColumns(customerRef.current)
+        : StaticColumnsPop(customerRef.current)),
     ];
     setDefaultColumns(dynamicColumns);
   };
@@ -401,6 +404,38 @@ const FormPriceOrStock = forwardRef((props, ref) => {
   const getFormValues = debounce(async () => {
     const cleanValues = await onSpecificationEvent();
     props.onValuesChange({ infoSpecData: cleanValues });
+    setTimeout(async () => {
+      const values = await form.validateFields();
+      // eslint-disable-next-line no-shadow
+      const cleanValues = {
+        firstValues: cleanArray(values.firstSpecValue || []),
+        secondValues: cleanArray(values.secondSpecValue || []),
+        firstSpecId:
+          values.firstSpecValue && values.firstSpecValue.length ? values.firstSpecId : null,
+        secondSpecId:
+          values.secondSpecValue && values.secondSpecValue.length ? values.secondSpecId : null,
+      };
+
+      const { inIdList: fisrtInIdList, noIdList: fisrtNoIdList } = filterSkuNotIdList(
+        cleanValues.firstValues,
+      );
+      const { inIdList: secndInIdList, noIdList: secndNoIdList } = filterSkuNotIdList(
+        cleanValues.secondValues,
+      );
+      const createSkuList = createProductData(
+        {
+          firstSpecId: cleanValues.firstSpecId,
+          secondSpecId: cleanValues.secondSpecId,
+          fisrtInIdList,
+          secndInIdList,
+          fisrtNoIdList,
+          secndNoIdList,
+        },
+        customer.isEdit,
+        skuList,
+      );
+      props.onValuesChange({ skuList: fliterSkuListSortData([...createSkuList]) });
+    }, 0);
   }, 400);
 
   const packageValueChange = () => {
@@ -444,6 +479,16 @@ const FormPriceOrStock = forwardRef((props, ref) => {
     },
   }));
 
+  useEffect(() => {
+    customerRef.current = customer;
+  }, [customer]);
+
+  useEffect(() => {
+    (async () => {
+      await onSpecificationEvent();
+    })();
+  }, [customer.isGold]);
+
   useEffect(() => {
     if (customer.isEdit || customer.isUseCache) {
       if (!editData) {

src/pages/ServiceGoods/index.jsx

@@ -31,6 +31,7 @@ import { ServiceContext } from './context';
 import { GOOD_MANAGE } from '@/../config/permission.config';
 import styles from './common.less';
 import { GoldCategory } from '@/config/app.config';
+import { debounce } from '@/utils/utils';
 
 /**
  * 服务商品改造-商品模块
@@ -377,7 +378,7 @@ const ServiceGoods = options => {
       }
       setPageLoading(false);
     })();
-  }, [SourceData, categoryIds]);
+  }, [SourceData]);
 
   useEffect(() => {
     if (options.visible) {
@@ -443,10 +444,10 @@ const ServiceGoods = options => {
   const onCategoryChange = e => {
     setCategoryIds(e);
     let txt = '';
-    if (categoryIds.includes(GoldCategory)) {
-      txt = '千克';
-    } else if (e.includes(GoldCategory)) {
+    if (e.includes(GoldCategory)) {
       txt = '克';
+    } else {
+      txt = '千克';
     }
     if (txt) {
       message.warning(`商品品类已切换，规格重量单位已自动切换为${txt}`, 6);
@@ -454,7 +455,7 @@ const ServiceGoods = options => {
   };
 
   // 保存草稿
-  const onSaveDraft = async () => {
+  const onSaveDraft = debounce(async () => {
     const info = localStorage.get(localAutoSaveKey);
     if (
       !info ||
@@ -506,7 +507,7 @@ const ServiceGoods = options => {
         handleCancel(true);
       },
     });
-  };
+  }, 400);
   const isPopGoods = location.pathname.indexOf('popGoodsManage') > 0; // pop商品管理-商品库(应付审计用的, 驳回和修改状态下不能编辑)
   const providerValue = {
     pageId,