n20-common-lib 2.21.3 → 2.21.5

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -184,7 +184,7 @@
       <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">
         {{ btnsNames['approval'] }}{{ '并审批下一条' | $lc }}</el-button
       >
-      <el-button v-if="showApprovalTo" type="primary" @click="approvalToV = true"
+      <el-button v-if="showApprovalTo && showApproveTo" type="primary" @click="approvalToV = true"
         >{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button
       >
       <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button>
@@ -459,6 +459,8 @@ export default {
   data() {
     this.msgisSync = !!this.$listeners['update:message']
     return {
+      // 是否显示批准至（读取门户配置）
+      showApproveTo: true,
       attributes: undefined,
       isWyfk: false,
       nextEgwOutgoingNodeId: undefined,
@@ -512,7 +514,7 @@ export default {
         pass: this.$l('通过'),
         refuse: this.$l('拒绝'),
         takeOff: this.$l('请假'),
-        reject: this.$l('驳回至发起人'),
+        reject: this.$l('驳回至申请人'),
         rejectPre: this.$l('驳回至上一节点'),
         approval: this.$l('批 准'),
         discard: this.$l('作 废'),
@@ -646,8 +648,9 @@ export default {
     // 意见是否必填
     getConfiguration() {
       getJsonc('portal/server-config.jsonc', null, true)
-        .then(({ opinionRequired }) => {
+        .then(({ opinionRequired, showApproveTo }) => {
           this.requiredC = opinionRequired ?? this.required
+          this.showApproveTo = showApproveTo ?? true
           // 读取该工作流是否意见必填
           if (this.$route.query.remarkIsMust !== undefined) {
             this.requiredC = this.$route.query.remarkIsMust === '1'
@@ -738,9 +741,10 @@ export default {
           }
         })
     },
-    // 获取是否显示驳回至按钮
+    // 获取是否显示驳回至批准按钮
     getShowApprovalTo() {
       if (this.showBtn && this.$route.query.state === '2') {
+        // 再读一个开关 false false
         axios
           .get(`/bems/activiti/sample/getTaskMoveVos/${this.$route.query.taskId}/1`, null, {
             noMsg: true
@@ -904,7 +908,7 @@ export default {
       if (!this.showFlowDialog) {
         this.beforeFn(this.beforeReject, () => {
           axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
-            this.thenMsg(data, this.authList.includes('refuse') ? $lc('拒绝') : $lc('驳回至发起人'))
+            this.thenMsg(data, this.authList.includes('refuse') ? $lc('拒绝') : $lc('驳回至申请人'))
           })
         })
       }
@@ -913,7 +917,7 @@ export default {
       this.showFlowDialog = false
       this.beforeFn(this.beforeReject, () => {
         axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
-          this.thenMsg(data, $lc('驳回至发起人'))
+          this.thenMsg(data, $lc('驳回至申请人'))
         })
       })
     },

package/src/components/ApprovalRecord/approvalImgPro/child.vue

@@ -300,7 +300,7 @@ export default {
         this.svgW.querySelector(`[data-element-id="${from}"]`).classList.add('activiti-node-reject')
         if (type === '1') {
           this.svgW.querySelector(`[data-element-id="${to}"]`).classList.add('activiti-node-reject')
-          this.setRejectLink(from, to, $lc('驳回至发起人'))
+          this.setRejectLink(from, to, $lc('驳回至申请人'))
         } else if (type === '2') {
           this.setRejectLink(from, to, $lc('驳回至上一步'))
         } else if (type === '3') {

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -346,7 +346,7 @@ export default {
         this.svgW.querySelector(`[data-element-id="${from}"]`).classList.add('activiti-node-reject')
         if (type === '1') {
           this.svgW.querySelector(`[data-element-id="${to}"]`).classList.add('activiti-node-reject')
-          this.setRejectLink(from, to, $lc('驳回至发起人'))
+          this.setRejectLink(from, to, $lc('驳回至申请人'))
         } else if (type === '2') {
           this.setRejectLink(from, to, $lc('驳回至上一步'))
         } else if (type === '3') {