diff --git a/src/components/Common/CommonNewBill.js b/src/components/Common/CommonNewBill.js index 3f04b6a..a366572 100644 --- a/src/components/Common/CommonNewBill.js +++ b/src/components/Common/CommonNewBill.js @@ -2021,7 +2021,7 @@ const BillComponent = Form.create({ onChange: props.onTitleChange.bind(this, "slave"), dragTableHeight:344 }, - noVlistTable: bPagination, + noVlistTable: sModelsId === '192116810113315220489243410' ? false : bPagination, onDelRow: props.onDelRow, onDelRowSelect: props.onDelRowSelect, data: bSingleTree && commonUtils.isNotEmptyArr(slaveData) ? commonUtils.genTreeByArr(slaveData, "sId", "sFatherSlaveId") : slaveData, diff --git a/src/components/Common/OfficePreview/index.js b/src/components/Common/OfficePreview/index.js index caf428a..42b3e7b 100644 --- a/src/components/Common/OfficePreview/index.js +++ b/src/components/Common/OfficePreview/index.js @@ -15,7 +15,7 @@ const OfficePreview = props => { .pop() .split("_") .pop(); - const fileUrl = `${commonConfig.file_host}file/download?savePathStr=${encodeURIComponent(officeFileUrl)}&sModelsId=100&token=${app.token}`; + const fileUrl = `${commonConfig.file_host}file/downloadView?savePathStr=${encodeURIComponent(officeFileUrl)}&sModelsId=100&token=${app.token}`; const fileType = title .split(".") .pop() @@ -34,16 +34,27 @@ const OfficePreview = props => {
-
- {fileType === "PDF" && } +
+ {fileType === 'PDF' && ( +
+ +
+ )} {['MP4', 'WEBM', 'OGG'].includes(fileType) && ( -
-