是否勒口

陈鑫涛
1 parent 498f739c
Showing 4 changed files with 145 additions and 83 deletions
src/components/QuickQuote/index.jsx
src/mobile/quotation/detailNew.jsx
src/routes/mobile/IndexMobile.css
src/routes/mobile/IndexMobile.less
@@ -1339,9 +1339,14 @@ 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)) {
+      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;
       }
  
@@ -1367,9 +1372,15 @@ const BoxComponent = props =&gt; {
   // const upViewProps11 = getUpViewPropsByITag(11);
   // 印刷参数表单
   let upViewProps12 = getUpViewPropsByITag(12);
-if (!(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {
-  upViewProps12.viewConfigs = upViewProps12.viewConfigs.slice(0, 6);
-}
+  if (!(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {
+    upViewProps12.viewConfigs = upViewProps12.viewConfigs.slice(0, 6);
+  }
+  //
+  upViewProps12.viewConfigs = upViewProps12.viewConfigs.map(item => {
+    if (item.sName === "bFlap") {
+    }
+    return item;
+  });
  
   // useEffect(() => {
  
@@ -1061,7 +1061,18 @@ const QuotationDetail = props =&gt; {
   if (!masterConfig) return "";
   const ableConfigs = masterConfig.gdsconfigformslave.filter(item => item.sName && item.bVisible);
   // 处理长宽样式
-  const viewConfigs = selectedNode?.bBox ? ableConfigs : ableConfigs.filter(x => x.sName !== "dHeight");
+  const viewConfigs = selectedNode?.bBox && selectedNode.sTypeKey !== "kapai" ? ableConfigs : ableConfigs.filter(x => x.sName !== "dHeight");
+  if (selectedNode?.bBox && selectedNode.sTypeKey !== "kapai") {
+    viewConfigs.forEach(item => {
+      if (item.sName === "dLength" || item.sName === "dWidth") {
+        item.iColValue = 4;
+      }
+    });
+  } else {
+    viewConfigs.forEach(item => {
+      item.iColValue = viewConfigs[0].iColValue;
+    });
+  }
   const viewProps = {
     ...props,
     viewConfigs: viewConfigs,
@@ -1514,7 +1525,12 @@ const BoxComponent = props =&gt; {
   };
  
   // 印刷参数表单
-  const upViewProps12 = getUpViewPropsByITag(12);
+  let upViewProps12 = getUpViewPropsByITag(12);
+  if (!(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {
+    if (upViewProps12 && upViewProps12.viewConfigs && upViewProps12.viewConfigs.length) {
+      upViewProps12.viewConfigs = upViewProps12.viewConfigs.slice(0, 6);
+    }
+  }
   // 拼板信息表单
   const upViewProps20 = getUpViewPropsByITag(20);
   const { bBox } = selectedNode;
@@ -1579,22 +1595,22 @@ const BoxComponent = props =&gt; {
   };
  
   // 获取sType为3的
-  const { productProcessInfo = [] } = masterData;
-  const finishedViewProps = {
-    ...props,
-    viewConfigs: finishedConfigs
-      .filter(item => item.sPartsName === boxModel || !item.sPartsName)
-      .map((item, i) => ({
-        ...item,
-        isSelect: switchStates ? switchStates[item.sName] : false,
-        // sName: "sParams" + i,
-        sProductClassifyId: item.sId,
-      })),
-    tableConfig: { ...slaveConfig, gdsconfigformslave: finishedConfigs },
-    iColValueView: 24,
-    viewRow: masterData,
-    tableName: "finished",
-  };
+  // const { productProcessInfo = [] } = masterData;
+  // const finishedViewProps = {
+  //   ...props,
+  //   viewConfigs: finishedConfigs
+  //     .filter(item => item.sPartsName === boxModel || !item.sPartsName)
+  //     .map((item, i) => ({
+  //       ...item,
+  //       isSelect: switchStates ? switchStates[item.sName] : false,
+  //       // sName: "sParams" + i,
+  //       sProductClassifyId: item.sId,
+  //     })),
+  //   tableConfig: { ...slaveConfig, gdsconfigformslave: finishedConfigs },
+  //   iColValueView: 24,
+  //   viewRow: masterData,
+  //   tableName: "finished",
+  // };
   const calcMethodData = commonUtils.convertStrToObj(slaveRowData?.sColumnNameConfigExclusion, []);
   // const radioValue = null;
   const { radioValue = calcMethodData[0]?.sCode } = slaveRowData;
@@ -1809,18 +1825,28 @@ const BoxComponent = props =&gt; {
       backendConfig: { sParentFieldsName: showConfig.sName, sBoxModel: boxModel },
     }));
   };
-
+  //  如果是卡牌那么默认使用矩形
+  // const currentBoxModel = "slaveUp" + props.boxModel;
+  //                     props.onDataChange(currentBoxModel, "sName", { sName: item.sName }, item.sId, boxsList);
+  if (selectedNode.sTypeKey === "kapai") {
+    console.log(5555555);
+    
+  }
   return (
     <div>
-      {selectedNode.box ? (
+      {selectedNode.bBox ? (
         <div>
-          <Selector
-            columns={4}
-            options={boxTypeList}
-            style={{ "--padding": "0.8rem 0" }}
-            value={selected ? [selected] : []}
-            onChange={v => handleChange(v)}
-          />
+          {true ? (
+            <Selector
+              columns={4}
+              options={boxTypeList}
+              style={{ "--padding": "0.8rem 0" }}
+              value={selected ? [selected] : []}
+              onChange={v => handleChange(v)}
+            />
+          ) : (
+            ""
+          )}
           <div className={styles.line}></div>
           <div>
             <Grid columns={4} gap={8}>
@@ -1866,57 +1892,65 @@ const BoxComponent = props =&gt; {
         </Grid>
       </div>
       <div>
-        <div className={styles.boxTitle}>
-          拼版信息
-          <EditFill color="#BFBFBF" style={{ marginLeft: "1rem" }} />
-        </div>
+        {selectedNode.bBox ? (
+          <div>
+            <div>
+              <div className={styles.boxTitle}>
+                拼版信息
+                <EditFill color="#BFBFBF" style={{ marginLeft: "1rem" }} />
+              </div>
  
-        <Grid columns={3} gap={8}>
-          {upViewProps20
-            ? upViewProps20.viewConfigs.map(x => (
-                <Grid.Item>
-                  <div className={styles.customer} key={x.id || x.showName}>
-                    <div>{x.showName}</div>
-                    <SelectInput
-                      {...upViewProps20}
-                      itemDetail={x}
-                      bCanInput={() => {
-                        // if (x.showDropDown) return false;
-                        return true;
-                      }}
-                    />
-                  </div>
-                </Grid.Item>
-              ))
-            : ""}
-        </Grid>
-      </div>
-      <div className={styles.svgBox1}>
-        <div style={{ width: "49%", height: "49%", position: "relative" }}>
-          <Typesetting {...boxProps} onSaveStates={handleSaveState} onSaveDPartsLength={onSaveDPartsLength} />
-        </div>
-        <div style={{ width: "47%", height: "47%", position: "relative" }}>
-          <ShowImgM {...showImgMProps} />
-        </div>
+              <Grid columns={3} gap={8}>
+                {upViewProps20
+                  ? upViewProps20.viewConfigs.map(x => (
+                      <Grid.Item>
+                        <div className={styles.customer} key={x.id || x.showName}>
+                          <div>{x.showName}</div>
+                          <SelectInput
+                            {...upViewProps20}
+                            itemDetail={x}
+                            bCanInput={() => {
+                              // if (x.showDropDown) return false;
+                              return true;
+                            }}
+                          />
+                        </div>
+                      </Grid.Item>
+                    ))
+                  : ""}
+              </Grid>
+            </div>
+            <div className={styles.svgBox1}>
+              <div style={{ width: "49%", height: "49%", position: "relative" }}>
+                <Typesetting {...boxProps} onSaveStates={handleSaveState} onSaveDPartsLength={onSaveDPartsLength} />
+              </div>
+              <div style={{ width: "47%", height: "47%", position: "relative" }}>
+                <ShowImgM {...showImgMProps} />
+              </div>
+            </div>
+            <Radio.Group
+              value={radioValue}
+              onChange={e => {
+                const iIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId);
+                slaveData[iIndex].radioValue = e;
+                props.setState(pre => ({
+                  ...pre,
+                  slaveData: slaveData,
+                }));
+              }}
+            >
+              {calcMethod.map(item => (
+                <Radio value={item.value} style={{ marginRight: "0.5rem" }}>
+                  {" "}
+                  {item.label}
+                </Radio>
+              ))}
+            </Radio.Group>
+          </div>
+        ) : (
+          ""
+        )}
       </div>
-      <Radio.Group
-        value={radioValue}
-        onChange={e => {
-          const iIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId);
-          slaveData[iIndex].radioValue = e;
-          props.setState(pre => ({
-            ...pre,
-            slaveData: slaveData,
-          }));
-        }}
-      >
-        {calcMethod.map(item => (
-          <Radio value={item.value} style={{ marginRight: "0.5rem" }}>
-            {" "}
-            {item.label}
-          </Radio>
-        ))}
-      </Radio.Group>
       <div>
         <MaterialsComponent {...props} slaveRowData={slaveRowData} boxModel={boxModel} />
       </div>
@@ -2499,6 +2533,7 @@ const BackendParamsExtraComponent = props =&gt; {
   };
  
   const onCostomClick = () => {};
+  if (!viewConfigs.length) return;
   return (
     <div>
       <div className={styles.boxTitle}>
+:global #tab-bar {
+  background-color: #f0f0f0;
+}
+:global #tab-bar .demoName {
+  font-size: 16px;
+  font-weight: bold;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+}
+.demoContainer {
+  height: 100%;
+}
+.newContainer {
+  height: calc(100vh - 84px);
+}
@@ -19,7 +19,7 @@
   //flex-direction: column;
 }
 .demoContainer{
-  height: calc(100vh - 15px);
+  height: 100%;
 }
  
 .newContainer{