Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

# Conflicts: # src/components/QuickQuote/index.jsx # src/mobile/components/SelectInput.jsx

Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main
# Conflicts: # src/components/QuickQuote/index.jsx # src/mobile/components/SelectInput.jsx
陈鑫涛
2 parents de6bd1cf fe09538a
Showing 6 changed files with 2 additions and 13 deletions
src/components/Common/BoxProject/svg.js
src/components/Common/CommonViewTable/index.js
src/components/Common/ShowImgMaterial/index.js
src/components/QuickQuote/index.jsx
src/mobile/quotation/detail.jsx
src/utils/request.js
@@ -10,7 +10,6 @@ import {
   createNoneProject,
 } from "../BoxDesign/createAirplaneBox";
 const SvgBox = props => {
-  console.log("🚀 ~ propsprops:", props);
   const svgContainerRef = useRef(null);
   const svgRef = useRef(null);
   const [boxKey, setBoxKey] = useState(new Date().getTime());
@@ -362,7 +362,6 @@ export default class CommonViewTable extends Component {
                   }
                   const viewRowNew = this.props.getViewRow?.(child) || viewRow;
-                  console.log("🚀 ~ CommonViewTable ~ viewConfigs&&viewConfigs.map ~ viewRowNew:", viewRowNew)
                   const showTypeProps = {
                     app,
@@ -302,7 +302,6 @@ export default class ShowImg extends Component {
   // //横向+竖 添加HTML
   getHHPHtml = (dMatLength, dMatWidth, dLength, dWidth, dBoold, dBite, wlfx, bBox) => {
-    console.log("🚀 ~ ShowImg ~ bBox:", bBox)
     const elements = [];
     var p_dMatLength = dMatLength;
     var p_dMatWidth = dMatWidth; //减去咬口后的高度
@@ -1257,7 +1257,6 @@ const BoxComponent = props =&gt; {
   };
   const getUpViewPropsByITag = iTag => {
-
     const config = slaveConfig.gdsconfigformslave.filter(item => {
       if (item.sName === "dSumPQty" && selectedNode.sTypeKey !== "huace") {
         return false;
@@ -1293,7 +1292,7 @@ const BoxComponent = props =&gt; {
   const [downAbleConfigsNew, setDownAbleConfigsNew] = useState([]);
   useEffect(() => {
     setDownAbleConfigsNew(downAbleConfigs);
-  }, [selectedNode.showName, boxModel]);
+  }, [selectedNode.showName, boxModel, downAbleConfigs.length]);
   // 获取sType为2的
   const downViewProps = {
@@ -1416,7 +1415,7 @@ const BoxComponent = props =&gt; {
                 props.setState(pre => {
                   const { sBackProcessData = [] } = slaveData[slaveRowIndex];
                   const iIndex = sBackProcessData.findIndex(item => item[child.sName]);
-                  slaveData[slaveRowIndex].sBackProcessData.splice(iIndex, 1);
+                  slaveData[slaveRowIndex].sBackProcessData?.splice(iIndex, 1);
                   return { ...pre, slaveData };
                 });
               }}
@@ -14,7 +14,6 @@ import Typesetting from &quot;@/components/Common/Typesetting/typesetting&quot;;
 import DynamicSVG from "@/components/Common/BoxDesignCompontent/svg";
 import ShowImgM from "@/components/Common/BoxShowImgMaterial/indexNew";
 const QuickQuoteEvent = props => {
-  console.log("🚀 ~ QuickQuoteEvent:", props);
   const { location } = props;
   const selectedNode = JSON.parse(location.state).quotationData;
   const addState = {};
@@ -915,7 +914,6 @@ const QuotationAllprogressDetail = baseProps =&gt; {
 const QuotationDetail = props => {
   const { location, app, sModelsId, state, masterData, selectedNode = {} } = props;
-  console.log("🚀 ~ QuotationDetail:", props);
   const { token } = app;
   const { formData = [], masterConfig } = state || {};
   const { quotationData } = JSON.parse(location.state) || {};
@@ -931,7 +929,6 @@ const QuotationDetail = props =&gt; {
     viewRow: { ...masterData, sProductClassifyId: selectedNode.sId },
     tableName: "master",
   };
-  console.log("🚀 ~ viewProps:", viewProps);
   return (
     <div>
@@ -947,7 +944,6 @@ const QuotationDetail = props =&gt; {
   );
 };
 const MasterComponent = props => {
-  console.log("🚀 ~ MasterComponent:", props);
   const { viewConfigs, masterData } = props;
   const customer = viewConfigs?.find(x => x.sName === "sCustomerName") || {};
@@ -1097,7 +1093,6 @@ const QuotationTabs = props =&gt; {
 const BoxComponent = props => {
   const { state, boxModel } = props;
   const { activeKey, slaveConfig, masterData, selectedNode, boxConfig, downAbleConfigs = [], slaveData } = state || {};
-  console.log("🚀 ~ BoxComponent:", slaveData);
   const { sModelsId } = props;
   const [selectList, setSelectList] = useState([]);
   const [boxTypeList, setBoxTypeList] = useState([]);
@@ -1445,7 +1440,6 @@ const BoxComponent = props =&gt; {
     });
     const slaveDataDetail = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel) || {};
-    console.log("🚀 ~ slaveDataDetail:", slaveNewData)
     const rowData = {
       ...slaveDataDetail,
       ...data,
@@ -39,7 +39,6 @@ export default function request(url, options) {
     .then(checkStatus)
     .then(parseJSON)
     .then((data) => {
-      console.log('=====data', data);
       // window.fetchCount -= 1;
       // if (window.fetchCount <= 0) {
       //   fetchLoading();