n20-common-lib 2.22.10 → 2.22.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.22.10",
+  "version": "2.22.12",
   "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/showAppOpi.vue

@@ -7,7 +7,8 @@
       clearable
       :multiple="multiple"
       collapse-tags
-      :placeholder="'常用审批意见，选择后将自动填充至下方输入框，您可在此基础上修改' | $lc"
+      :placeholder="'
+      ，选择后将自动填充至下方输入框，您可在此基础上修改' | $lc"
       @change="changeFn"
     >
       <el-option v-for="(item, i) in approveMsgList" :key="i" :label="item.suggestion" :value="item.suggestion" />
@@ -106,6 +107,7 @@ import ClTablePro from '../TablePro/index.vue'
 import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
 export default {
+  name: 'ShowAppOpi',
   components: {
     clSecondaryTab,
     ClDialog,

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

package/src/index.js

@@ -5,6 +5,7 @@ import AnchorItem from './components/Anchor/AnchorItem.vue'
 import Anchor from './components/Anchor/index.vue'
 
 import ApprovalButtons from './components/ApprovalButtons/index.vue'
+import ShowAppOpi from './components/ApprovalButtons/showAppOpi.vue'
 import ApproveCard from './components/ApprovalCard/ApproveCard.vue'
 import ApprovalCard from './components/ApprovalCard/index.vue'
 import ApprovalImg from './components/ApprovalRecord/approvalImg.vue'
@@ -183,6 +184,7 @@ const components = [
   ApproveCard,
   ApprovalRecord,
   ApprovalButtons,
+  ShowAppOpi,
   Expandable,
   ExpandablePane,
   Empty,
@@ -302,6 +304,7 @@ export {
   Anchor,
   AnchorItem,
   ApprovalButtons,
+  ShowAppOpi,
   ApprovalCard,
   /* 中建科 */
   ApprovalCardZjk,