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

src/components/administrative/AirticketCommissionDetail.vue

@@ -18,17 +18,37 @@
         <th>期数</th>
         <th>详情</th>
       </tr>
-      <tr v-for="item in dataList">
+      <tr v-for="(item,index) in dataList" :key="index">
         <td>{{item.BName}}</td>
         <td>{{item.DName}}</td>
         <td>{{item.UName}}</td>
-        <td>{{item.TotalPersion}}</td>
-        <td>{{item.CommissionMoney}}</td>
-        <td>{{item.Periods}}</td>
+        <td><template v-if="item.Frids.length==0">
+            {{item.TotalPersion}}
+          </template>
+        </td>
+        <td>
+          <template v-if="item.Frids.length==0">
+            {{item.CommissionMoney}}
+          </template>
+        </td>
+        <td>
+          <template v-if="item.Frids.length==0">
+            {{item.Periods}}</template>
+          <template v-else>
+            被驳回的财务单据:
+          </template>
+        </td>
         <td>
+          <template v-if="item.Frids.length==0">
             <a @click="goUrl(item)" style="color:blue;text-decoration:underline;cursor:pointer;">详情</a>&nbsp;&nbsp;
-          <a  
-            @click="DownLoadAirticketCommission(item)"
+          </template>
+          <template v-else v-for="(subItem,subIndex) in item.Frids">
+            <span :key="subIndex" style="color:red;text-decoration:underline;cursor:pointer;"
+              @click="goFinaceUrl('FinancialDocumentsDetail',subItem)">
+              {{subItem}}
+            </span>&nbsp;
+          </template>
+          <a @click="DownLoadAirticketCommission(item)"
             style="color:blue;text-decoration:underline;cursor:pointer; display:none;">下载差异</a>
         </td>
       </tr>
@@ -86,6 +106,16 @@
           null
         );
       },
