Browse Source

自定义检测项目流程权限修改,检测档案、已办打印按钮去除bug修复

cfort 3 năm trước cách đây
mục cha
commit
f22b010dc7

+ 4 - 2
src/business/platform/bpmn/form/index.vue

@@ -577,14 +577,16 @@
                     })
                 }
                 const buttons = []
-                // 去除打印按钮和流程审批意见按钮
+                // 已办事宜去除打印按钮和流程实例信息按钮(区分标准,this.instanceId有值则为已办)
                 const filterType = ['print', 'instanceDetail']
                 for (let i = 0; i < toolbars.length; i++) {
                     const button = toolbars[i]
                     const alias = button.alias
                     const code = button.code
                     button.key = alias === 'custom' ? code || alias + i : alias
-                    if (!filterType.includes(button.key)) {
+                    if (!this.instanceId) {
+                        buttons.push(button)
+                    } else if (!filterType.includes(button.key)) {
                         buttons.push(button)
                     }
                 }

+ 5 - 5
src/business/platform/form/utils/custom/process.js

@@ -209,11 +209,11 @@ export const processEdit = params => {
         node.users[0].calcs[0].description = formData.executor[index].desc2
         node.users[0].calcs[0].executorVar.name = formData.executor[index].name
         node.form.formValue = formData.formKey[index]
-        // 填充权限信息
-        processPermission[index].formKey = formData.formKey[index]
-        processPermission[index].flowKey = keys.process
-        processPermission[index].nodeId = keys.activity[index]
-        node.form.editFormRights = processPermission[index]
+        // 填充权限信息 -> 改为由表单统一限制
+        // processPermission[index].formKey = formData.formKey[index]
+        // processPermission[index].flowKey = keys.process
+        // processPermission[index].nodeId = keys.activity[index]
+        // node.form.editFormRights = processPermission[index]
 
         node.attributes.nodeId = keys.activity[index]
         // 填充节点操作按钮

+ 1 - 1
src/views/platform/bpmn/bpmInstHis/component/testingRecord.vue

@@ -37,7 +37,7 @@
                 <el-table-column prop="wei_tuo_id_" label="检测委托单号" width="150">
                     <template slot-scope="scope">{{ scope.row.wei_tuo_id_ | getID(trustList) }}</template>
                 </el-table-column>
-                <el-table-column prop="wei_tuo_dan_wei_" label="委托单位"></el-table-column>
+                <el-table-column prop="wei_tuo_fang_" label="委托单位"></el-table-column>
                 <el-table-column prop="wan_cheng_shi_jia" label="委托日期" width="100"></el-table-column>
                 <el-table-column prop="yang_pin_bian_hao" label="样品编号" width="150"></el-table-column>
                 <el-table-column prop="yang_pin_ming_che" label="样品名称" width="150"></el-table-column>