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

src/components/Ticketing/airTicketRules.vue

@@ -454,6 +454,7 @@
           <el-col :span="5">
             <el-form-item label="月">
               <el-select v-model="addMsg.MonthStr" size="mini" class="_month_input">
+                <el-option :key="DefaultValue" label="请选择" :value="DefaultValue"></el-option>
                 <el-option v-for="item in MonthList" :key="item" :label="item" :value="item"></el-option>
               </el-select>
             </el-form-item>
@@ -537,6 +538,18 @@
       },
       //保存信息
       SaveAirticketRules() {
+        if (this.addMsg.YearStr == 0) {
+          this.Info("请选择年份!");
+          return;
+        }
+        if (this.addMsg.MonthStr == 0) {
+          this.Info("请选择月份!");
+          return;
+        }
+        if (this.addMsg.UnitPrice == 0) {
+          this.Info("请输入提成金额!");
+          return;
+        }
         this.apipost(
           "AirTicketRules_post_SetAirticketRule",
           this.addMsg,

src/components/administrative/AirticketCommission.vue

+<style>
+  .CM_look {
+    padding: 4px !important;
+    position: relative;
+    top: 1px;
+  }
+
+</style>
+<template>
+  <div class="flexOne">
+    <div class="query-box">
+      <ul>
+        <li>
+          <input type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" />
+        </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 in dataList">
+        <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('AirticketCommissionDetail',item.ID)"
+              icon="iconfont icon-chakan" 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,
+      }
+    },
+    mounted() {
+      this.getList();
+    },
+    methods: {
+      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(
+          "AirTicketRules_post_GetAirticketCommissionPageList",
+          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
+        );
+      },
+      //生成票务提成报表
+      CreateAirticketCommission() {
+        this.apipost(
+          "AirTicketRules_post_CreateAirticketCommissionService", {},
+          res => {
+            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/AirticketCommissionDetail.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 in dataList">
+        <td>{{item.BName}}</td>
+        <td>{{item.DName}}</td>
+        <td>{{item.UName}}</td>
+        <td>{{item.TotalPersion}}</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() {
+      this.msg.MainId = this.$route.query.ID;
+      this.getList();
+    },
+    methods: {
+      //获取数据
+      getList() {
+        this.loading = true;
+        this.apipost(
+          "AirTicketRules_post_GetAirticketCommissionDetails",
+          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

@@ -326,6 +326,22 @@ export default {
                                 title: '提成管理'
                             },
                         },
+                        {
+                            path: '/AirticketCommission', //票务提成
+                            name: 'AirticketCommission',
+                            component: resolve => require(['@/components/administrative/AirticketCommission'], resolve),
+                            meta: {
+                                title: '票务提成'
+                            },
+                        },
+                        {
+                            path: '/AirticketCommissionDetail', //票务提成详情
+                            name: 'AirticketCommissionDetail',
+                            component: resolve => require(['@/components/administrative/AirticketCommissionDetail'], resolve),
+                            meta: {
+                                title: '票务提成详情'
+                            },
+                        },
                         {
                             path: '/CommissionDetail', //提成详情
                             name: 'CommissionDetail',