1

src/components/activity/CouponList.vue

@@ -243,7 +243,7 @@
         </el-col>
           <el-col :span="12">
           <el-form-item :label="$t('advmanager.v_line')" prop="lineId">
-            <el-select filterable v-model="addMsg.lineId" @change="getLineTeamList(addMsg.lineId),getTravelPrciePageList()">
+            <el-select filterable v-model="addMsg.lineIdList" :multiple="true" @change="getLineTeamList(addMsg.lineId),getTravelPrciePageList()">
               <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
               <el-option v-for="item in LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID">
               </el-option>
@@ -252,7 +252,7 @@
         </el-col>
         <el-col :span="12">
               <el-form-item :label="$t('advmanager.v_xilie')" prop="lineteamId">
-                <el-select filterable v-model="addMsg.lineteamId"
+                <el-select filterable v-model="addMsg.lineteamIdList" :multiple="true"
                 @change="getTravelPrciePageList">
                   <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
                   <el-option v-for="item in LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID">
@@ -298,6 +298,18 @@
                   type="datetime"></el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="活动开始" >
+                <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" class="w217" v-model="addMsg.activityStartDate"
+                  type="datetime"></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="活动结束" >
+                <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" class="w217" v-model="addMsg.activityEndDate"
+                  type="datetime"></el-date-picker>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="选择团" prop="">
                 <el-select filterable multiple v-model="addMsg.couponPriceLists"
@@ -368,6 +380,43 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+          <el-form-item label="发放线路" >
+            <el-select filterable v-model="addMsg.checkInLineList" :multiple="true" >
+              <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
+              <el-option v-for="item in LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="是否膨胀" >
+            <el-radio-group v-model="addMsg.isExpansion">
+                      <el-radio :label="0">否</el-radio>
+                      <el-radio :label="1">是</el-radio>
+                    </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+              <el-form-item label="膨胀金" >
+                <el-input @input="maxValueExpansionModel" maxlength="20" class="w217" type="number" v-model="addMsg.expansionModel.denomination"
+                  :placeholder="$t('active.cl_dkjezk')"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="订单人数" >
+                <el-input v-model="addMsg.expansionModel.orderGuestNum" class="w217" type="number" />
+              </el-form-item>
+            </el-col>
+        <el-col :span="12">
+          <el-form-item label="订单类型" prop="lineId">
+            <el-select filterable v-model="addMsg.expansionModel.orderType"  >
+              <el-option label="小包团" :value="2"></el-option>
+            
+            </el-select>
+          </el-form-item>
+        </el-col>
             </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -485,6 +534,16 @@
             message: this.$t('rule.qxzjzriqi'),
             trigger: "change"
           }],
