Просмотр исходного кода

修复消息已读bug,对话框组件文本显示bug

cfort 3 лет назад
Родитель
Сommit
2af36a2717

+ 1 - 1
src/business/platform/form/formbuilder/right-aside/editors/editor-field-custom-dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="panel panel-default">
-    <div class="panel-heading">参数设2置</div>
+    <div class="panel-heading">参数设置</div>
     <div class="panel-body">
       <el-form-item label-width="110px">
         <template slot="label">对话框类型<help-tip prop="customDialogType" /></template>

+ 7 - 3
src/layout/header-aside/components/header-message/index.vue

@@ -7,7 +7,7 @@
             placement="bottom"
         >
             <el-button class="ibps-ml-0 ibps-mr btn-text can-hover" type="text">
-                <el-badge :max="99" :value="messageCount">
+                <el-badge :max="9999" :value="messageCount">
                     <ibps-icon name="bell-o" size="16" />
                 </el-badge>
             </el-button>
@@ -24,7 +24,7 @@
                 class="ibps-ml-0 ibps-mr btn-text can-hover"
                 type="text"
             >
-                <el-badge :max="99" :value="messageCount">
+                <el-badge :max="9999" :value="messageCount">
                     <ibps-icon name="bell-o" size="16" />
                 </el-badge>
             </el-button>
@@ -69,7 +69,7 @@
             inside
             readonly
             @callback="loadData"
-            @close="(visible) => (dialogFormVisible = visible)"
+            @close="closeDialog"
         />
     </div>
 </template>
@@ -194,6 +194,10 @@
             clickMore() {
                 // 更多消息
                 this.$router.push('/message')
+            },
+            closeDialog(visible) {
+                this.dialogFormVisible = visible
+                this.loadData()
             }
         },
         // 销毁事件

+ 3 - 6
src/views/platform/bpmn/bpmInstHis/list.vue

@@ -192,7 +192,7 @@
                     },
                     // 表格字段配置
                     columns: [
-                        /* { prop: 'subject', label: '任务标题', link: 'dialog', width: 250 }, */
+                        // { prop: 'subject', label: '任务标题', link: 'dialog', width: 250 },
                         { prop: 'tYear', label: '年份', width: 58 },
                         { prop: 'tDept', label: '部门', width: 120 },
                         { prop: 'procDefName', label: '表单名称' },
@@ -227,7 +227,7 @@
             this.loadData()
             this.getConfig() //获取配置的报表
             let roleArr = this.$store.getters.userInfo.role
-            console.log(roleArr)
+            // console.log(roleArr)
             const hasRole = roleArr.some(item => item.name === '系统管理角色')
             if (hasRole) {
                 this.listConfig.toolbars.push({ key: 'remove' })
@@ -294,10 +294,7 @@
                     if (options[1]) {
                         let yersOption = options[1]
                         if (yersOption) {
-                            result =
-                                result +
-                                '/' +
-                                yersOption.substring(1, yersOption.length - 1)
+                            result = result + '/' + yersOption.substring(1, yersOption.length - 1)
                         }
                     }
                 }

+ 1 - 1
src/views/platform/message/inner/detail/dialog.vue

@@ -54,7 +54,7 @@ export default {
       dialogVisible: this.visible,
       dialogLoading: false,
       toolbars: [
-        { key: 'cancel' }
+        { key: 'cancel', label: '关闭' }
       ]
     }
   },