n20-common-lib 2.17.6 → 2.17.8

package/package.json

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

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -226,7 +226,7 @@ export default {
             appNoType: 'add',
             suggestion: '',
             key: this.tableDataA.length,
-            isAll: '0',
+            isAll: '2',
             isEnable: '1',
             belongUserno: sessionStorage.getItem('userNo')
           })
@@ -284,13 +284,13 @@ export default {
     getData() {
       if (this.andUser) {
         axios.post('/bems/activiti/actAppOpi/queryAppOpiAndUser', null, { loading: false }).then(({ data }) => {
-          this.tableDataA = this.getOnlyData(JSON.parse(JSON.stringify(data)))?.filter((item) => item.isAll === '0')
+          this.tableDataA = this.getOnlyData(JSON.parse(JSON.stringify(data)))?.filter((item) => item.isAll !== '1')
           this.tableData = this.getOnlyData(data)
         })
       } else {
         axios.post('/bems/activiti/actAppOpi/queryAppOpi', null, { loading: false }).then(({ data }) => {
           this.tableDataA = this.getOnlyData(JSON.parse(JSON.stringify(data.list || [])))?.filter(
-            (item) => item.isAll === '0'
+            (item) => item.isAll !== '1'
           )
           this.tableData = this.getOnlyData(data.list || [])
         })

package/src/components/ApprovalCard/index.vue

@@ -468,11 +468,15 @@ export default {
         resultName = resultName.split('-')
         resultName = resultName[resultName.length - 1]
         _item.resultName = resultName === $lc('推进') ? $lc('批准') : resultName
+        _item.resultNameA = resultName === $lc('推进') ? $lc('批准') : resultName
+        if (item.optName) {
+          _item.resultName = item.optName
+        }
         if (item.taskName === $lc('开始')) {
           _item.result = 1
-        } else if (_item.resultName === $lc('加签推进')) {
+        } else if (_item.resultNameA === $lc('加签推进')) {
           _item.result = 2
-        } else if (_item.resultName === $lc('作废')) {
+        } else if (_item.resultNameA === $lc('作废')) {
           _item.result = 4
         } else if (item.taskName === $lc('结束')) {
           _item.result = 5