{!props.hideBackBtn && (
@@ -1074,10 +1072,7 @@ const TreeComponent = props => {
selectedNode: select.selectedNodes[0]?.treeNode || {},
masterData: { ...masterData, sProductName: sProductName || select.node.title, sProductUnit: sProductUnit || select.node.treeNode.sUnit },
};
-
});
- console.log(props,'Tree');
-
}}
// defaultSelectedKeys={[activeTree]}
defaultExpandAll={true}
@@ -1093,7 +1088,6 @@ const ContentComponent = props => {
const { selectedNode = {}, extraParts = {} } = props.state;
const { showName } = selectedNode;
const extraPartsList = extraParts[showName] || [];
- console.log("🚀 ~ extraPartsList:", extraPartsList)
let { sAllPartsName = "" } = selectedNode;
let bEmpty = false;
if (commonUtils.isEmptyObject(selectedNode)) {
@@ -1104,7 +1098,6 @@ const ContentComponent = props => {
}
const boxModelList = sAllPartsName.split(",");
- console.log("🚀 ~ boxModelList:", boxModelList)
const [activeKey, setActiveKey] = useState(0);
useEffect(() => {
@@ -1166,7 +1159,6 @@ const ContentComponent = props => {
}
};
- console.log("🚀 ~ props:", props)
return (
<>
{/* 产品参数 */}
@@ -1267,8 +1259,7 @@ const BoxComponent = props => {
};
const getUpViewPropsByITag = iTag => {
- console.log(slaveConfig,'slaveConfig1');
-
+
const config = slaveConfig.gdsconfigformslave.filter(item => {
if (item.sName === "dSumPQty" && selectedNode.sTypeKey !== "huace") {
return false;
@@ -1518,10 +1509,10 @@ const BoxComponent = props => {
materialWidth,
bBox: true, // 快速报价盒型展示
};
+
let boxList = [];
if (slaveRowData.sColumnNameConfig && masterData.dLength && masterData.dWidth && masterData.dHeight) {
const slaveNewData = JSON.parse(slaveRowData.sColumnNameConfig);
- console.log("🚀 ~ slaveRowData:", slaveRowData)
const tables = [
{ name: "盒型类别", value: slaveRowData.sBoxType, type: null },
{ name: "盒身", value: slaveRowData.sBoxBody, type: slaveRowData.sTypes },
@@ -1905,8 +1896,7 @@ const ManyComponent = props => {
// 核价事件
const onCalcPrice = () => {
- console.log(props,'propsprops');
-
+
const addState = {
...props.onGetAllDelData(),
manyDataCache: [],
@@ -2043,7 +2033,10 @@ const ManyComponent = props => {
// 选择盒型弹窗
const BoxModelSelectedModal = props => {
- const { boxModelSelectedModalVisible } = props;
+ const { dividerProps, state, boxModel, boxModelSelectedModalVisible } = props;
+ const { masterData = {}, slaveConfig, slaveData = [], selectedNode = {}, downAbleConfigs = [], finishedConfigs = [] } = state;
+ const slaveRowData = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel) || {};
+
if (!boxModelSelectedModalVisible) return "";
const onCancel = () => {
@@ -2066,10 +2059,10 @@ const BoxModelSelectedModal = props => {
// ["sBoxId", "盒型ID"],
["sName", "名称", 119],
["sPackDetailPath", "刀线图", 300],
+ // ["sPackDetailPathUpLoad", "刀线图", 300],
["sPackPath", "3D图", 300],
["operation", "操作", 80],
];
-
const config = {
sId: commonUtils.createSid(),
// bisMutiSelect: true,
@@ -2129,6 +2122,67 @@ const BoxModelSelectedModal = props => {
)),
[boxTypeList.length]
);
+ const getSvgProps = svg => {
+ if (!svg) return;
+ const { sColumnNameConfig, sBoxType, sBoxBody, dBoxLength, dBoxWidth, dBoxHeight, sTypes } = svg;
+ const slaveData = JSON.parse(sColumnNameConfig);
+ const boxList = [];
+ const tables = [
+ { name: "盒型类别", value: sBoxType, type: null },
+ { name: "盒身", value: sBoxBody, type: sTypes },
+ { name: "盒长", value: dBoxLength, type: null },
+ { name: "盒宽", value: dBoxWidth, type: null },
+ { name: "盒高", value: dBoxHeight, type: null },
+ ];
+ // const { slaveData = [] } = this.props;
+ const titleList1 = [
+ { name: "上方盒舌", value: "dSFHS" },
+ { name: "盒底组件", value: "dHDC" },
+ { name: "下方盒舌", value: "dXFHS" },
+ { name: "左(上)插位组件", value: "dZSCW" },
+ { name: "左贴边位", value: "dZTBW" },
+ { name: "左(下)插位组件", value: "dZXCW" },
+ { name: "右(上)插位组件", value: "dYSCW" },
+ { name: "右贴边位", value: "dYTBW" },
+ { name: "右(下)插位组件", value: "dYXCW" },
+ ];
+ slaveData.forEach(x => {
+ boxList.push({
+ value: x.iValue,
+ sName: titleList1.find(item => item.value === x.sCode)?.name || "",
+ isEditable: true,
+ isSelect: false,
+ selectValue: null,
+ selectLabel: "",
+ selectImage: null,
+ type: x.sTypes || null,
+ show: true,
+ showName: x.sName, // 参数名称
+ });
+ });
+ tables.forEach(x => {
+ boxList.push({
+ value: x.value,
+ sName: x.name,
+ isEditable: true,
+ isSelect: false,
+ selectValue: null,
+ selectLabel: "",
+ selectImage: null,
+ type: x.type || null,
+ show: true,
+ showName: x.name, // 参数名称
+ });
+ });
+ const svgProps = {
+ ...props,
+ boxList,
+ dSvgBoxWidth: 100,
+ dSvgBoxHeight: 100,
+ showNew: 1,
+ };
+ return svgProps;
+ };
const tableProps = {
...commonBusiness.getTableTypes("box", {
@@ -2144,7 +2198,19 @@ const BoxModelSelectedModal = props => {
columns
.filter(item => item.dataIndex?.includes("Path"))
.forEach(column => {
- column.render = (value, record, index) => (value ? 
: "暂无图片");
+ // (value ? (column.dataIndex === 'sPackDetailPath' ? (boxData[index].sPackPath ? : '') : ) : "暂无图片");
+ column.render = (value, record, index) =>
+ column.dataIndex === "sPackDetailPath" ? (
+ boxData[index].sPackDetailPathUpLoad ? (
+
+ ) : (
+