领队报账新增其他费用类型明细页面

src/components/LeaderManagement/otherDetails.vue

+
+<template>
+  <div class="flexOne" style="min-width: 1200px;">
+   
+    <!-- 表格 -->
+    <div style="width: 100%; height: auto;min-height:500px;overflow-x: auto;margin-top:20px" class="ownScrollbarStyle">
+      <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
+        <tr class="title_tr">
+          <th width="300">日期</th>            
+          <th>金额</th>
+          <th>备注</th>
+          <th>附件</th> 
+        </tr>
+        <template v-for='(item, index) in dataList'>
+            <tr :key="index">
+                <td>{{item.UseDate ? item.UseDate.replace('T', ' ') : ''}}</td>
+                <td>{{item.UnitPrice}}</td>
+                <td>{{item.Remark}}</td>
+                <td>
+                    <div v-if="item.VoucherPicList.length">
+                        <div v-for="(vou, vouIndex) in item.VoucherPicList" :key="vouIndex">
+                            <img @click="openImg(vou.url)" style="width: 20px;height: 20px;" :src="vou.url" alt="">
+                        </div>
+                    </div>
+                    <div v-else>
+                    无
+                    </div>
+                </td>
+            </tr>
+        </template>
+        <tr>
+          <td v-show="dataList.length==0" colspan="16" align="center">暂无数据</td>
+        </tr>
+      </table>
+    </div>
+    <!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination> -->
+  </div>
+</template>
+
+<script>
+import payURL from "../commonPage/payURL.vue";
+import moment from "moment";
+export default {
+  data() {
+    return {
+      msg: {
+        TCIDs:''
+      },
+      dataList: [],
+      loading: false,
+      total: 0,
+      currentPage: 1,
+      showID: -1,
+      companyList:[],
+      employeeList:[],
+      urrencyTypeObj:{},
+    };
+  },
+  components: {},
+  created() {
+    let userInfo = this.getLocalStorage();
+    this.msg.TCIDs=this.$route.query.TCIDs?this.$route.query.TCIDs:"";
+    this.msg.date=this.$route.query.date?this.$route.query.date:"";
+  },
+  methods: {
+    openImg(src){
+      window.open(src, "_blank");
+    },
+    handleCurrentChange(val) {
+      this.msg.pageIndex = val;
+      this.getList();
+    },
+    resetPageIndex() {
+      this.msg.pageIndex = 1;
+      this.currentPage = 1;
+    },
+    openImg(src){
+      window.open(src, "_blank");
+    },
+    getList() {
+      
+      this.loading = true;
+      this.apipost('dmcstatistics_post_GetNewLeaderPayMoneyStatics', this.msg, res => {
+        this.loading=false;
+        
+        if(res.data.resultCode == 1) {
+            this.dataList = [];
+            let data=res.data.data.OtherOrderInfo.OtherList;
+            if(this.msg.date!='all'){
+              data.forEach(item => {
+                if(item.UseTimeStr==this.msg.date){
+                      this.dataList.push(item);
+                  }
+              });
+            }else{
+              this.dataList=data;
+            }
+        } else {
+            this.Error(res.data.message);
+        }
+        }, err => {})
+      
+    },
+   
+  },
+  mounted() {
+    this.getList();
+  }
+};
+</script>
+<style scoped>
+.numSpan{
+  display: inline-block;
+  width:60px;  
+}
+.widthSpan{
+    display: inline-block;
+    width: 45px;
+}
+.groupTourOrderSearchTable {
+  width: 100%;
+  min-width: 1500px;
+  font-size: 14px;
+  color: #333;
+  border-bottom: 1px solid #cccccc;
+  border-right: 1px solid #cccccc;
+  /* border-collapse: collapse; */
+}
+
+.groupTourOrderSearchTable tr th {
+  background: #e6e6e6;
+  height: 30px;
+  font-size: 12px;
+  text-align: left;
+  text-indent: 15px;
+  border-top: 1px solid #cccccc;
+  border-left: 1px solid #cccccc;
+}
+
+.groupTourOrderSearchTable tr {
+  background: #fff;
+  text-align: left;
+}
+
+.groupTourOrderSearchTable tr td {
+  padding: 8px;
+  border-top: 1px solid #cccccc;
+  border-left: 1px solid #cccccc;
+}
+
+.groupTourOrderSearchTable tr td p {
+  line-height: 20px;
+}
+
+.groupTourOrderSearchTable .dowloadSpan:hover {
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.groupTourOrderSearchTable span.personNo {
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.groupTourOrderSearchTable span.personNo:hover {
+  font-weight: bold;
+  color: #e95252;
+}
+
+
+</style>

src/components/SalesModule/groupTourOrder.vue

@@ -1816,7 +1816,7 @@
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==0"
                        @click='deleteItem(item)'>{{$t('pub.cancelBtn')}}
                       </div>
-                      <div @click='SpecialAPP(item.tcid, item.orderId)'>特价申请函</div>
+                      <div @click='SpecialAPP(item.tcid, item.orderId, item.orderspecialofferId)'>特价申请函</div>
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==1" title="如需取消订单清联系OP" style="color:red;">
                          {{$t('salesModule.OrderSured')}}
                       </div>
@@ -2071,7 +2071,8 @@
         SpecialAppMsg: {
           ApplyReason: '',
           UpdateBy: '',
-          OrderId: 0
+          OrderId: 0,
+          ID: 0,
         },
         //是否有修改业务员权限，1-有
         isEditOrderCreate:0,
@@ -2404,9 +2405,10 @@
           }
         },null)
       },
