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

src/components/BusExport.vue

@@ -49,12 +49,23 @@
     .totalTabal td{
         height:33px;
     }
+    .excelBtn{
+        color: #fff;
+        padding: 0 15px;
+        height: 30px;
+        background: #E95252;
+        border: 1px solid #E95252;
+        cursor: pointer;
+        border-radius: 15px;
+        margin-left: 10px;
+    }
 </style>
 
 <template>
     <div class="Bus_Content">
         <div class="BusExportTitle">
-              {{Year}}年{{Month}}月公社车账  
+            {{Year}}年{{Month}}月公社车账 
+            <input type="button" style="float:right;" @click="downLoadExcel" class="excelBtn" value="下载excel"/> 
         </div>
         <table class="Bus_detailTable">
             <thead>
@@ -154,6 +165,7 @@
           dataList:[],
           TotalJan:'',
           TotalCn:'',
+          downList: "",
       }
     },
     mounted() {
@@ -180,6 +192,15 @@
                     this.Error(res.data.message);
                 }
             }, err => {})
+        },
+        //点击下载
+        downLoadExcel(){
+            let msg = JSON.parse(JSON.stringify(this.msg));
+            this.GetLocalFile(
+                "bus_get_CarfareApportionExcelExport",
+                msg,
+                this.Year+'年'+this.Month+'月'+'公社车账.xls'
+            );
         }
     },
   }

src/components/Buying/CommondityOrderList.vue

+<style>
+  .CommondityOrderList .el-button-group .el-button{
+    padding:5px;
+  }
+</style>
+
+<template>
+  <div class="flexOne CommondityOrderList">
+    <div class="query-box">
+      <ul class="user_time_picker">
+        <li>
+          <span>
+            <em>姓名</em>
+            <el-input v-model="msg.AccountName" @keyup.enter.native="getList"></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>护照号</em>
+            <el-input v-model="msg.PassportNo" @keyup.enter.native="getList"></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>账户</em>
+            <el-input v-model="msg.LoginAccount" @keyup.enter.native="getList"></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>手机号码</em>
+            <el-input v-model="msg.MobilePhone" @keyup.enter.native="getList"></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>{{$t('admin.admin_status')}}</em>
+            <el-select filterable v-model="msg.AccountStatus">
+              <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
+              <el-option label="正常" :value="0"></el-option>
+              <el-option label="禁用" :value="1"></el-option>
+              <el-option label="删除" :value="2"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <input type="button" @click="getList()" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
+        </li>
+      </ul>
+    </div>
+    <div class="clearfix"></div>
+    <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>
+        <th>创建时间</th>
+        <th>{{$t('system.table_operation')}}</th>
+      </tr>
+      <tr v-for="item in dataList">
+        <td>{{item.AccountName}}</td>
+        <td>{{item.LoginAccount}}</td>
+        <td>{{item.MobilePhone}}</td>
+        <td>{{item.PassportNo}}</td>
+        <td>{{item.SexStr}}</td>
+        <td>{{item.AccountStatusStr}}</td>
+        <td>{{item.CreateTimeStr}}</td>
+        <td>
+          <el-button-group>
+            <template v-if="item.AccountStatus==0">
+              <el-tooltip class="item" effect="dark" content="禁用" placement="top">
+                <el-button type="primary" size="mini" icon="iconfont icon-jinyong" @click="SetAccountStatus(item.Id,1)">
+                </el-button>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                <el-button type="danger" size="mini" icon="iconfont icon-img_delete_small" @click="SetAccountStatus(item.Id,2)">
+                </el-button>
+              </el-tooltip>
+            </template>
+            <template v-else>
+              <el-tooltip class="item" effect="dark" content="启用" placement="top">
+                <el-button type="primary" size="mini" icon="iconfont icon-qidong" @click="SetAccountStatus(item.Id,0)">
+                </el-button>
+              </el-tooltip>
+            </template>
+          </el-button-group>
+        </td>
+      </tr>
+      <tfoot>
+        <tr>
+          <td colspan="8">
+            <el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper"
+              :page-size="msg.pageSize" :total="msg.total">
+            </el-pagination>
+          </td>
+        </tr>
+      </tfoot>
+    </table>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        //查询参数
+        msg: {
+          AccountName: "", //姓名
+          PassportNo: "", //护照
+          MobilePhone: "", //手机号码
+          AccountStatus: -1, //状态，
+          LoginAccount: "", //登录账户
+          pageIndex: 1,
+          pageSize: 10,
+          total: 0,
+        },
+        loading: false,
+        dataList: [],
+        //账户修改
+        editMsg: {
+          Id: 0,
+          AccountStatus: 0,
+        }
+      };
+    },
+    mounted() {
+      this.getList();
+    },
+    filters: {},
+    methods: {
+      handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.getList();
+      },
+      //获取数据
+      getList() {
+        this.loading = true;
+        this.apipost("ShopGuest_get_GetGuestAccountPageListService", this.msg, res => {
+          this.loading = false;
+          if (res.data.resultCode === 1) {
+            this.dataList = res.data.data.pageData;
+            this.msg.total = res.data.data.count;
+          } else {
+            this.Error(res.data.message);
+          }
+        }, null);
+      },
+      //修改账户类型
+      SetAccountStatus(Id, AccountStatus) {
+        this.editMsg.Id = Id;
+        this.editMsg.AccountStatus = AccountStatus;
+        var tipStr = "";
+        if (AccountStatus == 0) {
+          tipStr = "启用";
+        } else if (AccountStatus == 1) {
+          tipStr = "禁用";
+
+        } else if (AccountStatus == 2) {
+          tipStr = "删除";
+        }
+        var that = this;
+        this.Confirm("是否[" + tipStr + "]此账户?", function () {
+          that.apipost("ShopGuest_post_SetGuestAccountStatusService", that.editMsg, res => {
+            if (res.data.resultCode === 1) {
+              that.editMsg.Id = 0;
+              that.editMsg.AccountStatus = 0;
+              that.getList();
+            } else {
+              that.Error(res.data.message);
+            }
+          }, null);
+        });
+      }
+    }
+  };
+
+</script>

