n20-common-lib 2.9.71 → 2.9.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.9.71",
+  "version": "2.9.73",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalButtons/index.vue

@@ -223,7 +223,15 @@
     >
       <el-radio-group v-model="isJump">
         <el-radio label="0">{{ '重走流程' | $lc }}</el-radio>
-        <el-radio label="1">{{ '不重走流程' | $lc }}</el-radio>
+        <el-radio label="1"
+          >{{ '不重走流程' | $lc }}
+          <el-alert
+            :title="`此模式下被回退节点提交后将绕过中间已办节点，造成流程不严谨，谨慎使用！` | $lc"
+            type="warning"
+            show-icon
+          >
+          </el-alert
+        ></el-radio>
       </el-radio-group>
       <div slot="footer">
         <el-button type="primary" @click="handleIsJumpSave">{{ '确定' | $lc }}</el-button>
@@ -680,6 +688,7 @@ export default {
       })
     },
     handleIsJumpSave() {
+      this.showFlowDialog = false
       this.beforeFn(this.beforeReject, () => {
         axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
           this.thenMsg(data, $lc('驳回至发起人'))

package/src/components/ApprovalButtons/setRejectToProp.vue

@@ -45,7 +45,15 @@
       <div v-if="showRetraceFlowC">
         <el-radio-group v-model="isJump">
           <el-radio label="0">{{ '重走流程' | $lc }}</el-radio>
-          <el-radio label="1">{{ '不重走流程' | $lc }}</el-radio>
+          <el-radio label="1"
+            >{{ '不重走流程' | $lc }}
+            <el-alert
+              :title="`此模式下被回退节点提交后将绕过中间已办节点，造成流程不严谨，谨慎使用！` | $lc"
+              type="warning"
+              show-icon
+            >
+            </el-alert
+          ></el-radio>
         </el-radio-group>
       </div>
       <div class="text-c">

package/src/i18n.json

@@ -3469,5 +3469,10 @@
     "en": "Do not re-run the process",
     "th": "ไม่ทำการรีรันด้วยขั้นตอนเดิม",
     "vi": "Không làm lại quy trình"
+  },
+  "此模式下被回退节点提交后将绕过中间已办节点，造成流程不严谨，谨慎使用！": {
+    "en": "This mode will bypass the middle nodes that have been completed after the node is returned, causing the process to be non-standard. Use with caution!",
+    "th": "เมื่อมีการย้อนกลับไปยังโครงการที่มีการเสร็จสิ้นแล้ว จะทำให้โครงการไม่สมบูรณ์ โปรดใช้ด้วยระวัง!",
+    "vi": "Trong chế độ này, sau khi trả lại, các bước đã hoàn thành sẽ bị bỏ qua, làm cho quy trình không chuẩn xác. Sử dụng với cẩn thận!"
   }
 }