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

@@ -424,7 +424,7 @@ export default {
       width: 286px;
     }
     .el-input {
-      width: 140px;
+      width: 141px;
     }
     .el-form-item--small.el-form-item {
       margin-bottom: 0;

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

@@ -27,16 +27,21 @@
       </el-row>
       <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-form-item v-if="title == 3" :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" @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>
+          <el-form-item v-else :label="$t('提货点')" :prop="`nodeIds[${index}].wareHouses`" :rules="rules.nodeIds.wareHouses">
+            <el-select v-model="queryParams.nodeId" :placeholder="$t('请选择提货点')" :disabled="isDisable" clearable 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>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('兑换积分')" :prop="`nodeIds[${index}].points`" :rules="rules.nodeIds.points"> <el-input v-model.trim.number="item.points" :placeholder="$t('请输入')" :disabled="isDisable" /> </el-form-item
         ></el-col>
-        <el-col :span="6">
+        <el-col :span="6" class="giftNum">
           <el-form-item :label="$t('剩余数量')" :prop="`nodeIds[${index}].quantityRemain`" :rules="rules.nodeIds.quantityRemain">
             <el-input class="input-item-width" :disabled="isDisable && disabelEnableStatus" v-model.trim="item.quantityRemain" :placeholder="$t('请输入')" type="number" />
           </el-form-item>
@@ -92,7 +97,7 @@ import { editRewards, addRewards, getWarehouseList } from "@/api/ecw/giftManagem
 import { getDictDatas, DICT_TYPE } from "@/utils/dict"
 import imageUpload from "@/components/ImageUpload"
 import { parseTime, resetForm } from "../../../../utils/ruoyi"
-import { deepClone } from "@/utils"
+import { deepClone, titleCase } from "@/utils"
 export default {
   name: "operatingGift",
   props: {
@@ -324,6 +329,7 @@ export default {
       params.startTime = this.queryParams?.dateRangeCreateTime?.[0]
       params.endTime = this.queryParams?.dateRangeCreateTime?.[1]
       params.pickMethod = this.queryParams.pickMethod.toString()
+      params.nodeIds[0].wareHouses[0] = params.nodeId
       this.$refs["queryForm"].validate((valid) => {
         if (valid) {
           if (this.title == "2") {
@@ -377,4 +383,7 @@ export default {
 .input-item-width {
   width: 194px;
 }
+.giftNum .input-item-width {
+  width: auto;
+}
 </style>

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

 <template>
   <div class="app-container">
     <el-row class="mb8">
-      <el-button
-        type="success"
-        size="mini"
-        icon="el-icon-plus"
-        @click="handleNewScoreRule"
-        >{{ $t("添加规则") }}</el-button
-      >
-      <el-button
-        type="success"
-        size="mini"
-        icon="el-icon-delete"
-        @click="handleDelScoreRule"
-        >{{ $t("删除规则") }}</el-button
-      >
+      <el-button type="success" size="mini" icon="el-icon-plus" @click="handleNewScoreRule">{{ $t("添加规则") }}</el-button>
+      <el-button type="success" size="mini" icon="el-icon-delete" @click="handleDelScoreRule">{{ $t("删除规则") }}</el-button>
     </el-row>
-    <el-table
-      ref="multipleTable"
-      v-loading="loading"
-      @selection-change="handleSelectionChange"
-      :data="memberLevelList"
-    >
+    <el-table ref="multipleTable" v-loading="loading" @selection-change="handleSelectionChange" :data="memberLevelList">
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column
-        width="140"
-        :label="$t('序号')"
-        align="center"
-        prop="id"
-      ></el-table-column>
-      <el-table-column
-        :label="$t('等级名称')"
-        align="center"
-        prop="name"
-      ></el-table-column>
+      <el-table-column width="140" :label="$t('序号')" align="center" prop="id"></el-table-column>
+      <el-table-column :label="$t('等级名称')" align="center" prop="name"></el-table-column>
 
-      <el-table-column
-        width="140"
-        :label="$t('图标')"
-        align="center"
-        prop="mobile"
-      >
+      <el-table-column width="140" :label="$t('图标')" align="center" prop="mobile">
         <template slot-scope="scope">
-          <el-image :src="scope.row.icon" style="width: 50px; height: 50px">{{
-            $t("无")
-          }}</el-image>
+          <el-image :src="scope.row.icon" style="width: 50px; height: 50px">{{ $t("无") }}</el-image>
         </template>
       </el-table-column>
 
       <el-table-column :label="$t('积分范围')" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.lowerCount }}-{{ scope.row.upperCount }}
-        </template>
+        <template slot-scope="scope"> {{ scope.row.lowerCount }}-{{ scope.row.upperCount }} </template>
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            >{{ $t("修改") }}</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            >{{ $t("删除") }}</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">{{ $t("修改") }}</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">{{ $t("删除") }}</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- //分页列表 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      @pagination="handleQueryPagination"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" @pagination="handleQueryPagination" />
 
-    <el-dialog
-      :title="$t('添加规则')"
-      :visible.sync="dialogVisible"
-      width="30%"
-      :before-close="handleClose"
-    >
-      <el-form
-        :model="ruleForm"
-        ref="ruleForm"
-        label-width="100px"
-        class="demo-ruleForm"
-      >
+    <el-dialog :title="$t('添加规则')" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+      <el-form :model="ruleForm" ref="ruleForm" label-width="100px" class="demo-ruleForm">
         <el-form-item :label="$t('等级名称')">
           <el-input v-model="ruleForm.name"></el-input>
         </el-form-item>
@@ -110,31 +47,24 @@
           </el-col>
         </el-form-item>
         <el-form-item :label="$t('上传图标')">
-          <image-upload v-model="ruleForm.icon" />
+          <image-upload v-model="ruleForm.icon" :fileType="['png', 'jpg', 'jpeg']" :limit="1" />
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">{{ $t("取 消") }}</el-button>
-        <el-button type="primary" @click="handelAddNewMemberLevel">{{
-          $t("确定")
-        }}</el-button>
+        <el-button type="primary" @click="handelAddNewMemberLevel">{{ $t("确定") }}</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 <script>
-import { getDictDatas, DICT_TYPE } from "@/utils/dict";
-import {
-  getMemberLevelList,
-  addNewMemberLevel,
-  delMemberLevel,
-  editMemberLevel,
-} from "@/api/ecw/memberManagement";
-import ImageUpload from "@/components/ImageUpload";
+import { getDictDatas, DICT_TYPE } from "@/utils/dict"
+import { getMemberLevelList, addNewMemberLevel, delMemberLevel, editMemberLevel } from "@/api/ecw/memberManagement"
+import ImageUpload from "@/components/ImageUpload"
 export default {
   name: "integralRecord",
   components: {
-    ImageUpload,
+    ImageUpload
   },
   data() {
     return {
@@ -144,104 +74,104 @@ export default {
         icon: "",
         lowerCount: "",
         name: "",
-        upperCount: "",
+        upperCount: ""
       },
       total: 0,
       loading: true,
       memberLevelList: [],
       queryParams: {
         pageNo: 1,
-        pageSize: 10,
-      },
-    };
+        pageSize: 10
+      }
+    }
   },
   computed: {
     isChinese() {
-      return this.$i18n.locale === "zh_CN";
-    },
+      return this.$i18n.locale === "zh_CN"
+    }
   },
   created() {
-    this.handleQuery();
+    this.handleQuery()
   },
   activated() {
-    this.handleQuery();
+    this.handleQuery()
   },
   methods: {
     handleUpdate(row) {
-      this.ruleForm = { ...row };
-      this.dialogVisible = true;
+      this.ruleForm = { ...row }
+      this.dialogVisible = true
     },
     handleDelete(row) {
-      let ids = [row.id];
+      let ids = [row.id]
       delMemberLevel(ids).then((res) => {
-        this.$message.success(this.$t("删除成功"));
-        this.handleClose();
-        this.handleQuery();
-      });
+        this.$message.success(this.$t("删除成功"))
+        this.handleClose()
+        this.handleQuery()
+      })
     },
     handelAddNewMemberLevel() {
       if (this.ruleForm.id) {
         editMemberLevel(this.ruleForm).then((res) => {
-          this.$message.success(this.$t("更新成功"));
-          this.handleClose();
-          this.handleQuery();
-        });
+          this.$message.success(this.$t("更新成功"))
+          this.handleClose()
+          this.handleQuery()
+        })
       } else {
-        let params = { ...this.ruleForm };
+        let params = { ...this.ruleForm }
         addNewMemberLevel(params).then((res) => {
-          this.$message.success(this.$t("保存成功"));
-          this.handleClose();
-          this.handleQuery();
-        });
+          this.$message.success(this.$t("保存成功"))
+          this.handleClose()
+          this.handleQuery()
+        })
       }
     },
     handleSelectionChange(ids) {
-      this.selectList = ids;
+      this.selectList = ids
     },
     handleClose() {
-      this.dialogVisible = false;
-      this.selectList = [];
+      this.dialogVisible = false
+      this.selectList = []
       this.ruleForm = {
         icon: "",
         lowerCount: "",
         name: "",
-        upperCount: "",
-      };
+        upperCount: ""
+      }
     },
     handleDelScoreRule() {
       if (this.selectList.length > 0) {
         let ids = this.selectList.map((item) => {
-          return item.id;
-        });
+          return item.id
+        })
         delMemberLevel(ids).then((res) => {
-          this.$message.success(this.$t("删除成功"));
-          this.handleClose();
-          this.handleQuery();
-        });
+          this.$message.success(this.$t("删除成功"))
+          this.handleClose()
+          this.handleQuery()
+        })
       } else {
-        this.$message.warning(this.$t("请先选择要删除的会员等级"));
+        this.$message.warning(this.$t("请先选择要删除的会员等级"))
       }
     },
     handleNewScoreRule() {
-      this.dialogVisible = true;
+      this.dialogVisible = true
     },
     handleQuery() {
-      this.queryParams.pageNo = 1;
-      let params = { ...this.queryParams };
+      this.queryParams.pageNo = 1
+      let params = { ...this.queryParams }
       getMemberLevelList(params).then((res) => {
-        this.loading = false;
-        this.memberLevelList = res.data.list;
-        this.total = res.data.total;
-      });
+        this.loading = false
+        this.memberLevelList = res.data.list
+        this.total = res.data.total
+      })
     },
     handleQueryPagination() {
-      let params = { ...this.queryParams };
+      let params = { ...this.queryParams }
       getMemberLevelList(params).then((res) => {
-        this.loading = false;
-        this.memberLevelList = res.data.list;
-        this.total = res.data.total;
-      });
-    },
-  },
-};
+        this.loading = false
+        this.memberLevelList = res.data.list
+        this.total = res.data.total
+      })
+    }
+  }
+}
 </script>