-      SpecialAPP(tcid, orderId){
+      SpecialAPP(tcid, orderId, ID){
         this.SpecialAppMsg.OrderId = orderId
         this.SpecialAppShow = true
+        this.SpecialAppMsg.ID = ID
       },
       SQPhoto(){
         let checkID = []

src/components/administrative/DjCommissionDetail2.vue

+<style>
+.DjCommissionDetail2 .singeRowTable th{
+    padding: 5px 0;
+}
+</style>
+<template>
+    <div class="DjCommissionDetail2">
+        <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+            <tr v-if="dataList.length && dataList[0].OPCommissionDetailsList">
+                <th width="120px">区域划分</th>
+                <th width="120px">人数</th>
+                <th width="120px">实际发放<br>15元/人</th>
+                <th width="120px">总合计</th>
+                <th v-for="(item, index) in dataList[0].OPCommissionDetailsList" :key="index">{{item.EmployeeName + item.CommissionPercent + '%'}}</th>
+                <th>{{$t('system.table_operation')}}</th>
+            </tr>
+            <tr v-for="(item, index) in dataList" :key="index">
+                <td>{{item.BranchName}}</td>
+                <td>{{item.GuestNum}}</td>
+                <td>{{15}}</td>
+                <td>{{item.GuestNum * 15}}</td>
+                <td v-for="(Sitem, Sindex) in item.OPCommissionDetailsList" :key="Sindex">{{Sitem.CommissionMoney}}</td>
+                <td>查看</td>
+            </tr>
+            <tr>
+                <td>合计</td>
+                <td>{{allGuestNum}}</td>
+                <td>{{15}}</td>
+                <td>{{allGuestNum * 15}}</td>
+                <td>{{}}</td>
+                <td></td>
+            </tr>
+        </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 {
+            msg: {
+                pageIndex: 1,
+                pageSize: 1000,
+                ParentId: 0,
+                OrderStr: "RB_Branch_Id asc",
+                BName:-1
+            },
+            allGuestNum: 0,
+            loading: false,
+            dataList: [],
+            list: [
+                {
+                    name: 'xxx'
+                },{
+                    name: 'yyy'
+                },{
+                    name: 'ttt'
+                },{
+                    name: 'uuu'
+                },{
+                    name: 'iii'
+                },
+            ]
+        }
+    },mounted(){
+        this.getList()
+    },
+    methods : {
+        getList() {
+            this.loading = true;
+            this.apipost(
+                "OPCommission_GetPeriodsDetailsList",
+                this.msg,
+                res => {
+                this.loading = false;
+                if (res.data.resultCode == 1) {
+                    this.dataList = res.data.data.detailsList;
+                    this.$forceUpdate()
+                } else {
+                    this.Error(res.data.message);
+                }
+                },
+                null
+            );
+            },
+    }
+}
+</script>
\ No newline at end of file

src/components/leaderPay2.vue

@@ -650,7 +650,8 @@
           <td>{{getOrderType(item.OrderType)}}</td>
           <td>0</td>
           <td>{{moneyFormat(item.TotalPrice)}}</td>
-          <td>
+          <td style="cursor: pointer;">
+            <span v-if="item.OrderType==1" @click="godetailAll('qitaF')">明细</span>
           </td>
         </tr>
         <tr v-for="item in planPriceList">
@@ -1423,7 +1424,7 @@
           path = 'leaderPayHotelDetail'
           date = obj ? obj.CheckInDateStr : 'all'
         } else if (name === 'qitaF') {
-          path = 'leaderPayQiTalDetail'
+          path = 'otherDetails'
           date = obj ? obj.CheckInDateStr : 'all'
         }
         let fullPath = `/${path}?TCIDs=${TCIDs}&date=${date}`;

src/router/config.js

@@ -422,6 +422,14 @@ export default {
                                 title: '提成详情'
                             },
                         },
+                        {
+                            path: '/DjCommissionDetail2', //提成详情2
+                            name: 'DjCommissionDetail2',
+                            component: resolve => require(['@/components/administrative/DjCommissionDetail2'], resolve),
+                            meta: {
+                                title: '提成详情'
+                            },
+                        },
                         {
                             path: '/QzCommissionDetail', //提成详情 - 签证
                             name: 'QzCommissionDetail',
@@ -494,6 +502,14 @@ export default {
                                 title: '车辆报账详情'
                             },
                         },
+                        {
+                            path: '/otherDetails', //其他报账详情
+                            name: 'otherDetails',
+                            component: resolve => require(['@/components/LeaderManagement/otherDetails'], resolve),
+                            meta: {
+                                title: '其他报账详情'
+                            },
+                        },
                         {
                             path: '/DinningDetails', //餐食报账详情
                             name: 'DinningDetails',