Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/giftManagement/bulkExchange/components/chooseMember.vue

@@ -10,6 +10,7 @@
         :model="queryParams"
         ref="queryForm"
         size="small"
+        v-show="showSearch"
         :inline="true"
         label-width="120px"
       >
@@ -88,6 +89,12 @@
           }}</el-button>
         </el-form-item>
       </el-form>
+      <el-row class="mb8">
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="handleQueryPagination"
+        ></right-toolbar>
+      </el-row>
       <el-table
         ref="multipleTable"
         v-loading="loading"
@@ -189,6 +196,8 @@ export default {
       total: 0,
       loading: true,
       memberList: [],
+      // 显示搜索条件
+      showSearch: true,
       queryParams: {
         country: null,
         city: null,
@@ -199,8 +208,8 @@ export default {
         pageNo: 1,
         pageSize: 10,
         startTime: "",
-        usedScore: 0,
-        usedScoreOperate: 0,
+        usedScore: null,
+        usedScoreOperate: null,
       },
     };
   },

src/views/ecw/giftManagement/index.vue

@@ -137,6 +137,10 @@
         v-hasPermi="['ecw:giftManagement:add']"
         >{{ $t("添加礼品") }}</el-button
       >
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
     <!-- 礼品列表 -->
     <el-table ref="multipleTable" v-loading="loading" :data="list">
@@ -164,7 +168,7 @@
       </el-table-column>
       <el-table-column width="100" :label="$t('开始日期')">
         <template v-slot="{ row }">
-          {{ parseTime(row.createTime, "{y}-{m}-{d}") || "/" }}
+          {{ parseTime(row.startTime, "{y}-{m}-{d}") || "/" }}
         </template>
       </el-table-column>
       <el-table-column width="100" :label="$t('结束日期')">

src/views/ecw/memberManagement/addIntegrationRuleOperation/index.vue

@@ -49,12 +49,12 @@
       </el-row>
       <el-row :gutter="10">
         <el-col :span="12">
-          <el-form-item :label="$t('中文封面图')">
+          <el-form-item :label="$t('中文封面图')" prop="coverImageZh">
             <image-upload v-model="queryParams.coverImageZh" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item :label="$t('英文封面图')">
+          <el-form-item :label="$t('英文封面图')" prop="coverImageEn">
             <image-upload v-model="queryParams.coverImageEn" />
           </el-form-item>
         </el-col>

src/views/ecw/memberManagement/exchangeRecord/index.vue

@@ -4,6 +4,7 @@
       :model="queryParams"
       ref="queryForm"
       size="small"
+      v-show="showSearch"
       :inline="true"
       label-width="120px"
     >
@@ -156,6 +157,10 @@
         v-hasPermi="['ecw:memberManagement:exchangeoInfoImport']"
         >{{ $t("兑换信息导入") }}</el-button
       >
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="handleQueryPagination"
+      ></right-toolbar>
     </el-row>
     <el-table
       ref="multipleTable"
@@ -502,6 +507,8 @@ export default {
         verifyTime: "",
         verifyUser: "",
       },
+      // 显示搜索条件
+      showSearch: true,
       selectedMember: [],
       cityList: [],
       dateRangeCreateTime: [],
