修改问题

src/views/studentManager/modals/createMember.vue

@@ -5,7 +5,7 @@
       <el-form-item label="学练宝版本" prop="memberRankId" :rules="[
           { required: true, message: '请选择学练宝版本', trigger: 'blur' }
         ]">
-          <el-cascader
+          <!-- <el-cascader
             v-model.trim="memberForm.memberRankId"
             style="width: 100% !important"  
             :options="memberRankList"
@@ -13,8 +13,18 @@
             :show-all-levels="false"
             collapse-tags
             clearable
+            @change="getMemberList"
             placeholder="请选择学练宝版本"
-          ></el-cascader>
+          ></el-cascader> -->
+          <el-select
+            placeholder="请选择学练宝版本"
+            clearable
+            v-model.trim="memberForm.memberRankId"
+            @change="getMemberList"
+            style="width: 100% !important"
+          >
+            <el-option v-for="(item, index) in memberFeeSettingList" :key="index" :label="item.rankName" :value="item.id"></el-option>
+          </el-select>
         </el-form-item>
       <el-form-item
         label="学练宝周期"
@@ -110,6 +120,7 @@ export default {
       memberRankList: [],
       organId: null,
       rulesForm: null, // 范围
+      memberFeeSettingList: [],
       memberFeeSetting: null
     };
   },
@@ -125,11 +136,11 @@ export default {
         id
       } = this.multipleSelection;
       this.organId = organId;
-      const memberInfo = await getAllMemberFindByOrganIds([organId])
-      this.memberRankList = memberInfo.data || []
+      // const memberInfo = await getAllMemberFindByOrganIds([organId])
+      // this.memberRankList = memberInfo.data || []
       this.memberForm = {
         memberNum,
-        memberRankId: this.formatParentId(memberRankSettingId, this.memberRankList),
+        memberRankId: memberRankSettingId,  // this.formatParentId(memberRankSettingId, this.memberRankList),
         period,
         actualAmount,
         remark,
@@ -141,8 +152,8 @@ export default {
         return stu.userId;
       });
       this.organId = this.multipleSelection[0].organId; //
-      const memberInfo = await getAllMemberFindByOrganIds([this.organId])
-      this.memberRankList = memberInfo.data || []
+      // const memberInfo = await getAllMemberFindByOrganIds([this.organId])
+      // this.memberRankList = memberInfo.data || []
     }
    
     this.__init();
@@ -186,18 +197,18 @@ export default {
           rows: 10,
           organId: this.organId
         });
-        // console.log(rankInfo)
         const { rows } = rankInfo.data;
-        if (!rows[0]?.memberFeeSetting) {
+        this.memberFeeSettingList = rows || [];
+        if (this.memberFeeSettingList.length <= 0) {
           this.$bus.$emit("showguide", ["memberList"]);
         }
-        this.memberFeeSetting = rows[0]?.memberFeeSetting;
       } catch (e) {}
     },
     getMemberList() {
       let money = 0;
       const memberForm = this.memberForm;
-      const memberFeeSetting = this.memberFeeSetting;
+      const selectItem = this.memberFeeSettingList.find(item => item.id == memberForm.memberRankId);
+      const memberFeeSetting = selectItem ? selectItem.memberFeeSetting : null
       if (memberFeeSetting) {
         switch (memberForm?.period) {
           case "MONTH": {

src/views/studentManager/modals/setMemberList.vue

@@ -52,6 +52,7 @@
             v-model.trim="searchForm.timer"
             style="width: 420px"
             type="daterange"
+            clearable
             value-format="yyyy-MM-dd"
             range-separator="至"
             start-placeholder="开始日期"
@@ -180,7 +181,7 @@ import setMemberDate from "./setMemberDate";
 import pagination from "@/components/Pagination/index";
 import Tooltip from "@/components/Tooltip";
 import { api_studentMemberUpdateLog, api_studentManageUserInfo } from "../api";
-import { getTimes } from "@/utils";
+import { getTimeFormat } from "@/utils";
 export default {
   props: ["row", "type", "memberRankList"],
   components: {
@@ -196,7 +197,7 @@ export default {
         memberRankSettingId: null,
         buyType: null,
         operatorName: null,
-        timer: null,
+        timer: [],
       },
       tableList: [],
       pageInfo: {
@@ -218,7 +219,6 @@ export default {
       try {
         const { data } = await api_studentManageUserInfo({ userId: this.row.userId })
         this.userDetail = data;
-        console.log(data, 'data----')
       } catch {}
     },
     async getList() {
@@ -228,7 +228,7 @@ export default {
         if(memberRankSettingId && memberRankSettingId.length > 0) {
           rankId = memberRankSettingId[memberRankSettingId.length - 1]
         }
-        let params = { ...more, ...getTimes(timer, ["startTime", "endTime"]), userId: this.row.userId, memberRankSettingId: rankId };
+        let params = { ...more, ...getTimeFormat(timer, ["startTime", "endTime"]), userId: this.row.userId, memberRankSettingId: rankId };
         const { data } = await api_studentMemberUpdateLog(params)
         this.tableList = data.rows || []
         this.pageInfo.total = data.total || 0
@@ -240,6 +240,7 @@ export default {
     },
     onReSet() {
       this.$nextTick(() => {
+        this.searchForm.timer = []
         this.onSearch();
       });
     },