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

陈鑫涛
2 parents 6f61bf2e e5416ae5
Showing 2 changed files with 108 additions and 17 deletions
src/components/Common/CommonBase.js
src/components/QuickQuote/index.jsx
@@ -451,7 +451,7 @@ export default (ChildComponent) =&gt; {
         }
         const url = `${commonConfig.server_host}business/getSelectLimit/${showConfig.sId}?sModelsId=${this.state.sModelsId}&sName=${formSrcRoute}`;
         /*   参数   */
-        const nameNew = name.includes('slaveUp') ? 'slave' : name;
+        const nameNew = (name.includes('slaveUp') || name.includes('slaveDown')) ? 'slave' : name;
         const conditonValues = this.getSqlCondition(showConfig, nameNew, record);
  
         const body = {
@@ -526,6 +526,8 @@ const QuickQuoteEvent = props =&gt; {
             }, {}),
             dPartsQty: masterData.dProductQty,
             // iPositiveColor: Number(item.sColor),
+            iOppositeColor: item.sBackProcessData?.find(item => item.bPrintParams)?.iPositiveColor || 0,
+            iOppositeSpecialColor: item.sBackProcessData?.find(item => item.bPrintParams)?.iPositiveSpecialColor || 0,
             sPartsName: item.sBoxModel,
             materialsInfo: item.materialsInfo?.filter(x => commonUtils.isNotEmptyObject(x)),
             processInfo:
@@ -1335,23 +1337,25 @@ const BoxComponent = props =&gt; {
   };
  
   const getUpViewPropsByITag = iTag => {
-    const config = slaveConfig.gdsconfigformslave.filter(item => {
-      if (item.sName === "dSumPQty" && selectedNode.sTypeKey !== "huace") {
-        return false;
-      }
-      const { bAdvancedSetting, bFlap, bFold } = slaveRowData;
-      const shouldExcludeItem = (condition, itemNameList) => !condition && itemNameList.includes(item.sName);
-
-      if (
-        shouldExcludeItem(bAdvancedSetting, ["dPortrait", "dHorizontal"]) ||
-        shouldExcludeItem(bFlap, ["dFlap"]) ||
-        shouldExcludeItem(bFold, ["sFold", "dAdhesive", "dFold"])
-      ) {
-        return false;
-      }
+    const config = slaveConfig.gdsconfigformslave
+      .filter(item => !["sPrint", "sColor", "iPrintModePo"].includes(item.sName))
+      .filter(item => {
+        if (item.sName === "dSumPQty" && selectedNode.sTypeKey !== "huace") {
+          return false;
+        }
+        const { bAdvancedSetting, bFlap, bFold } = slaveRowData;
+        const shouldExcludeItem = (condition, itemNameList) => !condition && itemNameList.includes(item.sName);
+
+        if (
+          shouldExcludeItem(bAdvancedSetting, ["dPortrait", "dHorizontal"]) ||
+          shouldExcludeItem(bFlap, ["dFlap"]) ||
+          shouldExcludeItem(bFold, ["sFold", "dAdhesive", "dFold"])
+        ) {
+          return false;
+        }
  
-      return item.iTag === iTag;
-    });
+        return item.iTag === iTag;
+      });
     let boxConfigList = [];
     if (iTag === 20) {
       const showNameKeyList = ["dZBLB", "dSBLB", "dYBLB", "dXBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"];
@@ -1825,6 +1829,7 @@ const BoxComponent = props =&gt; {
                   {PrintingParameters}
                 </Divider>
                 <div className={styles.viewTable1}>
+                  <PrintParamsComponent {...props} />
                   <CommonViewTable {...upViewProps12} />
                 </div>
                 {/* <Divider {...dividerProps} orientationMargin="10px">
@@ -1977,6 +1982,92 @@ const BoxComponent = props =&gt; {
   );
 };
  
+// 印刷参数组件（印刷、颜色、单双面）
+const PrintParamsComponent = props => {
+  const { state, setState, boxModel } = props;
+  const { slaveConfig, slaveData, selectedNode } = state;
+
+  const slaveRowData = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel) || {};
+  const slaveRowDataIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId);
+  const { sBackProcessData = [] } = slaveRowData;
+  const printParams = sBackProcessData.filter(item => item.bPrintParams);
+
+  const printParamsConfig = slaveConfig.gdsconfigformslave
+    .filter(item => ["sPrint", "sColor", "iPrintModePo"].includes(item.sName))
+    .map(item => {
+      return {
+        ...item,
+        iColValue: 8,
+      };
+    });
+
+  const result = [];
+  for (let i = 0; i < printParams.length + 1; i++) {
+    const printParamsItem = printParams[i - 1];
+    const viewRow = { ...(i === 0 ? slaveRowData : printParamsItem), sProductClassifyId: selectedNode.sId };
+
+    const viewProps = {
+      ...props,
+      viewConfigs: printParamsConfig,
+      tableConfig: { ...slaveConfig, gdsconfigformslave: printParamsConfig },
+      iColValueView: 24,
+      viewRow,
+      tableName: `${i === 0 ? "slaveUp" : "slaveDown"}${boxModel}`,
+      onDataChange: (...args) => {
+        if (i === 0) {
+          props.onDataChange(...args);
+          return;
+        }
+
+        const iIndex = sBackProcessData.findIndex(item => item.sId === printParamsItem.sId);
+        sBackProcessData[iIndex] = { ...sBackProcessData[iIndex], ...args[2] };
+        slaveData[slaveRowDataIndex] = { ...slaveRowData, sBackProcessData };
+        setState(pre => {
+          return { ...pre, slaveData };
+        });
+      },
+    };
+
+    result.push(
+      <div className={styles.materialsLine}>
+        <div className={styles.materialsViewTable}>
+          <CommonViewTable {...viewProps} />
+        </div>
+        <div className={styles.materialsBtns} style={{ width: "25%", paddingRight: "calc(25% - 85px)" }}>
+          <Button
+            type="primary"
+            icon={<PlusOutlined />}
+            onClick={() => {
+              sBackProcessData.push({
+                sId: commonUtils.createSid(),
+                bPrintParams: true,
+              });
+              slaveData[slaveRowDataIndex] = { ...slaveRowData, sBackProcessData };
+              setState(pre => {
+                return { ...pre, slaveData };
+              });
+            }}
+          />
+          <Button
+            type="primary"
+            icon={<MinusOutlined />}
+            onClick={() => {
+              const iIndex = sBackProcessData.findIndex(item => item.sId === printParamsItem.sId);
+              sBackProcessData.splice(iIndex, 1);
+              slaveData[slaveRowDataIndex] = { ...slaveRowData, sBackProcessData };
+              setState(pre => {
+                return { ...pre, slaveData };
+              });
+            }}
+            style={i === 0 ? { visibility: "hidden" } : {}}
+          />
+        </div>
+      </div>
+    );
+  }
+  return result;
+};
+
 // 材料组件
 const MaterialsComponent = props => {
   const { state, slaveRowData, boxModel } = props;