Procházet zdrojové kódy

树组件字体大小调整,流程报表生成逻辑修复

cfort před 2 roky
rodič
revize
e5a2352b8a

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

@@ -650,11 +650,12 @@ export default {
         async createSnapshot (bizKey, proId) {
             const { code = '', name = '' } = this.getFormEL().formDefData || {}
             const { proInstId = '' } = this.getFormEL().params || {}
+            const instId = proId || proInstId
             const id = bizKey || this.getFormEL().formData.id
             if (!code) {
                 return
             }
-            const sql = `select * from t_lcidglbdbb where shi_fou_zi_biao_ = 't_${code}' and ti_jiao_kuai_zhao = '是' and gui_dang_lei_xing = 'process'`
+            const sql = `select * from t_lcidglbdbb where shi_fou_zi_biao_ = 't_${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))`
             const { first = '' } = this.$store.getters.level
             this.$common.request('sql', sql).then(async res => {
                 const { data = [] } = res.variables || {}

+ 4 - 1
src/business/platform/data/templatebuilder/right-aside/editors/template-script.vue

@@ -23,7 +23,7 @@
                         </span>
                         <el-dropdown-menu slot="dropdown">
                             <el-dropdown-item command="onLoad">页面加载事件(onLoad)</el-dropdown-item>
-                            <!-- <el-dropdown-item command="customFormatter">自定义格式(customFormatter)</el-dropdown-item> -->
+                            <el-dropdown-item command="customFormatter">自定义格式(customFormatter)</el-dropdown-item>
                             <!-- <el-dropdown-item command="onLoadActions">按钮加载事件(onLoadActions)</el-dropdown-item> -->
                             <el-dropdown-item command="beforeSubmit">按钮前置事件(beforeSubmit)</el-dropdown-item>
                             <el-dropdown-item command="afterSubmit">按钮后置事件(afterSubmit)</el-dropdown-item>
@@ -170,6 +170,9 @@
                     case 'onLoad':
                         val = '\n\t// 加载事件\n\tonLoad (template) {\n\t\t\n\t}'
                         break
+                    case 'customFormatter':
+                        val = '\n\t// 自定义格式\n\tcustomFormatter (template, name, value, rowData, column) {\n\t\t\n\t}'
+                        break
                     case 'onLoadActions':
                         val = '\n\t// 按钮加载事件\n\tonLoadActions (template) {\n\t\t\n\t}'
                         break

+ 1 - 1
src/components/ibps-tree/index.vue

@@ -535,7 +535,7 @@ $border-color: #e5e6e7;
         }
     }
     .ibps-custom-tree-node {
-        font-size: 14px;
+        font-size: 13px;
         padding-right: 8px;
     }
 }

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

@@ -263,11 +263,11 @@ export default {
                 },
                 // 表格字段配置
                 columns: [
-                    { prop: 'deptName', label: '部门', width: 90 },
-                    { prop: 'procDefName', label: '表单名称', sortable: 'custom', formatter: this.replaceFormName, width: 230 },
-                    { prop: 'desc', label: '事务说明', 'min-width': 300 },
-                    { prop: 'createBy', label: '编制人', width: 80, slotName: 'creator' },
-                    { prop: 'endTime', label: '完成时间', sortable: 'custom', width: 150 }
+                    { prop: 'deptName', label: '部门', width: 85 },
+                    { prop: 'procDefName', label: '表单名称', formatter: this.replaceFormName, width: 220 },
+                    { prop: 'desc', label: '事务说明', 'min-width': 280 },
+                    { prop: 'endTime', label: '完成时间', sortable: 'custom', width: 135 },
+                    { prop: 'createBy', label: '编制人', width: 70, slotName: 'creator' }
                 ],
                 rowHandle: {
                     actions: [