Merge branch 'pre-release' of...

Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao

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

@@ -134,10 +134,18 @@
                       >
                       </dict-selector>
                     </el-form-item>
-                    <el-form-item :label="$t('费用')" required>
+                    <el-form-item :label="$t('费用')">
                       <el-row :gutter="10">
                         <el-col :span="12">
-                          <el-form-item prop="expenses">
+                          <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,'')"
+                            />
+                          </el-form-item>
+                          <el-form-item v-show="!item.currency">
                             <el-input
                               v-model="item.expenses"
                               :placeholder="$t('请输入数字')"
@@ -147,8 +155,28 @@
                           </el-form-item>
                         </el-col>
                         <el-col :span="10">
-                          <el-form-item prop="currency">
+                         <div>
+                          <el-form-item prop="currency" :rules="rules.currency" v-show="item.expenses">
+                            <el-select
+                              clearable
+                              v-model="item.currency"
+                              :placeholder="$t('请选择币种')"
+                            >
+                              <el-option
+                                v-for="nodeItem in currencyList"
+                                :key="nodeItem.id"
+                                :label="
+                                  isChinese
+                                    ? nodeItem.titleZh
+                                    : nodeItem.titleEn
+                                "
+                                :value="nodeItem.id"
+                              />
+                            </el-select>
+                          </el-form-item>
+                          <el-form-item  v-show="!item.expenses">
                             <el-select
+                             clearable
                               v-model="item.currency"
                               :placeholder="$t('请选择币种')"
                             >
@@ -164,10 +192,11 @@
                               />
                             </el-select>
                           </el-form-item>
+                         </div>
                         </el-col>
                       </el-row>
                     </el-form-item>
-                    <el-form-item :label="$t('收件人姓名')" prop="recipientName"
+                    <el-form-item :label="$t('收件人姓名')" 
                       ><el-input
                         :placeholder="$t('请输入收件人姓名')"
                         clearable
@@ -177,7 +206,6 @@
                     </el-form-item>
                     <el-form-item
                       :label="$t('收件人电话')"
-                      prop="recipientPhoneNum"
                     >
                       <el-input
                         :placeholder="$t('请输入收件人电话')"
@@ -188,7 +216,6 @@
                     </el-form-item>
                     <el-form-item
                       :label="$t('收件人地址')"
-                      prop="recipientAddress"
                       v-if="item.redeemType != '1'"
                     >
                       <el-input

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

@@ -165,7 +165,7 @@
         width="140"
         :label="$t('兑换记录ID')"
         align="center"
-        prop="id"
+        prop="redemptionNumber"
       />
       <el-table-column
         width="140"

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

@@ -147,6 +147,7 @@
                           <el-select
                             v-model="item.currency"
                             :disabled="veriftyDisable"
+                            clearable
                             :placeholder="$t('请选择币种')"
                           >
                             <el-option
@@ -387,6 +388,15 @@ export default {
         return callback();
       }
     };
+    var expensesValidate =(rule, value, callback) => {
+      if (this.queryParamsList[0].currency && !value) {
+        return callback(
+          new Error(this.$t("请输入"))
+        );
+      } else {
+        return callback();
+      }
+    };
     return {
       env: process.env.NODE_ENV,
       // 是否显示弹出层
@@ -462,6 +472,10 @@ export default {
             message: this.$t("请输入整数或保留小数点后两位"),
             trigger: "blur",
           },
+          {
+            validator:expensesValidate,
+            trigger: "change",
+          }
         ],
         currency: [
           {

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

@@ -193,7 +193,7 @@
                 },
               })
             "
-            >{{ `${$t("兑换记录ID")}:${row.extParamJson.redeemId}` }}</el-button
+            >{{ `${$t("兑换记录ID")}:${row.extParamJson.redemptionNumber}` }}</el-button
           >
           <!-- 系统过期  sourceType = 3 不展示 -->
           <span v-if="row.sourceType == '3'"> -</span>

src/views/member/user/memberDetails.vue

@@ -236,7 +236,7 @@
       <el-menu-item index="exchange">{{ $t("兑换记录") }}</el-menu-item>
     </el-menu>
     <div class="table-container">
