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

src/components/LeaderManagement/leaderPayHotelDetail.vue

@@ -7,39 +7,71 @@
     <div class="clearfix"></div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
-        <th width="600px">问题名称</th>
-        <th>类型</th>
-        <th>排序</th>
-        <th>是否显示</th>
-        <th width="120px">操作</th>
-      </tr>
-      <tr v-for="item in dataList">
-        <td>{{item.Title}}</td>
-        <td>{{getTypeName(item.SurveyType)}}</td>
-        <td>
-           {{item.Sort}}
-        </td>
-        <td>
-           {{item.IsShow === 1 ? '显示' : '不显示'}}
-        </td>
-        <td>
-          asd
-        </td>
+        <th>日期</th>
+        <th>酒店名</th>
+        <th>房间类型</th>
+        <th>数量</th>
+        <th>单价/人</th>
+        <th>金额小计</th>
+        <th>支付方式</th>
+        <th>币种</th> 
+        <th>备注</th> 
       </tr>
+     <template v-for='(item,index) in dataList'>
+        <!-- <template v-for="(subItem,subIndex) in item.ScenicStatisticsList"> -->
+          <tr v-for="(childItem,childIndex) in item.ReimburseList.ReimburseDetailsList">
+            <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">{{item.CheckInDateStr}}</td>
+            <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
+              {{item.HotelName}}
+            </td> 
+            <td>
+              {{childItem.UserTypeStr}}
+            </td>
+            <td>{{childItem.UserNum}}</td>
+            <td>
+              <p>
+                {{item.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
+              </p>
+            </td>
+            <td>
+              {{moneyFormat(childItem.UnitPrice*childItem.UserNum)}}
+            </td>
+            <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
+              <span v-if="item.PayStyle === 1">现付</span>
+              <span v-else-if="item.PayStyle === 2">公司结算</span>
+              <span v-else-if="item.PayStyle === 3">预付</span>
+              <span v-else-if="item.PayStyle === 6">公司合团支付</span>
+              <span v-else></span>
+              </br>
+              <span v-show="item.PayStyle==6">付款团号：{{item.PayTypeTCNUM}}</span>
+            </td>
+            <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
+              {{getCurrencyStr(item.ReimburseList.CurrencyId)}}
+            </td> 
+            <td v-if="childIndex==0" :rowspan="item.ReimburseList.ReimburseDetailsList.length">
+              {{item.ReimburseList.Remarks}}
+            </td> 
+          </tr>
+        <!-- </template> -->
+      </template>
     </table>
-    <div class="noDataNotice" v-if="dataList.length<1">
-      <i class="iconfont icon-kong"></i>
-      <p>{{$t("active.ld_noData")}}</p>
-    </div>
   </div>
 </template>
 <script>
 export default {
   data() {
     return {
-      loading: false, 
+      loading: true, 
       dataList: [], 
+      currencyList: [],
     };
+  },created(){
+    this.apipost("financeinfo_post_GetList", {Name: ""}, res=>{
+      if (res.data.resultCode === 1) {
+        let data = res.data.data;
+        this.currencyList = data 
+      }
+    }, null)
   },
   mounted() {
     let TCIDs = this.$route.query.TCIDs;
@@ -48,9 +80,16 @@ export default {
   },
   filters: {},
 
-  methods: { 
+  methods: {
+    getCurrencyStr: function(id){ 
+      for(let i = 0; i < this.currencyList.length; i++) {
+        if (this.currencyList[i].ID == id) {
+          return this.currencyList[i].Name
+        }
+      }
+    },
     //获取数据
-    getList(TCIDs) {
+    getList(TCIDs, date) {
       this.loading = true;
       this.apipost(
         "dmcstatistics_post_GetNewLeaderPayMoneyStatics",
@@ -58,7 +97,18 @@ export default {
         res => {
           this.loading = false;
           if (res.data.resultCode === 1) {
-            this.dataList = res.data.data; 
+            let data = res.data.data.HotelList;
+            let dataList = [];
+            if(date!=='all') {
+              data.map(x=>{
+                if (x.CheckInDateStr == date){
+                  dataList.push(x)
+                }
+              })
+            } else {
+              dataList = data
+            }
+            this.dataList = dataList;
           } else {
             this.Error(res.data.message);
           }

src/components/LeaderManagement/leaderPayTicketDetail.vue

@@ -2,55 +2,94 @@
 </style>
 
 <template>
-  <div class="flexOne leaderPayTicketDetail"> 
+  <div class="flexOne leaderPayHotelDetail"> 
 
     <div class="clearfix"></div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
-        <th width="600px">问题名称</th>
-        <th>类型</th>
-        <th>排序</th>
-        <th>是否显示</th>
-        <th width="120px">操作</th>
-      </tr>
-      <tr v-for="item in dataList">
-        <td>{{item.Title}}</td>
-        <td>{{getTypeName(item.SurveyType)}}</td>
-        <td>
-           {{item.Sort}}
-        </td>
-        <td>
-           {{item.IsShow === 1 ? '显示' : '不显示'}}
-        </td>
-        <td>
-          asd
-        </td>
+        <th>日期</th>
+        <th>景点名</th>
+        <th>门票类型</th>
+        <th>数量</th>
+        <th>单价/人</th>
+        <th>金额小计</th>
+        <th>支付方式</th>
+        <th>币种</th> 
+        <th>备注</th> 
       </tr>
+     <template v-for='(item,index) in dataList'>
+        <template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
+          <tr v-for="(childItem,childIndex) in subItem.ReimburseList.ReimburseDetailsList">
+            <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">{{item.UseTimeStr}}</td>
+            <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
+              {{subItem.ScenicName}}
+            </td> 
+            <td>
+              {{childItem.UserTypeStr}}
+            </td>
+            <td>{{childItem.UserNum}}</td>
+            <td>
+              <p>
+                {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
+              </p>
+            </td>
+            <td>
+              {{moneyFormat(childItem.UnitPrice*childItem.UserNum)}}
+            </td>
+            <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
+              <span v-if="subItem.PayStyle === 1">现付</span>
+              <span v-else-if="subItem.PayStyle === 2">公司结算</span>
+              <span v-else-if="subItem.PayStyle === 3">预付</span>
+              <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
+              <span v-else></span>
+              </br>
+              <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
+            </td>
+            <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
+              {{getCurrencyStr(subItem.ReimburseList.CurrencyId)}}
+            </td> 
+            <td v-if="childIndex==0" :rowspan="subItem.ReimburseList.ReimburseDetailsList.length">
+              {{subItem.ReimburseList.Remarks}}
+            </td> 
+          </tr>
+        </template>
+      </template>
     </table>
-    <div class="noDataNotice" v-if="dataList.length<1">
-      <i class="iconfont icon-kong"></i>
-      <p>{{$t("active.ld_noData")}}</p>
-    </div>
   </div>
 </template>
 <script>
 export default {
   data() {
     return {
-      loading: false, 
+      loading: true, 
       dataList: [], 
+      currencyList: [],
     };
   },
   mounted() {
     let TCIDs = this.$route.query.TCIDs;
     let date =  this.$route.query.date;
     this.getList(TCIDs, date); 
+  },created(){
+    this.apipost("financeinfo_post_GetList", {Name: ""}, res=>{
+      if (res.data.resultCode === 1) {
+        let data = res.data.data;
+        this.currencyList = data 
+      }
+    }, null)
   },
   filters: {},
 
-  methods: { 
+  methods: {   
+    getCurrencyStr: function(id){ 
+      for(let i = 0; i < this.currencyList.length; i++) {
+        if (this.currencyList[i].ID == id) {
+          return this.currencyList[i].Name
+        }
+      }
+    },
     //获取数据
-    getList() {
+    getList(TCIDs, date) {
       this.loading = true;
       this.apipost(
         "dmcstatistics_post_GetNewLeaderPayMoneyStatics",
@@ -58,7 +97,18 @@ export default {
         res => {
           this.loading = false;
           if (res.data.resultCode === 1) {
-            this.dataList = res.data.data; 
+            let data = res.data.data.ScenicList;
+            let dataList = [];
+            if(date!=='all') {
+              data.map(x=>{
+                if (x.UseTimeStr == date){
+                  dataList.push(x)
+                }
+              })
+            } else {
+              dataList = data
+            }
+            this.dataList = dataList;
           } else {
             this.Error(res.data.message);
           }

src/components/leaderPay2.vue

@@ -511,13 +511,17 @@ input[type="number"] {
           <td>自费支出</td>
           <td>0</td>
           <td>{{moneyFormat(totalList.SelfPayingExpendTotalPrice)}}</td>
-          <td><span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhi')">明细</span></td>
+          <td>
+            <!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhi')">明细</span> -->
+          </td>
         </tr>
         <tr v-show="totalList.SelfPayingIncomeTotalPrice>0">
           <td>自费收入</td>
           <td>0</td>
           <td>{{moneyFormat(totalList.SelfPayingIncomeTotalPrice)}}</td>
-          <td><span class="cursorpointer text-decoratio" @click="godetailAll('zifeishou')">明细</span></td>
+          <td>
+            <!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeishou')">明细</span> -->
+            </td>
         </tr> 
         <!-- <tr v-show="totalList.IncomeTotalPrice>0">
           <td>消费收入</td>
@@ -529,13 +533,15 @@ input[type="number"] {
           <td>其他费用</td>
           <td>0</td>
           <td>{{moneyFormat(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)}}</td>
-           <td><span class="cursorpointer text-decoratio" @click="godetailAll('qitafeiyong')">明细</span></td>
+           <td>
+             <!-- <span class="cursorpointer text-decoratio" @click="godetailAll('qitafeiyong')">明细</span> -->
+             </td>
         </tr>
         <tr v-show="totalScenicPrice>0">
           <td>景点门票</td>
           <td>{{moneyFormat(OtherTotalPrice)}}</td>
           <td>{{moneyFormat(totalScenicPrice)}}</td>
-          <td><span class="cursorpointer text-decoratio" @click="godetailAll('ticket', childItem)">明细</span></td>
+          <td><span class="cursorpointer text-decoratio" @click="godetailAll('ticket')">明细</span></td>
           <!-- <td>
              <el-input
                 size="mini"
@@ -548,7 +554,7 @@ input[type="number"] {
           <td>交通</td>
           <td>{{moneyFormat(SelfPayingExpendTotalPrice)}}</td>
           <td>{{moneyFormat(totalTrafficPrice)}}</td>
-          <td><span class="cursorpointer text-decoratio" @click="godetailAll('bus', childItem)">明细</span></td>
+          <td><span class="cursorpointer text-decoratio" @click="godetailAll('bus')">明细</span></td>
           <!-- <td>
              <el-input
                 size="mini"
@@ -561,7 +567,7 @@ input[type="number"] {
           <td>餐饮</td>
           <td>{{moneyFormat(IncomeTotalPrice)}}</td>
           <td>{{moneyFormat(totalDinnerPrice)}}</td>
-          <td><span class="cursorpointer text-decoratio" @click="godetailAll('dining', childItem)">明细</span></td>
+          <td><span class="cursorpointer text-decoratio" @click="godetailAll('dining')">明细</span></td>
           <!-- <td>
              <el-input
                 size="mini"
@@ -574,7 +580,7 @@ input[type="number"] {
           <td>酒店</td>
           <td>{{moneyFormat(ExpendTotalPrice)}}</td>
           <td>{{moneyFormat(totalHotelPrice)}}</td>
-          <td><span class="cursorpointer text-decoratio" @click="godetailAll('hotel', childItem)">明细</span></td>
+          <td><span class="cursorpointer text-decoratio" @click="godetailAll('hotel')">明细</span></td>
           <!-- <td>
              <el-input
                 size="mini"
@@ -937,8 +943,8 @@ export default {
   },
   methods: {
     // 全部明细
-    godetailAll: function (){
-
+    godetailAll: function (name){ 
+      this.godetail(name)
     },
     // 明细
     godetail: function (name, obj) {
@@ -946,7 +952,7 @@ export default {
       let path = "", TCIDs = this.msg.TCIDs, date = '';
       if (name == 'ticket') {
         path = 'leaderPayTicketDetail'
-        date = obj.UseTimeStr
+        date = obj ? obj.UseTimeStr : 'all'
       } else if (name === 'bus') {
         path="CarDetails"
         TCIDs=obj.TCIDs;
@@ -959,7 +965,7 @@ export default {
         
       } else if (name === 'hotel') {
         path = 'leaderPayHotelDetail'
-        date = obj.CheckInDateStr
+        date = obj ? obj.CheckInDateStr : 'all'
       }
       let fullPath = `/${path}?TCIDs=${TCIDs}&date=${date}`;
       let dom = document.querySelector("#blankLink");