修改集点活动

src/views/system/pointActivities/index.vue

 <template>
   <div class="app-container">
-    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="68px" size="small">
-      <el-form-item label="用户ID" prop="consumerId">
+    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px" size="small">
+
+      <el-form-item label="累计点数" prop="points">
         <el-input
-          v-model="queryParams.consumerId"
+          v-model="queryParams.points"
           clearable
-          placeholder="请输入用户ID"
+          placeholder="请输入已累计点数"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="配置ID" prop="confId">
+      <el-form-item label="用户名称" prop="nickName">
         <el-input
-          v-model="queryParams.confId"
+          v-model="queryParams.nickName"
           clearable
-          placeholder="请输入配置ID"
+          placeholder="请输入已用户名称"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="已累计点数" prop="points">
+      <el-form-item label="配置名称" prop="confName">
         <el-input
-          v-model="queryParams.points"
+          v-model="queryParams.confName"
           clearable
-          placeholder="请输入已累计点数"
+          placeholder="请输入已配置名称"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="上次消费时间" prop="lastConsumptionTime">
-        <el-date-picker v-model="queryParams.lastConsumptionTime"
+      <el-form-item label="优惠券名称" prop="couponName">
+        <el-input
+          v-model="queryParams.couponName"
           clearable
-                        placeholder="请选择上次消费时间"
-                        type="date"
-                        value-format="yyyy-MM-dd">
-        </el-date-picker>
+          placeholder="请输入已优惠券名称"
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="是否可领取" prop="isReceive">
         <el-select v-model="queryParams.isReceive" clearable placeholder="请选择是否可领取">
@@ -43,7 +44,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否已领取优惠券" prop="couponReceived">
+      <el-form-item label="是否已领取" prop="couponReceived">
         <el-select v-model="queryParams.couponReceived" clearable placeholder="请选择是否已领取优惠券">
           <el-option
             v-for="dict in dict.type.store_is_use_coupon"
@@ -53,30 +54,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="优惠券领取日期" prop="receivedDate">
-        <el-date-picker v-model="queryParams.receivedDate"
-                        clearable
-                        placeholder="请选择优惠券领取日期"
-                        type="date"
-                        value-format="yyyy-MM-dd">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="优惠券过期日期" prop="couponExpirationDate">
-        <el-date-picker v-model="queryParams.couponExpirationDate"
-                        clearable
-                        placeholder="请选择优惠券过期日期"
-                        type="date"
-                        value-format="yyyy-MM-dd">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="是否删除(0:否,1:是)" prop="isDelete">
-        <el-input
-          v-model="queryParams.isDelete"
-          clearable
-          placeholder="请输入是否删除(0:否,1:是)"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -84,41 +61,41 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:pointActivities:add']"
-          icon="el-icon-plus"
-          plain
-          size="mini"
-          type="primary"
-          @click="handleAdd"
-        >新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:pointActivities:edit']"
-          :disabled="single"
-          icon="el-icon-edit"
-          plain
-          size="mini"
-          type="success"
-          @click="handleUpdate"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:pointActivities:remove']"
-          :disabled="multiple"
-          icon="el-icon-delete"
-          plain
-          size="mini"
-          type="danger"
-          @click="handleDelete"
-        >删除
-        </el-button>
-      </el-col>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          v-hasPermi="['system:pointActivities:add']"-->
+      <!--          icon="el-icon-plus"-->
+      <!--          plain-->
+      <!--          size="mini"-->
+      <!--          type="primary"-->
+      <!--          @click="handleAdd"-->
+      <!--        >新增-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          v-hasPermi="['system:pointActivities:edit']"-->
+      <!--          :disabled="single"-->
+      <!--          icon="el-icon-edit"-->
+      <!--          plain-->
+      <!--          size="mini"-->
+      <!--          type="success"-->
+      <!--          @click="handleUpdate"-->
+      <!--        >修改-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          v-hasPermi="['system:pointActivities:remove']"-->
+      <!--          :disabled="multiple"-->
+      <!--          icon="el-icon-delete"-->
+      <!--          plain-->
+      <!--          size="mini"-->
+      <!--          type="danger"-->
+      <!--          @click="handleDelete"-->
+      <!--        >删除-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:pointActivities:export']"
@@ -134,10 +111,16 @@
     </el-row>
 
     <el-table v-loading="loading" :data="pointActivitiesList" @selection-change="handleSelectionChange">
-      <el-table-column align="center" type="selection" width="55"/>
-      <el-table-column align="center" label="主键" prop="id"/>
-      <el-table-column align="center" label="用户ID" prop="consumerId"/>
-      <el-table-column align="center" label="配置ID" prop="confId"/>
+      <!--      <el-table-column align="center" type="selection" width="55"/>-->
+      <el-table-column align="center" label="用户名称" prop="nickName"/>
+      <el-table-column align="center" label="手机号" prop="phone"/>
+      <el-table-column align="center" label="用户头像" prop="avatar" width="100">
+        <template slot-scope="scope">
+          <image-preview :height="50" :src="scope.row.avatar" :width="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="配置名称" prop="confName"/>
+      <el-table-column align="center" label="优惠券名称" prop="couponName"/>
       <el-table-column align="center" label="已累计点数" prop="points"/>
       <el-table-column align="center" label="上次消费时间" prop="lastConsumptionTime" width="180">
         <template slot-scope="scope">
@@ -149,7 +132,7 @@
           <dict-tag :options="dict.type.store_is_use_coupon" :value="scope.row.isReceive"/>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="是否已领取优惠券" prop="couponReceived">