src/components/Hotel/roomReservationsDetails.1.vue

@@ -103,7 +103,7 @@
               </td>
               <!-- 占床/不占床 -->
               <td v-if="childIndex==0" :rowspan="5">
-                <p class="link" @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')">
+                <p class="link" @click="goUrlT('passengerHouse',item.TCID,'房间分配')">
                   {{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}</p>
               </td>
               <!-- 实际用房数 -->

src/components/Hotel/roomReservationsDetails.vue

@@ -105,13 +105,13 @@
               </td>
               <!-- 机位总数/(Y/E/F) -->
               <td v-if="childIndex==0" :rowspan="6">
-                <p class="link" @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
+                <p class="link" @click="goUrlT('RegistrationList',subItem.TCID,'报名清单')">
                   {{flightTotal}}/{{subItem.HouseStatistics.RealityYSeatNum}}/{{subItem.HouseStatistics.RealityESeatNum}}/{{subItem.HouseStatistics.RealityFSeatNum}}
                 </p>
               </td>
               <!-- 占床/不占床 -->
               <td v-if="childIndex==0" :rowspan="6">
-                <p class="link" @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')">
+                <p class="link" @click="goUrlT('passengerHouse',subItem.TCID,'房间分配')">
                   {{subItem.RealityHouseGuestNum}}/{{subItem.HouseStatistics.NoNeedBed}}</p>
               </td>
               <!-- 实际用房数 -->

src/components/SalesModule/productQuery.vue

@@ -815,6 +815,7 @@
                 <em v-if='item.IsSubstitution==1'>{{$t('salesModule.KYHB')}}（{{$t('visa.v_houbu')}}{{item.SubstitutionCount}}{{$t('salesModule.PeoPle')}}）</em>
                 <em v-if='item.IsSubstitution!=1' style="color: #E95252;">{{$t('salesModule.RefuseHB')}}</em>
               </p>
+              <p><span>操作OP</span><i style="font-weight:normal;">{{item.OPName}}</i></p>
             </div>
             <div class="d8">
               <p><i class="iconfont icon-hangban1"></i>{{$t('Operation.Op_Warmprompt')}}</p>

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -194,7 +194,7 @@
                 <div class="Team_firstTitle">
                   <span class="Team_comCoinType Team_shou">
                     <i class="iconfont icon-qian"></i>
-                  </span>其他总收入
+                  </span>其他
                 </div>
                 <div class="Team_Incontent">
                   <div>应收：<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div>
@@ -228,13 +228,13 @@
                 <div class="Team_firstTitle">
                   <span class="Team_comCoinType Team_lirun">
                     <i class="iconfont icon-qian"></i>
-                  </span>利润
+                  </span>利润（计算规则请看注解）
                 </div>
                 <div class="Team_Incontent">
                   <div>实际利润：<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
                   <div>当前利润：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
                   <div>
-                    注：实收-(应付/实付)+佣金收入+自费收入+其他收入(此处为收入模块下其他收入)
+                    注：实收-(应付/实付)+佣金收入+自费收入+其他收入
                     -联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出
                   </div>
                 </div>

src/router/config.js

@@ -3997,6 +3997,14 @@ export default {
                                 title: '账户管理'
                             }
                         },
+                        {
+                            path: '/CommondityOrderList',
+                            name: 'CommondityOrderList',
+                            component: resolve => require(['@/components/Buying/CommondityOrderList'], resolve),
+                            meta: {
+                                title: '订单管理'
+                            }
+                        },
                         {
                             path: '/IntegralMall',
                             name: 'IntegralMall',