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

src/components/FinancialModule/BasicDocuments.vue

@@ -132,7 +132,7 @@
     ._wenjian{
         padding: 15px;
         width: 91px;
-        height: 114px;
+        height: 80px;
         border:1px solid rgba(221,221,221,1);
         float: left;
         cursor: pointer;
@@ -375,7 +375,7 @@
                     <template v-for="(file,fIndex) in GetDetail.VorcherInos" v-if="file.Type!=3">
                         <div class="_wenjian" @click="showUpLoadFile(file)">
                             <p v-if="file.Type==1" class="_wenjian_P iconfont icon-excel"></p>
-                            <p class="_addFile_name">{{file.Content}}</p>
+                            <!-- <p class="_addFile_name">{{file.Content}}</p> -->
                         </div>
                     </template>
                 </div>
@@ -1556,7 +1556,7 @@ export default {
             if(this.GetDetail.CashierDetail==1){
                 this.AuditOrRefundMsg.SpecialNode=0;
             }
-            if(this.payMsgList[0].Type&&this.payMsgList[0].AccountId){
+            if(this.payMsgList.length>0){
                 this.AuditOrRefundMsg.tradeWays = this.payMsgList
             }else{
                this.AuditOrRefundMsg.tradeWays=[];

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -127,7 +127,7 @@
     ._wenjian{
         padding: 15px;
         width: 91px;
-        height: 114px;
+        height: 80px;
         border:1px solid rgba(221,221,221,1);
         float: left;
         cursor: pointer;
@@ -453,7 +453,7 @@
                           <template v-for="(file,fIndex) in GetDetail.VorcherInos" v-if="file.Type!=3">
                             <div class="_wenjian" @click="showUpLoadFile(file)">
                               <p v-if="file.Type==1" class="_wenjian_P iconfont" :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"></p>
-                              <p class="_addFile_name">{{file.Content}}</p>
+                              <!-- <p class="_addFile_name">{{file.Content}}</p> -->
                             </div>
                           </template>
                         </div>

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,12 +110,12 @@
               </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">
-                  <p v-for="(img, imgIndex) in subItem.ShopDetailsList[0].imgList" title="点击下载" @click="downLoadPZ(img)"
+                <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>
               </td>
@@ -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>