+      <el-table-column align="center" label="是否已领取" prop="couponReceived">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.store_is_use_coupon" :value="scope.row.couponReceived"/>
         </template>
@@ -164,28 +147,27 @@
           <span>{{ parseTime(scope.row.couponExpirationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="是否删除(0:否,1:是)" prop="isDelete"/>
       <el-table-column align="center" label="备注" prop="remark"/>
-      <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
-        <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['system:pointActivities:edit']"
-            icon="el-icon-edit"
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-          >修改
-          </el-button>
-          <el-button
-            v-hasPermi="['system:pointActivities:remove']"
-            icon="el-icon-delete"
-            size="mini"
-            type="text"
-            @click="handleDelete(scope.row)"
-          >删除
-          </el-button>
-        </template>
-      </el-table-column>
+      <!--      <el-table-column align="center" class-name="small-padding fixed-width" label="操作">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <el-button-->
+      <!--            v-hasPermi="['system:pointActivities:edit']"-->
+      <!--            icon="el-icon-edit"-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            @click="handleUpdate(scope.row)"-->
+      <!--          >修改-->
+      <!--          </el-button>-->
+      <!--          <el-button-->
+      <!--            v-hasPermi="['system:pointActivities:remove']"-->
+      <!--            icon="el-icon-delete"-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            @click="handleDelete(scope.row)"-->
+      <!--          >删除-->
+      <!--          </el-button>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -304,6 +286,9 @@ export default {
         pageNum: 1,
         pageSize: 10,
         consumerId: null,
+        nickName: null,
+        confName: null,
+        couponName: null,
         confId: null,
         points: null,
         lastConsumptionTime: null,

src/views/system/pointActivitiesConf/index.vue

@@ -9,31 +9,31 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="集点所需的消费次数" prop="pointsRequired">
+      <el-form-item label="优惠券名称" prop="couponName">
         <el-input
-          v-model="queryParams.pointsRequired"
+          v-model="queryParams.couponName"
           clearable
-          placeholder="请输入集点所需的消费次数"
+          placeholder="请输入已优惠券名称"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="每次消费的时间间隔(小时)" prop="timeInterval">
+      <el-form-item label="消费次数" prop="pointsRequired">
         <el-input
-          v-model="queryParams.timeInterval"
+          v-model="queryParams.pointsRequired"
           clearable
-          placeholder="请输入每次消费的时间间隔(小时)"
+          placeholder="请输入消费次数"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="优惠券Id" prop="couponId">
+      <el-form-item label="时间间隔" prop="timeInterval">
         <el-input
-          v-model="queryParams.couponId"
+          v-model="queryParams.timeInterval"
           clearable
-          placeholder="请输入优惠券Id"
+          placeholder="请输入每次消费的时间间隔(小时)"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="优惠券的领取期限 (天)" prop="collectionDeadline">
+      <el-form-item label="领取期限" prop="collectionDeadline">
         <el-input
           v-model="queryParams.collectionDeadline"
           clearable
@@ -41,7 +41,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="优惠券的使用期限 (天)" prop="couponDuration">
+      <el-form-item label="使用期限" prop="couponDuration">
         <el-input
           v-model="queryParams.couponDuration"
           clearable
@@ -49,7 +49,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="集点活动的重置周期 (月)" prop="collectionResetPeriod">
+      <el-form-item label="重置周期" prop="collectionResetPeriod">
         <el-input
           v-model="queryParams.collectionResetPeriod"
           clearable
@@ -67,14 +67,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否删除(0:否,1:是)" prop="isDelete">
-        <el-input
-          v-model="queryParams.isDelete"
-          clearable
-          placeholder="请输入是否删除(0:否,1:是)"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -133,20 +125,19 @@
 
     <el-table v-loading="loading" :data="pointActivitiesConfList" @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection" width="55"/>
-      <el-table-column align="center" label="主键" prop="id"/>
       <el-table-column align="center" label="配置名称" prop="name"/>
-      <el-table-column align="center" label="集点所需的消费次数" prop="pointsRequired"/>
-      <el-table-column align="center" label="每次消费的时间间隔(小时)" prop="timeInterval"/>
-      <el-table-column align="center" label="优惠券Id" prop="couponId"/>
-      <el-table-column align="center" label="优惠券的领取期限 (天)" prop="collectionDeadline"/>
-      <el-table-column align="center" label="优惠券的使用期限 (天)" prop="couponDuration"/>
-      <el-table-column align="center" label="集点活动的重置周期 (月)" prop="collectionResetPeriod"/>
+      <el-table-column align="center" label="消费次数" prop="pointsRequired"/>
+      <el-table-column align="center" label="消费间隔(小时)" prop="timeInterval"/>
+      <!--      <el-table-column align="center" label="优惠券Id" prop="couponId"/>-->
+      <el-table-column align="center" label="优惠券名称" prop="couponName"/>
+      <el-table-column align="center" label="领取期限 (天)" prop="collectionDeadline"/>
+      <el-table-column align="center" label="使用期限 (天)" prop="couponDuration"/>
+      <el-table-column align="center" label="重置周期 (月)" prop="collectionResetPeriod"/>
       <el-table-column align="center" label="是否开启" prop="isOpen">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.store_is_use_coupon" :value="scope.row.isOpen"/>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="是否删除(0:否,1:是)" prop="isDelete"/>
       <el-table-column align="center" label="备注" prop="remark"/>
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
         <template slot-scope="scope">
@@ -264,6 +255,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         name: null,
+        couponName: null,
         pointsRequired: null,
         timeInterval: null,
         couponId: null,