Merge branch 'cherry-pick-51f39326' into 'dev'

Merge branch 'feature/member-defect-604' into 'pre-release'

See merge request !80

src/i18n/languages/en_US.json

@@ -4514,6 +4514,7 @@
   "会员电话": "Member Phone NO.",
   "请输入会员电话": "Please input Member Phone NO.",
   "礼品名称": "gift name",
+  "礼品": "gift name",
   "请输入礼品名称": "Please input gift name",
   "请输入数字": "Please input number",
   "兑换积分": "Redeem Points",
@@ -4565,6 +4566,7 @@
   "请输入兑换数量": "Please enter the amount of redemption",
   "兑换方式": "Method of Exchange",
   "兑换入口": "Exchange entry",
+  "入口": "Exchange entry",
   "收件人姓名": "Recipient's name",
   "请输入收件人姓名": "Please enter recipient name",
   "收件人电话": "Recipient phone number",
@@ -4648,7 +4650,7 @@
   "请输入查找": "Please enter to find ",
   "删除规则": "Delete Rules ",
   "积分范围": "Integral Range ",
-  "兑换记录ID": "Exchange Record ID",
+  "记录ID": "Exchange Record ID",
   "核销回退": "Write-off rollback ",
   "请输入礼品积分": "Please enter Gift points ",
   "请输入当前积分": "Please enter current credits ",

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

@@ -81,22 +81,22 @@
         <!-- v值积分 -->
         <el-col :span="18">
           <el-form-item :label="$t('积分')" v-if="queryParams.type == '1'" required>
-            <el-row type="flex" justify="start" v-for="(item, index) in queryParams.extraOrderV.orderVRule">
-              <el-col :span="2">
-                <el-form-item :prop="'extraOrderV.orderVRule.' + index + '.low'" :rules="rules.extraOrderV.orderVRule.low"> <el-input style="width: 100px" v-model.number="item.low"></el-input></el-form-item>
+            <el-row v-for="(item, index) in queryParams.extraOrderV.orderVRule">
+              <el-col :span="4">
+                <el-form-item :prop="'extraOrderV.orderVRule.' + index + '.low'" :rules="rules.extraOrderV.orderVRule.low"> <el-input style="width: 120px" v-model.number="item.low"></el-input></el-form-item>
               </el-col>
-              <el-col :span="1">
+              <el-col :span="2">
                 {{ queryParams.extraOrderV.transportType == "3" ? "kg" : "m³" }}
                 {{ $t("至") }}
               </el-col>
-              <el-col :span="2">
-                <el-form-item :prop="'extraOrderV.orderVRule.' + index + '.high'" :rules="rules.extraOrderV.orderVRule.high"> <el-input style="width: 100px" v-model.number="item.high"></el-input> </el-form-item
+              <el-col :span="4">
+                <el-form-item :prop="'extraOrderV.orderVRule.' + index + '.high'" :rules="rules.extraOrderV.orderVRule.high"> <el-input style="width: 120px" v-model.number="item.high"></el-input> </el-form-item
               ></el-col>
-              <el-col :span="1"> {{ queryParams.extraOrderV.transportType == "3" ? "kg" : "m³" }} = </el-col>
-              <el-col :span="2">
-                <el-form-item :prop="'extraOrderV.orderVRule.' + index + '.score'" :rules="rules.extraOrderV.orderVRule.score"><el-input style="width: 100px" v-model.number="item.score"></el-input></el-form-item>
+              <el-col :span="2"> {{ queryParams.extraOrderV.transportType == "3" ? "kg" : "m³" }} = </el-col>
+              <el-col :span="4">
+                <el-form-item :prop="'extraOrderV.orderVRule.' + index + '.score'" :rules="rules.extraOrderV.orderVRule.score"><el-input style="width: 120px" v-model.number="item.score"></el-input></el-form-item>
               </el-col>
-              <el-col :span="1">
+              <el-col :span="2">
                 {{ $t("积分") }}
               </el-col>
               <el-col :span="1">
