‘抽奖活动’

src/components/activity/CouponList.vue

@@ -101,12 +101,12 @@
         <td>{{item.couponCount}}</td>
         <td>{{item.couponReceiveCount}}</td>
         <td>{{(item.couponCount - item.couponReceiveCount) > 0 ? (item.couponCount - item.couponReceiveCount) : 0 }}</td>
-        <td>{{item.lineName}}</td>
+        <td>{{item.lineId <= 0 ? '不限' : item.lineName}}</td>
         <td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td>
         <td>{{item.useCondition}}</td>
         <td>{{item.denomination}}</td>
         <!-- <td>{{item.useState}}</td> -->
-        <td>{{item.overlapUse === 1 ? "不允许" : "允许"}}</td>
+        <td>{{item.overlapUse === 0 ? "不允许" : "允许"}}</td>
         <td>{{item.effectDate}}</td>
         <td>{{item.expirationDate}}</td>
         <td>{{item.createBy}}</td>
@@ -323,12 +323,13 @@ export default {
       companyList: [],
       layerDepartMentList: [],
       departMentList: [],
-      PostList: []
+      PostList: [],
+      groupId: '',
     };
   },
   mounted() {
     let userInfo = this.getLocalStorage();
-    this.msg.groupId = this.getCompanyMsg.RB_Group_Id = this.addMsg.groupId = userInfo.RB_Group_id; //集团
+    this.groupId = this.msg.groupId = this.getCompanyMsg.RB_Group_Id = this.addMsg.groupId = userInfo.RB_Group_id; //集团
     this.msg.branchId = userInfo.RB_Branch_id; //公司 
     this.getList();
     this.getCompany();
@@ -456,6 +457,20 @@ export default {
     resetForm(formName) {
       //弹出框取消 初始化谈框内表单
       this.$refs[formName].resetFields();
+      this.addMsg = {
+        couponsName: "",
+        effectDate: "",
+        expirationDate: "",
+        couponsType: 1,
+        groupId: this.groupId,
+        branchId: "",
+        lineId: "",
+        denomination: "",
+        overlapUse: 0,
+        useCondition: "",
+        id: 0,
+        couponCount: '',
+      }
     }
   }
 };