修改优惠券管理

src/components/activity/CouponList.vue

@@ -127,14 +127,13 @@
         <th>{{$t('system.query_type')}}</th>
         <th>{{$t('active.cl_sytiaojian')}}</th>
         <th>{{$t('active.cl_miane')}}</th>
-        <!-- <th>使用状态</th> -->
         <th>{{$t('active.cl_djshiyong')}}</th>
         <th>{{$t('active.cl_sxriqi')}}</th>
         <th>{{$t('active.cl_sxzhuangtai')}}</th>
         <th>{{$t('active.cl_gqriqi')}}</th>
         <th>{{$t('MarketingActi.usingRange')}}</th>
         <th>{{$t('admin.admin_status')}}</th>
-        <th>{{$t('active.cl_addPp')}}</th>
+        <th>是否结束</th>
         <th>{{$t('MarketingActi.huangoujia')}}</th>
         <th>{{$t('MarketingActi.huodongtime')}}</th>
         <th>{{$t('hotel.hotel_remark')}}</th>
@@ -176,7 +175,10 @@
           <span v-if="item.couponStatus == 2" style="color: gray">{{$t('active.ld_jinyong')}}</span>
           <span v-if="item.couponStatus == 3" style="color: red">{{$t('system.ph_shanchu')}}</span>
         </td>
-        <td>{{item.createUserName}}</td>
+        <td>
+          <span v-if="item.activityIsEnding=='0'">未结束</span>
+          <span v-if="item.activityIsEnding=='1'">已结束</span>
+        </td>
         <td>{{item.redemptionPrice}}</td>
         <td>
             <p>{{$t('system.table_begTime')}}：{{item.activityStartDate}}</p>
@@ -227,6 +229,12 @@
                   @click="updateKucundialog=true"
                   ></el-button>
             </el-tooltip>
+            <el-tooltip class="item" effect="dark" content="修改" placement="top">
+                  <el-button v-if="EditBtn" type="danger" icon="iconfont icon-xiugai" circle style="padding:4px;"
+                  @click="outerVisible=true,EditItem(item)"
+                  ></el-button>
+            </el-tooltip>
+            
 
           <!-- </el-button-group> -->
         </td>
@@ -508,13 +516,17 @@ export default {
       QLineTeamList: [],
       upDateKcMsg:{
         number:''
-      }
+      },
+      EditBtn:false,
     };
   },
   mounted() {
     let userInfo = this.getLocalStorage();
     this.groupId = this.msg.groupId = this.getCompanyMsg.RB_Group_Id = this.addMsg.groupId = userInfo.RB_Group_id; //集团
     this.msg.branchId = userInfo.RB_Branch_id; //公司 
+    if(userInfo.EmployeeId==6115){
+      this.EditBtn=true;
+    }
     this.getList();
     this.getCompany();
     this.getLineList();
@@ -523,6 +535,9 @@ export default {
   },
 
   methods: {
+    EditItem(item){
+      this.addMsg=Object.assign({},item);
+    },
     //点击确定修改库存
     sureUpdatekucun(){
       this.apiJavaPost("/api/appActivity/updateCouponStock", this.upDateKcMsg, res => {
@@ -542,11 +557,7 @@ export default {
         this.getCompanyMsg,
         res => {
           if (res.data.resultCode == 1) {
-            if (this.outerVisible) {
               this.layerCompanyList = res.data.data;
-            } else {
-              this.companyList = res.data.data;
-            }
           } else {
           }
         },