修改

src/router/index.ts

@@ -64,7 +64,7 @@ const core = [
   },
   {
     path: '/personnel',
-    meta: { title: '业务员管理' },
+    meta: { title: '公证员管理' },
     component: () => import('@/views/core/personnel/index.vue')
   }
 ];

src/views/core/apply/index.vue

@@ -127,7 +127,7 @@ const toChangeUse = async (data) => {
 let fields: Ref<any[]> = ref([
   { label: '菜品名称', model: 'name', isSearch: true },
   { label: '卡路里(大卡)', model: 'reserve' },
-  { label: '状态', model: 'is_use', format: (i) => getDict(i, 'is_use'), isSearch: true, type: 'select' }
+  { label: '是否使用', model: 'is_use', format: (i) => getDict(i, 'is_use'), isSearch: true, type: 'select' }
 ]);
 // 操作
 let opera: Ref<any[]> = ref([

src/views/core/business/index.vue

@@ -19,11 +19,25 @@
   <cDialog :dialog="dialog" @toClose="toClose">
     <el-col :span="24" class="dialog_one" v-if="dialog.type == '1'">
       <cForm :span="24" :fields="formFields" :form="form" :rules="{}" @save="toSave" label-width="auto">
-        <template #img>
-          <cUpload model="img" :list="form.img" :limit="1" url="/files/notarization/news/upload" listType="picture-card" @change="onUpload"></cUpload>
-        </template>
-        <template #content>
-          <cEditor v-model="form.content" url="/files/notarization/news/upload"></cEditor>
+        <template #material>
+          <el-button class="button" type="primary" size="mini" @click="materialAdd('material')">添加</el-button>
+          <el-table :data="form.material" border size="mini">
+            <el-table-column label="字段名称" prop="label" align="center">
+              <template #default="scope">
+                <el-input v-model="scope.row.label" placeholder="请输入字段名称"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="字段值" prop="model" align="center">
+              <template #default="scope">
+                <el-input v-model="scope.row.model" placeholder="请输入字段值"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="90px">
+              <template #default="scope">
+                <el-button type="danger" size="mini" @click="materialkDel(scope.$index, 'material')">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
         </template>
       </cForm>
     </el-col>
@@ -106,10 +120,10 @@ const toChangeUse = async (data) => {
 // #region 表格及操作
 // NeedChange
 let fields: Ref<any[]> = ref([
-  { label: '标题', model: 'title', isSearch: true },
-  { label: '来源', model: 'origin', isSearch: true },
-  { label: '创建时间', model: 'create_time' },
-  { label: '状态', model: 'is_use', format: (i) => getDict(i, 'is_use'), isSearch: true, type: 'select' }
+  { label: '名称', model: 'name', isSearch: true },
+  { label: '收费标准', model: 'money' },
+  { label: '收费依据', model: 'basic' },
+  { label: '是否使用', model: 'is_use', format: (i) => getDict(i, 'is_use'), isSearch: true, type: 'select' }
 ]);
 // 操作
 let opera: Ref<any[]> = ref([
@@ -133,13 +147,11 @@ const getDict = (data, model) => {
   return get(res, 'label');
 };
 const toAdd = () => {
-  formFields.value = formFieldsForCreate;
   // 所属人是自己,需要把自己的id放进去
   form.value = { ...cloneDeep(defaultForm) };
   dialog.value.show = true;
 };
 const toEdit = async (data) => {
-  formFields.value = formFieldsForUpdate;
   form.value = { ...data };
   dialog.value.show = true;
 };
@@ -167,35 +179,32 @@ const toDel = async (data) => {
 
 // #region 表单及操作
 // NeedChange
-const defaultForm = { is_use: '0', img: [] };
-const formFields: Ref<any> = ref();
+const defaultForm = { is_use: '0' };
+const formFields: Ref<any> = ref([
+  { label: '名称', model: 'name' },
+  { label: '收费标准', model: 'money' },
+  { label: '收费依据', model: 'basic' },
+  { label: '所需资料', model: 'material', custom: true },
+  { label: '内容', model: 'content', type: 'textarea' }
+]);
 const dialog: Ref<any> = ref({ title: '数据信息', show: false, type: '1' });
-const form: Ref<any> = ref({ img: [] });
-const formFieldsForCreate = [
-  { label: '标题', model: 'title' },
-  { label: '来源', model: 'origin' },
-  { label: '创建时间', model: 'create_time', type: 'date' },
-  { label: '封面图片', model: 'img', custom: true },
-  { label: '简介', model: 'brief', type: 'textarea' },
-  { label: '内容', model: 'content', custom: true }
-];
-const formFieldsForUpdate = [
-  { label: '标题', model: 'title' },
-  { label: '来源', model: 'origin' },
-  { label: '创建时间', model: 'create_time', type: 'date' },
-  { label: '封面图片', model: 'img', custom: true },
-  { label: '简介', model: 'brief', type: 'textarea' },
-  { label: '内容', model: 'content', custom: true }
-];
+const form: Ref<any> = ref({});
 // 关闭弹框
 const toClose = () => {
   form.value = {};
   dialog.value.show = false;
 };
-const onUpload = (e: { model: string; value: Array<[]> }) => {
-  console.log(e);
-  const { model, value } = e;
-  form.value[model] = value;
+// 添加参数
+const materialAdd = (text) => {
+  let list = form.value[text] || [];
+  list.push({});
+  form.value.work = list;
+};
+// 删除参数
+const materialkDel = (index: number, text: string) => {
+  let list = form.value[text];
+  list.splice(index, 1);
+  form.value[text] = list;
 };
 // #endregion
 </script>

src/views/core/path/index.vue

@@ -8,30 +8,32 @@
           </template>
         </cSearch>
       </el-col>
+      <el-col :span="24" class="two">
+        <cButton @toAdd="toAdd"> </cButton>
+      </el-col>
       <el-col :span="24" class="thr">
-        <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @view="toView"> </cTable>
+        <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @edit="toEdit" @del="toDel" @changeUse="toChangeUse"> </cTable>
       </el-col>
     </el-col>
   </el-row>
   <cDialog :dialog="dialog" @toClose="toClose">
     <el-col :span="24" class="dialog_one" v-if="dialog.type == '1'">
-      <el-tabs v-model="active" type="border-card">
-        <el-tab-pane label="早餐" name="breakfast"> </el-tab-pane>
-        <el-tab-pane label="午餐" name="lunch"> </el-tab-pane>
-        <el-tab-pane label="晚餐" name="dinner"> </el-tab-pane>
-      </el-tabs>
+      <cForm :span="24" :fields="formFields" :form="form" :rules="{}" @save="toSave" label-width="auto">
+        <template #icon>
+          <cUpload model="icon" :list="form.icon" :limit="1" url="/files/notarization/path/upload" listType="picture-card" @change="onUpload"></cUpload>
+        </template>
+      </cForm>
     </el-col>
   </cDialog>
 </template>
 
 <script setup lang="ts">
-// 组件
 import { ref, Ref, onMounted, inject } from 'vue';
 // NeedChange
 import { PathStore } from '@/stores/core/path';
 import { DictDataStore } from '@/stores/system/dictData';
 import type { IQueryResult } from '@/util/types.util';
-import { get } from 'lodash';
+import { cloneDeep, get } from 'lodash';
 import baseStore from '@/stores/counter';
 const user = ref(baseStore.state.user);
 onMounted(async () => {
@@ -42,7 +44,6 @@ onMounted(async () => {
 });
 
 const loading: Ref<any> = ref(false);
-const active: Ref<any> = ref('breakfast');
 // NeedChange
 const store = PathStore();
 const dictDataStore = DictDataStore();
@@ -51,16 +52,12 @@ const $checkRes = inject('$checkRes') as Function;
 // #region 字典
 // NeedChange
 const statusList: Ref<any> = ref([]);
-const scheduleList: Ref<any> = ref([]);
 
 const searchOther = async () => {
   let res: IQueryResult;
   // 是否使用
   res = await dictDataStore.query({ code: 'isUse', is_use: '0' });
   if ($checkRes(res)) statusList.value = res.data;
-  // 用餐进度
-  res = await dictDataStore.query({ code: 'schedule', is_use: '0' });
-  if ($checkRes(res)) scheduleList.value = res.data;
 };
 // #endregion
 
@@ -83,19 +80,40 @@ const toSearch = (query) => {
   searchForm.value = query;
   search({ skip, limit });
 };
+const toChangeUse = async (data) => {
+  let status = '0';
+  switch (data.is_use) {
+    case '0':
+      status = '1';
+      break;
+    case '1':
+      status = '0';
+      break;
+    default:
+      break;
+  }
+  const udata = { _id: data._id, is_use: status };
+  const res = await store.update(udata);
+  if ($checkRes(res, true)) {
+    search({ skip: 0, limit });
+  }
+};
 // #endregion
 
 // #region 表格及操作
 // NeedChange
 let fields: Ref<any[]> = ref([
-  { label: '日期', model: 'date', isSearch: true },
-  { label: '早餐', model: 'breakfast', format: (i) => getDict(i, 'schedule') },
-  { label: '午餐', model: 'lunch', format: (i) => getDict(i, 'schedule') },
-  { label: '晚餐', model: 'dinner', format: (i) => getDict(i, 'schedule') },
-  { label: '状态', model: 'is_use', format: (i) => getDict(i, 'is_use') }
+  { label: '名称', model: 'name', isSearch: true },
+  { label: '排序', model: 'sort' },
+  { label: '是否使用', model: 'is_use', format: (i) => getDict(i, 'is_use'), isSearch: true, type: 'select' }
 ]);
 // 操作
-let opera: Ref<any[]> = ref([{ label: '查看', method: 'view' }]);
+let opera: Ref<any[]> = ref([
+  { label: '修改', method: 'edit' },
+  { label: '禁用', method: 'changeUse', type: 'warning', confirm: true, display: (i) => i.is_use === '0' },
+  { label: '使用', method: 'changeUse', type: 'success', confirm: true, display: (i) => i.is_use === '1' },
+  { label: '删除', method: 'del', confirm: true, type: 'danger' }
+]);
 
 const getDict = (data, model) => {
   let list;
@@ -103,9 +121,6 @@ const getDict = (data, model) => {
     case 'is_use':
       list = statusList.value;
       break;
-    case 'schedule':
-      list = scheduleList.value;
-      break;
     default:
       break;
   }
@@ -113,22 +128,58 @@ const getDict = (data, model) => {
   const res = list.find((f) => f.value == data);
   return get(res, 'label');
 };
-const toView = async (data) => {
+const toAdd = () => {
+  // 所属人是自己,需要把自己的id放进去
+  form.value = { ...cloneDeep(defaultForm) };
+  dialog.value.show = true;
+};
+const toEdit = async (data) => {
   form.value = { ...data };
   dialog.value.show = true;
 };
 // #endregion
 
+// #region 常规接口
+const toSave = async () => {
+  const data = cloneDeep(form.value);
+  let res: IQueryResult;
+  if (get(data, '_id')) res = await store.update(data);
+  else res = await store.create(data);
+  if ($checkRes(res, true)) {
+    search({ skip: 0, limit });
+    toClose();
+  }
+};
+const toDel = async (data) => {
+  const res = await store.del(data._id);
+  if ($checkRes(res, true)) {
+    search({ skip: 0, limit });
+  }
+};
+
+// #endregion
+
 // #region 表单及操作
 // NeedChange
+const defaultForm = { is_use: '0', icon: [] };
+const formFields: Ref<any> = ref([
+  { label: '名称', model: 'name' },
+  { label: '图标', model: 'icon', custom: true },
+  { label: '排序', model: 'sort', type: 'number' },
+  { label: '备注', model: 'remark', type: 'textarea' }
+]);
 const dialog: Ref<any> = ref({ title: '数据信息', show: false, type: '1' });
-const form: Ref<any> = ref({ file: [] });
+const form: Ref<any> = ref({ icon: [] });
 // 关闭弹框
 const toClose = () => {
   form.value = {};
   dialog.value.show = false;
 };
+const onUpload = (e: { model: string; value: Array<[]> }) => {
+  console.log(e);
+  const { model, value } = e;
+  form.value[model] = value;
+};
 // #endregion
 </script>
-
 <style scoped lang="scss"></style>

src/views/core/personnel/index.vue

@@ -12,35 +12,44 @@
         <cButton @toAdd="toAdd"> </cButton>
       </el-col>
       <el-col :span="24" class="thr">
-        <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @rate="toRate" @edit="toEdit" @del="toDel" @changeUse="toChangeUse"> </cTable>
+        <cTable :fields="fields" :opera="opera" :list="list" @query="search" :total="total" @edit="toEdit" @del="toDel" @changeUse="toChangeUse"> </cTable>
       </el-col>
     </el-col>
   </el-row>
   <cDialog :dialog="dialog" @toClose="toClose">
     <el-col :span="24" class="dialog_one" v-if="dialog.type == '1'">
       <cForm :span="24" :fields="formFields" :form="form" :rules="{}" @save="toSave" label-width="auto">
-        <template #params>
-          <el-button class="button" type="primary" size="mini" @click="paramsAdd()">添加</el-button>
-          <el-table :data="form.params" border size="mini">
-            <el-table-column label="参数名" prop="label" align="center">
+        <template #work>
+          <el-button class="button" type="primary" size="mini" @click="workAdd('work')">添加</el-button>
+          <el-table :data="form.work" border size="mini">
+            <el-table-column label="时间" prop="time" align="center">
               <template #default="scope">
-                <el-input v-model="scope.row.label" placeholder="请输入参数名"></el-input>
+                <el-input v-model="scope.row.time" placeholder="请输入任职时间"></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="参数值" prop="value" align="center">
+            <el-table-column label="地点" prop="address" align="center">
               <template #default="scope">
-                <el-input v-model="scope.row.value" placeholder="请输入参数值"></el-input>
+                <el-input v-model="scope.row.address" placeholder="请输入地点"></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" width="90px">
               <template #default="scope">
-                <el-button type="danger" size="mini" @click="paramsDel(scope.$index)">删除</el-button>
+                <el-button type="danger" size="mini" @click="workDel(scope.$index, 'work')">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
         </template>
-        <template #img>
-          <cUpload model="img" :list="form.img" :limit="1" url="/files/notarization/apply/upload" listType="picture-card" @change="onUpload"></cUpload>
+        <template #birth>
+          <el-date-picker v-model="form.birth" type="month" placeholder="请选择" format="YYYY年MM月" value-format="YYYY年MM月" />
+        </template>
+        <template #gender>
+          <el-option v-for="i in genderList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+        </template>
+        <template #education>
+          <el-option v-for="i in educationList" :key="i._id" :label="i.label" :value="i.value"></el-option>
+        </template>
+        <template #logo>
+          <cUpload model="logo" :list="form.logo" :limit="1" url="/files/notarization/personnel/upload" listType="picture-card" @change="onUpload"></cUpload>
         </template>
       </cForm>
     </el-col>
@@ -49,7 +58,6 @@
 
 <script setup lang="ts">
 import { ref, Ref, onMounted, inject } from 'vue';
-import { useRouter } from 'vue-router';
 // NeedChange
 import { PersonnelStore } from '@/stores/core/personnel';
 import { DictDataStore } from '@/stores/system/dictData';
@@ -64,7 +72,6 @@ onMounted(async () => {
   loading.value = false;
 });
 // 路由
-const router = useRouter();
 const loading: Ref<any> = ref(false);
 // NeedChange
 const store = PersonnelStore();
@@ -74,12 +81,20 @@ const $checkRes = inject('$checkRes') as Function;
 // #region 字典
 // NeedChange
 const statusList: Ref<any> = ref([]);
+const genderList: Ref<any> = ref([]);
+const educationList: Ref<any> = ref([]);
 
 const searchOther = async () => {
   let res: IQueryResult;
   // 是否使用
   res = await dictDataStore.query({ code: 'isUse', is_use: '0' });
   if ($checkRes(res)) statusList.value = res.data;
+  // 性别
+  res = await dictDataStore.query({ code: 'gender', is_use: '0' });
+  if ($checkRes(res)) genderList.value = res.data;
+  // 学历
+  res = await dictDataStore.query({ code: 'education', is_use: '0' });
+  if ($checkRes(res)) educationList.value = res.data;
 };
 // #endregion
 
@@ -125,14 +140,19 @@ const toChangeUse = async (data) => {
 // #region 表格及操作
 // NeedChange
 let fields: Ref<any[]> = ref([
-  { label: '菜品名称', model: 'name', isSearch: true },
-  { label: '卡路里(大卡)', model: 'reserve' },
-  { label: '状态', model: 'is_use', format: (i) => getDict(i, 'is_use'), isSearch: true, type: 'select' }
+  { label: '姓名', model: 'name', isSearch: true },
+  { label: '性别', model: 'gender', format: (i) => getDict(i, 'gender') },
+  { label: '出生年月', model: 'birth' },
+  { label: '学历', model: 'education', format: (i) => getDict(i, 'education') },
+  { label: '专业', model: 'speciality' },
+  { label: '职务', model: 'zw' },
+  { label: '职称', model: 'zc' },
+  { label: '执业证号', model: 'number' },
+  { label: '是否使用', model: 'is_use', format: (i) => getDict(i, 'is_use'), isSearch: true, type: 'select' }
 ]);
 // 操作
 let opera: Ref<any[]> = ref([
   { label: '修改', method: 'edit' },
-  { label: '评价', method: 'rate' },
   { label: '禁用', method: 'changeUse', type: 'warning', confirm: true, display: (i) => i.is_use === '0' },
   { label: '使用', method: 'changeUse', type: 'success', confirm: true, display: (i) => i.is_use === '1' },
   { label: '删除', method: 'del', confirm: true, type: 'danger' }
@@ -144,6 +164,12 @@ const getDict = (data, model) => {
     case 'is_use':
       list = statusList.value;
       break;
+    case 'gender':
+      list = genderList.value;
+      break;
+    case 'education':
+      list = educationList.value;
+      break;
     default:
       break;
   }
@@ -152,20 +178,14 @@ const getDict = (data, model) => {
   return get(res, 'label');
 };
 const toAdd = () => {
-  formFields.value = formFieldsForCreate;
   // 所属人是自己,需要把自己的id放进去
   form.value = { ...cloneDeep(defaultForm) };
   dialog.value.show = true;
 };
 const toEdit = async (data) => {
-  formFields.value = formFieldsForUpdate;
   form.value = { ...data };
   dialog.value.show = true;
 };
-// 菜品评价
-const toRate = async (data) => {
-  router.push({ path: '/rate', query: { id: data._id } });
-};
 // #endregion
 
 // #region 常规接口
@@ -190,37 +210,33 @@ const toDel = async (data) => {
 
 // #region 表单及操作
 // NeedChange
-const defaultForm = { is_use: '0', img: [] };
-const formFields: Ref<any> = ref();
+const defaultForm = { is_use: '0', logo: [], work: [] };
+const formFields: Ref<any> = ref([
+  { label: '证件照', model: 'logo', custom: true },
+  { label: '姓名', model: 'name' },
+  { label: '性别', model: 'gender', type: 'select' },
+  { label: '出生年月', model: 'birth', custom: true },
+  { label: '学历', model: 'education', type: 'select' },
+  { label: '专业', model: 'speciality' },
+  { label: '职务', model: 'zw' },
+  { label: '职称', model: 'zc' },
+  { label: '执业证号', model: 'number' },
+  { label: '工作经历', model: 'work', custom: true },
+  { label: '简介', model: 'brief', type: 'textarea' }
+]);
 const dialog: Ref<any> = ref({ title: '数据信息', show: false, type: '1' });
-const form: Ref<any> = ref({ img: [], params: [] });
-const formFieldsForCreate = [
-  { label: '菜品名称', model: 'name' },
-  { label: '卡路里(大卡)', model: 'reserve', type: 'number' },
-  { label: '参数列表', model: 'params', custom: true },
-  { label: '图片', model: 'img', custom: true },
-  { label: '菜品介绍', model: 'content', type: 'textarea' },
-  { label: '备注', model: 'remark', type: 'textarea' }
-];
-const formFieldsForUpdate = [
-  { label: '菜品名称', model: 'name' },
-  { label: '卡路里(大卡)', model: 'reserve', type: 'number' },
-  { label: '参数列表', model: 'params', custom: true },
-  { label: '图片', model: 'img', custom: true },
-  { label: '菜品介绍', model: 'content', type: 'textarea' },
-  { label: '备注', model: 'remark', type: 'textarea' }
-];
+const form: Ref<any> = ref({ logo: [], work: [] });
 // 添加参数
-const paramsAdd = () => {
-  let list = form.value.params || [];
+const workAdd = (text) => {
+  let list = form.value[text] || [];
   list.push({});
-  form.value.params = list;
+  form.value.work = list;
 };
 // 删除参数
-const paramsDel = (index: number) => {
-  let list = form.value.params;
+const workDel = (index: number, text: string) => {
+  let list = form.value[text];
   list.splice(index, 1);
-  form.value.params = list;
+  form.value[text] = list;
 };
 // 关闭弹框
 const toClose = () => {

src/views/system/config/index.vue

@@ -4,7 +4,7 @@
       <el-col :span="24" class="one">
         <cForm :span="24" :fields="formFields" :form="form" :rules="{}" @save="toSave" label-width="auto">
           <template #logo>
-            <cUpload model="img" :list="form.logo" :limit="1" url="/files/notarization/config/upload" listType="picture-card" @change="onUpload"></cUpload>
+            <cUpload model="logo" :list="form.logo" :limit="1" url="/files/notarization/config/upload" listType="picture-card" @change="onUpload"></cUpload>
           </template>
           <template #brief>
             <cEditor v-model="form.brief" url="/files/notarization/config/upload"></cEditor>
@@ -76,7 +76,6 @@ const formFields: Ref<any> = ref([
 ]);
 const form: Ref<any> = ref({ logo: [] });
 const onUpload = (e: { model: string; value: Array<[]> }) => {
-  console.log(e);
   const { model, value } = e;
   form.value[model] = value;
 };

vite.config.ts

@@ -16,7 +16,7 @@ export default defineConfig(({ mode }) => {
       port: 9001,
       proxy: {
         '/files': {
-          target: 'http://127.0.0.1', // https://broadcast.waityou24.cn
+          target: 'http://192.168.1.197', // https://broadcast.waityou24.cn
           changeOrigin: true
         },
         '/notarization/api': {