Merge branch 'cherry-pick-8ea84255' into 'dev'

Befect 710 | Task 512 | 修复【新建礼品】提货点删除后仍保持搜  --  兑换记录，兑换时间没有赋值

See merge request !87

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

 <template>
   <div class="app-container">
     <el-button type="success" @click="handleSelectMember"> {{ $t("添加会员") }}</el-button>
-    <div class="container">
+    <div class="container exchangeBulkOperation">
       <div v-if="memberList.length > 0">
         <div class="formBox" v-for="(item, index) in queryParamsList" :key="item.memberId">
           <el-form :model="queryParamsList[index]" :ref="`queryForm${item.memberId}`" size="small" :inline="true" :rules="rules" label-width="168px">
@@ -56,8 +56,8 @@
                     <el-form-item :label="$t('兑换入口')">
                       <dict-selector clearable :disabled="true" v-model="item.entrance" :type="DICT_TYPE.PLATFORM_TYPE"> </dict-selector>
                     </el-form-item>
-                    <el-form-item :label="$t('费用')">
-                      <el-row :gutter="10">
+                    <el-form-item class="expenses" :label="$t('费用')">
+                      <el-row>
                         <el-col :span="12">
                           <el-form-item prop="expenses" :rules="rules.expenses" v-show="item.currency">
                             <el-input v-model="item.expenses" :placeholder="$t('请输入数字')" clearable onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
@@ -66,7 +66,7 @@
                             <el-input v-model="item.expenses" :placeholder="$t('请输入数字')" clearable onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
                           </el-form-item>
                         </el-col>
-                        <el-col :span="10">
+                        <el-col :span="12">
                           <div>
                             <el-form-item prop="currency" :rules="rules.currency" v-show="item.expenses">
                               <el-select clearable v-model="item.currency" :placeholder="$t('请选择币种')">
@@ -93,7 +93,7 @@
                       <el-input :placeholder="$t('请输入兑换人')" clearable v-model="item.redeemer" 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" 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" 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('请选择快递公司')">
@@ -312,7 +312,7 @@ export default {
               recipientPhoneNum: null,
               recipientAddress: null,
               redeemer: this.$store.getters.name,
-              redemptionTime: getNowDateTime("00:00:00"),
+              redemptionTime: getNowDateTime(),
               courierCompany: null,
               expressNo: null,
               expressSender: this.$store.getters.name,
@@ -407,6 +407,30 @@ export default {
 }
 </script>
 <style scoped lang="scss">
+::v-deep .exchangeBulkOperation {
+  .formBox {
+    .el-date-editor.el-input,
+    .el-input,
+    .upload-file {
+      width: 286px;
+    }
+  }
+
+  .expenses {
+    .el-form-item {
+      margin-right: 0;
+    }
+    .el-row {
+      width: 286px;
+    }
+    .el-input {
+      width: 140px;
+    }
+    .el-form-item--small.el-form-item {
+      margin-bottom: 0;
+    }
+  }
+}
 .card-title {
   padding-right: 10px;
   border-right: 4px solid rgb(64, 158, 255);

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

@@ -28,7 +28,7 @@
       <el-row :gutter="10" v-for="(item, index) in queryParams.nodeIds">
         <el-col :span="6">
           <el-form-item :label="$t('提货点')" :prop="`nodeIds[${index}].wareHouses`" :rules="rules.nodeIds.wareHouses">
-            <el-select v-model="item.wareHouses" :placeholder="$t('请选择提货点')" :disabled="isDisable" clearable multiple filterable remote reserve-keyword :remote-method="handleWarehouseList" :loading="loading" size="small">
+            <el-select v-model="item.wareHouses" :placeholder="$t('请选择提货点')" :disabled="isDisable" clearable multiple filterable remote reserve-keyword :remote-method="handleWarehouseList" @visible-change="changeWarehouseList" :loading="loading" size="small">
               <el-option v-for="nodeItem in warehouseList" :key="nodeItem.id" :label="isChinese ? nodeItem.titleZh : nodeItem.titleEn" :value="nodeItem.id" />
             </el-select>
           </el-form-item>
@@ -232,7 +232,7 @@ export default {
           wareHouses: [
             {
               required: true,
-              message: this.$t("请选择网点"),
+              message: this.$t("请选择提货点"),
               trigger: "change"
             }
           ],
@@ -301,6 +301,11 @@ export default {
     dataTimeFunc(e) {
       console.log("5555", e)
     },
+    changeWarehouseList(e) {
+      if (e) {
+        this.handleWarehouseList()
+      }
+    },
     handleWarehouseList(val = "") {
       let params = { title: val }
       getWarehouseList(params).then((res) => {