guhongwei 2 years ago
parent
commit
a968734fb0
2 changed files with 31 additions and 16 deletions
  1. 21 14
      src/views/user/expert/detail.vue
  2. 10 2
      src/views/user/expert/index.vue

+ 21 - 14
src/views/user/expert/detail.vue

@@ -30,11 +30,13 @@
 </template>
 
 <script setup lang="ts">
-import type { FormRules } from 'element-plus';
 import type { Ref } from 'vue';
 import { ref, reactive, onMounted } from 'vue';
-import { ElMessage } from 'element-plus';
 import { useRoute } from 'vue-router';
+import { ElMessage } from 'element-plus';
+import type { FormRules } from 'element-plus';
+
+// 接口
 import { DictDataStore } from '@common/src/stores/system/dictData'; // 字典表
 import { RoleStore } from '@common/src/stores/system/role'; // 个人
 import { ExpertStore } from '@common/src/stores/admins/expert'; // 专家
@@ -44,16 +46,16 @@ const expert = ExpertStore();
 const dictData = DictDataStore();
 const role = RoleStore();
 const personal = PersonalStore();
+
+// 路由
 const route = useRoute();
+
+// 加载中
 const loading = ref(false);
-let form: Ref<any> = ref({});
-let roleList: Ref<any> = ref([]);
-let statusList: Ref<any> = ref([]);
-let codeList: Ref<any> = ref([]);
-let areaList: Ref<any> = ref([]);
-let personalList: Ref<any> = ref([]);
-let disabled: Ref<any> = ref(false);
+
 // 表单
+let disabled: Ref<any> = ref(false);
+let form: Ref<any> = ref({});
 let formFields: Ref<any[]> = ref([
   { label: '邀请码', model: 'code', type: 'select' },
   { label: '账号', model: 'account' },
@@ -83,10 +85,15 @@ let formFields: Ref<any[]> = ref([
   { label: '状态', model: 'status', type: 'select' },
   { label: '个人用户id', model: 'personal_id', type: 'select' } //查询个人用户,选择
 ]);
-const rules = reactive<FormRules>({
-  name: [{ required: true, message: '名称', trigger: 'blur' }],
-  account: [{ required: true, message: '账号', trigger: 'blur' }]
-});
+const rules = reactive<FormRules>({});
+
+// 字典表
+let roleList: Ref<any> = ref([]);
+let statusList: Ref<any> = ref([]);
+let codeList: Ref<any> = ref([]);
+let areaList: Ref<any> = ref([]);
+let personalList: Ref<any> = ref([]);
+
 onMounted(async () => {
   loading.value = true;
   if (route.query.isdisabled) disabled.value = route.query.isdisabled;
@@ -138,7 +145,7 @@ const searchOther = async () => {
   res = await dictData.query({ type: 'common_status' });
   if (res.errcode == 0) statusList.value = res.data;
   // 个人
-  res = await personal.query();
+  res = await personal.query({ status: '1' });
   if (res.errcode == 0) personalList.value = res.data;
 };
 </script>

+ 10 - 2
src/views/user/expert/index.vue

@@ -36,15 +36,22 @@
 import _ from 'lodash';
 import type { Ref } from 'vue';
 import { ref, onMounted, getCurrentInstance } from 'vue';
-import { ElMessage } from 'element-plus';
 import { useRouter } from 'vue-router';
+import { ElMessage } from 'element-plus';
+
+// 接口
 import { ExpertStore } from '@common/src/stores/admins/expert';
 import { DictDataStore } from '@common/src/stores/system/dictData'; // 字典表
 import type { IQueryResult } from '@/util/types.util';
 const expert = ExpertStore();
 const dictData = DictDataStore();
-const router = useRouter();
+
 const { proxy } = getCurrentInstance() as any;
+
+// 路由
+const router = useRouter();
+
+// 加载中
 const loading = ref(false);
 // 列表数据
 let list: Ref<any> = ref([]);
@@ -74,6 +81,7 @@ let form: Ref<{}> = ref({});
 let formFields: Ref<any[]> = ref([{ label: '状态', model: 'status', type: 'select' }]);
 // 查询数据
 let searchForm: Ref<any> = ref({});
+// 字典表
 let statusList: Ref<any> = ref([]);
 let areaList: Ref<any> = ref([]);
 onMounted(async () => {