n20-common-lib 2.9.68 → 2.9.69

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -203,11 +203,33 @@
       />
     </cl-dialog>
     <cl-dialog v-drag :visible.sync="rejectToV" :title="'驳回至节点' | $lc" width="960px" append-to-body top="7.5vh">
-      <reject-to-prop :task-id="taskId" @close="rejectToV = false" @confirm="rejectToFn" />
+      <reject-to-prop
+        :task-id="taskId"
+        @close="rejectToV = false"
+        :showRetraceFlow="isShowRetrace"
+        @confirm="rejectToFn"
+      />
     </cl-dialog>
     <cl-dialog v-drag :visible.sync="approvalToV" :title="'批准至节点' | $lc" width="960px" append-to-body top="7.5vh">
       <reject-to-prop :task-id="taskId" type="approvalTo" @close="approvalToV = false" @confirm="approvalToFn" />
     </cl-dialog>
+    <cl-dialog
+      v-drag
+      :visible.sync="showFlowDialog"
+      :title="'驳回发起人是否重走流程' | $lc"
+      width="400px"
+      append-to-body
+      center-dialog
+    >
+      <el-radio-group v-model="isJump">
+        <el-radio label="0">{{ '重走流程' | $lc }}</el-radio>
+        <el-radio label="1">{{ '不重走流程' | $lc }}</el-radio>
+      </el-radio-group>
+      <div slot="footer">
+        <el-button type="primary" @click="handleIsJumpSave">{{ '确定' | $lc }}</el-button>
+        <el-button @click="showFlowDialog = false">{{ '取消' | $lc }}</el-button>
+      </div>
+    </cl-dialog>
     <cl-dialog v-drag :visible.sync="verifyV" :title="'校验结果' | $lc" width="960px" append-to-body top="7.5vh">
       <div class="m-t m-b">
         <span class="m-r-ss">{{ '结果统计：' | $lc }}</span> {{ '共计校验' | $lc }}<span>{{ verifyMsg.checkSum }}</span
@@ -393,7 +415,10 @@ export default {
       verifyV: false,
       verifyMsg: {},
       promptType: '0',
-      remarkOpt: []
+      remarkOpt: [],
+      isShowRetrace: undefined,
+      isJump: undefined,
+      showFlowDialog: false
     }
   },
   computed: {
@@ -577,6 +602,7 @@ export default {
           addTaskTag: this.addTaskTag,
           addTaskWay: this.addTaskWay,
           customizationDtos,
+          isJump: this.isJump,
           ...this.otherAtt
         }
       ]
@@ -625,24 +651,46 @@ export default {
         F.then && F.then(callFn)
       }
     },
+    // 查询是否配置 允许不重走流程
+    async getIsShowRetraceFlow() {
+      let procInstId = this.$route.query.processInstanceId
+      let taskId = this.taskId
+      const { code, data } = await axios.get(
+        `/bems/activiti/admin/todo/isShowRetraceFlowOptions/${procInstId}/${taskId}`
+      )
+      return code === 200 && data
+    },
     // 驳回
-    rejectFn() {
+    async rejectFn() {
       if (!this.messageC) {
         return this.errMsgFn(this.authList.includes('refuse') ? $lc('拒绝') : $lc('驳回'))
       }
+      this.showFlowDialog = await this.getIsShowRetraceFlow()
+
+      if (this.showFlowDialog) return
+
+      this.beforeFn(this.beforeReject, () => {
+        axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
+          this.thenMsg(data, $lc('驳回至发起人'))
+        })
+      })
+    },
+    handleIsJumpSave() {
       this.beforeFn(this.beforeReject, () => {
         axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
           this.thenMsg(data, $lc('驳回至发起人'))
         })
       })
     },
-    rejectToB() {
+    async rejectToB() {
       if (!this.messageC) {
         return this.errMsgFn($lc('驳回'))
       }
+      this.isShowRetrace = await this.getIsShowRetraceFlow()
       this.rejectToV = true
     },
-    rejectToFn(taskId) {
+    rejectToFn(taskId, isJump) {
+      this.isJump = isJump
       this.rejectToV = false
       let param = this.getParam()
       param.forEach((item) => {

package/src/components/ApprovalButtons/setRejectToProp.vue

@@ -40,9 +40,18 @@
         <template slot-scope="{ row }">{{ row | userF }}</template>
       </el-table-column>
     </el-table>
-    <div slot="footer" class="m-t text-c">
-      <el-button type="primary" @click="confirmFn">{{ type === 'approvalTo' ? $lc('批准') : $lc('驳回') }}</el-button>
-      <el-button @click="$emit('close')">{{ '取消' | $lc }}</el-button>
+
+    <div slot="footer" class="m-t">
+      <div v-if="showRetraceFlowC">
+        <el-radio-group v-model="isJump">
+          <el-radio label="1">{{ '重走流程' | $lc }}</el-radio>
+          <el-radio label="0">{{ '不重走流程' | $lc }}</el-radio>
+        </el-radio-group>
+      </div>
+      <div class="text-c">
+        <el-button type="primary" @click="confirmFn">{{ type === 'approvalTo' ? $lc('批准') : $lc('驳回') }}</el-button>
+        <el-button @click="$emit('close')">{{ '取消' | $lc }}</el-button>
+      </div>
     </div>
   </cl-page>
 </template>
@@ -72,6 +81,10 @@ export default {
     taskId: {
       type: String,
       default: ''
+    },
+    showRetraceFlow: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -81,9 +94,15 @@ export default {
       },
       stlV: undefined,
       list: [],
+      isJump: undefined,
       tableData: []
     }
   },
+  computed: {
+    showRetraceFlowC() {
+      return this.showRetraceFlow
+    }
+  },
   mounted() {
     axios
       .get(`/bems/activiti/sample/getTaskMoveVos/${this.taskId}/${this.type === 'approvalTo' ? 1 : 0}`, null, {
@@ -112,7 +131,7 @@ export default {
         this.$message.warning($lc('请选择节点'))
         return
       }
-      this.$emit('confirm', this.stlV)
+      this.$emit('confirm', this.stlV, this.isJump)
     }
   }
 }

package/src/i18n.json

@@ -3459,5 +3459,15 @@
     "en": "App approval",
     "th": "การอนุมัติบน App",
     "vi": "Phe duyệt bằng App"
+  },
+  "重走流程": {
+    "en": "Re-run the process",
+    "th": "ทำการรีรันด้วยขั้นตอนเดิม",
+    "vi": "Làm lại quy trình"
+  },
+  "不重走流程": {
+    "en": "Do not re-run the process",
+    "th": "ไม่ทำการรีรันด้วยขั้นตอนเดิม",
+    "vi": "Không làm lại quy trình"
   }
 }