-      <div class="reward" v-if="activeIndex == 'reward'">
+      <div class="reward" v-show="activeIndex == 'reward'">
         <el-form
           :model="queryParams"
           ref="queryForm"
@@ -336,7 +336,7 @@
           @pagination="handleQueryPagination"
         />
       </div>
-      <div class="exchange" v-else>
+      <div class="exchange" v-show="activeIndex != 'reward'">
         <el-form
           :model="queryParamsRecord"
           ref="queryForm"
@@ -395,17 +395,32 @@
           :data="memberRecordList"
         >
           <el-table-column
-            width="140"
             :label="$t('兑换记录ID')"
+             width="160"
             align="center"
-            prop="id"
-          ></el-table-column>
+          >
+          <template #default="{ row }">
+            <el-button
+              type="text"
+              @click="handleViewRecord(scope.row)"
+            >{{ row.redemptionNumber }}</el-button>
+          </template>
+          </el-table-column>
           <el-table-column
             width="140"
             :label="$t('礼品ID')"
             align="center"
-            prop="rewardCode"
-          ></el-table-column>
+           
+          >
+          <template #default="{ row }">
+            <el-button
+              type="text"
+              @click="
+               handleShowRewardsDetail(row)
+              "
+            >{{ row.rewardCode }}</el-button>
+          </template>
+          </el-table-column>
           <el-table-column
             :label="$t('礼品名称')"
             align="center"
@@ -418,8 +433,8 @@
           ></el-table-column>
           <el-table-column :label="$t('兑换时间')" align="center">
             <template v-slot="{ row }">
-              {{ parseTime(row.redemptionTime) || "/" }}</template
-            >
+              {{ parseTime(row.redemptionTime) || "/" }}
+            </template>
           </el-table-column>
           <el-table-column
             :label="$t('兑换积分')"
@@ -818,6 +833,14 @@
         </el-tabs>
       </div>
     </el-dialog>
+      <!-- 查看 礼品 -->
+      <operating-gift
+      ref="operatingGift"
+      :title="operatingPagetitle"
+      :rewards-details="rewardsItem"
+      :show.sync="dialogVisible"
+      :node-list="nodeList"
+    />
   </div>
 </template>
 <script>
@@ -843,12 +866,15 @@ import {
   queryMemberScoreRecord,
   queryMemberExchangeRecord,
 } from "@/api/ecw/memberManagement";
-
+import { getNodeList, getRewardsDetails } from '@/api/ecw/giftManagement'
+import OperatingGift from '@/views/ecw/giftManagement/components/operatingGift.vue'
 export default {
   name: "memberDetails",
-  components: { ImageUpload, FileUpload },
+  components: { ImageUpload, FileUpload, OperatingGift },
   data() {
     return {
+      // 网点
+      nodeList: [],
       //兑换记录:
       dateRangeCreateTimeRecord: [],
       memberRecordList: [],
@@ -1006,6 +1032,10 @@ export default {
         row: 10,
         userId: undefined,
       },
+      loading: true,
+      dialogVisible: false,
+      operatingPagetitle: '',
+      rewardsItem: {},
       attestationShow: false,
       modifyLicense: false,
       modifyIdCard: true, //修改身份证
@@ -1021,6 +1051,7 @@ export default {
     this.getDetails();
     this.handleQuery();
     this.handleQueryRecord();
+    this.getNodeListAPI();
   },
   computed: {
     isChinese() {
@@ -1037,6 +1068,27 @@ export default {
     });
   },
   methods: {
+    handleViewRecord(row) {
+      this.$router.push({
+        path: '/memberManagement/exchangeRecordOperation',
+        query: { exchangeRewardID: row.id, pageStatus: 'view' }
+      })
+    },
+    getNodeListAPI() {
+      getNodeList().then((res) => {
+        this.nodeList = res.data
+      })
+    },
+    handleShowRewardsDetail(row){
+      let params = {
+        id: row.rewardId
+      };
+      getRewardsDetails(params).then((res) => {
+        this.dialogVisible = true
+        this.operatingPagetitle = '1'
+        this.rewardsItem  = res.data;
+      });
+    },
     handleExchangeRedeemType(id) {
       return this.getDictDatas(DICT_TYPE.WAY_OF_RECEIVING).filter(
         (item) => item.value == id