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

陈鑫涛
2 parents dd43301a 95578725
Showing 6 changed files with 68 additions and 23 deletions
src/components/Common/CommonBillEvent.js
src/components/Common/CommonComponent/index.js
src/components/Common/ToolBar/ToolBarNew.js
src/components/CommonElementEvent/FilfileManageInfo.js
src/components/QuickQuote/index.jsx
src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
@@ -2345,7 +2345,7 @@ export default (ChildComponent) =&gt; {
           }
         }
         this.props.onSaveState({
-          loading: false,
+          loading: false, slaveDelData: [], controlDelData: [], materialsDelData: [], processDelData: [], manyqtysDelData: [], colorDelData: [], packDelData: []
         });
         return true;
       } else {
@@ -23,7 +23,7 @@ import {
   Tooltip,
   Modal,
 } from "antd-v4";
-import {DeleteOutlined, EyeOutlined, FilePdfOutlined, FileWordOutlined, FileExcelOutlined, FileOutlined, RightOutlined } from "@ant-design/icons";
+import {DeleteOutlined, EyeOutlined, FilePdfOutlined, FileWordOutlined, FileExcelOutlined, FileOutlined, RightOutlined, PlaySquareOutlined } from "@ant-design/icons";
 import * as commonUtils from "@/utils/utils";
 import styles from "@/index.less";
 import Provinces from "@/assets/provinces.json";
@@ -3526,7 +3526,7 @@ export default class CommonComponent extends Component {
           ? `${commonConfig.file_host}file/download?savePathStr=${picAddr[0]}&scale=0.1&sModelsId=100&token=${token}`
           : picAddr[0]; /* 缩略图 */
         // const dataPriviewUrl = `${commonConfig.server_host}file/download?savePathStr=${picAddr}&width=800&&height=500&sModelsId=100&token=${token}`; /* 预览 */
-        const officeFileTypeList = ["PDF", "DOCX", "XLSX"];
+        const officeFileTypeList = ['PDF', 'DOCX', 'XLSX', 'MP4', 'WEBM', 'OGG'];
         const imgTypeList = ["PNG", "SVG", "JPG", "JPEG", "GIF", "BMP", "TIFF", "ICO"];
         const officeFileType = picAddr[0].split(".").pop().toUpperCase();
         let fileIcon = <FilePdfOutlined />;
@@ -3534,6 +3534,8 @@ export default class CommonComponent extends Component {
           fileIcon = <FileWordOutlined />;
         } else if (officeFileType === "XLSX") {
           fileIcon = <FileExcelOutlined />;
+        } else if (['MP4', 'WEBM', 'OGG'].includes(officeFileType)) {
+          fileIcon = <PlaySquareOutlined />;
         }
         let imgBox1 = "";
         if (officeFileTypeList.includes(officeFileType)) {
@@ -337,7 +337,7 @@ class ToolBarComponent extends Component {
       const { masterConfig = {} } = this.props;
       const { gdsconfigformslave = [] } = masterConfig;
       const sBtnSendDialogConfigList = gdsconfigformslave.filter(item => item.sControlName && item.sControlName.includes("BtnSendDialog"));
-      if (commonUtils.isNotEmptyArr(sBtnSendDialogConfigList) && !this.props.onToolBarBtnClick) {
+      if (location.pathname === "/indexPage/quotationPackTableTree" || (commonUtils.isNotEmptyArr(sBtnSendDialogConfigList) && !this.props.onToolBarBtnClick)) {
         this.btnSendDialogLoaded = true;
         this.props.onSaveState({
           onToolBarBtnClick: this.handleClick,
@@ -87,6 +87,7 @@ class FilfileManageInfoComponent extends Component {
       tableDataRow.sSrcId = commonUtils.isNotEmptyObject(currentPane) ? currentPane.sSrcId : '';
       tableDataRow.sSrcSlaveId = commonUtils.isNotEmptyObject(currentPane) ? currentPane.sSrcSlaveId : '';
       tableDataRow.sPicturePath = file.response && file.response.code === 1 ? sPicturePath : '';
+      tableDataRow.spicture = tableDataRow.sPicturePath;
       tableDataRow.sFileName = file.response && file.response.code === 1 ? file.name : '';
       tableData.push(tableDataRow);
       this.props.onSaveState({ [`${name}Data`]: tableData });
@@ -127,9 +128,9 @@ class FilfileManageInfoComponent extends Component {
           tableDataRow.sSrcId = commonUtils.isNotEmptyObject(currentPane) ? currentPane.sSrcId : '';
           tableDataRow.sSrcSlaveId = commonUtils.isNotEmptyObject(currentPane) ? currentPane.sSrcSlaveId : '';
           tableDataRow.sPicturePath = file.response && file.response.code === 1 ? sPicturePath : '';
+          tableDataRow.spicture = tableDataRow.sPicturePath;
           tableDataRow.sFileName = file.response && file.response.code === 1 ? file.name : '';
           tableData.push(tableDataRow);
-          console.log('12', tableData);
           // this.props.onSaveState({ [`${name}Data`]: tableData, enabled: true });
         } else if (file.response && file.response.code === -1) {
           message.error(file.response.msg);
@@ -532,13 +532,36 @@ const QuickQuoteEvent = props =&gt; {
       packDelData: packDelDataOld = [],
     } = props;
     const addState = {
-      slaveDelData: [...slaveDelDataOld, ...slaveData.map(item => ({ ...item, handleType: "del" }))],
-      controlDelData: [...controlDelDataOld, ...controlData.map(item => ({ ...item, handleType: "del" }))],
-      materialsDelData: [...materialsDelDataOld, ...materialsData.map(item => ({ ...item, handleType: "del" }))],
-      processDelData: [...processDelDataOld, ...processData.map(item => ({ ...item, handleType: "del" }))],
-      manyqtysDelData: [...manyqtysDelDataOld, ...manyqtysData.map(item => ({ ...item, handleType: "del" }))],
-      colorDelData: [...colorDelDataOld, ...colorData.map(item => ({ ...item, handleType: "del" }))],
-      packDelData: [...packDelDataOld, ...packData.map(item => ({ ...item, handleType: "del" }))],
+      slaveDelData: [
+        ...slaveDelDataOld,
+        ...slaveData.filter(item => !slaveDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+      ],
+      controlDelData: [
+        ...controlDelDataOld,
+        ...controlData.filter(item => !controlDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+      ],
+      materialsDelData: [
+        ...materialsDelDataOld,
+        ...materialsData
+          .filter(item => !materialsDelDataOld.map(item1 => item1.sId).includes(item.sId))
+          .map(item => ({ ...item, handleType: "del" })),
+      ],
+      processDelData: [
+        ...processDelDataOld,
+        ...processData.filter(item => !processDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+      ],
+      manyqtysDelData: [
+        ...manyqtysDelDataOld,
+        ...manyqtysData.filter(item => !manyqtysDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+      ],
+      colorDelData: [
+        ...colorDelDataOld,
+        ...colorData.filter(item => !colorDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+      ],
+      packDelData: [
+        ...packDelDataOld,
+        ...packData.filter(item => !packDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+      ],
     };
     return addState;
   };
@@ -1570,7 +1593,18 @@ const MasterComponent = props =&gt; {
       if (child.sName === "sProductName") {
         return (
           <div className={styles.productNameBtns}>
-            <Button type="link" icon={<UploadOutlined />}></Button>
+            <Button
+              type="link"
+              icon={<UploadOutlined />}
+              onClick={() => {
+                const { slaveSelectedRowKeys } = props;
+                if (commonUtils.isEmptyArr(slaveSelectedRowKeys)) {
+                  message.warning("请先核价！");
+                  return;
+                }
+                props.onToolBarBtnClick({ key: "BtnUpload" });
+              }}
+            ></Button>
           </div>
         );
       }
@@ -2718,17 +2752,20 @@ const ManyComponent = props =&gt; {
       manyDataCache: [],
     };
  
-    props.onSaveState(
-      {
-        masterData: { ...props.masterData, handleType: props.masterData.handleType || "update" },
-        ...addState,
-      },
-      () => {
-        props.handleCalcPrice();
-      }
-    );
+    props.onSaveState({
+      masterData: { ...props.masterData, handleType: props.masterData.handleType || "update" },
+      calcPriceTime: commonUtils.createSid(),
+      ...addState,
+    });
   };
  
+  useEffect(() => {
+    if (props.calcPriceTime) {
+      props.onSaveState({ calcPriceTime: undefined });
+      props.handleCalcPrice();
+    }
+  }, [props.calcPriceTime]);
+
   // 根据主表数量更改多数量表
   useEffect(() => {
     const baseCount = masterData.dProductQty || 1000;
@@ -10058,7 +10058,12 @@ const QuotationComponent = Form.create({
             </AntdDraggableModal> : ''
         }
       </Layout>}
-      {quickQuoteModelNew && <QuickQuote {...props} bLinkFieledClick={bLinkFieledClick} />}
+      {quickQuoteModelNew && (
+        <>
+          <div style={{ display: 'none' }}><Toolbar {...props} /></div>
+          <QuickQuote {...props} bLinkFieledClick={bLinkFieledClick} />
+        </>
+      )}
  
       { true ? '' : <AntdDraggableDiv draggableDivClassName="xly-eject"> <a onClick={props.onEjectRight}> <img src={EjectRight} alt="eject" /></a> </AntdDraggableDiv>}
       { true ? '' :