Эх сурвалжийг харах

表单只读格式文本显示调整,支持csv格式文件

cfort 1 жил өмнө
parent
commit
c556b2f534

+ 3 - 4
src/business/platform/bpmn/form/action.js

@@ -34,7 +34,7 @@ export default {
             switch (buttonType) {
                 case 'agree':// 同意
                     // 判断是否最后一步流程
-                    if (this.actionTitle == '同意并结束') {
+                    if (this.actionTitle === '同意并结束') {
                         this.setData('1')
                     } else {
                         this.setData()
@@ -85,7 +85,7 @@ export default {
                     this.instanceDetailVisible = true
                     break
                 case 'startFlow': // 启动流程
-                    if (this.actionTitle == '同意并结束') {
+                    if (this.actionTitle === '同意并结束') {
                         this.setData('1')
                     } else {
                         this.setData('已编制')
@@ -650,7 +650,6 @@ export default {
             if (!code) {
                 return
             }
-            
             const sql = `select * from t_lcidglbdbb where tablekey_ = '${code}' and ti_jiao_kuai_zhao = '是' and gui_dang_lei_xing = 'process' and (liu_cheng_xuan_ze = (select PROC_DEF_KEY_ from ibps_bpm_inst where id_ = '${instId}' limit 1) or liu_cheng_xuan_ze = (select PROC_DEF_KEY_ from ibps_bpm_inst_his where id_ = '${instId}' limit 1))`
             request('sql', sql).then(async res => {
                 const { data = [] } = res.variables || {}
@@ -671,7 +670,7 @@ export default {
                     // this.updateState(id, code, '1', null)
                     return
                 }
-                const path = data[0].bao_biao_lu_jing_.split('.rpx') [0]
+                const path = data[0].bao_biao_lu_jing_.split('.rpx')[0]
                 const url = this.$getReportFile(`罗医细胞质量检测实验室/${path}`, `id_=${id}`)
                 const now = new Date(new Date().getTime() + 28800000).toJSON().slice(0, 16).replace(/[-:T]/g, '')
                 const fileName = name + now

+ 2 - 2
src/business/platform/form/formrender/dynamic-form/dynamic-form-field.vue

@@ -1214,10 +1214,10 @@
         padding-left: 0px;
     }
     .ibps-overflow {
-        white-space: pre-line;
+        white-space: pre-wrap;
     }
     .ibps-field-text {
-        white-space: pre-line;
+        white-space: pre-wrap;
         color: #000000;
         box-shadow: 0 0 0 0 rgba(0, 0, 0, 0.1), 0 0 0 0 rgba(0, 0, 0, 0.1), 0 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 0px 0 rgba(0, 0, 0, 0.1);
         padding-left: 5px;

+ 1 - 1
src/components/ibps-file-viewer/constants/index.js

@@ -1,5 +1,5 @@
 
-export const officeType = ['doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx']
+export const officeType = ['doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx', 'csv']
 export const pdfType = ['pdf']
 export const txtType = ['txt']
 export const imageType = ['jpg', 'jpeg', 'bmp', 'png', 'gif']