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

src/components/SalesModule/passengerSaleList.vue

@@ -53,6 +53,9 @@
                                 <el-tooltip  class="item" effect="dark" content="删除" placement="top-start">
                                     <el-button type="primary" style='background:#e95252; border-color:#e95252' icon="iconfont icon-shanchu" @click="pal_del(item)"></el-button>
                                 </el-tooltip>
+                                <el-tooltip  class="item" effect="dark" content="下载申请表" placement="top-start">
+                                    <el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3' icon="iconfont icon-img_download" @click="goUrlB(item.Id)"></el-button>
+                                </el-tooltip>
                             </el-button-group>
                         </td>
                     </tr>
@@ -113,6 +116,10 @@ export default {
         goUrlA: function (guestId){
             this.$router.push({name: 'addPassenger',query:{"TCID":this.msg.tcid,"orderId":this.msg.id,'guestId':guestId}});
         },
+        goUrlB: function (guestId){
+            let routeData = this.$router.resolve({name: 'VisaPersonalFormSell', query: {data: guestId}});
+            window.open(routeData.href, '_blank');
+        },
         goUrlP: function () {
             this.$router.push({ name: 'passengerListSale', query: { id: this.msg.id, tcnum: this.msg.tcnum, blank: 'y', tab: '旅客分房'} });
         },

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -284,7 +284,6 @@
         this.loading = true
         this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
            this.loading = false
-          console.log("dmcstatistics_post_GetUniteCombinationNumService", res.data.data);
           if (res.data.resultCode == 1) {
             this.msg.total = res.data.data.count;
             let data = res.data.data.pageData.data;
@@ -312,6 +311,7 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
+      this.getLineTeamList();
       this.getList()
     },
   }

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -123,7 +123,7 @@
             <div class="TB_comtitle">团队收支明细</div>
             <div class="Team_Content">
                 <el-row :gutter="12">
-                    <el-col :span="5">
+                    <el-col :span="4">
                         <div class="Team_DList">
                             <div class="Team_firstTitle">收客情况</div>
                             <div>团队编号：{{TCID}}</div>
@@ -133,7 +133,7 @@
                             <div>系列：{{DataList.TeamBalance.LtName}}</div>
                         </div>
                     </el-col>
-                    <el-col :span="5">
+                    <el-col :span="4">
                         <div class="Team_DList">
                             <div class="Team_firstTitle">
                                 <span class="Team_comCoinType Team_shou">
@@ -147,7 +147,7 @@
                             </div>
                         </div>
                     </el-col>
-                    <el-col :span="5">
+                    <el-col :span="4">
                         <div class="Team_DList">
                             <div class="Team_firstTitle">
                                 <span class="Team_comCoinType Team_zhichu">
@@ -161,7 +161,7 @@
                             </div>
                         </div>
                     </el-col>
-                    <el-col :span="5">
+                    <el-col :span="4">
                         <div class="Team_DList">
                             <div class="Team_firstTitle">
                                 <span class="Team_comCoinType Team_lirun">
@@ -174,6 +174,18 @@
                             </div>
                         </div>
                     </el-col>
+                  <el-col :span="4">
+                    <div class="Team_DList">
+                      <div class="Team_firstTitle">
+                                <span class="Team_comCoinType Team_lirun">
+                                    <i class="iconfont icon-qian"></i>
+                                </span>提成
+                      </div>
+                      <div class="Team_Incontent">
+                        <div>预计提成<span>￥{{DataList.ExpectedCut}}</span></div>
+                      </div>
+                    </div>
+                  </el-col>
                 </el-row>
             </div>
         </div>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1078,6 +1078,10 @@
             this.queryCommonData.checkDialogAll = false;
             this.queryCommonData.ckedplat = [];
           }
+          else
+          {
+            this.Info(res.data.message);
+          }
         });
       },
       //单团设置上架

src/components/VisaPersonalForm.vue

@@ -175,7 +175,7 @@
                     </p>
                     <p>在日邀请人(如保证人和邀请人是同一个人，请写“同上”)</p>
                     <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                        <span>姓名<input  style="width: 48%;" type="text" value='参照"身元保证书"'></span>
+                        <span>姓名<input  style="width: 48%;" type="text" value='同上'></span>
                         <span>电话<input  style="width: 100%;" type="text" ></span>
                     </p>
                     <p style="    margin-top: 20px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;