+          activityStartDate: [{
+            required: true,
+            message: this.$t('rule.qxzsxriqi'),
+            trigger: "change"
+          }],
+          activityEndDate: [{
+            required: true,
+            message: this.$t('rule.qxzjzriqi'),
+            trigger: "change"
+          }],
           couponCount: [{
             required: true,
             message: this.$t('rule.qsryhqshuliang'),
@@ -500,6 +559,8 @@
           couponsName: "",
           effectDate: "",
           expirationDate: "",
+          activityStartDate:"",
+          activityEndDate:"",
           couponsType: 1,
           groupId: "",
           branchId: "",
@@ -518,6 +579,15 @@
           openPlatformList:[],
           couponPriceLists:[],
           couponPriceList: [],
+          lineIdList:[],
+          lineteamId:[],
+          checkInLineList:[],
+          isExpansion:0,
+          expansionModel:{
+            orderTyperderType:"",
+            denomination:"",
+            orderGuestNum:""
+          }
         },
         pwdMsg: {
           Id: "",
@@ -614,7 +684,14 @@
       },
       EditItem(item) {
       
-      
+        console.log("点击修改",item);
+        if(item.expansionModel=== null){
+          console.log("item.expansionModel",item.expansionModel);
+          item.expansionModel ={  orderTyperderType:"",
+            denomination:"",
+            orderGuestNum:""}
+
+        }
         this.addMsg = Object.assign({}, item);
         if(item.couponPriceLists||item.lineId||item.lineteamId||item.effectDate||item.expirationDate){
         
@@ -688,12 +765,24 @@
           this.$message.error(this.$t('rule.zkqzdzkwzhe'))
         }
       },
+      maxValueExpansionModel: function (val) {
+        if (this.addMsg.couponsType === 2 && val >= 9.99) {
+          this.addMsg.expansionModel.denomination = 9.99
+          this.$message.error(this.$t('rule.zkqzdzkwzhe'))
+        }
+      },
       addData() {
         let sDate = new Date(this.addMsg.effectDate)
         let eDate = new Date(this.addMsg.expirationDate)
         if (sDate > eDate) {
           return this.$message.error(this.$t('rule.yxjzrbxdyksshijian'))
         }
+
+        let sactivityStartDate = new Date(this.addMsg.activityStartDate)
+        let eactivityEndDate = new Date(this.addMsg.activityEndDate)
+        if (sactivityStartDate > eactivityEndDate) {
+          return this.$message.error(this.$t('rule.yxjzrbxdyksshijian'))
+        }
         this.isleaveBtn = false;
         this.apipost("coupon_post_SetCouponModel", this.addMsg, res => {
             if (res.data.resultCode == 1) {
@@ -738,10 +827,13 @@
         this.addMsg.couponsName = item.couponsName
         this.addMsg.effectDate = item.effectDate
         this.addMsg.expirationDate = item.expirationDate
+        this.addMsg.activityStartDate = item.activityStartDate
+        this.addMsg.activityEndDate = item.activityEndDate
         this.addMsg.couponsType = item.couponsType
         this.addMsg.groupId = item.groupId
         this.addMsg.branchId = item.branchId
         this.addMsg.lineId = item.lineId
+       //this.addMsg.expansionModel=item.expansionModel
         this.addMsg.denomination = item.denomination
         this.addMsg.overlapUse = item.overlapUse
         this.addMsg.useCondition = item.useCondition
@@ -754,6 +846,20 @@
         this.addMsg.remark = item.remark
         this.addMsg.autoGrant= item.autoGrant
         this.addMsg.openPlatformList= item.openPlatformList
+        this.addMsg.checkInLineList= item.checkInLineList
+        this.addMsg.lineIdList= item.lineIdList
+        this.addMsg.lineteamIdList= item.lineteamIdList
+        console.log("item.expansionModel",item.expansionModel);
+        if(item.expansionModel=== null){
+          console.log("item.expansionModel",item.expansionModel);
+          this.addMsg.expansionModel ={  orderTyperderType:"",
+            denomination:"",
+            orderGuestNum:""}
+
+        }else{
+          console.log("item.expansionModel11",item.expansionModel);
+          this.addMsg.expansionModel =item.expansionModel
+        }
         this.isleaveBtn = true;
       },
       // 删除
@@ -832,10 +938,12 @@
           effectDate: "",
           expirationDate: "",
           couponsType: 1,
-          groupId: this.groupId,
+          groupId: "",
           branchId: "",
           lineId: 0,
           denomination: "",
+          activityStartDate:"",
+          activityEndDate:"",
           overlapUse: 0,
           useCondition: "",
           id: 0,
@@ -844,6 +952,20 @@
           couponsUseScope: 1,
           couponStatus: 1,
           redemptionPrice: '',
+          remark: "",
+          autoGrant:"",
+          openPlatformList:[],
+          couponPriceLists:[],
+          couponPriceList: [],
+          lineIdList:[],
+          lineteamId:[],
+          checkInLineList:[],
+          isExpansion:0,
+          expansionModel:{
+            orderTyperderType:"",
+            denomination:"",
+            orderGuestNum:""
+          }
         }
       }
     }