Merge pull request #1404 from luofann/fix_test_0923

feat: 流程中新增【审批节点】时调整默认项 --story=119817007
TencentBlueKing · Sep 23, 2024 · 323cfd0 · 323cfd0
2 parents a04b4a3 + 584eddd
commit 323cfd0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/docs/RELEASE.md b/docs/RELEASE.md
@@ -2,6 +2,7 @@
 ## [Version: 2.7.0] - 2024-08-29
 【优化】esb鉴权信息迁移到header，支持版本 open-paas/esb >= 2.12.20  
 【优化】导航栏中“我的经办”改为“我的已办”  
+【优化】流程中新增【审批节点】时调整默认项  
 【修复】导航栏样式按照设计规范统一处理  
 【修复】公共API文件导出实现方式修改  
 【修复】修复单据列表在非首页搜索报错的问题  

diff --git a/docs/RELEASE_EN.md b/docs/RELEASE_EN.md
@@ -1,6 +1,7 @@
 # Changelog
 ## [Version: 2.7.0] - 2024-08-29
 【Improved】Migrated the authentication information to header when calling esb, support open-paas/esb >= 2.12.20  
+【Improved】Adjust default items when adding an Approval Node in the process.
 【Fixed】The navigation bar style has been standardized according to the design specifications.  
 【Fixed】Modified the implementation method for exporting common API files.  
 【Fixed】Fixed the issue where searching on the document list in non-home pages resulted in an error.  

diff --git a/frontend/pc/src/views/processManagement/processDesign/nodeConfigue/ApprovalNode.vue b/frontend/pc/src/views/processManagement/processDesign/nodeConfigue/ApprovalNode.vue
@@ -237,9 +237,11 @@
             {{$t(`m['节点处理人为空时，直接跳过且不视为异常']`) }}
           </bk-checkbox>
           <bk-checkbox
+            v-model="formInfo.enable_terminate_ticket_when_rejected"
+            :checked="formInfo.enable_terminate_ticket_when_rejected"
             :true-value="true"
             :false-value="false"
-            v-model="formInfo.enable_terminate_ticket_when_rejected">
+            :before-change="handleTerminateRejectedChange">
             {{$t(`m['审批节点最终结果为拒绝时，自动终止单据']`) }}
           </bk-checkbox>
         </bk-form-item>
@@ -411,7 +413,7 @@
           is_multi: true,
           processors: [],
           is_allow_skip: false,
-          enable_terminate_ticket_when_rejected: false,
+          enable_terminate_ticket_when_rejected: true,
         },
         nodeTagList: [],
         allCondition: [],
@@ -488,7 +490,7 @@
         }
         this.formInfo.is_sequential = this.configur.is_sequential;
         this.formInfo.is_allow_skip = this.configur.is_allow_skip;
-        this.formInfo.enable_terminate_ticket_when_rejected = this.configur.extras.enable_terminate_ticket_when_rejected;
+        this.formInfo.enable_terminate_ticket_when_rejected = ('enable_terminate_ticket_when_rejected') in this.configur.extras ? this.configur.extras.enable_terminate_ticket_when_rejected : true;
         this.formInfo.processors = this.configur.processors ? this.configur.processors.split(',') : [];
         this.formInfo.ticket_type = this.configur.extras.ticket_status ? this.configur.extras.ticket_status.type : 'keep';
         this.formInfo.ticket_key = this.configur.extras.ticket_status ? this.configur.extras.ticket_status.name : '';
@@ -589,6 +591,24 @@
         }
         this.excludeProcessor = [...['EMPTY', 'API'], ...excludeProcessor];
       },
+      handleTerminateRejectedChange() {
+        if (this.formInfo.enable_terminate_ticket_when_rejected) {
+          return new Promise((resolve) => {
+            this.$bkInfo({
+              title: '确认取消设置？',
+              subTitle: '取消后，当审批人拒绝后，单据继续往下执行，请谨慎操作！',
+              confirmFn: () => {
+                resolve(true);
+              },
+              cancelFn: () => {
+                resolve(false);
+              },
+            });
+          });
+        }
+
+        return true;
+      },
       // 确认
       async submitNode() {
         const validates = [this.$refs.nodeInfoForm.validate()];
@@ -602,7 +622,6 @@
             finish_condition: this.finishCondition,
             is_multi: false,
             is_allow_skip: false,
-            enable_terminate_ticket_when_rejected: false,
           };
           // 基本信息
           params.name = this.formInfo.name;