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

bug-8742 终止按钮的默认审批意见,不要预设“同意”

shenQiLong 1 день назад
Родитель
Сommit
8ac839fc9e

+ 1 - 1
src/business/platform/bpmn/components/approval-opinion/index.vue

@@ -222,7 +222,7 @@ export default {
                 this.data =
                   this.action == 'agree'
                     ? '同意'
-                    : this.action == 'stop'
+                    : this.action == 'stop' || this.action == 'endProcess'
                     ? '终止'
                     : this.action == 'reject'
                     ? '退回修改'

+ 1 - 1
src/business/platform/bpmn/form-ext/approve.vue

@@ -199,7 +199,7 @@ export default {
           response.variables !== {} && response.variables.def
             ? response.variables.def.value
             : ''
-        this.approve.opinion = data
+        this.approve.opinion = action == 'manualend' ? data || '终止' : data
       })
     },
     /**

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

@@ -519,10 +519,10 @@ export default {
 
         // 表单意见是否隐藏意见
         this.$nextTick(() => {
-          this.isBpmOpinionHide = this.handleBpmOpinionHide(
-            data.attributes || {},
-            this.formDef
-          )
+          const { setting } = this.$store.getters
+          this.isBpmOpinionHide =
+            this.handleBpmOpinionHide(data.attributes || {}, this.formDef) &&
+            !setting?.button?.terminate
         })
         // 流程关联信息
         this.formParams.bpmLinkData = FormUtil.getBpmLinkData(