From e5cc7ab6c7a694b01c5b4f9cf38c0e4edd48f009 Mon Sep 17 00:00:00 2001
From: 陈鑫涛 <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Wed, 25 Jun 2025 13:05:17 +0800
Subject: [PATCH] 卷筒展示特殊值
---
src/components/Common/Typesetting/typesetting.js | 33 ++++++++++++++++++++++++---------
src/components/QuickQuote/index.jsx | 29 +++++++++++++++++++----------
src/mobile/components/SelectInput.jsx | 18 +++++++++---------
src/mobile/quotation/detailNew.jsx | 46 +++++++++++++++++++++++++---------------------
4 files changed, 77 insertions(+), 49 deletions(-)
diff --git a/src/components/Common/Typesetting/typesetting.js b/src/components/Common/Typesetting/typesetting.js
index 74b1004..d87501c 100644
--- a/src/components/Common/Typesetting/typesetting.js
+++ b/src/components/Common/Typesetting/typesetting.js
@@ -923,15 +923,30 @@ const Typesetting = props => {
) : (
- 排版尺寸大于上机尺寸，请确认参数！
+
+
+ 排版尺寸大于上机尺寸，请确认参数！
+
+
)}
{
) {
return false;
}
- if (selectedNode.sTypeKey !== 'kapai' && item.sName === 'sMagnification') {
- return false
+ if (selectedNode.sTypeKey !== "kapai" && item.sName === "sMagnification") {
+ return false;
}
+
return item.iTag === iTag;
});
let boxConfigList = [];
@@ -1417,15 +1418,23 @@ const BoxComponent = props => {
// 印刷参数表单
let upViewProps12 = getUpViewPropsByITag(12);
- if (!(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {
- upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(
- x => x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth"
- );
- }
-
- // useEffect(() => {
+ const filterConditions = {
+ juantong: x =>
+ x.sName === "sMagnification" ||
+ x.sName === "dPartsLength" ||
+ x.sName === "dPartsWidth" ||
+ x.sName === "dRowGap" ||
+ x.sName === "dColGap" ||
+ x.sName === "sPaperDirection",
+ default: x => x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth",
+ };
- // }, [selectedNode.sTypeKey, slaveRowData.sBoxModel]);
+
+ if (selectedNode.sTypeKey === "juantong") {
+ upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(filterConditions.juantong);
+ } else if (!(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {
+ upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(filterConditions.default);
+ }
// 拼板信息表单
const upViewProps20 = getUpViewPropsByITag(20);
diff --git a/src/mobile/components/SelectInput.jsx b/src/mobile/components/SelectInput.jsx
index 8bebe4e..6e85571 100644
--- a/src/mobile/components/SelectInput.jsx
+++ b/src/mobile/components/SelectInput.jsx
@@ -31,10 +31,12 @@ const SelectInput = props => {
if (!viewRow.sBackProcessData) return;
// const data = viewRow.sBackProcessData[downIndex][itemDetail.sName];
// setValue(data);
- } else if (tableName.includes('sBackendParams')) {
- const data = props.sBackProcessData.find(item => item[props.sParentFieldsName]).sBackendParams.find(item => item.sParam === itemDetail.sParam)
- const values = data.label ? data.label : data.value
- setValue(values || '')
+ } else if (tableName.includes("sBackendParams")) {
+ const data = props.sBackProcessData.find(item => item[props.sParentFieldsName]).sBackendParams.find(item => item.sParam === itemDetail.sParam);
+ if (data) {
+ const values = data.label ? data.label : data.value;
+ setValue(values || "");
+ }
} else {
setValue(viewRowNew || ""); // 动态更新 value
}
@@ -104,7 +106,6 @@ const SelectInput = props => {
if (!visible) return;
let { sDropDownType, sVisColumnName } = itemDetail;
if (sVisColumnName && sVisColumnName === "sProcessName") {
-
if (sDropDownType === "sql") {
if (itemDetail.sParamDropDown) {
const { sParamDropDown = "", sName0, sName } = itemDetail;
@@ -118,7 +119,7 @@ const SelectInput = props => {
[sName]: item,
sParamKey: sName0,
sParamKeyNew: sName,
- label:item
+ label: item,
})),
totalPageCount: 1,
currentPageNo: 1,
@@ -141,7 +142,6 @@ const SelectInput = props => {
// getSqlDropDownData(searchValue);
} else if ((sDropDownType = "const")) {
-
if (!itemDetail.showDropDown) return;
const list = Object.entries(JSON.parse(itemDetail.showDropDown)).map(([key, value]) => ({
label: value,
@@ -181,7 +181,7 @@ const SelectInput = props => {
{
- props.onDataChange(tableName, itemDetail.sName, { [itemDetail.sName]: val,label:val }, null, coplyColumns);
+ props.onDataChange(tableName, itemDetail.sName, { [itemDetail.sName]: val, label: val }, null, coplyColumns);
}}
/>
) : (
@@ -200,7 +200,7 @@ const SelectInput = props => {
}}
readOnly={bReadonly}
/>
- {(itemDetail.sDropDownType === 'sql' || itemDetail.sDropDownType === 'const')? (
+ {itemDetail.sDropDownType === "sql" || itemDetail.sDropDownType === "const" ? (
diff --git a/src/mobile/quotation/detailNew.jsx b/src/mobile/quotation/detailNew.jsx
index adf0283..8ca64a6 100644
--- a/src/mobile/quotation/detailNew.jsx
+++ b/src/mobile/quotation/detailNew.jsx
@@ -1506,23 +1506,27 @@ const BoxComponent = props => {
// 印刷参数
const getUpViewPropsByITag = iTag => {
if (!slaveConfig) return;
- 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;
- }
-
- return item.iTag === iTag;
- });
+ 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;
+ }
+ if (selectedNode.sTypeKey !== "kapai" && item.sName === "sMagnification") {
+ return false;
+ }
+ return item.iTag === iTag;
+ });
let boxConfigList = [];
if (iTag === 20) {
const showNameKeyList = ["dZBLB", "dSBLB", "dYBLB", "dXBLB", "dZBJJ", "dYBJJ", "dSBJJ", "dXBJJ"];
@@ -1541,10 +1545,10 @@ const BoxComponent = props => {
// 印刷参数表单
let upViewProps12 = getUpViewPropsByITag(12);
- if (!(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {
- if (upViewProps12 && upViewProps12.viewConfigs && upViewProps12.viewConfigs.length) {
- upViewProps12.viewConfigs = upViewProps12.viewConfigs.slice(0, 6);
- }
+ if (upViewProps12 && upViewProps12.viewConfigs && !(selectedNode.sTypeKey === "huace" && slaveRowData.sBoxModel === "封面")) {
+ upViewProps12.viewConfigs = upViewProps12.viewConfigs.filter(
+ x => x.sName === "sMagnification" || x.sName === "dPartsLength" || x.sName === "dPartsWidth"
+ );
}
// 拼板信息表单
const upViewProps20 = getUpViewPropsByITag(20);
--
libgit2 0.22.2