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

src/components/activity/CouponList.vue

@@ -82,10 +82,11 @@
     <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>
         <th>生效日期</th>
@@ -95,6 +96,7 @@
       </tr>
       <tr v-for="(item,index) in DataList" v-loading="loading">
         <td>{{item.couponsName}}</td>
+        <td>{{item.couponCount}}</td>
         <td>{{item.lineName}}</td>
         <td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td>
         <td>{{item.denomination}}</td>
@@ -208,11 +210,18 @@
             </td>
           </tr>
           <tr>
+            <td>
+              <el-form-item label="优惠券数量" prop="couponCount">
+                <el-input v-model="addMsg.couponCount" class="w217" type="number"/>
+              </el-form-item>
+            </td>
             <td>
               <el-form-item label="使用条件" prop="useCondition">
                 <el-input v-model="addMsg.useCondition" class="w217" placeholder="满多少可用"/>
               </el-form-item>
             </td>
+          </tr>
+          <tr>
             <td>
               <el-form-item label="生效日期" prop="effectDate">
                 <el-date-picker
@@ -223,8 +232,6 @@
                 ></el-date-picker>
               </el-form-item>
             </td>
-          </tr>
-          <tr>
             <td>
               <el-form-item label="有效截止日" prop="expirationDate">
                 <el-date-picker
@@ -280,6 +287,7 @@ export default {
         useCondition: [{ required: true, message: "请输入使用条件", trigger: "blur" }],
         effectDate: [{ required: true, message: "请选择生效日期", trigger: "change" }],
         expirationDate: [{ required: true, message: "请选择截止日期", trigger: "change" }],
+        couponCount: [{ required: true, message: "请输入优惠券数量", trigger: "blur" }],
       },
       addMsg: {
         couponsName: "",
@@ -293,6 +301,7 @@ export default {
         overlapUse: 0,
         useCondition: "",
         id: 0,
+        couponCount: '',
       },
       pwdMsg: {
         Id: "",
@@ -407,6 +416,8 @@ export default {
       this.addMsg.overlapUse= item.overlapUse
       this.addMsg.useCondition= item.useCondition
       this.addMsg.id= item.id
+      this.addMsg.couponCount = item.couponCount
+      console.log(item.couponCount)
       this.isleaveBtn = true;
     },
     handleCurrentChange(val) {