Commit e5cc7ab6c7a694b01c5b4f9cf38c0e4edd48f009

Authored by 陈鑫涛
1 parent f7d9d091

卷筒展示特殊值

src/components/Common/Typesetting/typesetting.js
@@ -923,15 +923,30 @@ const Typesetting = props => { @@ -923,15 +923,30 @@ const Typesetting = props => {
923 </div> 923 </div>
924 </div> 924 </div>
925 ) : ( 925 ) : (
926 - <div style={{  
927 - width:'100%',  
928 - textAlign:'center',  
929 - height:'300px',  
930 - lineHeight:'300px',  
931 - fontSize:'20px',  
932 - fontWeight:'700',  
933 - color:'#B9B9B9'  
934 - }}>排版尺寸大于上机尺寸,请确认参数!</div> 926 + <div
  927 + style={{
  928 + display: "flex",
  929 + height: `${isMobile ? "15rem" : "300px"}`,
  930 + justifyContent: "center",
  931 + alignItems: "center", // 垂直居中
  932 + width: "100%",
  933 + fontSize: `${isMobile ? "1rem" : "20px"}`,
  934 + fontWeight: "700",
  935 + color: "#B9B9B9",
  936 + wordWrap: "break-word",
  937 + whiteSpace: "normal",
  938 + overflow: "hidden",
  939 + textAlign:'center'
  940 + }}
  941 + >
  942 + <span
  943 + style={{
  944 + wordBreak: "break-all", // 确保长单词换行
  945 + }}
  946 + >
  947 + 排版尺寸大于上机尺寸,请确认参数!
  948 + </span>
  949 + </div>
935 )} 950 )}
936 951
937 <Modal 952 <Modal
src/components/QuickQuote/index.jsx
@@ -1391,9 +1391,10 @@ const BoxComponent = props =&gt; { @@ -1391,9 +1391,10 @@ const BoxComponent = props =&gt; {
1391 ) { 1391 ) {
1392 return false; 1392 return false;
1393 } 1393 }
1394 - if (selectedNode.sTypeKey !== 'kapai' && item.sName === 'sMagnification') {  
1395 - return false 1394 + if (selectedNode.sTypeKey !== "kapai" && item.sName === "sMagnification") {
  1395 + return false;
1396 } 1396 }
  1397 +
