n20-common-lib 2.22.11 → 2.22.13

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -579,27 +579,8 @@ export default {
               noMsg: true
             }
           )
-          // addTaskTip 是否给出加签提示
-          if (res.code === 200 && res.data && res.data.addTaskTip) {
-            this.$confirm('请确定是否向后加签', $lc('提示'), {
-              confirmButtonText: $lc('确定'),
-              cancelButtonText: $lc('取消'),
-              type: 'warning'
-            }).then(() => {
-              // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
-              if (
-                res.code === 200 &&
-                res.data &&
-                (res.data.showNextEgwOutgoingNodeName || res.data.showNextNodeAssignee)
-              ) {
-                this.setSpr = true
-                this.selectSprList = res.data
-              } else {
-                this.checkFlowFn()
-              }
-            })
-          } else {
-            // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
+          // 处理请求结果：showNextEgwOutgoingNodeName 或 showNextNodeAssignee 有一个为 true 时显示加签列表
+          const handleResult = () => {
             if (
               res.code === 200 &&
               res.data &&
@@ -608,9 +589,21 @@ export default {
               this.setSpr = true
               this.selectSprList = res.data
             } else {
+              this.nextEgwOutgoingNodeId = undefined
+              this.nextNodeApproveUnos = undefined
               this.checkFlowFn()
             }
           }
+          // addTaskTip 是否给出加签提示
+          if (res.code === 200 && res.data && res.data.addTaskTip) {
+            this.$confirm('请确定是否向后加签', $lc('提示'), {
+              confirmButtonText: $lc('确定'),
+              cancelButtonText: $lc('取消'),
+              type: 'warning'
+            }).then(handleResult)
+          } else {
+            handleResult()
+          }
         } catch (error) {
           console.log(error)
           this.checkFlowFn()

package/src/components/ApprovalButtons/selectSpr.vue

@@ -106,23 +106,11 @@ export default {
       this.selectCheck = this.selectSprList?.showNextNodeAssignee || false
     },
     personChange(list) {
-      const prevList = this.personList || []
       const { nextNodeAssigneeMinnum: min = 0, nextNodeAssigneeMaxnum: max = 0 } = this.selectSprList || {}
 
       // 校验最大值
       if (max && list.length > max) {
-        if (this.$message && this.$message.warning) {
-          this.$message.warning(`审批人数需小于 ${max} 个`)
-        }
-        // 恢复为上一次合法选择
-        this.$nextTick(() => {
-          if (this.$refs.personTable) {
-            this.$refs.personTable.clearSelection()
-            prevList.forEach((row) => {
-              this.$refs.personTable.toggleRowSelection(row, true)
-            })
-          }
-        })
+        this.$message.warning(`审批人数需小于或等于 ${max} 个`)
         return
       }
 
@@ -131,9 +119,8 @@ export default {
 
       // 校验最小值（仅提示，不强制拦截）
       if (min && list.length < min) {
-        if (this.$message && this.$message.info) {
-          this.$message.info(`审批人数需大于 ${min} 个`)
-        }
+        this.$message.info(`审批人数需大于或等于 ${min} 个`)
+        return
       }
     },
     closeFn(item) {

package/src/components/Upload/uploadMsg.vue

@@ -258,6 +258,8 @@ export default {
     handleClose() {
       this.progressV = false
       this.$emit('clearFiles')
+      this.page.current = 1
+      this.page.pageSize = 20
     },
     getList() {
       const startIndex = (this.page.current - 1) * this.page.pageSize