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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -456,7 +456,7 @@
                       style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">{{item.PriceTeamTypeName}}</label>
                   </div>
                   <div class="TCL-OutBranchName" title="销售公司">
-                    {{item.UnionBranchName}}
+                    {{item.UnionBranchName}}  &nbsp; <span v-if="item.BZStatus" :style="{'background-color':item.BZStatus==1?'#ff99cc':item.BZStatus==2?'#bcd6ee':'#00c6ff','color':'#000000','margin-top':'3px'}">{{(item.BZStatus==1?'未报账':item.BZStatus==2?'已报账':'报账中')}}</span>
                   </div>
                   <div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
                   <div class="d12" style="float:none;margin:3px auto;">
@@ -2086,6 +2086,7 @@
               this.queryMsg.noData = !this.queryMsg.total > 0;
               if (!this.isCommissionDetails) return
               this.getDetailsOfRoyalty()
+              this.getTravelAccountStatus()
             }
           },
           err => {}
@@ -2116,6 +2117,31 @@
           }
         )
       },
+      getTravelAccountStatus(){
+        let Ids = this.queryCommonData.dataList.map(x => {
+          return x.TCID
+        })
+        let msg = [...new Set(Ids)]
+        this.apipost(
+          "Financial_post_GetTravelAccountStatus", {
+            TCIDStr: msg.join(',')
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              let RoyaltyList = []
+              RoyaltyList = res.data.data
+              this.queryCommonData.dataList.forEach(x => {
+                RoyaltyList.forEach(y => {
+                  if (x.TCID == y.TCID) {
+                    x.BZStatus = y.State
+                  }
+                })
+              })
+              this.$forceUpdate()
+            }
+          }
+        )
+      },
       //验证大小
       checkTeamNum(queryMsg) {
         var TeamMinNum = parseInt(queryMsg.TeamMinNum);

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -380,7 +380,9 @@
                       {{item.PriceTeamTypeName&&item.PriceTeamTypeName=='单地接'?item.PriceTeamTypeName:'单团'}}
                     </label>
                   </div>
-                  <div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">{{item.UnionBranchName}}</div>
+                  <div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">
+                    {{item.UnionBranchName}} &nbsp; <span v-if="item.BZStatus" :style="{'background-color':item.BZStatus==1?'#ff99cc':item.BZStatus==2?'#bcd6ee':'#00c6ff','color':'#000000','margin-top':'3px'}">{{(item.BZStatus==1?'未报账':item.BZStatus==2?'已报账':'报账中')}}</span>
+                  </div>
                   <div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
                   <div class="d12" style="float:none;margin:3px auto;">
                     <p>
@@ -1539,6 +1541,7 @@
               this.queryMsg.noData = !this.queryMsg.total > 0;
               if (!this.isCommissionDetails) return
               this.getDetailsOfRoyalty()
+              this.getTravelAccountStatus()
             }
           },
           err => {}
@@ -1569,6 +1572,31 @@
           }
         )
       },
+      getTravelAccountStatus(){
+        let Ids = this.queryCommonData.dataList.map(x => {
+          return x.TCID
+        })
+        let msg = [...new Set(Ids)]
+        this.apipost(
+          "Financial_post_GetTravelAccountStatus", {
+            TCIDStr: msg.join(',')
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              let RoyaltyList = []
+              RoyaltyList = res.data.data
+              this.queryCommonData.dataList.forEach(x => {
+                RoyaltyList.forEach(y => {
+                  if (x.TCID == y.TCID) {
+                    x.BZStatus = y.State
+                  }
+                })
+              })
+              this.$forceUpdate()
+            }
+          }
+        )
+      },
       //验证大小
       checkTeamNum(queryMsg) {
         var TeamMinNum = parseInt(queryMsg.TeamMinNum);