diff --git a/public/static/onlyOffice/editor.html b/public/static/onlyOffice/editor.html index e60778481..d8200d73f 100644 --- a/public/static/onlyOffice/editor.html +++ b/public/static/onlyOffice/editor.html @@ -1,6 +1,6 @@ - + @@ -8,8 +8,10 @@ 在线编辑 - - + + + + @@ -17,12 +19,46 @@
+ + + + + +
+
+
+ + + diff --git a/src/api/process.js b/src/api/process.js index bb866770b..cfab0cb4e 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -604,6 +604,15 @@ export function getConvertFileByAttId(data) { }) } +// 获取openOffice 在线预览文件 +export function getBusStandFileByAttId(data) { + return axios({ + url: 'api/att/attFile/getBusStandFileByAttId', + method: 'get', + params: data + }) +} + // 未符合项跟踪修改状态 export function updateBaseInfo(data) { return axios({ diff --git a/src/components/CustomFormComponents/DatePicker.vue b/src/components/CustomFormComponents/DatePicker.vue index c5ea683dc..132f60b76 100644 --- a/src/components/CustomFormComponents/DatePicker.vue +++ b/src/components/CustomFormComponents/DatePicker.vue @@ -14,7 +14,7 @@ :value-format="valueFormat" format="yyyy-MM-dd" :value="value" - type="date" + type="dates" :editable="true" :disabled="disabled" :placeholder="placeholder" @@ -74,5 +74,7 @@ export default { diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 7f43379ab..5a64f5188 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -67,7 +67,8 @@ diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 2c55be7df..c3db04114 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -248,12 +248,13 @@ - + 批量删除 + 移除标准 + 编辑 +
@@ -380,7 +385,7 @@ + v-if="isPermission('d9730d984627af948053df56a2db7997,dd4ea796dab7a01b105ba657b1968a84,a7a38a95ea374695fc3128037f6feccf')>0" label="操作" align="center" width="50">