Merge branch 'master' of http://git.cc-lotus.info/zkzx/zkzx_admin

README.md

@@ -1 +1,2 @@
 zkzx_admin
+1

index.vue

@@ -9,7 +9,7 @@
           <cButton @toAdd="toAdd()"> </cButton>
         </el-col>
         <el-col :span="24" class="thr">
-          <cTable :fields="fields" :opera="opera" :data="list" @query="search" :total="total" @edit="toEdit" @del="toDel" :select="false">
+          <cTable :fields="fields" :opera="opera" :data="list" @query="search" :total="total" @edit="toEdit" @del="toDel" >
             <template #dict_type="{ item, row }">
               <template v-if="item.model === 'dict_type'">
                 <el-link size="mini" type="primary" @click="toType(row)">{{ getProps(row, item.model) }}</el-link>

src/views/admin/admins/detail.vue

@@ -3,10 +3,10 @@
     <el-row>
       <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
         <el-col :span="24" class="one">
-          <cSearch :is_back="true" @toBack="toBack"></cSearch>
+          <cSearch :is_title="false" :is_back="true" @toBack="toBack"></cSearch>
         </el-col>
         <el-col :span="24" class="two">
-          <cForm :span="24" :fields="formFields" :form="form" :rules="rules" @save="onSubmit">
+          <cForm :span="24" :fields="formFields" :form="form" :rules="rules" @save="toSave">
             <template #pid>
               <el-option v-for="(i, index) in pidList" :key="index" :label="i.name" :value="i._id"></el-option>
             </template>
@@ -26,11 +26,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 { AdminStore } from '@common/src/stores/admins/admin'; // 角色
@@ -38,14 +40,14 @@ import type { IQueryResult } from '@/util/types.util';
 const admin = AdminStore();
 const dictData = DictDataStore();
 const role = RoleStore();
+
+// 路由
 const route = useRoute();
-const loading = ref(false);
-let form: Ref<any> = ref({});
-let roleList: Ref<any> = ref([]);
-let pidList: Ref<any> = ref([]);
-let codeList: Ref<any> = ref([]);
 
+// 加载中
+const loading = ref(false);
 // 表单
