完善优惠列表

src/views/ecw/coupon/index.vue

@@ -17,7 +17,12 @@
         <dict-selector :type='DICT_TYPE.ECW_COUPON_TYPE' v-model="queryParams.type" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <dict-selector :type="DICT_TYPE.ECW_COUPON_STATUS" v-model="queryParams.status"/>
+        <!-- <dict-selector :type="DICT_TYPE.ECW_COUPON_STATUS" v-model="queryParams.status"/> -->
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
+          <el-option label="草稿" value="0" />
+          <el-option label="已发布" value="1" />
+          <el-option label="已过期" value="2" />
+        </el-select>
       </el-form-item>
       <el-form-item label="关键字" prop="conditionCurrencyId">
         <el-input v-model="queryParams.searchKey" placeholder="请输入关键字" clearable @keyup.enter.native="handleQuery"/>
@@ -136,11 +141,11 @@
         </template>
       </el-table-column>
       <el-table-column label="标题" align="center" prop="titleZh" />
-      <el-table-column label="描述" align="center" prop="type">
+      <!-- <el-table-column label="描述" align="center" prop="type">
         <template slot-scope="{row}">
           {{$l(row, 'content')}}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="发布人/发布时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <div>{{ scope.row.creatorName }}</div>
@@ -163,12 +168,12 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
-      </el-table-column>
+      </el-table-column-->
       <el-table-column label="状态" align="center" prop="createTime" width="180">
         <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.ECW_IS_DRAFT" :value="row.status" />
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row, true)"
@@ -261,6 +266,10 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
+      if(params.status == 2){
+        params.overdueStatus=0
+        params.status = null
+      }
       this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
       this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');