@@ -573,6 +573,7 @@ export default {
         },
         extraOrderV: {
           //订单V值扩展字段
+          channel: [],
           firstOrder: "1",
           orderEntry: null,
           transportType: "", //运输方式

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

@@ -87,7 +87,7 @@
                     <el-input :placeholder="$t('请输入兑换人')" clearable v-model="item.redeemer" :disabled="veriftyDisable" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
                   </el-form-item>
                   <el-form-item :label="$t('兑换时间')">
-                    <el-date-picker type="date" placement="bottom-start" :disabled="veriftyDisable" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('选择兑换时间')" v-model="item.redemptionTime"></el-date-picker>
+                    <el-date-picker type="datetime" placement="bottom-start" :disabled="veriftyDisable" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('选择兑换时间')" v-model="item.redemptionTime"></el-date-picker>
                   </el-form-item>
                   <el-form-item :label="$t('快递公司')" v-if="item.redeemType != '1'">
                     <el-select v-model="item.courierCompany" :placeholder="$t('请选择快递公司')">

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

@@ -84,7 +84,7 @@
         <template #default="{ row }"> {{ $l(handleStatus(row.status), "label") || "/" }}</template>
       </el-table-column>
 
-      <el-table-column :label="$t('创建人')" align="center" prop="creator" />
+      <el-table-column :label="$t('创建人')" width="120px" align="center" prop="creator" />
       <el-table-column :label="$t('创建时间')" width="150px" align="center">
         <template #default="{ row }"> {{ parseTime(row.createTime) || "/" }}</template>
       </el-table-column>

src/views/member/user/memberDetails.vue

@@ -202,7 +202,7 @@
       </div>
       <div class="exchange" v-show="activeIndex != 'reward'">
         <el-form :model="queryParamsRecord" ref="queryForm" size="small" :inline="true" label-width="120px">
-          <el-form-item :label="$t('礼品名称')">
+          <el-form-item :label="$t('礼品')">
             <el-input style="width: 300px" v-model.trim="queryParamsRecord.rewardTitle" :placeholder="$t('请输入礼品名称')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
           </el-form-item>
           <el-form-item :label="$t('领取方式')">
@@ -219,7 +219,7 @@
         </el-form>
 
         <el-table ref="multipleTable" v-loading="loading" :data="memberRecordList">
-          <el-table-column :label="$t('兑换记录ID')" width="160" align="center">
+          <el-table-column :label="$t('记录ID')" width="160" align="center">
             <template #default="{ row }">
               <el-button type="text" @click="handleViewRecord(row)">{{ row.redemptionNumber }}</el-button>
             </template>
@@ -229,20 +229,21 @@
               <el-button type="text" @click="handleShowRewardsDetail(row)">{{ row.rewardCode }}</el-button>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('礼品名称')" align="center" :prop="isChinese ? 'rewardTitleZh' : 'rewardTitleEn'"></el-table-column>
-          <el-table-column :label="$t('会员名称')" align="center" :prop="isChinese ? 'memberNameZh' : 'memberNameEn'"></el-table-column>
-          <el-table-column :label="$t('兑换时间')" align="center">
+          <el-table-column width="180" :label="$t('礼品')" align="center" :prop="isChinese ? 'rewardTitleZh' : 'rewardTitleEn'"></el-table-column>
+          <el-table-column :label="$t('会员')" align="center" :prop="isChinese ? 'memberNameZh' : 'memberNameEn'"></el-table-column>
+          <el-table-column width="180" :label="$t('时间')" align="center">
             <template v-slot="{ row }">
               {{ parseTime(row.redemptionTime) || "/" }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('兑换积分')" align="center" prop="totalCount"></el-table-column>
-          <el-table-column width="140" :label="$t('兑换入口')" align="center">
+          <el-table-column width="140" :label="$t('数量')" align="center" prop="rewardCount"></el-table-column>
+          <el-table-column :label="$t('积分')" align="center" prop="totalCount"></el-table-column>
+          <el-table-column width="140" :label="$t('入口')" align="center">
             <template v-slot="{ row }">
               {{ isChinese ? handleExchangeEntrance(row.entrance).label : handleExchangeEntrance(row.entrance).labelEn }}
             </template>
           </el-table-column>
-          <el-table-column width="140" :label="$t('兑换网点')" align="center" :prop="isChinese ? 'nodeTitleZh' : 'nodeTitleEn'"> </el-table-column>
+          <el-table-column width="140" :label="$t('网点')" align="center" :prop="isChinese ? 'nodeTitleZh' : 'nodeTitleEn'"> </el-table-column>
           <el-table-column width="140" :label="$t('领取方式')" align="center">
             <template v-slot="{ row }">
               {{ isChinese ? handleExchangeRedeemType(row.redeemType).label : handleExchangeRedeemType(row.redeemType).labelEn }}
@@ -254,7 +255,7 @@
             </template>
           </el-table-column>
           <el-table-column width="140" :label="$t('备注')" align="center" prop="remark"></el-table-column>、
-          <el-table-column width="140" :label="$t('数量')" align="center" prop="rewardCount"></el-table-column>
+
           <el-table-column width="140" :label="$t('创建人')" align="center" prop="creatorName"></el-table-column>
           <el-table-column width="140" :label="$t('更新人')" align="center" prop="updaterName"></el-table-column>
         </el-table>
@@ -455,7 +456,7 @@ export default {
         endTime: "",
         nodeId: "",
         pageNo: 1,
-        pageSize: 100
+        pageSize: 10
       },
       queryParams: {
         ruleTitle: "",
@@ -689,7 +690,7 @@ export default {
         holdScoreOperate: null,
         key: null,
         pageNo: 1,
-        pageSize: 100,
+        pageSize: 10,
         startTime: null,
         usedScore: null,
         usedScoreOperate: null
@@ -755,7 +756,7 @@ export default {
         scoreCountOperate: "",
         endTime: "",
         pageNo: 1,
-        pageSize: 1000,
+        pageSize: 100,
         startTime: ""
       }
       this.handleQuery()