Merge branch 'dev' into test

src/views/ecw/coupon/index.vue

@@ -9,12 +9,21 @@
       <!-- <el-form-item :label="$t('标题')" prop="titleEn">
         <el-input v-model="queryParams.titleEn" :placeholder="$t('请输入标题')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      <el-form-item :label="$t('类型')" prop="type">
-        <dict-selector :type='DICT_TYPE.ECW_COUPON_TYPE' v-model="queryParams.type" clearable />
+      <el-form-item :label="$t('类型')" prop="types">
+        <dict-selector
+          :type='DICT_TYPE.ECW_COUPON_TYPE'
+          v-model="queryParams.types"
+          multiple
+          clearable />
       </el-form-item>
-      <el-form-item :label="$t('状态')" prop="status" clearable>
+      <el-form-item :label="$t('状态')" prop="statusList" clearable>
         <!-- <dict-selector :type="DICT_TYPE.ECW_COUPON_STATUS" v-model="queryParams.status"/> -->
-        <el-select v-model="queryParams.status" :placeholder="$t('请选择')" clearable size="small">
+        <el-select
+          v-model="queryParams.statusList"
+          :placeholder="$t('请选择')"
+          clearable
+          multiple
+          size="small">
           <el-option :label="$t('草稿')" value="0" />
           <el-option :label="$t('已发布')" value="1" />
           <el-option :label="$t('已过期')" value="2" />
@@ -23,6 +32,38 @@
       <el-form-item :label="$t('关键字')" prop="searchKey">
         <el-input v-model="queryParams.searchKey" :placeholder="$t('请输入关键字')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
+
+
+      <el-form-item :label="$t('有效期')" prop="validDays">
+        <el-input
+          v-model.trim="queryParams.validDays"
+          :placeholder="$t('请输入有效期')"
+          clearable
+          @keyup.enter.native="handleQuery"
+          onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
+        />
+      </el-form-item>
+
+      <el-form-item :label="$t('创建时间')">
+        <el-date-picker
+          v-model="dateRangeCreateTime"
+          type="datetimerange"
+          :start-placeholder="$t('开始日期')"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :end-placeholder="$t('结束日期')"
+        >
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item :label="$t('创建人')" prop="creator">
+        <el-input
+          v-model.trim="queryParams.creator"
+          :placeholder="$t('请输入创建人')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
@@ -50,42 +91,46 @@
           <dict-tag :type="DICT_TYPE.ECW_COUPON_TYPE" :value="row.type" />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('标题')" align="center" prop="titleZh" />
+      <el-table-column :label="$t('标题')" align="center" prop="titleZh"  width="180" />
       <!-- <el-table-column :label="$t('描述')" align="center" prop="type">
         <template slot-scope="{row}">
           {{$l(row, 'content')}}
         </template>
       </el-table-column> -->
-      <el-table-column :label="$t('发布人') + '/' + $t('发布时间')" align="center" prop="startTime" width="180">
+      <el-table-column :label="$t('发布人') + '/' + $t('发布时间')" align="center" prop="startTime" width="150">
         <template slot-scope="scope">
           <div>{{ scope.row.creatorName }}</div>
           <div>{{ parseTime(scope.row.createTime) }}</div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('开始时间')" align="center" prop="startTime" width="180">
+      <el-table-column :label="$t('有效期(天)')" align="center" prop="validDays" width="90"/>
+
+      <el-table-column :label="$t('开始时间')" align="center" prop="startTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('结束时间')" align="center" prop="endTime" width="180">
+      <el-table-column :label="$t('结束时间')" align="center" prop="endTime" width="100">
         <template slot-scope="{row}">
           <div :style="{color: !row.overdueStatus ? 'red' : null}">{{ parseTime(row.endTime, '{y}-{m}-{d}') }}</div>
           <div style="color: red">{{ !row.overdueStatus ? $t('已过期') : expireTips(row.endTime) }}</div>
         </template>
       </el-table-column>
-      <!--
-      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
+
+      <el-table-column :label="$t('创建人') + '/' + $t('创建时间')" align="center" width="150">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <div>{{ scope.row.creatorName }}</div>
+          <div>{{ parseTime(scope.row.createTime)}}</div>
         </template>
-      </el-table-column-->
-      <el-table-column :label="$t('更新人') + '/' + $t('更新时间')" align="center" width="180">
+      </el-table-column>
+
+      <el-table-column :label="$t('更新人') + '/' + $t('更新时间')" align="center" width="150">
         <template slot-scope="scope">
           <div>{{ scope.row.updaterName }}</div>
           <div>{{ parseTime(scope.row.updateTime)}}</div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('状态')" align="center" prop="createTime" width="180">
+      <el-table-column :label="$t('状态')" align="center" prop="createTime" width="120">
         <template slot-scope="{row}">
           <template v-if="row.status === 1">
             <template v-if="row.putonStatus === 1">{{$t('已发布，投放中')}}</template>
@@ -185,7 +230,7 @@ export default {
       open: false,
       dateRangeStartTime: [],
       dateRangeEndTime: [],
-      dateRangeCreateTime: null,
+      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -278,7 +323,14 @@ export default {
       }
       this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
       this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+
+      this.addBeginAndEndTime(
+        params,
+        this.dateRangeCreateTime,
+        "createTime",
+        false
+      );
+
       // 执行查询
       getCouponPage(params).then(response => {
         this.list = response.data.list;
@@ -296,7 +348,10 @@ export default {
       this.dateRangeStartTime = [];
       this.dateRangeEndTime = [];
       this.dateRangeCreateTime = [];
+      this.queryParams.statusList =[];
+
       this.resetForm("queryForm");
+      this.queryParams.types =[];
       this.handleQuery();
     },
     /** 新增按钮操作 */
@@ -359,7 +414,13 @@ export default {
       params.pageSize = undefined;
       this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
       this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+
+      this.addBeginAndEndTime(
+        params,
+        this.dateRangeCreateTime,
+        "createTime",
+        false
+      );
       // 执行导出
       this.$confirm(this.$t('是否确认导出所有优惠券信息数据项?')).then(() => {
           this.exportLoading = true;

src/views/ecw/order/detail.vue

@@ -630,8 +630,9 @@ export default {
     },
     getOrderCheckInfo(){
       let that = this
-      // 执行查询
-      getOrderCheckInfo(that.orderId).then(response => {
+      // TODO 待提供执行查询接口
+      // getOrderCheckInfo(that.orderId).then(response => {
+          getOrderItemDeleted(that.orderId).then(response => {
         that.orderCheckInfoData = response.data;
       });
     },