feat: 修改自动补足问题

src/pages/ServiceGoods/components/AddRepertoryModal.jsx

@@ -14,7 +14,7 @@ const AddRepertoryModal = (props, ref) => {
     maxStock: 0,
     autoStock: false,
   });
-
+  const [isRequired, setIsRequired] = useState(true);
   const { modifiedInventory, intactData, repertoryModel } = props;
   const { type, idx, item } = repertoryModel;
   useImperativeHandle(ref, () => ({
@@ -28,6 +28,7 @@ const AddRepertoryModal = (props, ref) => {
     form.setFieldsValue({
       autoStock: e ? 1 : 0,
     });
+    setIsRequired(!e)
   };
   // 勾选库存设置
   const onChangeSetRepertory = e => {
@@ -135,7 +136,7 @@ const AddRepertoryModal = (props, ref) => {
             <Form.Item
               name="maxStock"
               label="最大库存"
-              rules={[{ required: true, message: '请填写最大库存' }]}
+              rules={[{ required: isRequired, message: '请填写最大库存' }]}
             >
               <InputNumber
                 min={0}

src/pages/ServiceGoods/components/AddSellTimeModal.jsx

@@ -39,7 +39,6 @@ const AddSellTimeModal = (props, ref) => {
   };
   useEffect(() => {
     console.log('open', open);
-    console.log('sss/', formProject);
     // formProject.setFieldsValue({ saleTimes: [['12:00', '13:00']] })
   }, [open]);
   const onChange = () => {};

src/pages/ServiceGoods/components/FormTakeaway.jsx

@@ -79,6 +79,8 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
   const [tempSpecs, setTempSpecs] = useState([]);
   const [weightUnits, setWeightUnits] = useState([]);
   const [peopleUnits, setPeopleUnits] = useState([]);
+  const [isRequired, setIsRequired] = useState(true);
+
 
   // 自定义加入菜单
   const showModal = () => {
@@ -123,8 +125,9 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
       categoryId,
     } = takeawayItem;
     let unit = takeawayItem.unit;
+
     unit = (unit && (Array.isArray(unit) && unit?.length && unit?.slice(1).toString())) || unit;
-    console.log(unit, 'unit=====');
+    console.log(takeawayItem, 'takeawayItem');
     const singularSpecList = [{ specGroupName: '份量', generateSku: 1, specs: [] }]; // 单规格
     const multiSpecList = [{ specGroupName: '份量', generateSku: 1, specs: [] }]; // 多规格
     // const multiSpu = customer.isEdit ? skuList:[]; // 多库存spu、
@@ -188,6 +191,11 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
               if (specsItem && !specsItem.generateSku) {
                 specsItem.generateSku = 1;
               }
+              if(specsItem.specGroupName){
+                specsItem?.specs?.forEach(itm=>{
+                  itm.specGroupName = specsItem.specGroupName
+                })
+              }
               multiSpecList.push(specsItem);
             });
           }
@@ -219,9 +227,10 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
             obj.unique = '';
             multiSpecList.forEach((itm, idx) => {
               if (item[idx] && !item[idx]?.specGroupName) {
-                item[idx].specGroupName = '';
+                if(multiSpecList[idx].specGroupName){
                   item[idx].specGroupName = multiSpecList[idx].specGroupName;
                 }
+              }
             });
             obj.specs = [...item];
             return obj;
@@ -232,7 +241,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
           item.salePrice = 0;
           item.unique = item?.specs
             .map(itm => {
-              if (itm.unit) {
+              if (itm?.unit) {
                 itm.unit =
                   itm?.unit &&
                   (Array.isArray(itm?.unit) ? itm?.unit.slice(itm?.unit.length - 1)[0] : itm?.unit);
@@ -250,7 +259,6 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
         console.log('multiSpu', multiSpu);
         if (tempMultiSpu.length) {
           multiSpu.forEach((item, index) => {
-            console.log('item===', item);
             tempMultiSpu.forEach((itm, idx) => {
               if (item.unique === itm.unique) {
                 item.serviceItem = objectComparison(item.serviceItem, itm);
@@ -300,6 +308,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
   const getFormValues = debounce(() => {
     const values = form.getFieldsValue();
     console.log(values, 'values===');
+    // debugger
     props.onValuesChange({ takeawayItem: JSON.parse(JSON.stringify(values)) });
     const takeawayData = customer.isEdit
       ? { takeawayItem: Object.assign({}, editData, values) }
@@ -333,7 +342,6 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
     tempMultiSpu.push(...temp);
     setTempMultiSpu(tempMultiSpu);
     setMultiSpu(multiSpu);
-    console.log('multiSpu===333', multiSpu, tempMultiSpu);
     getFormValues();
     return false;
   };
@@ -432,6 +440,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
     form.setFieldsValue({
       autoStock: e ? 1 : 0,
     });
+    setIsRequired(!e)
   };
   // 显示加入库存弹框
   const showAddRepertoryModal = (type, idx, item) => {
@@ -444,7 +453,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
     let lastName = '';
     const tempName = `${editData?.name || ''}`;
     // const tempSpecName = `${item?.specs[0]?.specName || ''}`;
-    const tempQuantity = `${+item.specs[0]?.quantity > 0 ? '(' : ''} ${item.specs[0]?.quantity ||
+    const tempQuantity = `(${item.specs[0]?.quantity ||
       ''}`;
     const tempUnit = `${item.specs[0]?.unit || ''} ${item.specs[0]?.unit ? ')' : ''}`;
     // const tempSecondSpecName = `${item.specs[1]?.specName || ''}`;
@@ -863,7 +872,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
             <Form.Item
               name="maxStock"
               label="最大库存"
-              rules={[{ required: true, message: '请填写最大库存' }]}
+              rules={[{ required: isRequired, message: '请填写最大库存' }]}
             >
               <InputNumber
                 max={999999999}
@@ -1047,10 +1056,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
                     name="specs"
                     initialValue={
                       [
-                        // {
-                        //   specGroupName: '',
-                        //   specs: [],
-                        // },
+                      
                       ]
                     }
                   >
@@ -1060,7 +1066,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
                           <Form.Item key={specsField.key} className={styles.conBg}>
                             <Form.Item
                               {...specsField}
-                              validateTrigger={['onChange', 'onBlur']}
+                              // validateTrigger={['onChange', 'onBlur']}
                               name={[specsField.name, 'specGroupName']}
                               rules={[
                                 {