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

src/components/FinancialModule/viittoCommissions.vue

@@ -6,30 +6,22 @@
       </li>
     </ul>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+      <thead>
         <tr>
-        <th style="width:30%">线路名称</th>
           <th>人员</th>
+          <th>部门</th>
           <th>占比</th>
-        <th>设置</th>
+          <th width="300">操作</th>
         </tr>
-      <tr>
-        <td>全部</td>
-        <td>地接账户基金</td>
-        <td>{{allzb}}%</td>
-        <td>
-          <!-- <el-button @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
-          <el-button @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button> -->
-        </td>
-
-      </tr>
-      <tbody v-for="(item,i) in dataList" :key="i">
-        <tr v-for="(com,index) in item.OPCommissionList" :key="index">
-          <td :rowspan="item.OPCommissionList.length" v-if="index==0">{{item.LineName}}</td>
-          <td>{{com.EmployeeName}}</td>
-          <td>{{com.CommissionPercent}}%</td>
+      </thead>
+      <tbody>
+        <tr v-for="(item,index) in dataList" :key="index">
+          <td>{{item.EmployeeName}}</td>
+          <td>{{item.DepartmentName}}</td>
+          <td>{{item.CommissionPercent}}%</td>
           <td>
-            <el-button @click="SetRules(com)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
-            <el-button @click="Delete(com)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
+            <el-button @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
+            <el-button @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
           </td>
         </tr>
       </tbody>
@@ -60,12 +52,7 @@
 </template>
 
 <script>
