n20-common-lib 2.13.13 → 2.13.15

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -516,25 +516,31 @@ export default {
   methods: {
     // 查询选择审批人
     async showAdvancePop() {
-      try {
-        const res = await this.$axios.post('/bems/activiti/admin/todo/showAdvancePop', {
-          isAgentcy: this.$route.query.isAgentcy,
-          taskId: this.$route.query.taskId
-        }, {
-          loading: false,
-          noMsg:true
-        })
-        // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
-        if (res.code === 200 && res.data && (res.data.showNextEgwOutgoingNodeName || res.data.showNextNodeAssignee)) {
-          this.setSpr = true
-          this.selectSprList = res.data
-        } else {
+      this.beforeFn(this.beforeRatify, async () => {
+        try {
+          const res = await this.$axios.post(
+            '/bems/activiti/admin/todo/showAdvancePop',
+            {
+              isAgentcy: this.$route.query.isAgentcy,
+              taskId: this.$route.query.taskId
+            },
+            {
+              loading: false,
+              noMsg: true
+            }
+          )
+          // 如果返回正常 且有返回值 且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()
+          }
+        } catch (error) {
+          console.log(error)
           this.checkFlowFn()
         }
-      } catch (error) {
-        console.log(error)
-        this.checkFlowFn()
-      }
+      })
     },
     // 选择审批人
     selectSprListFn(data) {
@@ -932,13 +938,11 @@ export default {
       if (this.addTaskList.length > 0 && !this.addTaskType) {
         return this.addErrFn()
       }
-      this.beforeFn(this.beforeRatify, () => {
-        axios.post('/bems/activiti/admin/todo/advance', this.getParam()).then(({ data }) => {
-          this.thenMsg(
-            data,
-            this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
-          )
-        })
+      axios.post('/bems/activiti/admin/todo/advance', this.getParam()).then(({ data }) => {
+        this.thenMsg(
+          data,
+          this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
+        )
       })
     },
     approvalNext() {

package/src/components/TablePro/index.vue

@@ -366,7 +366,7 @@ export default {
         return columns.map((column) => {
           if (!column.type) {
             const rate = column['_width_'] / columnsWidth
-            column['width'] = windowWidth * rate
+            column['width'] = Math.ceil(windowWidth * rate)
             return column
           }