Преглед изворни кода

修复体系运行记录盒bug,调整生成快照时机

cfort пре 2 година
родитељ
комит
f0c7f25dd6

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

@@ -323,7 +323,7 @@ export default {
             if (actionName === 'agree') {
                 agree(params).then(response => {
                     this.handleResponse(actionName, loading, response)
-                    this.createSnapshot()
+                    // this.createSnapshot()
                 }).catch(() => {
                     loading.close()
                 })
@@ -370,6 +370,9 @@ export default {
                 } else if (actionName === 'rejectToPrevious' || actionName === 'rejectToStart' || actionName === 'reject') {
                     this.rejectDialogVisible = false
                 }
+                if (actionName === 'agree') {
+                    this.createSnapshot()
+                }
                 // 后置事件
                 this.afterScript(this.actionName, {
                     data: response.data,

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

@@ -266,9 +266,9 @@ export default {
                 columns: [
                     { prop: 'deptName', label: '部门', width: 90 },
                     { prop: 'procDefName', label: '表单名称', sortable: 'custom', formatter: this.replaceFormName, width: 250 },
-                    { prop: 'subject', label: '事务说明', formatter: this.getDesc, 'min-width': 300 },
+                    { prop: 'desc', label: '事务说明', 'min-width': 300 },
                     { prop: 'createBy', label: '编制人', width: 80, slotName: 'creator' },
-                    { prop: 'endTime', label: '完成时间', sortable: 'custom', dateFormat: 'yyyy-MM-dd hh:mm:ss', width: 150 }
+                    { prop: 'endTime', label: '完成时间', sortable: 'custom', width: 150 }
                 ],
                 rowHandle: {
                     actions: [
@@ -318,12 +318,12 @@ export default {
             return cellValue
         },
         // 截取事务说明字段内容
-        getDesc (row, column, cellValue, index) {
-            const hasDesc = cellValue.includes('#')
+        getDesc (str) {
+            const hasDesc = str.includes('#')
             if (!hasDesc) {
                 return ''
             }
-            return cellValue.split('#')[1]
+            return str.split('#')[1]
         },
         getInfo (val) {
             const arr = val.split('#')
@@ -348,6 +348,7 @@ export default {
                 dataResult.forEach(item => {
                     const temp = this.getInfo(item.subject)
                     item.deptName = temp ? temp.deptName : ''
+                    item.desc = this.getDesc(item.subject)
                 })
                 response.data.dataResult = dataResult
                 ActionUtils.handleListData(this, response.data)

+ 10 - 9
src/views/system/dashboard/components/workbench.vue

@@ -143,6 +143,7 @@ export default {
         }
     },
     data () {
+        const fieldWidth = window.innerWidth > 1600 ? 150 : 120
         const { first = '', second = '' } = this.$store.getters.level || {}
         const level = second || first
         const { userList = [], deptList = [] } = this.$store.getters || {}
@@ -246,10 +247,10 @@ export default {
                     },
                     guide: {
                         forms: [
-                            { prop: 'suo_shu_xi_tong_', label: '子系统', fieldType: 'input' },
-                            { prop: 'gong_neng_mo_kuai', label: '功能模块', fieldType: 'input' },
+                            { prop: 'suo_shu_xi_tong_', label: '所属子系统', fieldType: 'input' },
+                            { prop: 'gong_neng_mo_kuai', label: '所属功能模块', labelWidth: 100, fieldType: 'input' },
                             { prop: 'biao_dan_ming_che', label: '记录表单', fieldType: 'input' },
-                            { prop: 'shi_wu_lei_xing_', label: '事务类型',fieldType: 'select', options: taskTypeOptions }
+                            { prop: 'shi_wu_lei_xing_', label: '事务类型', fieldType: 'select', options: taskTypeOptions }
                         ]
                     }
                 },
@@ -312,16 +313,16 @@ export default {
                     ],
                     guide: [
                         { prop: 'sn', label: '序号', width: 60 },
-                        { prop: 'sysName', label: '子系统', sortable: 'custom', width: 100 },
-                        { prop: 'module', label: '功能模块', width: 120 },
+                        { prop: 'sysName', label: '所属子系统', sortable: 'custom', width: 100 },
+                        { prop: 'module', label: '所属功能模块', width: fieldWidth },
                         { prop: 'tableName', label: '记录表单', width: 200 },
                         // { prop: 'tableNo', label: '表单编号', width: 100 },
-                        { prop: 'timing', label: '填写时机', minWidth: 120 },
+                        { prop: 'timing', label: '填写时机/记录频次', minWidth: fieldWidth },
                         { prop: 'taskType', label: '事务类型', tags: taskTypeOptions, width: 100 },
                         { prop: 'fileName', label: '程序文件', width: 160 },
-                        { prop: 'creator', label: '编制人', width: 120 },
-                        { prop: 'reviewer', label: '审核人', width: 120 },
-                        { prop: 'approver', label: '审批人', width: 120 }
+                        { prop: 'creator', label: '编制人', width: fieldWidth },
+                        { prop: 'reviewer', label: '审核人', width: fieldWidth },
+                        { prop: 'approver', label: '审批人', width: fieldWidth }
                     ]
                 }
             }

+ 1 - 1
src/views/system/dashboard/page.vue

@@ -171,7 +171,7 @@
     import { StatisticsData, StatisticsSign } from '@/api/platform/system/jbdHome'
     import { getToken } from '@/utils/auth'
     import newHome from './components/new-home'
-    import Workbench from './components/workbench'
+    import Workbench from './components/workbench.vue'
     import curdPost from '@/business/platform/form/utils/custom/joinCURD.js'
 
     const _import = require('@/utils/util.import.' + process.env.NODE_ENV)