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

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;
           });
         }
     },