Commit 8d6546ab98b73b4a2f67da3fae1a03a9c1101edb

Authored by 陈鑫涛
1 parent b495dfd8

出纸方向

src/components/QuickQuote/index.jsx
... ... @@ -1396,7 +1396,7 @@ const MasterComponent = props => {
1396 1396 });
1397 1397 }
1398 1398 const lengthData = viewConfigs.find(x => x.sName === "dLength");
1399   -
  1399 +
1400 1400 if (selectedNode && selectedNode.sTypeKey && selectedNode.sTypeKey !== "danye") {
1401 1401 if (lengthData) {
1402 1402 lengthData.showName = "高(D)";
... ... @@ -1458,9 +1458,13 @@ const BoxComponent = props => {
1458 1458 sKeyUpFilterName: "",
1459 1459 pageNum: 1,
1460 1460 pageSize: 1000,
  1461 + sSqlCondition: {
  1462 + sProductClassifyId: selectedNode.sId,
  1463 + },
1461 1464 };
1462 1465 const retrunData = await commonServices.postValueService(props.app.token, body, url);
1463 1466 const dropDownData = retrunData.data?.dataset?.rows;
  1467 + console.log("🚀 ~ getSqlDropDownData ~ dropDownData:", dropDownData)
1464 1468 cb(dropDownData);
1465 1469 };
1466 1470  
... ... @@ -1502,7 +1506,12 @@ const BoxComponent = props => {
1502 1506 viewRow: slaveRowData,
1503 1507 tableName: `slaveUp${boxModel}`,
1504 1508 };
1505   -console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 12}),'slaveConfig.gdsconfigformslave');
  1509 + console.log(
  1510 + slaveConfig.gdsconfigformslave.filter(item => {
  1511 + return item.iTag === 12;
  1512 + }),
  1513 + "slaveConfig.gdsconfigformslave"
  1514 + );
1506 1515  
1507 1516 const getUpViewPropsByITag = iTag => {
1508 1517 const config = slaveConfig.gdsconfigformslave
... ... @@ -1546,6 +1555,9 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1
1546 1555 if (!selectedNode.bBleed && item.sName === "dBleed") {
1547 1556 return false;
1548 1557 }
  1558 + if (selectedNode.sTypeKey !== "juantong" && item.sName === "sPaperDirection") {
  1559 + return false;
  1560 + }
1549 1561 return item.iTag === iTag;
1550 1562 });
1551 1563  
... ... @@ -1586,8 +1598,8 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1
1586 1598 }
1587 1599 }
1588 1600 const newConfig = [...boxConfigList, ...config];
1589   - console.log(newConfig,'newConfig');
1590   -
  1601 + console.log(newConfig, "newConfig");
  1602 +
1591 1603 return {
1592 1604 ...props,
1593 1605 viewConfigs: newConfig,
... ... @@ -1602,7 +1614,7 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1
1602 1614 // const upViewProps11 = getUpViewPropsByITag(11);
1603 1615 // 印刷参数表单
1604 1616 let upViewProps12 = getUpViewPropsByITag(12);
1605   - console.log("🚀 ~ upViewProps12:", upViewProps12)
  1617 + console.log("🚀 ~ upViewProps12:", upViewProps12);
1606 1618  
1607 1619 const filterConditions = {
1608 1620 juantong: x =>
... ... @@ -1614,7 +1626,12 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1
1614 1626 x.sName === "dBleed" ||
1615 1627 x.sName === "sPaperDirection",
1616 1628 default: x =>
1617   - x.sName === "sPaperDirection"|| x.sName === "dBleed" || x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth" || x.sName === "dSumPQty",
  1629 + x.sName === "sPaperDirection" ||
  1630 + x.sName === "dBleed" ||
  1631 + x.sName === "sMagnification" ||
  1632 + x.sName === "dPartsLength" ||
  1633 + x.sName === "dPartsWidth" ||
  1634 + x.sName === "dSumPQty",
1618 1635 };
1619 1636 if (selectedNode.sTypeKey === "juantong") {
1620 1637 upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(filterConditions.juantong);
... ... @@ -2146,25 +2163,25 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=>{ return item.iTag === 1
2146 2163 <div className={styles.boxRreview}>
2147 2164 <Image.PreviewGroup>
2148 2165 {svgProps.boxList.length ? (
2149   - <div style={{ width: " 300px", height: "290px",backgroundColor: "#fff",borderRight: "1px solid #ccc" }}>
  2166 + <div style={{ width: " 300px", height: "290px", backgroundColor: "#fff", borderRight: "1px solid #ccc" }}>
2150 2167 <DynamicSVG {...svgProps} />
2151 2168 </div>
2152 2169 ) : (
2153 2170 <div className={styles.noImg}>{noImage}</div>
2154 2171 )}
2155   -
  2172 +
2156 2173 {/* <div className={styles.boxRreviewTitile}>展开图</div> */}
2157 2174 {slaveRowData.sPackPath ? (
2158 2175 // <Image width={300} src={slaveRowData.sPackPath} />
2159 2176  
2160 2177 <div style={{ width: "300px", height: "300px" }}>
2161   - <Carousel dots>
2162   - {imagesData.map((image, index) => (
2163   - <div key={index} className="carousel-item">
2164   - <Image src={image.src} alt={image.alt} />
2165   - </div>
2166   - ))}
2167   - </Carousel>
  2178 + <Carousel dots style={{ width: "300px", height: "300px" }}>
  2179 + {imagesData.map((image, index) => (
  2180 + <div key={index} className="carousel-item">
  2181 + <Image src={image.src} alt={image.alt} style={{ width: "300px", height: "290px" }}/>
  2182 + </div>
  2183 + ))}
  2184 + </Carousel>
2168 2185 </div>
2169 2186 ) : (
2170 2187 <div className={styles.noImg}>{noImage}</div>
... ... @@ -2192,7 +2209,7 @@ console.log(slaveConfig.gdsconfigformslave.filter(item=&gt;{ return item.iTag === 1
2192 2209 {cailiaoyinshuaDiv}
2193 2210 </div>
2194 2211 <div>
2195   - <div style={{width:'600px',height:'300px'}}>
  2212 + <div style={{ width: "600px", height: "300px" }}>
2196 2213 <div className={styles.boxComponent}>
2197 2214 <Typesetting {...boxProps} onSaveStates={handleSaveState} onSaveDPartsLength={onSaveDPartsLength} />
2198 2215 </div>
... ...