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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1099,6 +1099,12 @@
                         v-if="item.OrderLeaderGuestNum >= 1">+{{ item.OrderLeaderGuestNum }}</span>{{ $t("Operation.Op_people") }}
                     </i>
                   </p>
+                  <p>
+                    <span>已收订</span>
+                    <i>
+                      <span class="TCL-redType">{{ item.DJNum }}</span> {{ $t("Operation.Op_people") }}
+                    </i>
+                  </p>
                   <p v-if="item.SingleDMNum > 0">
                     <span>{{ $t("salesModule.SingleJ") }}</span>
                     <i>{{ item.SingleDMNum }}</i>
@@ -3314,7 +3320,7 @@
                   that.Success(res.data.message);
                   ttMsg.configId = res.data.data;
                   that.getControlList();
-                  that.gotoUrl(path,ttMsg);
+                  that.gotoUrl(path, ttMsg);
                 } else {
                   that.Error(res.data.message);
                 }
@@ -3481,7 +3487,7 @@
             "】" +
             this.$t("objFill.v101.dictriqiwei") +
             this.CopyTripAndFeatureMsg.StartDate;
-            tipMsg+=",变更日期后,请重新同步酒店信息。";
+          tipMsg += ",变更日期后,请重新同步酒店信息。";
         }
         that.Confirm(tipMsg, function () {
           that.saveLoading = true;
@@ -3492,7 +3498,7 @@
               that.saveLoading = false;
               if (res.data.resultCode == 1) {
                 if (that.CopyTripAndFeatureMsg.updateType == 1) {
-                  that.Success(that.$t("objFill.v101.fuzhixingccg")+res.data.message);
+                  that.Success(that.$t("objFill.v101.fuzhixingccg") + res.data.message);
                 } else {
                   that.Success(res.data.message);
                 }

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -718,6 +718,12 @@
                         v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('hotel.hotel_people')}}
                     </i>
                   </p>
+                  <p>
+                    <span>已收订</span>
+                    <i>
+                      <span class="TCL-redType">{{ item.DJNum }}</span> {{ $t("Operation.Op_people") }}
+                    </i>
+                  </p>
                   <p>
                     <span>{{$t('Operation.Op_takeSeat')}}</span>
                     <i>{{item.Occupied}}</i>{{$t('hotel.hotel_people')}}

src/components/activity/CouponAllDetail.vue

+<style>
+
+</style>
+<template>
+  <div class="flexOne page-CouponDetail">
+    <div class="query-box">
+      <ul class="user_time_picker">
+        <li>
+          <span>
+            <em>{{$t('objFill.v102.fafangkeix')}}</em>
+            <el-select filterable  v-model="msg.CustomerType" @change="getDropDowmCoupon();getList()">
+              <el-option :label="$t('Operation.Op_fellow')" value="0"></el-option>
+                <el-option :label="$t('Operation.Op_direct')" value="1"></el-option>
+            </el-select>
+          </span>
+        </li>
+         <li v-if="S_CheckAllOrder">
+          <span>
+            <em>{{$t('system.table_company')}}</em>
+            <el-select filterable :disabled="msg.IsParentCompany==2" v-model="msg.BrandId">
+              <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
+              <el-option v-for="item in companyList" :label="item.BName" :value="item.Id" :key="item.Id"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>客户名称</em>
+            <el-input v-model="msg.CustomerKey" @keyup.enter.native="getList"></el-input>
+          </span>
+        </li>
+         <li>
+          <span>
+            <em>{{$t('active.cl_couponName')}}</em>
+            <el-select filterable v-model="msg.CouponId">
+               <el-option :label="$t('pub.pleaseSel')" value="0"></el-option>
+             <el-option v-for="item in CouponList" :key="item.id"
+                    :label="item.couponsName" :value="item.id">
+                  </el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>{{$t('admin.admin_status')}}</em>
+            <el-select filterable v-model="msg.UseState">
+               <el-option :label="$t('pub.pleaseSel')" value="0"></el-option>
+              <el-option :label="$t('active.cl_wsyong')" value="1"></el-option>
+              <el-option :label="$t('active.cl_ysyong')" value="2"></el-option>
+              <el-option :label="$t('active.cl_yzfei')" value="3"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>领取时间</em>
+            <el-date-picker class="h34" v-model="AcessDate" @change="timeAdd(1)" type="daterange"
+                  value-format="yyyy-MM-dd">
+                </el-date-picker>
+          </span>
+        </li>
+         <li>
+          <span>
+            <em>使用时间</em>
+            <el-date-picker class="h34" v-model="UseDate" @change="timeAdd(1)" type="daterange"
+                  value-format="yyyy-MM-dd">
+                </el-date-picker>
+          </span>
+        </li>
+         <li>
+          <span>
+            <em>过期时间</em>
+            <el-date-picker class="h34" v-model="ExpirationDate" @change="timeAdd(1)" type="daterange"
+                  value-format="yyyy-MM-dd">
+                </el-date-picker>
+          </span>
+        </li>
+        
+        <li>
+          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()">
+        </li>
+      </ul>
+    </div>
+    <div class="clearfix"></div>
+    <div style="margin: 10px 0;" class="fz14 color333">
+      领取总数:<span class="colorE95252">{{
+        CountData.allCount
+      }}</span>&nbsp;&nbsp;&nbsp;&nbsp;已使用数：<span class="colorE95252">{{
+         CountData.allUCount
+      }}</span>&nbsp;&nbsp;&nbsp;&nbsp;未使用数：<span class="colorE95252">{{
+         CountData.allNCount
+      }}</span>&nbsp;&nbsp;&nbsp;&nbsp;作废数：<span class="colorE95252">{{
+         CountData.allFCount
+      }}</span>
+    </div>
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
+      <tr>
+        <th>客户名称</th>
+        <th>关联销售</th>
+        <th>优惠卷名称</th>
+        <th>优惠内容</th>
+        <th>使用状态</th>
+        <th>领取时间</th>
+        <th>过期时间</th>
+        <th>使用时间</th>
+        <th>关联订单</th>
+      </tr>
+      <tbody v-loading="loading">
+        <tr v-for="(item,index) in DataList" :key="index">
+          <td>   <el-tooltip class="item" effect="dark" :content="item.contact+item.contactNumber" placement="top-start">
+      <span>{{item.userName}}</span>
+    </el-tooltip></td>
+             <td>
+               <el-tooltip class="item" effect="dark" :content="item.allSaleName" placement="top-start">
+      <span>{{item.saleName}}</span>
+    </el-tooltip></td>
+               <td>
+                {{item.couponsName}}</td>
+                  <td>{{item.couponsType==1?("满"+item.useCondition+"元减"+item.denomination+"元"):("满"+item.useCondition+"打"+item.denomination+"折")}}</td>
+           <td>
+            <span v-if="item.useState == 1" style="color: green">{{$t('active.cl_wsyong')}}</span>
+            <span v-if="item.useState == 2" style="color: gary">{{$t('active.cl_ysyong')}}</span>
+            <span v-if="item.useState == 3" style="color: red">{{$t('active.cl_yzfei')}}</span>
+          </td>
+         <td>{{item.acessDate }}</td>
+          <td>{{item.effectDate }}至{{item.expirationDate }}</td>
+         <td>{{item.useDate ? item.useDate : $t('active.cl_wsyong')}}</td>
+         <td>
+            <span v-if="item.orderId === 0">{{$t('active.cl_zanwu')}}</span>
+            <span v-else>{{item.orderId}}</span>
+          </td>
+         
+        </tr>
+      </tbody>
+    </table>
+    <div class="noDataNotice" v-if="DataList.length<1">
+      <i class="iconfont icon-kong"></i>
+      <p>{{$t('active.ld_noData')}}</p>
+    </div>
+    <el-pagination background @current-change="handleCurrentChange" v-if="DataList.length>0"
+      :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 {
+        loading: false,
+        DataList: [],
+        AcessDate: [],
+        UseDate: [],
+        ExpirationDate: [],
+        S_CheckAllOrder: false,
+        msg: {
+          pageIndex: 1,
+          pageSize: 15,
+          CouponId: "0",
+          UseState: "0",
+          CustomerType:"0",
+          BrandId:"-1",
+          CustomerKey:"",
+          SAcessDate:"",
+          EAcessDate:"",
+          SUseDate:"",
+          EUseDate:"",
+          SExpirationDate:"",
+          EExpirationDate:""
+        },
+        CouponList:[],//下拉优惠券
+        companyList: [],
+        currentPage: 1,
+        total: 0,
+        CountData:{},
+      };
+    },
+    created() {
+     // this.msg.couponId = this.$route.query.couponId
+      //this.msg.UseState = this.$route.query.UseState
+    },
+    mounted() {
+       let userInfo = this.getLocalStorage();
+      let ActionMenuCode = userInfo.ActionMenuCode;
+      if (ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
+        this.S_CheckAllOrder = true
+      }
+      if (!this.S_CheckAllOrder) {
+        this.msg.BrandId = userInfo.RB_Branch_id
+      }
+      this.getDropDowmCoupon();
+      this.getCompany();
+      this.getList();
+      this.getCountList();
+    },
+    methods: {
+        timeAdd(t) { // 日期格式
+        if (t == 1) { //领取时间
+          if (!this.AcessDate) {
+            this.msg.SAcessDate = '';
+            this.msg.EAcessDate = '';
+            return
+          }
+          this.msg.SAcessDate = this.AcessDate[0];
+          this.msg.EAcessDate = this.AcessDate[1];
+        }
+        if (t == 2) { //使用时间
+          if (!this.UseDate) {
+            this.SUseDate = '';
+            this.EUseDate = '';
+            return
+          }
+          this.SUseDate = this.UseDate[0];
+          this.EUseDate = this.UseDate[1];
+        }
+        if (t == 3) { //有效期
+          if (!this.ExpirationDate) {
+            this.msg.SExpirationDate = '';
+            this.msg.EExpirationDate = '';
+            return
+          }
+          this.msg.SExpirationDate = this.ExpirationDate[0];
+          this.msg.EExpirationDate = this.ExpirationDate[1];
+        }
+      },
+      getCountList() {
+        //获取数据
+        this.loading = true;
+        this.apipost(
+          "coupon_post_GetUserCouponCountList",
+          this.msg,
+          res => {
+            this.loading = false;
+            if (res.data.resultCode === 1) {
+              this.CountData = res.data.data;
+            } else {
+              this.$message.error(res.data.message)
+            }
+          }
+        );
+      },
+      getList() {
+        //获取数据
+        this.loading = true;
+        this.apipost(
+          "coupon_post_GetUserCouponPageList",
+          this.msg,
+          res => {
+            this.loading = false;
+            if (res.data.resultCode === 1) {
+              this.total = res.data.data.count;
+              this.DataList = res.data.data.pageData;
+            } else {
+              this.$message.error(res.data.message)
+            }
+          }
+        );
+      },
+        getCompany() {
+        this.apipost(
+          "admin_get_BranchGetList",
+          this.getCompanyMsg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.layerCompanyList = res.data.data;
+              this.companyList = res.data.data;
+            }
+          }
+        );
+      },
+        getDropDowmCoupon() {
+        this.apipost("coupon_post_GetDropDowmList", {
+          "CouponsName": "",
+          "BranchId": -1,
+          "CustomerType":this.msg.CustomerType
+        }, res => {
+          if (res.data.resultCode == 1) {
+            this.CouponList = res.data.data;
+          } else {
+            this.Info(res.data.message);
+          }
+        })
+        this.msg.CouponId="0";
+      },
+      handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.getList();
+      },
+      resetPageIndex() {
+        this.msg.pageIndex = 1;
+        this.currentPage = 1;
+      },
+    }
+  };
+
+</script>

src/router/config.js

@@ -5818,6 +5818,14 @@ export default {
                 title: '优惠券发放列表'
               }
             },
+            {
+              path: '/CouponAllDetail',
+              name: 'CouponAllDetail',
+              component: resolve => require(['@/components/activity/CouponAllDetail'], resolve),
+              meta: {
+                title: '优惠券发放统计列表'
+              }
+            },
             {
               path: '/LuckyDraw',
               name: 'LuckyDraw',