修复兑换记录，礼品操作等问题

(cherry picked from commit 778fa5e3)

src/views/ecw/giftManagement/bulkExchange/index.vue

@@ -135,7 +135,7 @@
       </el-row>
     </div>
 
-    <choose-Member :dialogVisible.sync="dialogVisible" @transferSelectMemberInfo="onGetSelectMemberInfo" :memberSelectList="memberList"> </choose-Member>
+    <choose-Member :dialogVisible.sync="dialogVisible" @transferSelectMemberInfo="onGetSelectMemberInfo" :memberSelectList="memberList" :giftScore.sync="rewardsDetails.pointsRequire"> </choose-Member>
   </div>
 </template>
 <script>
@@ -175,6 +175,7 @@ export default {
       currencyList: [],
       quantityComputation: null,
       checkFormResult: [],
+      rewardsDetails: {},
       rules: {
         rewardCount: [
           {

src/views/ecw/giftManagement/components/operatingGift.vue

@@ -47,7 +47,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="1">
-          <el-button type="primary" :disabled="isDisable" :icon="index == '0' ? 'el-icon-plus' : 'el-icon-minus'" @click="handleOrderVRule(item, index)"></el-button>
+          <el-button type="primary" :disabled="isDisable" v-if="title == 3" :icon="index == '0' ? 'el-icon-plus' : 'el-icon-minus'" @click="handleOrderVRule(item, index)"></el-button>
         </el-col>
       </el-row>
 

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

@@ -304,19 +304,20 @@ export default {
     }
     const validatehigh = (rule, value, callback) => {
       const index = Number(rule.field.split(".")[2])
+      console.log("osdpoopd", index)
       if (index == "0") {
         if (this.queryParams.extraOrderV.orderVRule[index].low && this.queryParams.extraOrderV.orderVRule[index].low >= this.queryParams.extraOrderV.orderVRule[index].high) {
-          callback(this.$t("本次最终积分应大于本次开始积分"))
+          callback(this.$t("最终积分应大于本次开始积分"))
         } else if (this.queryParams.extraOrderV.orderVRule[index + 1] && this.queryParams.extraOrderV.orderVRule[index + 1].low && this.queryParams.extraOrderV.orderVRule[index + 1].low <= this.queryParams.extraOrderV.orderVRule[index].high) {
-          callback(this.$t("本次最终积分应小于下一次开始积分"))
+          callback(this.$t("最终积分应小于下次开始积分"))
         } else {
           callback()
         }
       } else if (index > 0) {
         if (this.queryParams.extraOrderV.orderVRule[index].low && this.queryParams.extraOrderV.orderVRule[index].low >= this.queryParams.extraOrderV.orderVRule[index].high) {
-          callback(this.$t("本次最终积分应大于本次开始积分"))
-        } else if (this.queryParams.extraOrderV.orderVRule[index + 1]?.low && this.queryParams.extraOrderV.orderVRule[index].high <= this.queryParams.extraOrderV.orderVRule[index + 1].low) {
-          callback(this.$t("本次最终积分应小于下一次开始积分"))
+          callback(this.$t("最终积分应大于本次开始积分"))
+        } else if (this.queryParams.extraOrderV.orderVRule[index + 1]?.low && this.queryParams.extraOrderV.orderVRule[index + 1].low <= this.queryParams.extraOrderV.orderVRule[index].high) {
+          callback(this.$t("最终积分应小于下次开始积分"))
         } else {
           callback()
         }

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

@@ -435,7 +435,8 @@ export default {
     // 新增兑换
     handleNewExchange() {
       this.$router.push({
-        path: "/member/memberManagement/exchangeRecordOperation"
+        path: "/member/memberManagement/exchangeRecordOperation",
+        query: { pageStatus: "add" }
       })
     },
     getNodeListAPI() {

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

@@ -5,6 +5,16 @@
         <el-form v-for="(item, index) in queryParamsList" :key="item.memberId" :model="queryParamsList[index]" :ref="`queryForm${item.memberId}`" size="small" :inline="true" :rules="rules" :disabled="viewRecordDisable" label-width="148px">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
+              <div>
+                <el-row :gutter="10" v-if="$route.query.pageStatus != 'add'">
+                  <el-form-item :label="$t('记录ID')">
+                    <el-input :placeholder="$t('请输入记录ID')" clearable disabled v-model="item.redemptionNumber" />
+                  </el-form-item>
+                  <el-form-item :label="$t('状态')">
+                    <el-input :placeholder="$t('请输入状态')" clearable disabled v-model="item.exchangeStatusName" />
+                  </el-form-item>
+                </el-row>
+              </div>
               <el-row :gutter="10">
                 <span class="card-title">{{ $t("基础信息") }}</span>
               </el-row>
@@ -104,7 +114,7 @@
                     <el-input :placeholder="$t('请输入快递寄出人')" clearable v-model="item.expressSender" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
                   </el-form-item>
                   <el-form-item :label="$t('上传附件')">
-                    <file-upload v-model="item.annex" :disabled="veriftyDisable || viewRecordDisable"></file-upload>
+                    <file-upload v-model="item.annex" :fileType="['doc', 'docx', 'xls', 'xlsx', 'txt', 'pdf', 'jpg', 'jpeg', 'png']" :disabled="veriftyDisable || viewRecordDisable"></file-upload>
                   </el-form-item>
                   <el-form-item :label="$t('备注')">
                     <el-input style="width: 500px" :disabled="veriftyDisable" type="textarea" v-model="item.remark"></el-input>
@@ -114,19 +124,19 @@
                       <el-input v-model="item.verifyUser"></el-input>
                     </el-form-item>
                     <el-form-item :label="$t('核销时间')">
-                      <el-date-picker type="date" :placeholder="$t('选择核销时间')" v-model="item.verifyTime" value-format="yyyy-MM-dd HH:mm:ss" placement="bottom-start"></el-date-picker>
+                      <el-date-picker type="datetime" :placeholder="$t('选择核销时间')" v-model="item.verifyTime" value-format="yyyy-MM-dd HH:mm:ss" placement="bottom-start"></el-date-picker>
                     </el-form-item>
                     <el-form-item :label="$t('创建人')" v-if="!veriftyDisable">
                       <el-input v-model="item.creatorName"></el-input>
                     </el-form-item>
                     <el-form-item :label="$t('创建时间')" v-if="!veriftyDisable">
-                      <el-date-picker type="date" :placeholder="$t('创建时间')" v-model="item.createTime" value-format="yyyy-MM-dd HH:mm:ss" placement="bottom-start"></el-date-picker>
+                      <el-date-picker type="datetime" :placeholder="$t('创建时间')" v-model="item.createTime" value-format="yyyy-MM-dd HH:mm:ss" placement="bottom-start"></el-date-picker>
                     </el-form-item>
                     <el-form-item :label="$t('最后更新人')" v-if="!veriftyDisable">
                       <el-input v-model="item.updater"></el-input>
                     </el-form-item>
                     <el-form-item :label="$t('最后更新时间')" v-if="!veriftyDisable">
-                      <el-date-picker type="date" :placeholder="$t('最后更新时间')" v-model="item.updateTime" value-format="yyyy-MM-dd HH:mm:ss" placement="bottom-start"></el-date-picker>
+                      <el-date-picker type="datetime" :placeholder="$t('最后更新时间')" v-model="item.updateTime" value-format="yyyy-MM-dd HH:mm:ss" placement="bottom-start"></el-date-picker>
                     </el-form-item>
                   </div>
                 </el-row>
@@ -332,7 +342,7 @@ export default {
         break
       case "add":
         this.submitButtonText = this.$t("确认兑换")
-        this.getDetails()
+        // this.getDetails()
         break
 
       default:
@@ -343,6 +353,10 @@ export default {
 
   activated() {},
   methods: {
+    // 兑换状态
+    handleExchangeStatus(id) {
+      return this.isChinese ? this.getDictDatas(DICT_TYPE.REWARD_REDEEM_STATUS).filter((item) => item.value == id)[0].label : this.getDictDatas(DICT_TYPE.REWARD_REDEEM_STATUS).filter((item) => item.value == id)[0].labelEn
+    },
     getDetails() {
       memberUserGet({ id: this.$route.query.memberId }).then((r) => {
         // this.details = r.data;
@@ -379,6 +393,7 @@ export default {
           this.queryParamsList[0].updateTime = parseTime(data.updateTime)
           this.queryParamsList[0].createTime = parseTime(data.createTime)
           this.queryParamsList[0].expressDate = parseTime(data.expressDate) //快递时间
+          this.queryParamsList[0].exchangeStatusName = this.handleExchangeStatus(data.status)
           this.handleRewardCount(data, 0, data.rewardCount)
           if (this.$route.query.pageStatus == "verify") {
             this.queryParamsList[0].verifyTime = getNowDateTime()