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

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -71,13 +71,29 @@
         <tr v-if="shopDataList.length==0">
           <td colspan="22">暂无数据</td>
         </tr>
-        <tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}" v-if="outItem.PriceShopList.length>0">
+        <tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}"
+          v-if="outItem.PriceShopList.length>0">
           <template v-for="(item,index) in outItem.PriceShopList">
             <template v-for="(subItem,subIndex) in item.ShopDetailsList">
               <tr>
                 <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
                   {{outItem.NewCombinationNum}}
                 </td>
+                <template v-if="outItem.TCList.length==1">
+                  <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
+                    {{subItem.StartCityNames}}
+                  </td>
+                  <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
+                    {{subItem.TCNUMS}}
+                  </td>
+                  <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
+                    {{subItem.LeaderName}}
+                  </td>
+                  <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
+                    {{subItem.GuideName}}
+                  </td>
+                </template>
+                <template v-else>
                   <td>
                     {{subItem.StartCityNames}}
                   </td>
@@ -90,6 +106,7 @@
                   <td>
                     {{subItem.GuideName}}
                   </td>
+                </template>
                 <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0' width="180"
                   style="word-wrap:break-word ;">
                   {{item.ShopName}}
@@ -127,8 +144,7 @@
                 </td>
                 <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
                   <div>
-                    <p style="cursor: pointer;color:blue;"
-                      @click="CreateBill(item.ShopDetailsList)">生成单据</p>
+                    <p style="cursor: pointer;color:blue;" @click="CreateBill(item.ShopDetailsList)">生成单据</p>
                   </div>
                 </td>
 
@@ -295,14 +311,7 @@
           this.loading = false
           if (res.data.resultCode == 1) {
             this.msg.total = res.data.data.count;
-            let shopDataList = res.data.data.pageData;
-            shopDataList.forEach(x => {
-              x.PriceShopList.forEach(z => {
-                z.imgList = (z.Credentials && z.Credentials.length > 0) ? z.Credentials.split(",") :
-                  '';
-              });
-            });
-            this.shopDataList = shopDataList;
+            this.shopDataList = res.data.data.pageData;
           } else {
             this.$message.error(res.data.message)
           }

src/components/ShoppingStore/ShoppingReimbursement2.vue

@@ -60,9 +60,6 @@
           <th width="70">总金额</th>
           <th width="80">领队佣金<br />(应付)</th>
           <th width="80">导游佣金<br />(应付)</th>
-          <!--<th width="80">公司佣金<br />(应收)</th>
-          <th width="80">返佣余额</th> 
-          <th width="80">返佣总计</th>-->
           <th width="80">汇率</th>
           <th width="80">凭证</th>
           <th width="80">财务单据</th>
@@ -70,13 +67,29 @@
         <tr v-if="shopDataList.length==0">
           <td colspan="22">暂无数据</td>
         </tr>
-        <tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}" v-if="outItem.PriceShopList.length>0">
+        <tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}"
+          v-if="outItem.PriceShopList.length>0">
           <template v-for="(item,index) in outItem.PriceShopList">
             <template v-for="(subItem,subIndex) in item.ShopDetailsList">
               <tr>
                 <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
                   {{outItem.NewCombinationNum}}
                 </td>
+                <template v-if="outItem.TCList.length==1">
+                  <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
+                    {{subItem.StartCityNames}}
+                  </td>
+                  <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
+                    {{subItem.TCNUMS}}
+                  </td>
+                  <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
+                    {{subItem.LeaderName}}
+                  </td>
+                  <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
+                    {{subItem.GuideName}}
+                  </td>
+                </template>
+                <template v-else>
                   <td>
                     {{subItem.StartCityNames}}
                   </td>
@@ -89,6 +102,7 @@
                   <td>
                     {{subItem.GuideName}}
                   </td>
+                </template>
                 <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0' width="180"
                   style="word-wrap:break-word ;">
                   {{item.ShopName}}
@@ -108,15 +122,6 @@
                 <td width="80">
                   {{subItem.GuideCommission}}
                 </td>
-                <!-- <td width="80">
-                  {{subItem.CompanyCommission}}
-                </td>
-                <td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
-                  {{subItem.OtherDeduct}}
-                </td>
-                <td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
-                  {{subItem.BackTotalMoney}}
-                </td> -->
                 <td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
                   {{subItem.DMCRate}}
                 </td>
@@ -126,8 +131,7 @@
                 </td>
                 <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
                   <div>
-                    <p style="cursor: pointer;color:blue;"
-                      @click="CreateBill(item.ShopDetailsList)">生成单据</p>
+                    <p style="cursor: pointer;color:blue;" @click="CreateBill(item.ShopDetailsList)">生成单据</p>
                   </div>
                 </td>
               </tr>
@@ -338,8 +342,6 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
-      // this.msg.StartDate = '';
-      // this.msg.EndDate = ''
       this.getLineList();
       this.getList();
     },
@@ -379,7 +381,7 @@
 
   .ShoppingTable th {
     background-color: #E6E6E6;
-    height:35px;
+    height: 35px;
   }
 
   .SponeTable td:first-child {

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -192,7 +192,7 @@
               item.ScenicStatisticsList.forEach(x => {
                 x.PayStyle = x.PayStyle.toString();
                 this.calculationPrice(x);
-                if(x.CombinationNum==''||x.CombinationNum==null){
+                if (x.CombinationNum == '' || x.CombinationNum == null) {
                   x.CombinationNum = this.$route.query.NewCombinationNum;
                 }
               })
@@ -207,6 +207,11 @@
           this.list.forEach(item => {
             item.ScenicStatisticsList.forEach(insideItem => {
               insideItem.OrderState = 0;
+              insideItem.TicketPriceList.forEach(subItem => {
+                if (!subItem.Discount) {
+                  subItem.Discount = 0;
+                }
+              });
             })
           })
         }
@@ -214,9 +219,16 @@
           this.list.forEach(item => {
             item.ScenicStatisticsList.forEach(insideItem => {
               insideItem.OrderState = 1;
+              insideItem.TicketPriceList.forEach(subItem => {
+                if (!subItem.Discount) {
+                  subItem.Discount = 0;
+                }
+              });
             })
           })
         }
+
+        console.log("this.list", this.list);
         this.apipost('dmcstatistics_get_SetTicketOrder', this.list, res => {
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message);
@@ -234,6 +246,7 @@
       this.getList()
     },
   }
+
 </script>
 <style>
   .admissionStatisticsDetailsTalbe {

src/router/config.js

@@ -2614,7 +2614,21 @@ export default {
                             meta: {
                                 title: '营收报表'
                             },
-                        }, { //财务 报表 团队营收变更报表
+                        }, { //财务 报表 变更报表
+                            path: '/ChangeRevenueReport',
+                            name: 'ChangeRevenueReport',
+                            component: resolve => require(['@/components/FinancialModule/ReportForm/ChangeRevenueReport'], resolve),
+                            meta: {
+                                title: '变更报表'
+                            },
+                        },{ //财务 变更详情
+                            path: '/ChangeRevenueDetail',
+                            name: 'ChangeRevenueDetail',
+                            component: resolve => require(['@/components/FinancialModule/ReportForm/ChangeRevenueDetail'], resolve),
+                            meta: {
+                                title: '变更详情'
+                            },
+                        },{ //财务 报表 团队营收变更报表
                             path: '/TeamRevenueReportChange',
                             name: 'TeamRevenueReportChange',
                             component: resolve => require(['@/components/FinancialModule/ReportForm/TeamRevenueReportChange'], resolve),