Browse Source

Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

liuhj 1 week ago
parent
commit
3b09782f61
1 changed files with 17 additions and 2 deletions
  1. 17 2
      src/components/Finance/Overspend.vue

+ 17 - 2
src/components/Finance/Overspend.vue

@@ -174,7 +174,12 @@ export default {
                 '退餐费(地接导入)',
                 '车超时费用(地接导入)',
                 '酒店超支费用-酒店导入'
-            ]
+            ],
+            overspendAuditUser: {
+                jinliExpand: [],
+                zhuguanExpand: [],
+                syzhuguanExpand: []
+            }
         }
     },
     methods: {
@@ -289,6 +294,7 @@ export default {
                 if (res.data.code == 200) {
                     that.dataCount = res.data.data.dataCount
                     that.tableData = res.data.data.dataList;
+                    that.overspendAuditUser = res.data.data.overspendAuditUser;
                 } else {
                     that.$message({
                         message: res.data.msg,
@@ -437,7 +443,16 @@ export default {
             var jinli = [330];
             var zhuguan = [334];
             var syzhuguan = [149];
-            jinli.push(235);
+
+            jinli = jinli.concat(this.overspendAuditUser.jinliExpand);
+            zhuguan = zhuguan.concat(this.overspendAuditUser.zhuguanExpand);
+            syzhuguan = syzhuguan.concat(this.overspendAuditUser.syzhuguanExpand);
+
+            //数组去重
+            jinli = [...new Set(jinli)];
+            zhuguan = [...new Set(zhuguan)];
+            syzhuguan = [...new Set(syzhuguan)];
+
             var biaoshi = -1;
             if (userid) {
                 if (jinli.indexOf(userid) != -1) {