Commit 8b302a40e331d7437e117f29f9b09f583305b439
Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main
# Conflicts: # src/components/QuickQuote/index.jsx # src/mobile/components/SelectInput.jsx
Showing
6 changed files
with
2 additions
and
13 deletions
src/components/Common/BoxProject/svg.js
| ... | ... | @@ -10,7 +10,6 @@ import { |
| 10 | 10 | createNoneProject, |
| 11 | 11 | } from "../BoxDesign/createAirplaneBox"; |
| 12 | 12 | const SvgBox = props => { |
| 13 | - console.log("π ~ propsprops:", props); | |
| 14 | 13 | const svgContainerRef = useRef(null); |
| 15 | 14 | const svgRef = useRef(null); |
| 16 | 15 | const [boxKey, setBoxKey] = useState(new Date().getTime()); | ... | ... |
src/components/Common/CommonViewTable/index.js
| ... | ... | @@ -362,7 +362,6 @@ export default class CommonViewTable extends Component { |
| 362 | 362 | } |
| 363 | 363 | |
| 364 | 364 | const viewRowNew = this.props.getViewRow?.(child) || viewRow; |
| 365 | - console.log("π ~ CommonViewTable ~ viewConfigs&&viewConfigs.map ~ viewRowNew:", viewRowNew) | |
| 366 | 365 | |
| 367 | 366 | const showTypeProps = { |
| 368 | 367 | app, | ... | ... |
src/components/Common/ShowImgMaterial/index.js
| ... | ... | @@ -302,7 +302,6 @@ export default class ShowImg extends Component { |
| 302 | 302 | |
| 303 | 303 | // //ζ¨ͺε+η« ζ·»ε HTML |
| 304 | 304 | getHHPHtml = (dMatLength, dMatWidth, dLength, dWidth, dBoold, dBite, wlfx, bBox) => { |
| 305 | - console.log("π ~ ShowImg ~ bBox:", bBox) | |
| 306 | 305 | const elements = []; |
| 307 | 306 | var p_dMatLength = dMatLength; |
| 308 | 307 | var p_dMatWidth = dMatWidth; //εε»ε¬ε£εηι«εΊ¦ | ... | ... |
src/components/QuickQuote/index.jsx
| ... | ... | @@ -1257,7 +1257,6 @@ const BoxComponent = props => { |
| 1257 | 1257 | }; |
| 1258 | 1258 | |
| 1259 | 1259 | const getUpViewPropsByITag = iTag => { |
| 1260 | - | |
| 1261 | 1260 | const config = slaveConfig.gdsconfigformslave.filter(item => { |
| 1262 | 1261 | if (item.sName === "dSumPQty" && selectedNode.sTypeKey !== "huace") { |
| 1263 | 1262 | return false; |
| ... | ... | @@ -1293,7 +1292,7 @@ const BoxComponent = props => { |
| 1293 | 1292 | const [downAbleConfigsNew, setDownAbleConfigsNew] = useState([]); |
| 1294 | 1293 | useEffect(() => { |
| 1295 | 1294 | setDownAbleConfigsNew(downAbleConfigs); |
| 1296 | - }, [selectedNode.showName, boxModel]); | |
| 1295 | + }, [selectedNode.showName, boxModel, downAbleConfigs.length]); | |
| 1297 | 1296 | |
| 1298 | 1297 | // θ·εsTypeδΈΊ2η |
| 1299 | 1298 | const downViewProps = { |
| ... | ... | @@ -1416,7 +1415,7 @@ const BoxComponent = props => { |
| 1416 | 1415 | props.setState(pre => { |
| 1417 | 1416 | const { sBackProcessData = [] } = slaveData[slaveRowIndex]; |
| 1418 | 1417 | const iIndex = sBackProcessData.findIndex(item => item[child.sName]); |
| 1419 | - slaveData[slaveRowIndex].sBackProcessData.splice(iIndex, 1); | |
| 1418 | + slaveData[slaveRowIndex].sBackProcessData?.splice(iIndex, 1); | |
| 1420 | 1419 | return { ...pre, slaveData }; |
| 1421 | 1420 | }); |
| 1422 | 1421 | }} | ... | ... |
src/mobile/quotation/detail.jsx
| ... | ... | @@ -14,7 +14,6 @@ import Typesetting from "@/components/Common/Typesetting/typesetting"; |
| 14 | 14 | import DynamicSVG from "@/components/Common/BoxDesignCompontent/svg"; |
| 15 | 15 | import ShowImgM from "@/components/Common/BoxShowImgMaterial/indexNew"; |
| 16 | 16 | const QuickQuoteEvent = props => { |
| 17 | - console.log("π ~ QuickQuoteEvent:", props); | |
| 18 | 17 | const { location } = props; |
| 19 | 18 | const selectedNode = JSON.parse(location.state).quotationData; |
| 20 | 19 | const addState = {}; |
| ... | ... | @@ -915,7 +914,6 @@ const QuotationAllprogressDetail = baseProps => { |
| 915 | 914 | |
| 916 | 915 | const QuotationDetail = props => { |
| 917 | 916 | const { location, app, sModelsId, state, masterData, selectedNode = {} } = props; |
| 918 | - console.log("π ~ QuotationDetail:", props); | |
| 919 | 917 | const { token } = app; |
| 920 | 918 | const { formData = [], masterConfig } = state || {}; |
| 921 | 919 | const { quotationData } = JSON.parse(location.state) || {}; |
| ... | ... | @@ -931,7 +929,6 @@ const QuotationDetail = props => { |
| 931 | 929 | viewRow: { ...masterData, sProductClassifyId: selectedNode.sId }, |
| 932 | 930 | tableName: "master", |
| 933 | 931 | }; |
| 934 | - console.log("π ~ viewProps:", viewProps); | |
| 935 | 932 | |
| 936 | 933 | return ( |
| 937 | 934 | <div> |
| ... | ... | @@ -947,7 +944,6 @@ const QuotationDetail = props => { |
| 947 | 944 | ); |
| 948 | 945 | }; |
| 949 | 946 | const MasterComponent = props => { |
| 950 | - console.log("π ~ MasterComponent:", props); | |
| 951 | 947 | const { viewConfigs, masterData } = props; |
| 952 | 948 | |
| 953 | 949 | const customer = viewConfigs?.find(x => x.sName === "sCustomerName") || {}; |
| ... | ... | @@ -1097,7 +1093,6 @@ const QuotationTabs = props => { |
| 1097 | 1093 | const BoxComponent = props => { |
| 1098 | 1094 | const { state, boxModel } = props; |
| 1099 | 1095 | const { activeKey, slaveConfig, masterData, selectedNode, boxConfig, downAbleConfigs = [], slaveData } = state || {}; |
| 1100 | - console.log("π ~ BoxComponent:", slaveData); | |
| 1101 | 1096 | const { sModelsId } = props; |
| 1102 | 1097 | const [selectList, setSelectList] = useState([]); |
| 1103 | 1098 | const [boxTypeList, setBoxTypeList] = useState([]); |
| ... | ... | @@ -1445,7 +1440,6 @@ const BoxComponent = props => { |
| 1445 | 1440 | }); |
| 1446 | 1441 | const slaveDataDetail = slaveData.find(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel) || {}; |
| 1447 | 1442 | |
| 1448 | - console.log("π ~ slaveDataDetail:", slaveNewData) | |
| 1449 | 1443 | const rowData = { |
| 1450 | 1444 | ...slaveDataDetail, |
| 1451 | 1445 | ...data, | ... | ... |
src/utils/request.js