Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/LeaderManagement/leaderReimbursement.vue

@@ -1394,7 +1394,7 @@
           name: "ChoiceAddFinancialDocuments",
           query: {
             Type: 2,
-            companyID: this.msgList[0].OutBranchId,
+            companyID: this.msgList&&this.msgList.length>0&&this.msgList[0].OutBranchId?this.msgList[0].OutBranchId:this.$route.query.OutBranchId,
             'blank': 'y',
             'orderObj': JSON.stringify(orderObj)
           }
@@ -1460,7 +1460,7 @@
         }
         let TCIDARR = []
         let id = [];
-        if( this.msgList[0].LineId==this.myLineId){
+        if((this.msgList&&this.msgList.length>0&&this.msgList[0].LineId==this.myLineId)||this.myLineId){
 
       if (_orderSource === 1 && _type === 2) {
                   id = [94]
@@ -1506,7 +1506,7 @@
           query: {
             'Type': _type,
             'path': 'teamRevenueExpenditure',
-            'companyID': this.msgList[0].OutBranchId,
+            'companyID': this.msgList&&this.msgList.length>0&&this.msgList[0].OutBranchId?this.msgList[0].OutBranchId:this.$route.query.OutBranchId,
             'templateID': id,
             'blank': 'y',
             'orderObj': JSON.stringify(orderObj),

src/components/dmc/manager/teamRevenueExpenditure.vue

@@ -363,7 +363,7 @@
       }
     },
     methods: {
-      //跳转到财务页面 
+      //跳转到财务页面
       goFinaceURL(id) {
         this.$router.push({
           name: 'FinancialDocumentsDetail',
@@ -441,7 +441,7 @@
       goUrl(_orderSource, _type) {
         let TCIDARR = []
         let id = [];
-        if( this.msgList[0].LineId==this.LineId){
+        if((this.msgList&&this.msgList.length>0&&this.msgList[0].LineId==this.LineId)||this.LineId){
 
       if (_orderSource === 1 && _type === 2) {
                   id = [94]
@@ -470,7 +470,7 @@
               id = [88, 89]
             }
         }
-       
+
         TCIDARR.push(this.$route.query.id)
         let orderObj = {
           OrderID: 0,
@@ -485,7 +485,7 @@
           query: {
             'Type': _type,
             'path': 'teamRevenueExpenditure',
-            'companyID': this.msgList[0].OutBranchId,
+            'companyID': this.msgList&&this.msgList.length>0&&this.msgList[0].OutBranchId?this.msgList[0].OutBranchId:this.$route.query.OutBranchId,
             'templateID': id,
             'blank': 'y',
             'orderObj': JSON.stringify(orderObj),
@@ -499,7 +499,7 @@
         }, res => {
           if (res.data.resultCode == 1) {
             this.msgList = res.data.data
-          
+
           } else {}
         }, err => {})
       },