1397 return item.iTag === iTag; 1398 return item.iTag === iTag;
1398 }); 1399 });
1399 let boxConfigList = []; 1400 let boxConfigList = [];
@@ -1417,15 +1418,23 @@ const BoxComponent = props =&gt; { @@ -1417,15 +1418,23 @@ const BoxComponent = props =&gt; {
1417 // 印刷参数表单 1418 // 印刷参数表单
1418 let upViewProps12 = getUpViewPropsByITag(12); 1419 let upViewProps12 = getUpViewPropsByITag(12);
1419 1420
1420 - if (!(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {  
1421 - upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(  
1422 - x => x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth"  
1423 - );  
1424 - }  
1425 -  
1426 - // useEffect(() => { 1421 + const filterConditions = {
  1422 + juantong: x =>
  1423 + x.sName === "sMagnification" ||
  1424 + x.sName === "dPartsLength" ||
  1425 + x.sName === "dPartsWidth" ||
  1426 + x.sName === "dRowGap" ||
  1427 + x.sName === "dColGap" ||
  1428 + x.sName === "sPaperDirection",
  1429 + default: x => x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth",
  1430 + };
1427 1431
1428 - // }, [selectedNode.sTypeKey, slaveRowData.sBoxModel]); 1432 +
  1433 + if (selectedNode.sTypeKey === "juantong") {
  1434 + upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(filterConditions.juantong);
  1435 + } else if (!(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {
  1436 + upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(filterConditions.default);
  1437 + }
1429 // 拼板信息表单 1438 // 拼板信息表单
1430 const upViewProps20 = getUpViewPropsByITag(20); 1439 const upViewProps20 = getUpViewPropsByITag(20);
1431 1440
src/mobile/components/SelectInput.jsx
@@ -31,10 +31,12 @@ const SelectInput = props =&gt; { @@ -31,10 +31,12 @@ const SelectInput = props =&gt; {
31 if (!viewRow.sBackProcessData) return; 31 if (!viewRow.sBackProcessData) return;
32 // const data = viewRow.sBackProcessData[downIndex][itemDetail.sName]; 32 // const data = viewRow.sBackProcessData[downIndex][itemDetail.sName];
33 // setValue(data); 33 // setValue(data);
34 - } else if (tableName.includes('sBackendParams')) {  
35 - const data = props.sBackProcessData.find(item => item[props.sParentFieldsName]).sBackendParams.find(item => item.sParam === itemDetail.sParam)  
36 - const values = data.label ? data.label : data.value  
37 - setValue(values || '') 34 + } else if (tableName.includes("sBackendParams")) {
  35 + const data = props.sBackProcessData.find(item => item[props.sParentFieldsName]).sBackendParams.find(item => item.sParam === itemDetail.sParam);
  36 + if (data) {
  37 + const values = data.label ? data.label : data.value;
  38 + setValue(values || "");
  39 + }
38 } else { 40 } else {
39 setValue(viewRowNew || ""); // 动态更新 value 41 setValue(viewRowNew || ""); // 动态更新 value
40 } 42 }
@@ -104,7 +106,6 @@ const SelectInput = props =&gt; { @@ -104,7 +106,6 @@ const SelectInput = props =&gt; {
104 if (!visible) return; 106 if (!visible) return;
105 let { sDropDownType, sVisColumnName } = itemDetail; 107 let { sDropDownType, sVisColumnName } = itemDetail;
106 if (sVisColumnName && sVisColumnName === "sProcessName") { 108 if (sVisColumnName && sVisColumnName === "sProcessName") {
107 -  
108 if (sDropDownType === "sql") { 109 if (sDropDownType === "sql") {
109 if (itemDetail.sParamDropDown) { 110 if (itemDetail.sParamDropDown) {
110 const { sParamDropDown = "", sName0, sName } = itemDetail; 111 const { sParamDropDown = "", sName0, sName } = itemDetail;
@@ -118,7 +119,7 @@ const SelectInput = props =&gt; { @@ -118,7 +119,7 @@ const SelectInput = props =&gt; {
118 [sName]: item, 119 [sName]: item,
119 sParamKey: sName0, 120 sParamKey: sName0,
120 sParamKeyNew: sName, 121 sParamKeyNew: sName,
121 - label:item 122 + label: item,
122 })), 123 })),
123 totalPageCount: 1, 124 totalPageCount: 1,
124 currentPageNo: 1, 125 currentPageNo: 1,
@@ -141,7 +142,6 @@ const SelectInput = props =&gt; { @@ -141,7 +142,6 @@ const SelectInput = props =&gt; {
141 142
142 // getSqlDropDownData(searchValue); 143 // getSqlDropDownData(searchValue);
143 } else if ((sDropDownType = "const")) { 144 } else if ((sDropDownType = "const")) {
144 -  
145 if (!itemDetail.showDropDown) return; 145 if (!itemDetail.showDropDown) return;
146 const list = Object.entries(JSON.parse(itemDetail.showDropDown)).map(([key, value]) => ({ 146 const list = Object.entries(JSON.parse(itemDetail.showDropDown)).map(([key, value]) => ({
147 label: value, 147 label: value,
@@ -181,7 +181,7 @@ const SelectInput = props =&gt; { @@ -181,7 +181,7 @@ const SelectInput = props =&gt; {
181 <Checkbox 181 <Checkbox
182 style={{ height: "3.125rem" }} 182 style={{ height: "3.125rem" }}
183 onChange={val => { 183 onChange={val => {
184 - props.onDataChange(tableName, itemDetail.sName, { [itemDetail.sName]: val,label:val }, null, coplyColumns); 184 + props.onDataChange(tableName, itemDetail.sName, { [itemDetail.sName]: val, label: val }, null, coplyColumns);
185 }} 185 }}
186 /> 186 />
187 ) : ( 187 ) : (
@@ -200,7 +200,7 @@ const SelectInput = props =&gt; { @@ -200,7 +200,7 @@ const SelectInput = props =&gt; {
200 }} 200 }}
201 readOnly={bReadonly} 201 readOnly={bReadonly}
202 /> 202 />
203 - {(itemDetail.sDropDownType === 'sql' || itemDetail.sDropDownType === 'const')? ( 203 + {itemDetail.sDropDownType === "sql" || itemDetail.sDropDownType === "const" ? (
204 <div className={styles.icons} onClick={clickBtn}> 204 <div className={styles.icons} onClick={clickBtn}>
205 <DownOutline /> 205 <DownOutline />
206 </div> 206 </div>
src/mobile/quotation/detailNew.jsx
@@ -1506,23 +1506,27 @@ const BoxComponent = props =&gt; { @@ -1506,23 +1506,27 @@ const BoxComponent = props =&gt; {
1506 // 印刷参数 1506 // 印刷参数
1507 const getUpViewPropsByITag = iTag => { 1507 const getUpViewPropsByITag = iTag => {
1508 if (!slaveConfig) return; 1508 if (!slaveConfig) return;
1509 - const config = slaveConfig.gdsconfigformslave.filter(item => {  
1510 - if (item.sName === "dSumPQty" && selectedNode.sTypeKey !== "huace") {  
1511 - return false;  
1512 - }  
1513 - const { bAdvancedSetting, bFlap, bFold } = slaveRowData;  
1514 - const shouldExcludeItem = (condition, itemNameList) => !condition && itemNameList.includes(item.sName);  
1515 -  
1516 - if (  
1517 - shouldExcludeItem(bAdvancedSetting, ["dPortrait", "dHorizontal"]) ||  
1518 - shouldExcludeItem(bFlap, ["dFlap"]) ||  
1519 - shouldExcludeItem(bFold, ["sFold", "dAdhesive", "dFold"])  
1520 - ) {  
1521 - return false;  
1522 - }  
1523 -  
1524 - return item.iTag === iTag;  
1525 - }); 1509 + const config = slaveConfig.gdsconfigformslave
  1510 + .filter(item => !["sPrint", "sColor", "iPrintModePo"].includes(item.sName))
  1511 + .filter(item => {
  1512 + if (item.sName === "dSumPQty" && selectedNode.sTypeKey !== "huace") {
  1513 + return false;
  1514 + }
  1515 + const { bAdvancedSetting, bFlap, bFold } = slaveRowData;
  1516 + const shouldExcludeItem = (condition, itemNameList) => !condition && itemNameList.includes(item.sName);
  1517 +
  1518 + if (
  1519 + shouldExcludeItem(bAdvancedSetting, ["dPortrait", "dHorizontal"]) ||
  1520 + shouldExcludeItem(bFlap, ["dFlap"]) ||
  1521 + shouldExcludeItem(bFold, ["sFold", "dAdhesive", "dFold"])
  1522 + ) {
  1523 + return false;
  1524 + }
  1525 + if (selectedNode.sTypeKey !== "kapai" && item.sName === "sMagnification") {
  1526 + return false;
  1527 + }
  1528 + return item.iTag === iTag;
  1529 + });
1526 let boxConfigList = []; 1530 let boxConfigList = [];
1527 if (iTag === 20) { 1531 if (iTag === 20) {
1528 const showNameKeyList = ["dZBLB", "dSBLB", "dYBLB", "dXBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"]; 1532 const showNameKeyList = ["dZBLB", "dSBLB", "dYBLB", "dXBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"];
@@ -1541,10 +1545,10 @@ const BoxComponent = props =&gt; { @@ -1541,10 +1545,10 @@ const BoxComponent = props =&gt; {
1541 1545
1542 // 印刷参数表单 1546 // 印刷参数表单
1543 let upViewProps12 = getUpViewPropsByITag(12); 1547 let upViewProps12 = getUpViewPropsByITag(12);
1544 - if (!(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {  
1545 - if (upViewProps12 && upViewProps12.viewConfigs && upViewProps12.viewConfigs.length) {  
1546 - upViewProps12.viewConfigs = upViewProps12.viewConfigs.slice(0, 6);  
1547 - } 1548 + if (upViewProps12 && upViewProps12.viewConfigs && !(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {
  1549 + upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(
  1550 + x => x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth"
  1551 + );
1548 } 1552 }
1549 // 拼板信息表单 1553 // 拼板信息表单
1550 const upViewProps20 = getUpViewPropsByITag(20); 1554 const upViewProps20 = getUpViewPropsByITag(20);