@@ -643,10 +650,14 @@ export default {
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
+      if (response.code == "1001011027") {
+        this.$message.error(response.msg);
+      }
       if (
         !response.data.redeemIdFailedMap ||
-        JSON.stringify(response.data.redeemIdFailedMap) != "{}"
+        JSON.stringify(response.data.redeemIdFailedMap) == "{}"
       ) {
+        this.upload.open = false;
         this.$modal.msgSuccess(this.$t("导入成功"));
         this.handleQuery();
         return;
@@ -819,6 +830,7 @@ export default {
     },
     resetQuery() {
       this.loading = true;
+      this.dateRangeCreateTime = [];
       this.queryParams = {
         country: null,
         city: null,

src/views/ecw/memberManagement/exchangeRecordOperation/components/chooseGift.vue

@@ -137,6 +137,12 @@
           }}</el-button>
         </el-form-item>
       </el-form>
+      <el-row class="mb8">
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+      </el-row>
       <!-- 礼品列表 -->
       <el-table ref="multipleTable" v-loading="loading" :data="list">
         <el-table-column
@@ -258,8 +264,8 @@
       <pagination
         v-show="total > 0"
         :total="total"
-        :page.sync="queryParams.pageNo"
-        :limit.sync="queryParams.pageSize"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.rows"
         @pagination="getList"
       />
     </div>

src/views/ecw/memberManagement/exchangeRecordOperation/index.vue

@@ -434,7 +434,7 @@ export default {
           },
           {
             validator: validatePass2,
-            trigger: "blur",
+            trigger: ["blur", "change"],
           },
         ],
         rewardName: [
@@ -584,6 +584,15 @@ export default {
         : (this.queryParamsList[0].memberName = item.englishName);
       this.queryParamsList[0].holdScore = item.holdScore;
       this.queryParamsList[0].memberId = item.id;
+
+      this.queryParamsList[0].spendCredit =
+        this.queryParamsList[0].pointsRequire *
+        this.queryParamsList[0].rewardCount;
+
+      this.queryParamsList[0].remainingPoints =
+        this.queryParamsList[0].holdScore - this.queryParamsList[0].spendCredit;
+      this.quantityComputation =
+        this.queryParamsList[0].remainingPoints >= 0 ? true : false;
     },
     querySearchAsync(queryString, cb) {
       let result = [];
@@ -649,6 +658,13 @@ export default {
         this.queryParamsList[0].rewardName = item.titleEn;
       }
       this.queryParamsList[0].pointsRequire = item.pointsRequire;
+
+      this.queryParamsList[0].rewardCount = "";
+      this.queryParamsList[0].spendCredit = "";
+      this.queryParamsList[0].remainingPoints =
+        this.queryParamsList[0].holdScore;
+      this.quantityComputation =
+        this.queryParamsList[0].remainingPoints >= 0 ? true : false;
     },
     handleSelectMember() {
       this.dialogVisible = true;

src/views/ecw/memberManagement/integralRecord/index.vue

@@ -4,6 +4,7 @@
       :model="queryParams"
       ref="queryForm"
       size="small"
+      v-show="showSearch"
       :inline="true"
       label-width="120px"
     >
@@ -91,6 +92,12 @@
         }}</el-button>
       </el-form-item>
     </el-form>
+    <el-row class="mb8">
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="handleQueryPagination"
+      ></right-toolbar>
+    </el-row>
     <el-table ref="multipleTable" v-loading="loading" :data="memberList">
       <el-table-column
         width="140"
@@ -254,6 +261,8 @@ export default {
       dateRangeCreateTime: [],
       total: 0,
       loading: true,
+      // 显示搜索条件
+      showSearch: true,
       memberList: [],
       queryParams: {
         ruleTitle: "",
@@ -320,6 +329,7 @@ export default {
     },
     resetQuery() {
       this.loading = true;
+      this.dateRangeCreateTime = [];
       this.queryParams = {
         ruleTitle: "",
         ruleDesc: "",

src/views/ecw/memberManagement/integrationRule/index.vue

@@ -5,6 +5,7 @@
       ref="queryForm"
       size="small"
       :inline="true"
+      v-show="showSearch"
       label-width="68px"
     >
       <el-form-item :label="$t('指标类型')">
@@ -118,6 +119,10 @@
         @click="handleNewScoreRule"
         >{{ $t("添加规则") }}</el-button
       >
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="handleQueryPagination"
+      ></right-toolbar>
     </el-row>
     <el-table
       ref="multipleTable"
@@ -297,6 +302,7 @@ export default {
     return {
       dateRangeCreateTime: [],
       total: 0,
+      showSearch: true,
       loading: true,
       dialogPostponeVisible: false,
       integrationRuleList: [],
@@ -463,6 +469,12 @@ export default {
     handleQuery() {
       this.queryParams.page = 1;
       let params = { ...this.queryParams };
+      this.addBeginAndEndTime(
+        params,
+        this.dateRangeCreateTime,
+        "createTime",
+        false
+      );
       getScoreRecordList(params).then((res) => {
         this.loading = false;
         this.integrationRuleList = res.data.list;
@@ -485,6 +497,7 @@ export default {
     },
     resetQuery() {
       this.loading = true;
+      this.dateRangeCreateTime = [];
       this.queryParams = {
         ruleTitle: "",
         ruleDesc: "",

src/views/ecw/memberManagement/memberPointsSummary/index.vue

@@ -5,6 +5,7 @@
       ref="queryForm"
       size="small"
       :inline="true"
+      v-show="showSearch"
       label-width="120px"
     >
       <el-form-item :label="$t('关键词')">
@@ -106,6 +107,10 @@
         @click="handleScore"
         >{{ $t("操作积分") }}</el-button
       >
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="handleQueryPagination"
+      ></right-toolbar>
     </el-row>
     <el-table
       ref="multipleTable"
@@ -245,6 +250,8 @@ export default {
       cityList: [],
       dateRangeCreateTime: [],
       total: 0,
+      // 显示搜索条件
+      showSearch: true,
       loading: true,
       dialogVisible: false,
       memberList: [],
@@ -367,6 +374,7 @@ export default {
       });
     },
     resetQuery() {
+      this.dateRangeCreateTime = [];
       this.loading = true;
       this.queryParams = {
         country: null,

src/views/member/user/memberDetails.vue

@@ -1051,7 +1051,7 @@ export default {
     handleQueryRecord() {
       this.queryParamsRecord.pageNo = 1;
       let params = { ...this.queryParamsRecord };
-      if (this.dateRangeCreateTimeRecord > 0) {
+      if (this.dateRangeCreateTimeRecord) {
         params.startTime = this.dateRangeCreateTimeRecord[0];
         params.endTime = this.dateRangeCreateTimeRecord[1];
       }
@@ -1064,6 +1064,7 @@ export default {
 
     resetQueryRecord() {
       this.loading = true;
+      this.dateRangeCreateTimeRecord = [];
       this.queryParamsRecord = {
         country: null,
         city: null,
@@ -1132,6 +1133,7 @@ export default {
     },
     resetQuery() {
       this.loading = true;
+      this.dateRangeCreateTime = [];
       this.queryParams = {
         ruleTitle: "",
         ruleDesc: "",
@@ -1180,7 +1182,6 @@ export default {
     },
     getDetails() {
       memberUserGet({ id: this.$route.params.id }).then((r) => {
-        console.log(r, "rrrr");
         this.details = r.data;
       });
     },