-  import moment from "moment"
-  import {
-    constants
-  } from 'fs';
   export default {
-    name: 'Feedback',
     data() {
       return {
         allzb: 100,
@@ -73,8 +60,6 @@
         loading: false,
         ruleVisible: false,
         form: {
-          LineName: '出境日本线',
-          LineID: 14,
           EmployeeId: '',
           CommissionPercent: 0,
         },
@@ -106,7 +91,7 @@
             type: "warning"
           })
           .then(() => {
-            this.apipost('OPCommission_RemoveOPCommission', {
+            this.apipost('ViittoCommission_post_RemoveViittoCommissionRuleService', {
               ID: item.Id
             }, res => {
               if (res.data.resultCode == 1) {
@@ -123,8 +108,6 @@
       addRule() {
         this.ruleVisible = true;
         this.form = {
-          LineName: '出境日本线',
-          LineID: 14,
           EmployeeId: '',
           CommissionPercent: 0,
         }
@@ -132,8 +115,6 @@
       SetRules(item) {
         this.ruleVisible = true;
         this.form = {
-          LineName: '出境日本线',
-          LineID: 14,
           EmployeeId: item.EmployeeId,
           CommissionPercent: item.CommissionPercent,
           Id: item.Id
@@ -146,12 +127,10 @@
             let newnum = 0;
             if (this.form.Id) {
               this.dataList.forEach(item => {
-                item.OPCommissionList.forEach(com => {
-                  if (com.Id != this.form.Id) {
-                    num += com.CommissionPercent;
+                  if (item.Id != this.form.Id) {
+                    num += item.CommissionPercent;
                   }
               })
-              })
               newnum = 100 - num;
             } else {
               newnum = this.allzb;
@@ -161,7 +140,7 @@
               return;
             }
             this.apipost(
-              'OPCommission_SetOPCommission', this.form,
+              'ViittoCommission_post_SetViittoCommissionRuleService', this.form,
               res => {
                 if (res.data.resultCode == 1) {
                   this.getList();
@@ -181,13 +160,13 @@
         let userInfo = this.getLocalStorage()
         let msg = {
           GroupId: userInfo.RB_Group_id,
-          BranchId: '-1',
+          BranchId: '49',
           DepartmentId: '-1',
           PostId: '-1',
           IsLeave: '0'
         }
         this.apipost(
-          'admin_get_EmployeeGetList', {},
+          'admin_get_EmployeeGetList', msg,
           res => {
             if (res.data.resultCode == 1) {
               this.EmployeeList = res.data.data
@@ -198,18 +177,16 @@
       },
       getList() {
         this.loading = true;
-        this.apipost("OPCommission_GetPageList", {}, res => {
+        this.apipost("ViittoCommission_get_GetListService", {}, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.dataList = res.data.data;
             // allzb
-            let num = 0;
-            this.dataList.forEach(item => {
-              item.OPCommissionList.forEach(com => {
-                num += com.CommissionPercent;
-              })
+            let num=0;
+            this.dataList.forEach(item=>{
+                num+=item.CommissionPercent; 
             })
-            this.allzb = 100 - num;
+            this.allzb=100-num;
           }
         });
       },

src/components/Hotel/roomReservationsDetails.vue

@@ -103,7 +103,8 @@
                   </tr>
                   <tr v-for="(subItem,subIndex) in HotelHouseTypeList" :key="subIndex">
                     <td style="width:100px;">
-                      {{subItem.Name}}
+                      <el-checkbox v-model="subItem.IsChecked"> {{subItem.Name}}
+                      </el-checkbox>
                     </td>
                     <td style="width:150px;">
                       <el-input class='w135 tcenter' maxlength="2" @keyup.native="checkInteger(subItem,'HouseNum')"
@@ -121,7 +122,8 @@
                     </td>
                   </tr>
                 </table>
-                <el-button slot="reference" style="background:#E95252; border-color:#E95252;" type="primary" v-if="CurrentUserInfo.EmployeeId == 615" @click="IsShowMoreUpdate=true">
+                <el-button slot="reference" style="background:#E95252; border-color:#E95252;" type="primary"
+                  v-if="CurrentUserInfo.EmployeeId == 615" @click="IsShowMoreUpdate=true">
                   批量修改酒店
                 </el-button>
               </el-popover>
@@ -516,7 +518,7 @@
                   <tr>
                     <td colspan="2" style="height:5px;"></td>
                   </tr>
-                  <tr>
+                  <tr style="display:none;">
                     <td width="70" style="text-align:right;">{{$t('ground.tixinggys')}}:</td>
                     <td>
                       <el-select class='w135 sel' v-model='subItem.SupplierHotelStatus'
@@ -527,17 +529,17 @@
                       </el-select>
                     </td>
                   </tr>
-                  <tr>
+                  <tr style="display:none;">
                     <td colspan="2" style="height:5px;">
                     </td>
                   </tr>
-                  <tr>
+                  <tr style="display:none;"> 
                     <td width="70" style="text-align:right;">{{$t('ground.duigysbz')}}：</td>
                     <td>
                       <el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
                     </td>
                   </tr>
-                  <tr v-if="subItem.SupplierToDmcRemarks">
+                  <tr v-if="subItem.SupplierToDmcRemarks" style="display:none;">
                     <td width="70" style="text-align:right;">{{$t('ground.gongysddjbz')}}：</td>
                     <td>
                       <span
@@ -647,30 +649,35 @@
         isShowPiliangPop: false, //是否显示批量上传popover
         IsShowMoreUpdate: false,
         HotelHouseTypeList: [{
+            IsChecked: false,
             HouseType: 1,
             Name: "单间",
             HouseNum: 0,
             BookNum: 0
           },
           {
+            IsChecked: false,
             HouseType: 2,
             Name: "标准间",
             HouseNum: 0,
             BookNum: 0
           },
           {
+            IsChecked: false,
             HouseType: 3,
             Name: "大床间",
             HouseNum: 0,
             BookNum: 0
           },
           {
+            IsChecked: false,
             HouseType: 4,
             Name: "三人间",
             HouseNum: 0,
             BookNum: 0
           },
           {
+            IsChecked: false,
             HouseType: 5,
             Name: "司导间",
             HouseNum: 0,
@@ -687,20 +694,35 @@
     methods: {
       //批量修改房间数和房间人
       BatchHotelOrder() {
+        var checkArray = [];
+        this.HotelHouseTypeList.forEach(item => {
+          if (item.IsChecked) {
+            checkArray.push(item);
+          }
+        });
+        if (checkArray != null && checkArray.length > 0) {
           var msg = {
             TCID: this.$route.query.id,
-          OrderDetails: this.HotelHouseTypeList
+            OrderDetails: checkArray
           };
           this.apipost('dmcstatistics_get_SetBatchHotelOrderService', msg, res => {
             this.loading = false;
-          this.IsShowMoreUpdate=false;
+            this.IsShowMoreUpdate = false;
             if (res.data.resultCode == 1) {
               this.getList();
               this.Success(res.data.message);
+              this.HotelHouseTypeList.forEach(item => {
+                item.IsChecked = false;
+                item.HouseNum = 0;
+                item.BookNum = 0;
+              });
             } else {
               this.Error(res.data.message);
             }
           }, err => {})
+        } else {
+          this.Info("请选择要修改的房型!");
+        }
       },
       MoreUpdate(subItem) {
         this.IsMoreUpdate = 1;

src/components/Ticketing/TicketManager.vue

@@ -3937,11 +3937,11 @@ export default {
                 this.addMsg.RulesList.splice(index, 1);
             }
         },
-        //根据当前员工所在部门获取该部门及子部门员工信息
+        //根据当前员工所在部门获取该部门及子部门员工信息只获取票务信息
         getEmployeeList() {
             this.apipost(
                 "admin_get_GetEmployeeByUserDepartmentId",
-                {},
+                {IsGetTicket:1},
                 res => {
                     if (res.data.resultCode == 1) {
                         this.EmployeeList = res.data.data;

src/components/Ticketing/flightPerformance.vue

@@ -346,7 +346,7 @@ export default {
     getEmployeeList() {
       this.apipost(
         "admin_get_GetEmployeeByUserDepartmentId",
-        {},
+        {IsGetTicket:1},
         res => {
           if (res.data.resultCode == 1) {
             this.EmployeeList = res.data.data;

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -1082,16 +1082,8 @@
       },
       //根据当前员工所在部门获取该部门及子部门员工信息
       getEmployeeList() {
-        let userInfo = this.getLocalStorage()
-        let msg = {
-          GroupId: userInfo.RB_Group_id,
-          BranchId: '-1',
-          DepartmentId: '-1',
-          PostId: '-1',
-          IsLeave: '0'
-        }
         this.apipost(
-          'admin_get_EmployeeGetList', {},
+          'admin_get_GetEmployeeByUserDepartmentId', {IsGetTicket:1},
           res => {
             if (res.data.resultCode == 1) {
               this.EmployeeList = res.data.data