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

src/components/FinancialModule/BasicDocuments.vue

@@ -1346,10 +1346,14 @@ export default {
           },null)
         },
         jumpPlanPage(path, id){
+            this.apipost('dmcstatistics_post_GetTCIDsByOneTCID', {TCID: id}, res=>{
+                if(res.data.resultCode==1){
                     this.$router.push({
                         name: path,
-                query: { id: id, isUpdate: false, blank: 'y'}
+                        query: { id: res.data.data.TCIDs, isUpdate: false, blank: 'y'}
                     })
+                }
+            }, null)
         },
         jumpPage(path,id,type){
             if(type==1){

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -1117,6 +1117,15 @@ export default {
           columnAlign: "left",
           isResize: true
         },
+        {
+          field: "UnionTiCheng",
+          formatter: this.moneyFormat,
+          title: "联运提成",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "left",
+          isResize: true
+        },
         {
           field: "YingYeE",
           formatter: this.moneyFormat,
@@ -1538,6 +1547,8 @@ export default {
       if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
       if (field === "TransportCost")
         return this.priceFormat(rowData.TransportCost);
+      if (field === "UnionTiCheng")
+        return this.priceFormat(rowData.UnionTiCheng);
       if (field === "YingYeE") return this.priceFormat(rowData.YingYeE);
       if (field === "AverageIncome")
         return this.priceFormat(rowData.AverageIncome);

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1284,6 +1284,15 @@ export default {
           columnAlign: "right",
           isResize: true
         },
+        {
+          field: "UnionTiCheng",
+          formatter: this.moneyFormat,
+          title: "联运提成",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true
+        },
         {
           field: "YingYeE",
           formatter: this.moneyFormat,
@@ -1577,6 +1586,7 @@ export default {
         "合肥",
         "南宁",
         "联运成本",
+        "联运提成",
         "营业额",
         "GRP",
         "TKT",
@@ -1673,7 +1683,8 @@ export default {
         "BC",
         "BD",
         "BE",
-        "BF"
+        "BF",
+        "BG"
       ];
       const ws = XLSX.utils.aoa_to_sheet(data);
       ws["!cols"] = wscols;
@@ -1747,6 +1758,8 @@ export default {
       if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
       if (field === "TransportCost")
         return this.priceFormat(rowData.TransportCost);
+        if (field === "UnionTiCheng")
+        return this.priceFormat(rowData.UnionTiCheng);
       if (field === "YingYeE") return this.priceFormat(rowData.YingYeE);
       if (field === "AverageIncome")
         return this.priceFormat(rowData.AverageIncome);
@@ -1904,6 +1917,9 @@ export default {
       }
        if(rowData.TransportCost < 0 && columnName=="TransportCost"){
         return "column-cell-class-name-test-red"
+      }
+       if(rowData.UnionTiCheng < 0 && columnName=="UnionTiCheng"){
+        return "column-cell-class-name-test-red"
       }
        if(rowData.YingYeE < 0 && columnName=="YingYeE"){
         return "column-cell-class-name-test-red"

src/components/LeaderManagement/leaderReimbursement.vue

@@ -446,7 +446,7 @@
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
       <tr>
         <th>预付合计</th>
-        <th>团号</th>
+        <th width="140">团号</th>
         <th>实际领款</th>
         <th>财务单号</th>
         <th>操作</th>
@@ -454,12 +454,12 @@
       <tr v-for='(item, index) in nav' >
         <td rowspan="2" width="180" v-if="index===0">总金额： {{moneyFormat(TotalNav.reimburseTotalPrice.PlanPrice)}}</td>
         <td>{{item.TCNUMS}}</td>
-        <td>
-          <p v-if="item.LeaderGetPrice>0">已领款：{{moneyFormat(item.LeaderGetPrice)}}</p>
+        <td style="display: flex;align-items: center;padding: 5px 20px; height: 40px;">
+          <p style="padding-right: 20px;" v-if="item.LeaderGetPrice>0">已领款：<span style="color: red;">{{moneyFormat(item.LeaderGetPrice)}}</span></p>
           <el-input v-if="item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.95)" class="w300" type="number" v-model="item.LeaderGetPriceT"></el-input>
         </td>
         <td>
-          <span v-for="(subItem, subIndex) in item.FinanceIds" class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', subItem)">{{subItem}}</span>
+          <p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', subItem)">{{subItem}}</span>&nbsp;&nbsp;<span class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem)">申请书</span> &nbsp;&nbsp;<span class="cursorpointer text-decoration" @click="goFncUrl('DebitNote', subItem)">借支单</span></p>
         </td>
         <td width="80" class="_zhidan">
           <input type="button" v-if="isUpdate=='true' && item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.95)" value="制单" class="normalBtn" @click="goZhiDan(item)" />

src/components/SalesModule/SalesFinancialDetail.vue

@@ -373,9 +373,9 @@ export default {
             this.shiMoney = 0;
             data.forEach(x=>{
               this.allMoney += x.PreferPrice
-              if(x.PayMoney>0){
+              // if(x.PayMoney>0){
                 this.shiMoney += (x.PayMoney+x.Fee)
-              }
+              // }
             })
             this.dataList = data;
             this.getList(2)
@@ -384,9 +384,9 @@ export default {
             this.shiMoneyP = 0;
             data.forEach(x=>{
               this.allMoneyP += x.PreferPrice
-              if(x.PayMoney>0){
+              // if(x.PayMoney>0){
               this.shiMoneyP += (x.PayMoney+x.Fee)
-              }
+              // }
             })
             this.dataListP = data;
             this.loading = false;

src/components/Ticketing/PassengerList.vue

@@ -487,7 +487,7 @@
           OrderID: 0,
           OrderSource: 4,
           Obj: {},
-          SourceID: this.$route.query.SourceID,
+          SourceID: this.$route.query.id,
           TCIDList: [],
           isFromPassenger:true,
         }

src/components/Ticketing/TicketManager.vue

@@ -2522,7 +2522,7 @@
           query: {
             blank: 'y',
             isFromTk:true,
-            SourceID: obj.ID,
+            id: obj.ID,
             TCIDList: obj.TCIDList,
             companyIDList: obj.OutBranchIdList,
             tab: title

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -568,7 +568,7 @@
                               <template v-if="subItem.SubList">
                                 <div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
                                   {{subItem.SubList[0].HotelName}}
-                                  <a style="color:green">{{subItem.SubList[0].RemainingInventory>-3?"【OK】":"【暂定】"}}</a>
+                                  <a style="color:green">{{subItem.SubList[0].Status==1?"【OK】":"【暂定】"}}</a>
                                   【<a
                                     style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
                                     {{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
@@ -1176,7 +1176,7 @@
                     item.SalePlatList.push(parseInt(y))
                   })
                 }
-                //console.log("HotelOrderListReports",item.HotelOrderListReports);
+                console.log("HotelOrderListReports",item.HotelOrderListReports);
               });
             }
           },

src/components/activity/MemberPrivilege.vue

+<template>
+  <div class="flexOne">
+    <div class="query-box">
+      <ul class="user_time_picker"> 
+        <li>
+          <input type="button" @click=" " class="hollowFixedBtn" value="查询">
+          <input type="button" @click="outerVisible = true,dialogTitle=$t('active.ad_addad'),resetInfo()" class="normalBtn" :value="$t('pub.addBtn')">
+        </li>
+      </ul>
+    </div>
+
+    <div class="clearfix"></div>
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+      <tr>
+        <th>会员等级</th>
+        <th>等级名称</th>
+        <th>积分</th>
+        <th>特权</th>
+        <th>升降级标准</th>
+        <th>星级有效期延长的条件</th>
+        <th>操作</th>
+      </tr>
+      <tr v-for="item in dataList">
+         <td>{{item.rank}}</td>
+         <td>{{item.awardName}}</td>
+         <td>{{item.awardCount}}</td>
+         <td>{{item.awardWinningCount}}</td>
+         <td>223</td>
+         <td>22</td>
+         <td>
+            <el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
+                <el-button
+                type="primary"
+                icon="el-icon-edit"
+                circle
+                @click="outerVisible=true,dialogTitle=$t('active.ld_editInfo'),updateData(item)"
+                ></el-button>
+            </el-tooltip>
+         </td>
+      </tr>
+    </table>
+    <div class="noDataNotice" v-if="dataList.length<1">
+      <i class="iconfont icon-kong"></i>
+      <p>{{$t("active.ld_noData")}}</p>
+    </div>
+    <el-dialog
+      custom-class="w800"
+      :title="dialogTitle"
+      :visible.sync="outerVisible"
+      center
+      :before-close="closeChangeMachie"
+    >
+      <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
+        <table class="layerTable layerNoIcon">
+          <tr>
+            <td>
+              <el-form-item label="会员等级" prop="memberLevel">
+                <el-input v-model="addMsg.memberLevel" class="w217" />
+              </el-form-item>
+            </td>
+            <td>
+              <el-form-item label="等级名称" prop="memberName">
+                <el-input v-model="addMsg.memberName" class="w217" />
+              </el-form-item>
+            </td>
+          </tr>
+            <td>
+              <el-form-item label="积分" prop="integral">
+                <el-input v-model="addMsg.integral" class="w217" />
+              </el-form-item>
+            </td>
+            <td>
+              <el-form-item label="特权" prop="privilege"  >
+                <el-select filterable v-model="addMsg.privilege" class="w217" >
+                  <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+                  <el-option v-for="item in awardRelationList" :label="item.couponsName" :value="item.couponId" :key="item.couponId"></el-option>
+                </el-select>
+              </el-form-item>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">
+              <el-form-item label="升降级标准" prop="standard">
+                <el-input v-model="addMsg.standard" type="textarea"/>
+              </el-form-item>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">
+              <el-form-item label="星级有效期延长的条件" prop="condition">
+                <el-input v-model="addMsg.condition" type="textarea"/>
+              </el-form-item>
+            </td>
+          </tr>
+        </table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
+        <button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
+      </div>
+    </el-dialog>
+</div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      //请求
+      msg: {
+        lotteryId: '',
+      },
+      addMsg:{
+          id:0,
+          memberLevel: '',
+          memberName: '',
+          integral: '',
+          privilege: '',
+          standard: '',
+          condition: ''
+      },
+     rules:{ 
+        memberLevel: [{ required: true, message: '请输入会员等级', trigger: "blur" }],
+        memberName: [{ required: true, message: '请输入等级名称', trigger: "blur" }],
+        integral: [{required: true, message: '请输入积分', trigger: "blur"}],
+        privilege: [{ required: true, message: '请选择特选', trigger: "change" }],
+        standard: [{ required: true, message: '请输入升降级标准', trigger: "blur" }],
+        condition: [{ required: true, message: '请输入星级有效期延长的条件', trigger: "blur" }],
+      },
+      loading:false,
+      outerVisible:false,
+      dialogTitle:'',
+      dataList:[],
+      awardRelationList:[],
+    };
+  },
+  mounted() {
+    this.msg.lotteryId = this.$route.query.lotteryId;
+    // this.getList();
+  },
+  filters: {
+  },
+
+  methods: {
+    //获取数据
+    getList() {
+      this.loading = true;
+      this.apiJavaPost("/api/sell/lottery/getLotteryAwardList", this.msg, res => {
+        this.loading = false;
+        if (res.data.resultCode === 1) {
+          this.dataList = res.data.data;
+          console.log(this.dataList,'datalist');
+        } else {
+          this.Error(res.data.message)
+        }
+      }, null);
+    },
+    //提交
+    submitForm(addMsg) {
+      //提交创建、修改表单
+      this.$refs[addMsg].validate(valid => {
+        if (valid) {
+            this.addAward();
+        } else {
+          return false;
+        }
+      });
+    },
+    //提交添加
+    addAward(){
+        this.addMsg.lotteryId = this.$route.query.lotteryId;
+        if(this.addMsg.awardType==1||this.addMsg.awardType==2){
+          this.addMsg.awardRelationId = 0;
+        }
+        this.apiJavaPost("/api/sell/lottery/setLotteryAward", this.addMsg, res => {
+            if (res.data.resultCode === 1) {
+                this.Success(res.data.message);
+                this.outerVisible = false;
+                this.getList();
+            } else {
+              this.Error(res.data.message)
+            }
+        }, null);
+    },
+    //修改信息
+    updateData(item){
+      this.addMsg.id=item.id;
+      this.addMsg.lotteryId = item.lotteryId;
+      this.addMsg.awardName = item.awardName;
+      this.addMsg.awardType = item.awardType;
+      this.addMsg.awardRelationId = item.awardRelationId;
+      this.addMsg.awardCount = item.awardCount;
+      this.addMsg.awardStatus = item.awardStatus;
+      this.addMsg.rank = item.rank;
+      this.getAwardRelationId(3);
+    },
+    //根据奖项类型请求关联Id
+    getAwardRelationId(id){
+      let branchId = this.$route.query.branchId;
+      if(id==3){
+          let msg = {
+            couponId:this.addMsg.awardRelationId,
+            branchId:branchId
+          }
+          this.apiJavaPost("/api/sell/lottery/getCouponsList", msg, res => {
+              if (res.data.resultCode === 1) {
+                  this.awardRelationList = res.data.data;
+              } else {
+                this.Error(res.data.message)
+              }
+          }, null); 
+      }
+    },
+    //重置信息
+    resetInfo(){
+        var newMsg = {
+          id:0,
+          lotteryId:0,
+          awardName:'',
+          awardType:1,
+          awardRelationId:0,
+          awardCount:'',
+          awardStatus:1,
+          rank:'',  
+        }
+        this.addMsg = newMsg;
+    },
+    closeChangeMachie(done) {
+      //弹出框关闭初始化弹框内表单
+      done();
+      this.resetForm("addMsg");
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    }
+   }
+};
+</script>
\ No newline at end of file

src/components/busManagement/busStockManager.vue

@@ -39,9 +39,12 @@
         v-loading='msg.loading'>
         <tr>
           <th width="5%">序号</th>
-          <th width="5%">停车场名称/停车场地址</th>
+          <th width="5%">停车场名称</th>
+          <th width="5%">停车场地址</th>
+          <th width="5%">联系电话</th>
           <th width="10%">地区</th>
           <th width="10%">总库存/使用库存/剩余库存</th>
+          <th width="10%">价格</th>
           <th width="10%">操作人</th>
           <th width="10%">操作</th>
         </tr>
@@ -51,15 +54,22 @@
           </td>
           <td style="text-align:left;padding:0 20px;">
             {{item.ParkName}}
-            <br />
+          </td>
+          <td>
             {{item.Address}}
           </td>
+          <td style="text-align:left;padding:0 20px;">
+            {{item.ParkTel}}
+          </td>
           <td>
             {{item.CountryName}}-{{item.ProvinceName}}-{{item.CityName}}-{{item.DistrictName}}
           </td>
           <td>
             {{item.StockNum}}/{{item.UseNum}}/{{item.ShengYu}}
           </td>
+          <td>
+            {{item.ParkPrice}}
+          </td>
           <td>
             {{item.CreatyByName}}
             <br />
@@ -70,8 +80,7 @@
               <el-button type="primary" icon="el-icon-edit" @click="IsShow=true,GetPark(item.Id)" circle></el-button>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
-              <el-button  type="danger" icon="el-icon-delete"
-                          @click="delPark(item.Id)" circle></el-button>
+              <el-button type="danger" icon="el-icon-delete" @click="delPark(item.Id)" circle></el-button>
             </el-tooltip>
           </td>
         </tr>
@@ -104,14 +113,14 @@
         </el-col>
         <el-col :span="5">
           <el-form-item label="国家">
-            <el-select v-model="PostMsg.Country" clearable class="w210" filterable @change="getAddProvince(PostMsg.Country,1)"
-              :placeholder="$t('hotel.hotel_country')">
+            <el-select v-model="PostMsg.Country" clearable class="w210" filterable
+              @change="getAddProvince(PostMsg.Country,1)" :placeholder="$t('hotel.hotel_country')">
               <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
               <el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <!-- <el-col :span="5">
           <el-form-item label="省份">
             <el-select v-model="PostMsg.Province" filterable class="w210" @change="getAddProvince(PostMsg.Province,2)"
               :placeholder="$t('hotel.hotel_province')">
@@ -127,13 +136,15 @@
               <el-option v-for="item in cityList2" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="5">
           <el-form-item label="详细地址">
-            <el-input v-model="PostMsg.Address" class="w210"></el-input>
+            <el-input placeholder="请输入内容" class="w210" v-model="PostMsg.Address">
+              <el-button slot="append" @click="selectAddress = true" icon="iconfont icon-img_dw"></el-button>
+            </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <!-- <el-col :span="5">
           <el-form-item label="经度">
             <el-input v-model="PostMsg.Lng" class="w210"></el-input>
           </el-form-item>
@@ -143,18 +154,37 @@
           <el-form-item label="纬度">
             <el-input v-model="PostMsg.Lat" class="w210"></el-input>
           </el-form-item>
+        </el-col> -->
+        <el-col :span="5">
+          <el-form-item label="电话">
+            <el-input v-model="PostMsg.ParkTel" class="w210" max-length="30"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="价格">
+            <el-input v-model="PostMsg.ParkPrice" @keyup.native="checkPrice(PostMsg,'ParkPrice')" class="w210"
+              max-length="15">
+            </el-input>
+          </el-form-item>
         </el-col>
 
         <el-col :span="5">
           <el-form-item label="库存数量">
-            <el-input v-model="PostMsg.StockNum" @keyup.native="checkInteger(PostMsg,'StockNum')" class="w210"></el-input>
+            <el-input v-model="PostMsg.StockNum" @keyup.native="checkInteger(PostMsg,'StockNum')" class="w210">
+            </el-input>
           </el-form-item>
         </el-col>
       </el-form>
     </div>
+
+    <el-dialog custom-class="mapList" title="地图选址" center :visible.sync="selectAddress">
+      <googleMap @refList="googleMap" v-bind:address="PostMsg.Address" @headCallBack="headCall"></googleMap>
+    </el-dialog>
+
   </div>
 </template>
 <script>
+  import googleMap from "../commonPage/googleMap.vue";
   export default {
     data() {
       return {
@@ -182,12 +212,15 @@
           Lng: "",
           Lat: "",
           StockNum: 0,
+          ParkPrice: 0,
+          ParkTel: ""
         },
-        countryList:[],
-        provinceList:[],
-        cityList:[],
-        provinceList2:[],
-        cityList2:[]
+        countryList: [],
+        provinceList: [],
+        cityList: [],
+        provinceList2: [],
+        cityList2: [],
+        selectAddress: false,
 
       }
     },
@@ -218,12 +251,11 @@
         }, res => {
           if (res.data.resultCode == 1) {
             this.PostMsg = res.data.data;
-            console.log(this.PostMsg);
-            if(this.PostMsg.Country>0){
-                this.getPrivince(this.PostMsg.Country,1);
+            if (this.PostMsg.Country > 0) {
+              this.getPrivince(this.PostMsg.Country, 1);
             }
-            if(this.PostMsg.Province>0){
-                this.getPrivince(this.PostMsg.Province,2);
+            if (this.PostMsg.Province > 0) {
+              this.getPrivince(this.PostMsg.Province, 2);
             }
           } else {
             this.$message.error(res.data.message)
@@ -245,6 +277,8 @@
             this.PostMsg.Lng = "";
             this.PostMsg.Lat = "";
             this.PostMsg.StockNum = 0;
+            this.PostMsg.ParkPrice = 0;
+            this.PostMsg.ParkTel = "";
             this.getList();
           } else {
             this.$message.error(res.data.message)
@@ -334,7 +368,7 @@
         }
       },
       //初始化对应下拉
-      getPrivince(ID,type){
+      getPrivince(ID, type) {
         let msg = {
           Id: ID
         };
@@ -353,7 +387,7 @@
       },
 
       //重置
-      resetMsg(){
+      resetMsg() {
         let msg = {
           Id: 0,
           ParkName: "",
@@ -367,11 +401,25 @@
           StockNum: 0,
         }
         this.PostMsg = msg;
-      }
+      },
+      googleMap() {
+        this.selectAddress = false;
+      },
+      headCall(msg) {
+        this.PostMsg.Lng = msg.lng;
+        this.PostMsg.Lat = msg.lat;
+        this.PostMsg.Address = msg.address;
+        console.log(msg, 'msssgggg');
+        console.log(msg.address);
+      },
+
     },
     mounted() {
       this.getCountryList();
       this.getList();
+    },
+    components: {
+      googleMap: googleMap,
     }
   }
 
@@ -426,10 +474,17 @@
     cursor: pointer;
   }
 
-  .busStockManager .w150 .el-input{
-    width:150px;
+  .busStockManager .w150 .el-input {
+    width: 150px;
   }
-  .busStockManager .el-button.is-circle{
-    padding:5px;
+
+  .busStockManager .el-button.is-circle {
+    padding: 5px;
   }
+
+  .busStockManager .mapList {
+    width: 850px;
+    height: 510px;
+  }
+
 </style>

src/components/dmc/manager/LeaderHander.vue

@@ -221,8 +221,8 @@
             本
           </div>
         </td>
-        <td>李逍遥</td>
-        <td>李逍遥</td>
+        <td></td>
+        <td></td>
         <td>
           <div>存款证明单</div>
           <div>旅客职业背景表</div>

src/components/dmc/manager/groundOperation.vue

@@ -48,7 +48,8 @@
 </style>
 
 <template>
-  <div v-if="isShow">
+  <div v-loading="loading2">
+    <div v-loading="loading">
       <table class="GOd_Table" border="0" cellspacing="0" cellpadding="0">
         <tr>
           <th colspan="9">导游领队运行计划表</th>
@@ -86,33 +87,73 @@
             部门负责人
           </td>
           <td>机票负责人</td>
-        <td>{{PrincipalList[0].CreateByName}}</td>
+          <td>
+              <template v-if="PrincipalList.length>0">
+                  {{PrincipalList[0].CreateByName}}
+              </template>
+          </td>
           <td>联系电话</td>
-        <td colspan="5">{{PrincipalList[0].CreateByMobile}}</td>
+          <td colspan="5">
+            <template v-if="PrincipalList.length>0">
+              {{PrincipalList[0].CreateByMobile}}
+            </template>
+          </td>
         </tr>
         <tr>
           <td>订房负责人</td>
-        <td>{{PrincipalList[0].HConfirmName}}</td>
+          <td>
+            <template v-if="PrincipalList.length>0">
+              {{PrincipalList[0].HConfirmName}}
+            </template>
+          </td>
           <td>联系电话</td>
-        <td colspan="5">{{PrincipalList[0].HConfirmMobile}}</td>
+          <td colspan="5">
+            <template v-if="PrincipalList.length>0">
+              {{PrincipalList[0].HConfirmMobile}}
+            </template>
+          </td>
         </tr>
         <tr>
           <td>车辆负责人</td>
-        <td>{{PrincipalList[0].BConfirmName}}</td>
+          <td>
+            <template v-if="PrincipalList.length>0">
+              {{PrincipalList[0].BConfirmName}}
+            </template>
+          </td>
           <td>联系电话</td>
-        <td colspan="5">{{PrincipalList[0].BConfirmMobile}}</td>
+          <td colspan="5">
+              <template v-if="PrincipalList.length>0">
+                {{PrincipalList[0].BConfirmMobile}}
+              </template>
+          </td>
         </tr>
         <tr>
           <td>订餐负责人</td>
-        <td>{{PrincipalList[0].DConfirmName}}</td>
+          <td>
+            <template v-if="PrincipalList.length>0">
+                {{PrincipalList[0].DConfirmName}}
+            </template>
+          </td>
           <td>联系电话</td>
-        <td colspan="5">{{PrincipalList[0].DConfirmMobile}}</td>
+          <td colspan="5">
+            <template v-if="PrincipalList.length>0">
+              {{PrincipalList[0].DConfirmMobile}}
+            </template>
+          </td>
         </tr>
         <tr>
           <td>门票负责人</td>
-        <td>{{PrincipalList[0].TConfirmName}}</td>
+          <td>
+            <template v-if="PrincipalList.length>0">
+              {{PrincipalList[0].TConfirmName}}
+            </template>
+            </td>
           <td>联系电话</td>
-        <td colspan="5">{{PrincipalList[0].TConfirmMobile}}</td>
+          <td colspan="5">
+            <template v-if="PrincipalList.length>0">
+              {{PrincipalList[0].TConfirmMobile}}
+            </template>
+          </td>
         </tr>
       </table>
       <table class="GOd_Table" border="0" cellspacing="0" cellpadding="0">
@@ -274,6 +315,10 @@
           </td>
         </tr>
       </table>
+      <div style="width:100%;height:100%;">
+
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -293,12 +338,13 @@
         DMCStaticsCommon: {},
         //购物店
         shopList: [],
-        isShow: false,
+        loading: false,
         PostConfig: {
           ID: 0,
           TCIDs: "",
           PlanDescription: ""
         },
+        loading2:false,
       };
     },
     methods: {
@@ -309,10 +355,9 @@
           NewCombinationNum: '',
         };
         //更新酒店图片
-        this.apipost(
-          "dmcstatistics_post_GetExtendLeaderAllStatics",
-          msg,
-          res => {
+        this.loading2=true;
+        this.apipost( "dmcstatistics_post_GetExtendLeaderAllStatics",msg,res => {
+            this.loading2=false;
             if (res.data.resultCode == 1) {
               this.BaseInfo = res.data.data.BaseInfo;
               this.PrincipalList = res.data.data.PrincipalList;
@@ -321,7 +366,6 @@
               this.DMCStaticsCommon = res.data.data.DMCStaticsCommon;
               this.shopList = res.data.data.shopList;
               this.PostConfig = res.data.data.DMCStaticsCommon.LeaderApply;
-              this.isShow = true;
             } else {
               this.Error(res.data.message);
             }
@@ -371,8 +415,10 @@
           uid: this.getLocalStorage().EmployeeId
         };
         let fileName = "导游计划表" + this.$commonUtils.getCurrentDate() + ".xls";
+        this.loading=true;
         this.GetLocalFile("dmcstatistics_get_DwonLoadLeaderapply", msg, fileName,
           res => {
+            this.loading=false;
           });
         }
     },

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -810,7 +810,7 @@
               <div>
                 {{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;
                 <span v-if="subItem.UseCount>0 && item.SubList.length==1">
-                  <a style="color:green">{{subItem.RemainingInventory>-3?"【OK】":"【暂定】"}}</a>
+                  <a style="color:green">{{subItem.Status==1?"【OK】":"【暂定】"}}</a>
                   【<span style="color:green">本团使用库存：{{subItem.UseCount}}
                     {{subItem.CostPrice!=0?"价格:"+subItem.CostPrice:""}}</span>】
                 </span>

src/router/config.js

@@ -5,7 +5,6 @@ export default {
             path: '/',
             name: 'login',
             component: login 
-
         },
         {
             path: '/login',
@@ -3119,6 +3118,14 @@ export default {
                                 title: '会员等级'
                             }
                         },
+                        {
+                            path: '/MemberPrivilege',
+                            name: 'MemberPrivilege',
+                            component: resolve => require(['@/components/activity/MemberPrivilege'], resolve),
+                            meta: {
+                                title: '会员特权'
+                            }
+                        },
                     ]
                 },
                 {