diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js
index 8ca5a99..91d8530 100644
--- a/src/components/Common/CommonComponent/index.js
+++ b/src/components/Common/CommonComponent/index.js
@@ -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 = ;
@@ -3534,6 +3534,8 @@ export default class CommonComponent extends Component {
fileIcon = ;
} else if (officeFileType === "XLSX") {
fileIcon = ;
+ } else if (['MP4', 'WEBM', 'OGG'].includes(officeFileType)) {
+ fileIcon = ;
}
let imgBox1 = "";
if (officeFileTypeList.includes(officeFileType)) {
diff --git a/src/components/Common/ToolBar/ToolBarNew.js b/src/components/Common/ToolBar/ToolBarNew.js
index 840ad68..a786f06 100644
--- a/src/components/Common/ToolBar/ToolBarNew.js
+++ b/src/components/Common/ToolBar/ToolBarNew.js
@@ -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,
diff --git a/src/components/CommonElementEvent/FilfileManageInfo.js b/src/components/CommonElementEvent/FilfileManageInfo.js
index aeb8a20..85e304f 100644
--- a/src/components/CommonElementEvent/FilfileManageInfo.js
+++ b/src/components/CommonElementEvent/FilfileManageInfo.js
@@ -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);
diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx
index f1e620c..42ddd47 100644
--- a/src/components/QuickQuote/index.jsx
+++ b/src/components/QuickQuote/index.jsx
@@ -1593,7 +1593,18 @@ const MasterComponent = props => {
if (child.sName === "sProductName") {
return (
- }>
+ }
+ onClick={() => {
+ const { slaveSelectedRowKeys } = props;
+ if (commonUtils.isEmptyArr(slaveSelectedRowKeys)) {
+ message.warning("请先核价!");
+ return;
+ }
+ props.onToolBarBtnClick({ key: "BtnUpload" });
+ }}
+ >
);
}
diff --git a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
index 79e590c..6593e31 100644
--- a/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
+++ b/src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
@@ -10058,7 +10058,12 @@ const QuotationComponent = Form.create({
: ''
}
}
- {quickQuoteModelNew && }
+ {quickQuoteModelNew && (
+ <>
+
+
+ >
+ )}
{ true ? '' :
}
{ true ? '' :