会员管理

src/views/components/his/userPatietDetails.vue

@@ -235,20 +235,20 @@ export default {
         patientName: [
           { required: true, message: "名称不能为空", trigger: "blur" }
         ],
-        idCard: [
-          { required: true, message: "身份证号不能为空", trigger: "blur" },
+        // idCard: [
+        //   { required: true, message: "身份证号不能为空", trigger: "blur" },
 
-        ],
+        // ],
         sex: [
           { required: true, message: "性别不能为空", trigger: "blur" }
 
         ],
-        birthday: [
-          { required: true, message: "生日不能为空", trigger: "blur" }
-        ],
-        mobile:[
-          { required: true, message: "手机号不能为空", trigger: "blur" },
-        ],
+        // birthday: [
+        //   { required: true, message: "生日不能为空", trigger: "blur" }
+        // ],
+        // mobile:[
+        //   { required: true, message: "手机号不能为空", trigger: "blur" },
+        // ],
         status: [
           { required: true, message: "状态不能为空", trigger: "blur" }
         ],

src/views/his/user/index.vue

@@ -66,31 +66,48 @@
                  />
         </el-select>
       </el-form-item>
-       <el-form-item label="注册时间" prop="createTime">
-                 <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
-              </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      <el-form-item label="注册时间" prop="createTime">
+                <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
       </el-form-item>
       <el-form-item label="所属公司" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          placeholder="请输入所属公司"
+        <el-select
+          v-model="queryCompanyId"
+          placeholder="请选择所属公司"
           clearable
+          filterable 
           size="small"
-          @keyup.enter.native="handleQuery"
-        />
+          @change="handleQueryCompanyChange"
+        >
+          <el-option
+            v-for="item in companyQueryOptions"
+            :key="item.companyId"
+            :label="item.companyName"
+            :value="item.companyId">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="所属销售" prop="companyUserNickName">
-        <el-input
-          v-model="queryParams.companyUserNickName"
-          placeholder="请输入所属销售"
+      <el-form-item label="所属销售" prop="companyUserId">
+        
+        <el-select
+          v-model="queryCompanyUserId"
+          placeholder="请选择所属销售"
           clearable
+          filterable 
           size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-option
+            v-for="item in companyQueryUserOptions"
+            :key="item.userId"
+            :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
+      </el-form-item>        
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
+      
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -251,11 +268,16 @@
 import { listUser, getUser, delUser, addUser, updateUser, exportUser } from "@/api/his/user";
 import { getCompanyUserList, changeCompanyUser, getCompanyList } from '@/api/company/companyUser';
 import userDetails from '../../components/his/userDetails.vue';
+
 export default {
   name: "User",
   components: {userDetails},
   data() {
     return {
+      companyQueryOptions:[],
+      companyQueryUserOptions:[],
+      queryCompanyId:null,
+      queryCompanyUserId:null,
       companyName: null,
       companyUserNickName: null,
       // 更换会员归属表单校验
@@ -353,6 +375,10 @@ export default {
     this.getDicts("sys_company_or").then(response => {
       this.orOptions = response.data;
     });
+    getCompanyList().then(response => {
+        if (response.code === 200) {
+          this.companyQueryOptions = response.data;
+        }});
   },
   methods: {
     /** 销售选择变化 */
@@ -378,6 +404,26 @@ export default {
                  this.$refs.userDetails.getDetails(row.userId);
             }, 1);
      },
+     handleQueryCompanyChange(companyId){
+      // 清空已选择的销售
+      this.queryCompanyUserId = null;
+      // 根据公司ID获取对应的销售列表
+      if (companyId) {
+        getCompanyUserList({ companyId: companyId }).then(response => {
+          if (response.code === 200) {
+            this.companyQueryUserOptions = response.data;
+          } else {
+            this.$message.error(response.msg || '获取销售列表失败');
+            this.companyQueryUserOptions = [];
+          }
+        }).catch(() => {
+          this.$message.error('获取销售列表失败');
+          this.companyQueryUserOptions = [];
+        });
+      } else {
+        this.companyQueryUserOptions = [];
+      }
+     },
     handleCompanyChange(companyId) {
       // 清空已选择的销售
       this.changeCompanyUserForm.companyUserId = null;
@@ -440,6 +486,8 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      this.queryParams.companyId = this.queryCompanyId;
+      this.queryParams.companyUserId = this.queryCompanyUserId;
       this.getList();
     },
     /** 重置按钮操作 */
@@ -450,6 +498,8 @@ export default {
       this.queryParams.eTime=null;
       this.queryParams.companyName = null;
       this.queryParams.companyUserNickName = null;
+      this.queryParams.companyId = null;
+      this.queryParams.companyUserId = null;
       this.handleQuery();
     },
     // 多选框选中数据