+      goFinaceUrl(path, id) {
+        this.$router.push({
+          path: '/' + path,
+          query: {
+            id: id,
+            blank: 'y',
+            tab: id + '单据详情'
+          }
+        })
+      },
       goUrl(item) {
         this.$router.push({
           path: "flightPerformance",

src/components/administrative/ViittoCommission.vue

+<style>
+  .CM_look {
+    padding: 4px !important;
+    position: relative;
+    top: 1px;
+  }
+
+</style>
+<template>
+  <div class="flexOne">
+    <div class="query-box">
+      <ul>
+        <li>
+          <input v-if="IsAuth==1 || CurrentUserInfo.EmployeeId==5|| CurrentUserInfo.EmployeeId==615" type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" :disabled="isDisable"  />
+        </li>
+      </ul>
+    </div>
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+      <tr>
+        <th>期数</th>
+        <th>提成总金额</th>
+        <th>{{$t('admin.admin_czPerson')}}</th>
+        <th>日期</th>
+        <th>{{$t('system.table_operation')}}</th>
+      </tr>
+      <tr v-for="(item,index) in dataList" :key="index">
+        <td>{{item.Periods}}</td>
+        <td>{{item.SumPrice}}</td>
+        <td>{{item.CreateByName}}</td>
+        <td>{{item.CreateTimeStr}}</td>
+        <td>
+          <el-tooltip class="item" effect="dark" content="查看" placement="top">
+            <el-button type="primary" class="CM_look" @click="goUrl('ViittoCommissionDetail',item.ID)"
+              icon="iconfont icon-chakan" circle></el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="制单" placement="top">
+            <el-button type="primary" class="CM_look" @click="goUrlZD" icon="iconfont icon-caidan-fill" circle></el-button>
+          </el-tooltip>
+        </td>
+      </tr>
+    </table>
+    <!-- 分页 -->
+    <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>
+  export default {
+    data() {
+      return {
+        msg: {
+          PageIndex: 1,
+          PageSize: 20
+        },
+        loading: false,
+        //数据源
+        dataList: [],
+        total: 0,
+        currentPage: 1,
+        isDisable:false,
+        IsAuth:0,//生成票务提成权限
+        CurrentUserInfo:{},//当前用户对象
+      }
+    },
+    mounted() {
+      let userInfo = this.getLocalStorage();
+      this.CurrentUserInfo=userInfo;
+      this.GetAuth();
+      this.getList();
+    },
+    methods: {
+      goUrlZD(){
+        let orderObj = {
+          OrderID: 0,
+          OrderSource: 8,
+          Obj: {},
+          SourceID: 0,
+          CostType:194,
+          SelectState:true,
+        }
+        let id=[29,31];
+        this.$router.push({
+            name: 'ChoiceAddFinancialDocuments',
+            query: {
+              Type: 2,
+              templateID: JSON.stringify(id),
+              'blank': 'y',
+              'orderObj': JSON.stringify(orderObj)
+            }
+          })
+      },
+      handleCurrentChange(val) {
+        this.msg.PageIndex = val;
+        this.getList();
+      },
+      goUrl(path, id) {
+        this.$router.push({
+          path: path,
+          query: {
+            ID: id,
+            blank: 'y',
+            tab: '微途业绩详情'
+          }
+        });
+      },
+      //获取数据
+      getList() {
+        this.loading = true;
+        this.apipost(
+          "ViittoCommission_get_GetViittoCommissionPageListService",
+          this.msg,
+          res => {
+            this.loading = false;
+            if (res.data.resultCode == 1) {
+              this.dataList = res.data.data.pageData;
+              this.total = res.data.data.count;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+       GetAuth() {
+        this.apipost('ViittoCommission_get_CreateViittoCommissionAuthService', {}, res => {
+          if (res.data.resultCode == 1) {
+            this.IsAuth = res.data.data;
+          } else {
+            this.$message.error(res.data.message);
+          }
+        }, err => {})
+      },
+      //生成票务提成报表
+      CreateAirticketCommission() {
+        this.loading=true;
+        this.isDisable=true;
+        this.apipost(
+          "ViittoCommission_post_CreateViittoCommissionService", {},
+          res => {
+            this.loading=false;
+            this.isDisable=false;
+            if (res.data.resultCode == 1) {
+              this.getList();
+              this.Success('报表生成成功')
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      }
+    }
+  }
+</script>
\ No newline at end of file

src/components/administrative/ViittoCommissionDetail.vue

+<style>
+  .CM_look {
+    padding: 4px !important;
+    position: relative;
+    top: 1px;
+  }
+
+</style>
+<template>
+  <div class="flexOne">
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+      <tr>
+        <th>公司</th>
+        <th>部门</th>
+        <th>姓名</th>
+        <th>提成百分比</th>
+        <th>提成金额</th>
+        <th>期数</th>
+      </tr>
+      <tr v-for="(item,index) in dataList" :key="index">
+        <td>{{item.BName}}</td>
+        <td>{{item.DName}}</td>
+        <td>{{item.UName}}</td>
+        <td> {{item.CommissionPercent}} %
+        </td>
+        <td>
+          {{item.CommissionMoney}}
+        </td>
+        <td>
+          {{item.Periods}}
+        </td>
+      </tr>
+    </table>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        msg: {
+          MainId: 0
+        },
+        loading: false,
+        //数据源
+        dataList: [],
+      }
+    },
+    mounted() {
+      let userInfo = this.getLocalStorage()
+      this.msg.MainId = this.$route.query.ID;
+      this.getList();
+    },
+    methods: {
+      //获取数据
+      getList() {
+        this.loading = true;
+        this.apipost(
+          "ViittoCommission_get_GetViittoListService",
+          this.msg,
+          res => {
+            this.loading = false;
+            if (res.data.resultCode == 1) {
+              this.dataList = res.data.data;
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          null
+        );
+      },
+    },
+  }
+
+</script>

src/router/config.js

@@ -362,6 +362,22 @@ export default {
                                 title: '票务提成详情'
                             },
                         },
+                        {
+                            path: '/ViittoCommission', //微途提成
+                            name: 'ViittoCommission',
+                            component: resolve => require(['@/components/administrative/ViittoCommission'], resolve),
+                            meta: {
+                                title: '票务提成'
+                            },
+                        },
+                        {
+                            path: '/ViittoCommissionDetail', //微途提成详情
+                            name: 'ViittoCommissionDetail',
+                            component: resolve => require(['@/components/administrative/ViittoCommissionDetail'], resolve),
+                            meta: {
+                                title: '微途提成详情'
+                            },
+                        },
                         {
                             path: '/CommissionDetail', //提成详情
                             name: 'CommissionDetail',