Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi

Min
2 parents 29d550e0 25cac788
Showing 9 changed files with 138 additions and 23 deletions
src/components/Common/CommonCostomTabBill.js
src/components/Common/Typesetting/typesetting.js
src/mobile/components/SelectInput.jsx
src/mobile/components/selectInput.css
src/mobile/components/selectInput.less
src/mobile/quotation/detailNew.jsx
src/mobile/quotation/master.jsx
src/mobile/quotation/quotationDetail.css
src/mobile/quotation/quotationDetail.less
@@ -2468,7 +2468,6 @@ class CommonNewBill extends Component {
         const proName = proObj.sproName;
         let sRowData = slaveRow;
         //取第一条BOM的id
-        console.log('addState1addState1', name, tableData);
         sRowData = { ...sRowData, sBomId: tableData[0].sBomId };
         const value = {
           sProName: proName,
@@ -607,6 +607,7 @@ const Typesetting = props =&gt; {
   const isShow = slaveRowData && slaveRowData.dMachineLength && slaveRowData.dMaxWidth && slaveRowData.dMaxLength && isMax && innerDivs.length;
   if (isCustomized && !isShow) {
+    if (isMobile) return;
     message.error("排版尺寸大于上机尺寸，请确认参数！");
   }
   const onClick = () => {
 import React, { useState, useRef, useEffect, useCallback } from "react";
-import { Input, Popup, Button, Toast, PickerView, SearchBar,Checkbox } from "antd-mobile";
+import { Input, Popup, Button, Toast, PickerView, SearchBar, Checkbox } from "antd-mobile";
 import { DownOutline } from "antd-mobile-icons";
 import commonConfig from "@/utils/config";
 import * as commonServices from "@/services/services";
@@ -148,7 +148,12 @@ const SelectInput = props =&gt; {
     <div>
       <div className={styles.inputBox}>
         {propsType === "b" ? (
-         <Checkbox style={{height:'3.125rem'}}/>
+          <Checkbox
+            style={{ height: "3.125rem" }}
+            onChange={val => {
+              props.onDataChange(tableName, itemDetail.sName, { [itemDetail.sName]: val }, null, coplyColumns);
+            }}
+          />
         ) : (
           <div>
             {" "}
 .inputBox {
   position: relative;
+  height: 100%;
 }
 .inputBox .icons {
   position: absolute;
 .inputBox {
   position: relative;
+  height: 100%;
+  // margin: 0.5rem 0;
   .icons {
     position: absolute;
     top: 50%;
@@ -17,7 +17,6 @@ import { cloneDeep } from &quot;lodash&quot;;
 import moment from "moment";
 const QuickQuoteEvent = props => {
   const { location, selectedNode, sModelsId } = props;
-  const [isDraftSaved, setIsDraftSaved] = useState(false);
   // const selectedNode = JSON.parse(location.state).quotationData;
   const addState = {};
@@ -357,7 +356,6 @@ const QuickQuoteEvent = props =&gt; {
       });
       return;
     }
-    const type = isDraftSaved ? "add" : "update";
     props.onSaveState(
       {
         ...addState.onGetAllDelData(),
@@ -878,6 +876,7 @@ const QuickQuoteEvent = props =&gt; {
           manyqtysData: state.manyData,
         },
       }));
+     
       const result = await props.handleCalculation(
         false,
         { ...masterProps, ...newState, manyqtysConfig: state.manyConfig, manyqtysData: state.manyData },
@@ -1467,6 +1466,10 @@ const BoxComponent = props =&gt; {
       if (item.sName === "dSumPQty" && selectedNode.sTypeKey !== "huace") {
         return false;
       }
+      const { bAdvancedSetting } = slaveRowData;
+      if ((item.sName === "dPortrait" && !bAdvancedSetting) || (item.sName === "dHorizontal" && !bAdvancedSetting)) {
+        return false;
+      }
       return item.iTag === iTag;
     });
@@ -1515,20 +1518,26 @@ const BoxComponent = props =&gt; {
   //   return pre;
   // }, []);
   useEffect(() => {
-    setDownAbleConfigsNew(downAbleConfigs);
-  }, [downAbleConfigs]);
+    // setDownAbleConfigsNew(downAbleConfigs);
+    const data = downAbleConfigs.reduce((pre, cur) => {
+      const childConfigs = downAbleExtraConfigs.filter(item => item.sParentName === cur.showName);
+      pre.push(cur, ...childConfigs);
+      return pre;
+    }, []);
+    setDownAbleConfigsNew(data);
+  }, [downAbleConfigs, downAbleExtraConfigs]);
   // 初始化状态，存储每个 Switch 的状态
   const [switchStates, setSwitchStates] = useState(null);
   useEffect(() => {
     if (!sBackProcessData) return;
-    const newSwitchStates = downAbleConfigsNew
-      .filter(item => item.sPartsName === boxModel || !item.sPartsName)
-      .reduce((acc, item, index) => {
-        acc[item.sName] = sBackProcessData ? sBackProcessData[index][item.sName] !== "" : false;
-        return acc;
-      }, {});
-
-    setSwitchStates(newSwitchStates);
+    // const newSwitchStates = downAbleConfigsNew
+    //   .filter(item => item.sPartsName === boxModel || !item.sPartsName)
+    //   .reduce((acc, item, index) => {
+    //     acc[item.sName] = sBackProcessData && sBackProcessData[index]? sBackProcessData[index][item.sName] !== "" : false;
+    //     return acc;
+    //   }, {});
+
+    // setSwitchStates(newSwitchStates);
   }, [downAbleConfigsNew, boxModel]); // 依赖数组
   // 处理 Switch 变化的函数
@@ -1544,7 +1553,7 @@ const BoxComponent = props =&gt; {
     .map((item, i) => ({
       ...item,
       isSelect: switchStates ? switchStates[item.sName] : false,
-      sName: "sParams" + i,
+      // sName: "sParams" + i,
       sProductClassifyId: item.sId,
     }));
   const downViewProps = {
@@ -1555,6 +1564,7 @@ const BoxComponent = props =&gt; {
     viewRow: slaveRowData,
     tableName: `slaveDown${boxModel}`,
   };
+
   // 获取sType为3的
   const { productProcessInfo = [] } = masterData;
   const finishedViewProps = {
@@ -1891,7 +1901,75 @@ const BoxComponent = props =&gt; {
                   <Switch checked={switchStates ? switchStates[x.sName] : ""} onChange={val => handleSwitchChange(x, val)} />
                   <div className={styles.customer} style={{ marginTop: "0", marginLeft: "2rem", width: "40%" }}>
                     {switchStates && switchStates[x.sName] ? (
-                      <SelectInput {...downViewProps} itemDetail={{ ...x, sVisColumnName: "sProcessName", sDropDownType: "sql" }} downIndex={i} />
+                      // 这里需要数组遍历 多个工序
+                      <div className={styles.processFlex}>
+                        <SelectInput {...downViewProps} itemDetail={{ ...x, sVisColumnName: "sProcessName", sDropDownType: "sql" }} downIndex={i} />
+                        <div className={styles.processBtn}>
+                          {!x.sParentName ? (
+                            <Button
+                              color="primary"
+                              fill="solid"
+                              size="small"
+                              style={{
+                                width: "1.93rem",
+                                height: "1.93rem",
+                                display: "flex",
+                                justifyContent: "center",
+                                alignItems: "center",
+                                textAlign: "center",
+                              }}
+                              onClick={() => {
+                                props.setState(pre => {
+                                  const newSId = commonUtils.createSid();
+                                  const newConfig = {
+                                    ...x,
+                                    sId: newSId,
+                                    sParentName: x.showName,
+                                    sName: `${x.sName}_${newSId}`,
+                                  };
+                                  return {
+                                    ...pre,
+                                    downAbleExtraConfigs: [...downAbleExtraConfigs, newConfig],
+                                  };
+                                });
+                              }}
+                            >
+                              <AddOutline />
+                            </Button>
+                          ) : (
+                            <Button
+                              color="danger"
+                              fill="solid"
+                              size="small"
+                              style={{
+                                width: "1.93rem",
+                                height: "1.93rem",
+                                display: "flex",
+                                justifyContent: "center",
+                                alignItems: "center",
+                                textAlign: "center",
+                              }}
+                              onClick={() => {
+                                props.setState(pre => {
+                                  const iIndex = downAbleExtraConfigs.findIndex(item => item.sId === x.sId);
+
+                                  const slaveRowIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId);
+                                  const { sBackProcessData = [] } = slaveData[slaveRowIndex];
+                                  const iIndex1 = sBackProcessData.findIndex(item => item[x.sName]);
+                                  slaveData[slaveRowIndex].sBackProcessData?.splice(iIndex1, 1);
+                                  return {
+                                    ...pre,
+                                    downAbleExtraConfigs: [...downAbleExtraConfigs.slice(0, iIndex), ...downAbleExtraConfigs.slice(iIndex + 1)],
+                                    slaveData,
+                                  };
+                                });
+                              }}
+                            >
+                              <MinusOutline />
+                            </Button>
+                          )}
+                        </div>
+                      </div>
                     ) : (
                       ""
                     )}
@@ -2200,7 +2278,7 @@ const ManyComponent = props =&gt; {
     };
     props.onSaveState(
       {
-        masterData: { ...props.masterData, handleType: props.masterData.handleType || "update" },
+        masterData: { ...props.masterData, handleType: props.isDraftSaved ? "add" : "update" },
         ...addState,
       },
       () => {
@@ -15,6 +15,7 @@ const masterEvent = props =&gt; {
   const { token } = app;
   const [state, setState] = useState(null);
   const [isInitialized, setIsInitialized] = useState(false);
+  const [isDraftSaved, setIsDraftSaved] = useState(false);
   const getSqlDropDownData = async (formId, name, showConfig, record, sKeyUpFilterName, pageNum) => {
     const url = `${commonConfig.server_host}business/getSelectLimit/${showConfig.sId}?sModelsId=${sModelsId}`;
@@ -186,6 +187,8 @@ const masterEvent = props =&gt; {
     onSaveState: handleSaveState,
     onSaveData: handleSaveData,
     onSubmit: handleSave,
+    isDraftSaved,
+    setIsDraftSaved,
     // onButtonClick: handleButtonClick,
     ...state,
   };
@@ -360,7 +363,6 @@ const handleCalculation = async (bSave, nextProps, isWait, props) =&gt; {
     manyDataCache = [],
     dQuickQuoteProductQty,
   } = nextProps;
-    console.log("🚀 ~ handleCalculation ~ dQuickQuoteProductQty:", dQuickQuoteProductQty)
   let { slaveData, controlData, materialsData, processData, masterData, manyqtysData, packData } = nextProps;
   const sMakePerson = masterData.sMakePerson;
   const data = [];
@@ -408,15 +410,25 @@ const handleCalculation = async (bSave, nextProps, isWait, props) =&gt; {
       masterData.sFormId = nextProps.masterData.sFormId;
       masterData.sBillNo = nextProps.masterData.sBillNo;
     }
-    masterData.handleType = nextProps.handleType && nextProps.handleType === "update" ? "update" : "add";
+    // masterData.handleType = nextProps.handleType && nextProps.handleType === "update" ? "update" : "add";
     if (masterData.handleType === "update" && !commonUtils.isEmpty(sMakePerson)) {
       masterData.sMakePerson = sMakePerson;
+      if (masterData.sBillNo === "") {
+        const slaveUrl = `${commonConfig.server_host}business/getBusinessDataByFormcustomId/${"172129113112117410664746760"}?sModelsId=${
+          props.sModelsId
+        }`;
+        const value = { sId: masterData.sId };
+        const slaveReturnData = (await commonServices.postValueService(props.app.token, value, slaveUrl)).data;
+        const data = slaveReturnData.dataset.rows[0].dataSet[0];
+        masterData = { ...data };
+      }
     }
     slaveData = valueReturn[`${slaveConfig.sTbName.toLowerCase()}_tmp`].map(item => {
       item.handleType = dQuickQuoteProductQty ? "update" : item.handleType;
-        item.sId = commonUtils.createSid();
+      item.sId = commonUtils.createSid();
       return item;
     });
+
     controlData = valueReturn[`${controlConfig.sTbName.toLowerCase()}_tmp`].map(item => {
       item.handleType = dQuickQuoteProductQty ? "update" : item.handleType;
       item.sId = commonUtils.createSid();
@@ -539,7 +551,7 @@ const handleCalculation = async (bSave, nextProps, isWait, props) =&gt; {
         ...addState,
       });
     } else {
-      masterData.handleType = "update";
+      // masterData.handleType = "update";
       if (isWait) {
         return {
           slaveData,
@@ -798,7 +810,8 @@ const handleSaveData = async (params, props) =&gt; {
     Toast.show({
       content: "保存成功",
     });
-    masterData.handleType = "update";
+    // masterData.handleType = "update";
+    props.setIsDraftSaved(true);
     props.onSaveState({
       enabled: false,
       currentId: masterData.sId,
@@ -159,3 +159,11 @@
   right: 5%;
   bottom: 10%;
 }
+.processFlex {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.processFlex .processBtn {
+  margin-left: 1rem;
+}
@@ -167,4 +167,12 @@
     right: 5%;
     bottom: 10%;
   }
+}
+.processFlex{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .processBtn{
+    margin-left: 1rem;
+  }
 }
 \ No newline at end of file