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

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -87,16 +87,16 @@
                 {{item.GuideName}}
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
-                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList[0].ShopNum}}</div>
+                <div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].ShopNum:""}}</div>
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopName}}</div>
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
-                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList[0].EnterTimeStr}}</div>
+                <div v-for="subItem in item.CommonReport.PriceShopList">{{ subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterTimeStr:""}}</div>
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
-                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList[0].EnterNum}}</div>
+                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].EnterNum:""}}</div>
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <template v-for="subItem in item.CommonReport.PriceShopList">
@@ -110,11 +110,11 @@
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <!--佣金领取状况-->
-                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList[0].CommissionStatusStr}}</div>
+                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].CommissionStatusStr:""}}</div>
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <!--凭证上传-->
-                <div v-for="subItem in item.CommonReport.PriceShopList">
+                <div v-for="subItem in item.CommonReport.PriceShopList" v-if="subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0">
                   <p  v-for="(img, imgIndex) in subItem.ShopDetailsList[0].imgList" title="点击下载" @click="downLoadPZ(img)"
                     v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p>
                 </div>
@@ -127,7 +127,7 @@
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <!--导游佣金调整-->
-                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList[0].GuideCommission}}</div>
+                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].GuideCommission:""}}</div>
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <template v-for="subItem in item.CommonReport.PriceShopList">
@@ -137,19 +137,19 @@
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <!--其余扣除(返佣余额)-->
-                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList[0].OtherDeduct}}</div>
+                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].OtherDeduct:""}}</div>
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <!--返佣总计(返佣余额)-->
-                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList[0].BackTotalMoney}}</div>
+                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].BackTotalMoney:""}}</div>
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <!--汇率-->
-                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList[0].DMCRate}}</div>
+                <div v-for="subItem in item.CommonReport.PriceShopList">{{subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0? subItem.ShopDetailsList[0].DMCRate:""}}</div>
               </td>
               <td class="more_td" :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
                 <!--地接OP凭证-->
-                <div v-for="subItem in item.CommonReport.PriceShopList">
+                <div v-for="subItem in item.CommonReport.PriceShopList" v-if="subItem.ShopDetailsList!=null && subItem.ShopDetailsList.length>0">
                   <p v-for="(img, imgIndex) in subItem.ShopDetailsList[0].dmcImageList" title="点击下载" @click="downLoadPZ(img)"
                     v-if="img !== ''" style="cursor: pointer;">{{ '凭证' + (imgIndex + 1)}}</p>
                 </div>