+let form: Ref<any> = ref({});
 let formFields: Ref<any[]> = ref([
   { label: '所属上级', model: 'pid', type: 'select' },
   { label: '邀请码', model: 'code', type: 'select' },
@@ -56,10 +58,13 @@ let formFields: Ref<any[]> = ref([
   { label: '机构名称', model: 'dept_name' },
   { label: '角色', model: 'role', custom: true }
 ]);
-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 pidList: Ref<any> = ref([]);
+let codeList: Ref<any> = ref([]);
+
 onMounted(async () => {
   loading.value = true;
   await searchOther();
@@ -67,14 +72,21 @@ onMounted(async () => {
   loading.value = false;
 });
 const search = async () => {
-  if (route.query.id) {
+  let id = route.query.id;
+  let res: IQueryResult;
+  let info: any = { type: '1' };
+  if (id) {
+    // 已有数据
     formFields.value = formFields.value.filter((i) => i.model != 'password');
-    let res: IQueryResult = await admin.fetch(route.query.id);
-    if (res.errcode == 0) form.value = res.data as {};
-  } else form.value.type = '1';
+    res = await admin.fetch(route.query.id);
+    if (res.errcode == 0) {
+      info = res.data;
+    }
+  }
+  form.value = info;
 };
 // 提交
-const onSubmit = async (data) => {
+const toSave = async (data) => {
   let res: IQueryResult;
   if (data._id) res = await admin.update(data);
   else res = await admin.create(data);

src/views/admin/admins/index.vue

@@ -9,7 +9,7 @@
           <cButton @toAdd="toAdd()"> </cButton>
         </el-col>
         <el-col :span="24" class="thr">
-          <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @edit="toEdit" @del="toDel" :select="false"> </cTable>
+          <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @edit="toEdit" @del="toDel"> </cTable>
         </el-col>
       </el-col>
     </el-row>
@@ -21,11 +21,16 @@ import type { Ref } from 'vue';
 import { ref, onMounted, getCurrentInstance } from 'vue';
 import { ElMessage } from 'element-plus';
 import { useRouter } from 'vue-router';
+// 接口
 import { AdminStore } from '@common/src/stores/admins/admin'; // 角色
 import type { IQueryResult } from '@/util/types.util';
 const admin = AdminStore();
+// 路由
 const router = useRouter();
+
 const { proxy } = getCurrentInstance() as any;
+
+// 加载中
 const loading = ref(false);
 // 列表数据
 let list: Ref<any> = ref([]);

src/views/admin/business/detail.vue

@@ -3,10 +3,10 @@
     <el-row>
       <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
         <el-col :span="24" class="one">
-          <cSearch :is_back="true" @toBack="toBack"></cSearch>
+          <cSearch :is_title="false" :is_back="true" @toBack="toBack"></cSearch>
         </el-col>
         <el-col :span="24" class="two">
-          <cForm :span="24" :fields="formFields" :form="form" :rules="rules" @save="onSubmit">
+          <cForm :span="24" :fields="formFields" :form="form" :rules="rules" @save="toSave">
             <template #pid>
               <el-option v-for="(i, index) in pidList" :key="index" :label="i.name" :value="i._id"></el-option>
             </template>
@@ -26,26 +26,30 @@
 </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 { AdminStore } from '@common/src/stores/admins/admin'; // 角色
+import { AdminStore } from '@common/src/stores/admins/admin'; //管理员
 import type { IQueryResult } from '@/util/types.util';
+
 const admin = AdminStore();
 const dictData = DictDataStore();
 const role = RoleStore();
+
+// 路由
 const route = useRoute();
+
+// 加载中
 const loading = ref(false);
-let form: Ref<any> = ref({});
-let roleList: Ref<any> = ref([]);
-let pidList: Ref<any> = ref([]);
-let codeList: Ref<any> = ref([]);
 
 // 表单
+let form: Ref<any> = ref({});
 let formFields: Ref<any[]> = ref([
   { label: '所属上级', model: 'pid', type: 'select' },
   { label: '邀请码', model: 'code', type: 'select' },
@@ -56,10 +60,13 @@ let formFields: Ref<any[]> = ref([
   { label: '机构名称', model: 'dept_name' },
   { label: '角色', model: 'role', custom: true }
 ]);
-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 pidList: Ref<any> = ref([]);
+let codeList: Ref<any> = ref([]);
+
 onMounted(async () => {
   loading.value = true;
   await searchOther();
@@ -67,14 +74,21 @@ onMounted(async () => {
   loading.value = false;
 });
 const search = async () => {
-  if (route.query.id) {
+  let id = route.query.id;
+  let res: IQueryResult;
+  let info: any = { type: '3' };
+  if (id) {
+    // 已有数据
     formFields.value = formFields.value.filter((i) => i.model != 'password');
-    let res: IQueryResult = await admin.fetch(route.query.id);
-    if (res.errcode == 0) form.value = res.data as {};
-  } else form.value.type = '3';
+    res = await admin.fetch(route.query.id);
+    if (res.errcode == 0) {
+      info = res.data;
+    }
+  }
+  form.value = info;
 };
 // 提交
-const onSubmit = async (data) => {
+const toSave = async (data) => {
   let res: IQueryResult;
   if (data._id) res = await admin.update(data);
   else res = await admin.create(data);

src/views/admin/business/index.vue

@@ -9,7 +9,7 @@
           <cButton @toAdd="toAdd()"> </cButton>
         </el-col>
         <el-col :span="24" class="thr">
-          <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @edit="toEdit" @del="toDel" :select="false"> </cTable>
+          <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @edit="toEdit" @del="toDel"> </cTable>
         </el-col>
       </el-col>
     </el-row>
@@ -19,14 +19,21 @@
 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 { AdminStore } from '@common/src/stores/admins/admin'; // 角色
 import type { IQueryResult } from '@/util/types.util';
 const admin = AdminStore();
-const router = useRouter();
+
 const { proxy } = getCurrentInstance() as any;
+
+// 路由
+const router = useRouter();
+// 加载中
 const loading = ref(false);
+
 // 列表数据
 let list: Ref<any> = ref([]);
 // 总数

src/views/admin/mechanism/detail.vue

@@ -3,10 +3,10 @@
     <el-row>
       <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
         <el-col :span="24" class="one">
-          <cSearch :is_back="true" @toBack="toBack"></cSearch>
+          <cSearch :is_title="false" :is_back="true" @toBack="toBack"></cSearch>
         </el-col>
         <el-col :span="24" class="two">
-          <cForm :span="24" :fields="formFields" :form="form" :rules="rules" @save="onSubmit">
+          <cForm :span="24" :fields="formFields" :form="form" :rules="rules" @save="toSave">
             <template #pid>
               <el-option v-for="(i, index) in pidList" :key="index" :label="i.name" :value="i._id"></el-option>
             </template>
@@ -26,26 +26,29 @@
 </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 { AdminStore } from '@common/src/stores/admins/admin'; // 角色
+import { AdminStore } from '@common/src/stores/admins/admin'; // 管理员
 import type { IQueryResult } from '@/util/types.util';
 const admin = AdminStore();
 const dictData = DictDataStore();
 const role = RoleStore();
+
+// 路由
 const route = useRoute();
+
+// 加载中
 const loading = ref(false);
-let form: Ref<any> = ref({});
-let roleList: Ref<any> = ref([]);
-let pidList: Ref<any> = ref([]);
-let codeList: Ref<any> = ref([]);
 
 // 表单
+let form: Ref<any> = ref({});
 let formFields: Ref<any[]> = ref([
   { label: '所属上级', model: 'pid', type: 'select' },
   { label: '邀请码', model: 'code', type: 'select' },
@@ -56,10 +59,12 @@ let formFields: Ref<any[]> = ref([
   { label: '机构名称', model: 'dept_name' },
   { label: '角色', model: 'role', custom: true }
 ]);
-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 pidList: Ref<any> = ref([]);
+let codeList: Ref<any> = ref([]);
+
 onMounted(async () => {
   loading.value = true;
   await searchOther();
@@ -67,16 +72,21 @@ onMounted(async () => {
   loading.value = false;
 });
 const search = async () => {
-  if (route.query.id) {
+  let id = route.query.id;
+  let res: IQueryResult;
+  let info: any = { type: '2' };
+  if (id) {
+    // 已有数据
     formFields.value = formFields.value.filter((i) => i.model != 'password');
-    let res: IQueryResult = await admin.fetch(route.query.id);
+    res = await admin.fetch(route.query.id);
     if (res.errcode == 0) {
-      form.value = res.data as {};
+      info = res.data;
     }
-  } else form.value.type = '2';
+  }
+  form.value = info;
 };
 // 提交
-const onSubmit = async (data) => {
+const toSave = async (data) => {
   let res: IQueryResult;
   if (data._id) res = await admin.update(data);
   else res = await admin.create(data);

src/views/admin/mechanism/index.vue

@@ -9,7 +9,7 @@
           <cButton @toAdd="toAdd()"> </cButton>
         </el-col>
         <el-col :span="24" class="thr">
-          <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @edit="toEdit" @del="toDel" :select="false"> </cTable>
+          <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @edit="toEdit" @del="toDel"> </cTable>
         </el-col>
       </el-col>
     </el-row>
@@ -21,11 +21,18 @@ import type { Ref } from 'vue';
 import { ref, onMounted, getCurrentInstance } from 'vue';
 import { ElMessage } from 'element-plus';
 import { useRouter } from 'vue-router';
+
+// 接口
 import { AdminStore } from '@common/src/stores/admins/admin'; // 角色
 import type { IQueryResult } from '@/util/types.util';
 const admin = AdminStore();
+
+// 路由
 const router = useRouter();
+
 const { proxy } = getCurrentInstance() as any;
+
+// 加载中
 const loading = ref(false);
 // 列表数据
 let list: Ref<any> = ref([]);

src/views/system/dict/detail.vue

@@ -15,7 +15,7 @@
           <cButton @toAdd="toAdd()"> </cButton>
         </el-col>
         <el-col :span="24" class="fou">
-          <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @edit="toEdit" @del="toDel" :select="false">
+          <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @edit="toEdit" @del="toDel">
             <template #type="{ item, row }">
               <template v-if="item.model === 'type'">
                 {{ getProps(row, item.model) }}

src/views/system/dict/index.vue

@@ -13,7 +13,7 @@
           <cButton @toAdd="toAdd()"> </cButton>
         </el-col>
         <el-col :span="24" class="thr">
-          <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @edit="toEdit" @del="toDel" :select="false">
+          <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @edit="toEdit" @del="toDel">
             <template #type="{ item, row }">
               <template v-if="item.model === 'type'">
                 <el-link size="mini" type="primary" @click="toType(row)">{{ getProps(row, item.model) }}</el-link>

src/views/system/module/detail.vue

@@ -2,7 +2,7 @@
   <el-row>
     <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
       <el-col :span="24" class="one">
-        <cSearch :is_back="true" @toBack="toBack"></cSearch>
+        <cSearch :is_title="false" :is_back="true" @toBack="toBack"></cSearch>
       </el-col>
       <el-col :span="24" class="two">
         <cForm :fields="fields" :rules="rules" :form="form" labelWidth="auto" @save="toSave">

src/views/system/role/detail.vue

@@ -2,7 +2,7 @@
   <el-row>
     <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
       <el-col :span="24" class="one">
-        <cSearch :is_back="true" @toBack="toBack"></cSearch>
+        <cSearch :is_title="false" :is_back="true" @toBack="toBack"></cSearch>
       </el-col>
       <el-col :span="24" class="two">
         <cForm :fields="fields" :rules="rules" :form="form" labelWidth="auto" @save="toSave">

src/views/user/company/detail.vue

@@ -2,7 +2,7 @@
   <el-row>
     <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
       <el-col :span="24" class="one">
-        <cSearch :is_back="true" @toBack="toBack"></cSearch>
+        <cSearch :is_title="false" :is_back="true" @toBack="toBack"></cSearch>
       </el-col>
       <el-col :span="24" class="two">
         <cForm :fields="fields" :rules="rules" :form="form" labelWidth="auto" @save="toSave">

src/views/user/expert/index.vue

@@ -26,7 +26,7 @@
             @edit="toEdit"
             @exam="toExam"
             @del="toDel"
-            :select="false"
+            
           >
           </cTable>
         </el-col>

src/views/user/personal/detail.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="main animate__animated animate__backInRight" v-loading="loading">
         <el-col :span="24" class="one">
-          <cSearch :is_back="true" @toBack="toBack"></cSearch>
+          <cSearch :is_title="false" :is_back="true" @toBack="toBack"></cSearch>
         </el-col>
         <el-col :span="24" class="two">
           <cForm :span="24" :fields="formFields" :form="form" :rules="rules" @save="toSave" :isSave="isSave" :disabled="disabled">