审批流程页面完善

src/api/company.ts

@@ -1,39 +1,42 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 公司列表
 export function apiCompanyLists(params: any) {
-  return request.get({ url: "/company/lists", params });
+    return request.get({ url: '/company/lists', params })
 }
 
 // 添加公司
 export function apiCompanyAdd(params: any) {
-  return request.post({ url: "/company/add", params });
+    return request.post({ url: '/company/add', params })
 }
 
 // 编辑公司
 export function apiCompanyEdit(params: any) {
-  return request.post({ url: "/company/edit", params });
+    return request.post({ url: '/company/edit', params })
 }
 
 // 删除公司
 export function apiCompanyDelete(params: any) {
-  return request.post({ url: "/company/delete", params });
+    return request.post({ url: '/company/delete', params })
 }
 
 // 公司详情
 export function apiCompanyDetail(params: any) {
-  return request.get({ url: "/company/detail", params });
+    return request.get({ url: '/company/detail', params })
 }
 
 // 下属公司详情
 export function apiSubordinateList(params: any) {
-  return request.get({ url: "/company/subordinate", params });
+    return request.get({ url: '/company/subordinate', params })
+}
+export function sendMsgApi(params: any) {
+    return request.get({ url: '/company/postsms', params })
 }
 // 生成合同
 export function generateGontract(params: any) {
-  return request.get({ url: "/company/Draftingcontracts", params });
+    return request.get({ url: '/company/Draftingcontracts', params })
 }
 // 发送短信
-export function sendMsgApi(params: any) {
+export function authentication(params: any) {
-  return request.get({ url: "/company/postsms", params });
+    return request.get({ url: '/company/authentication', params })
 }

src/api/examined.ts

@@ -0,0 +1,30 @@
+import request from "@/utils/request";
+//审批类型列表
+export function apiCateLists(params: any) {
+  return request.get({ url: "/cate/index", params });
+}
+//审批流程列表
+export function apiFlowLists(params: any) {
+  return request.get({ url: "/flow/index", params });
+}
+//创建审批类型
+export function apiCateCreat(params: any) {
+  return request.post({ url: "/cate/create", params });
+}
+// 创建流程
+export function apiFlowCreat(params: any) {
+  return request.post({ url: "/flow/create", params });
+}
+
+// 启用审批类型
+export function apiCateStatus(params: any) {
+  return request.get({ url: "/cate/status", params });
+}
+// 启用审批流程
+export function apiFlowStatus(params: any) {
+  return request.get({ url: "/flow/status", params });
+}
+// 审批流程详情
+export function apiFlowDetil(params: any) {
+  return request.get({ url: "/flow/view", params });
+}

src/hooks/usePaging.ts

@@ -1,64 +1,71 @@
-import { reactive, toRaw } from 'vue'
+import { reactive, toRaw } from "vue";
 
 // 分页钩子函数
 interface Options {
-    page?: number
+  page?: number;
-    size?: number
+  size?: number;
-    fetchFun: (_arg: any) => Promise<any>
+  fetchFun: (_arg: any) => Promise<any>;
-    params?: Record<any, any>
+  params?: Record<any, any>;
-    firstLoading?: boolean
+  firstLoading?: boolean;
 }
 
 export function usePaging(options: Options) {
-    const { page = 1, size = 15, fetchFun, params = {}, firstLoading = false } = options
+  const {
-    // 记录分页初始参数
+    page = 1,
-    const paramsInit: Record<any, any> = Object.assign({}, toRaw(params))
+    size = 15,
-    // 分页数据
+    fetchFun,
-    const pager = reactive({
+    params = {},
-        page,
+    firstLoading = false,
-        size,
+  } = options;
-        loading: firstLoading,
+  // 记录分页初始参数
-        count: 0,
+  const paramsInit: Record<any, any> = Object.assign({}, toRaw(params));
-        lists: [] as any[],
+  // 分页数据
-        extend: {} as Record<string, any>
+  const pager = reactive({
+    page,
+    size,
+    loading: firstLoading,
+    count: 0,
+    lists: [] as any[],
+    extend: {} as Record<string, any>,
+  });
+  // 请求分页接口
+  const getLists = () => {
+    pager.loading = true;
+    return fetchFun({
+      page_no: pager.page,
+      page_size: pager.size,
+      ...params,
     })
-    // 请求分页接口
+      .then((res: any) => {
-    const getLists = () => {
+        pager.count = res?.count;
-        pager.loading = true
+        res.lists ? (pager.lists = res.lists) : (pager.lists = res.data);
-        return fetchFun({
+        // pager.lists = res?.lists
-            page_no: pager.page,
+        pager.extend = res?.extend;
-            page_size: pager.size,
+        return Promise.resolve(res);
-            ...params
+      })
-        })
+      .catch((err: any) => {
-            .then((res: any) => {
+        return Promise.reject(err);
-                pager.count = res?.count
+      })
-                pager.lists = res?.lists
+      .finally(() => {
-                pager.extend = res?.extend
+        pager.loading = false;
-                return Promise.resolve(res)
+      });
-            })
+  };
-            .catch((err: any) => {
+  // 重置为第一页
-                return Promise.reject(err)
+  const resetPage = () => {
-            })
+    pager.page = 1;
-            .finally(() => {
+    getLists();
-                pager.loading = false
+  };
-            })
+  // 重置参数
-    }
+  const resetParams = () => {
-    // 重置为第一页
+    Object.keys(paramsInit).forEach((item) => {
-    const resetPage = () => {
+      params[item] = paramsInit[item];
-        pager.page = 1
+    });
-        getLists()
+    getLists();
-    }
+  };
-    // 重置参数
+  return {
-    const resetParams = () => {
+    pager,
-        Object.keys(paramsInit).forEach((item) => {
+    getLists,
-            params[item] = paramsInit[item]
+    resetParams,
-        })
+    resetPage,
-        getLists()
+  };
-    }
-    return {
-        pager,
-        getLists,
-        resetParams,
-        resetPage
-    }
 }

src/router/routes.ts

@@ -13,73 +13,81 @@
   }
  */
 
-import type { RouteRecordRaw } from 'vue-router'
+import type { RouteRecordRaw } from "vue-router";
-import { PageEnum } from '@/enums/pageEnum'
+import { PageEnum } from "@/enums/pageEnum";
-import Layout from '@/layout/default/index.vue'
+import Layout from "@/layout/default/index.vue";
 
-export const LAYOUT = () => Promise.resolve(Layout)
+export const LAYOUT = () => Promise.resolve(Layout);
 
-export const INDEX_ROUTE_NAME = Symbol()
+export const INDEX_ROUTE_NAME = Symbol();
 
 export const constantRoutes: Array<RouteRecordRaw> = [
-    {
+  {
-        path: '/:pathMatch(.*)*',
+    path: "/:pathMatch(.*)*",
-        component: () => import('@/views/error/404.vue')
+    component: () => import("@/views/error/404.vue"),
-    },
+  },
-    {
+  {
-        path: PageEnum.ERROR_403,
+    path: PageEnum.ERROR_403,
-        component: () => import('@/views/error/403.vue')
+    component: () => import("@/views/error/403.vue"),
-    },
+  },
-    {
+  {
-        path: PageEnum.LOGIN,
+    path: PageEnum.LOGIN,
-        component: () => import('@/views/account/login.vue')
+    component: () => import("@/views/account/login.vue"),
-    },
+  },
-    {
+  {
-        path: '/user',
+    path: "/user",
-        component: LAYOUT,
+    component: LAYOUT,
-        children: [
+    children: [
-            {
+      {
-                path: 'setting',
+        path: "setting",
-                component: () => import('@/views/user/setting.vue'),
+        component: () => import("@/views/user/setting.vue"),
-                name: Symbol(),
+        name: Symbol(),
-                meta: {
+        meta: {
-                    title: '个人设置'
+          title: "个人设置",
-                }
+        },
-            }
+      },
-        ]
+      {
-    }
+        path: "examined",
-    // {
+        component: () => import("@/views/examined/examinedFlow.vue"),
-    //     path: '/dev_tools',
+        name: Symbol(),
-    //     component: LAYOUT,
+        meta: {
-    //     children: [
+          title: "个人设置",
-    //         {
+        },
-    //             path: 'code/edit',
+      },
-    //             component: () => import('@/views/dev_tools/code/edit.vue'),
+    ],
-    //             meta: {
+  },
-    //                 title: '编辑数据表',
+  // {
-    //                 activeMenu: '/dev_tools/code'
+  //     path: '/dev_tools',
-    //             }
+  //     component: LAYOUT,
-    //         }
+  //     children: [
-    //     ]
+  //         {
-    // },
+  //             path: 'code/edit',
-    // {
+  //             component: () => import('@/views/dev_tools/code/edit.vue'),
-    //     path: '/setting',
+  //             meta: {
-    //     component: LAYOUT,
+  //                 title: '编辑数据表',
-    //     children: [
+  //                 activeMenu: '/dev_tools/code'
-    //         {
+  //             }
-    //             path: 'dict/data',
+  //         }
-    //             component: () => import('@/views/setting/dict/data/index.vue'),
+  //     ]
-    //             meta: {
+  // },
-    //                 title: '数据管理',
+  // {
-    //                 activeMenu: '/setting/dict'
+  //     path: '/setting',
-    //             }
+  //     component: LAYOUT,
-    //         }
+  //     children: [
-    //     ]
+  //         {
-    // }
+  //             path: 'dict/data',
-]
+  //             component: () => import('@/views/setting/dict/data/index.vue'),
+  //             meta: {
+  //                 title: '数据管理',
+  //                 activeMenu: '/setting/dict'
+  //             }
+  //         }
+  //     ]
+  // }
+];
 
 export const INDEX_ROUTE: RouteRecordRaw = {
-    path: PageEnum.INDEX,
+  path: PageEnum.INDEX,
-    component: LAYOUT,
+  component: LAYOUT,
-    name: INDEX_ROUTE_NAME
+  name: INDEX_ROUTE_NAME,
-}
+};

src/views/company/dialog_index.vue

@@ -27,14 +27,12 @@
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
             <div class="mt-4">
                 <el-table :data="pager.lists" @cell-click="handleCurrentChange">
-                    <el-table-column label="签约公司" property="company_name" />
+                    <el-table-column label="公司名称" property="company_name" />
                     <el-table-column label="公司类型" property="company_type" />
                     <el-table-column label="区县" property="area" />
                     <el-table-column label="乡镇" property="street" />
                     <el-table-column label="主联系人" property="master_name" />
                     <el-table-column label="联系方式" property="master_phone" />
-                    <el-table-column label="片区经理" property="area_manager" />
-                    <el-table-column label="是否签约" property="is_contract" />
                 </el-table>
             </div>
             <div class="flex mt-4 justify-end">

src/views/company/index.vue

@@ -83,15 +83,20 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column label="id" prop="id" show-overflow-tooltip width="60" />
-                    <el-table-column label="签约公司" prop="company_name" show-overflow-tooltip />
+                    <el-table-column label="公司名称" prop="company_name" show-overflow-tooltip />
                     <el-table-column label="公司类型" prop="company_type" show-overflow-tooltip />
                     <el-table-column label="区县" prop="area" show-overflow-tooltip />
                     <el-table-column label="乡镇" prop="street" show-overflow-tooltip />
                     <el-table-column label="主联系人" prop="master_name" show-overflow-tooltip />
                     <el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip />
                     <el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
-                    <el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip />
+                    <el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
-                    <el-table-column label="操作" align="center" width="450" fixed="right">
+                        <template #default="{ row }">
+                            <span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
+                            <span v-else style="color: #fe0000">未签约</span>
+                        </template></el-table-column
+                    >
+                    <el-table-column label="操作" align="center" width="500" fixed="right">
                         <template #default="{ row }">
                             <div style="display: flex">
                                 <el-button type="primary" link>
@@ -150,19 +155,29 @@
                                     >删除</el-button
                                 >
                                 <el-button
-                                    v-perms="['company/Draftingcontracts']"
+                                    v-if="row.is_authentication == 0"
+                                    v-perms="['company/authentication']"
                                     type="primary"
                                     link
-                                    @click="showCreateConctPop(row)"
+                                    @click="handleAuthentication(row.id)"
-                                    >生成合同</el-button
+                                    >企业认证</el-button
-                                >
-                                <el-button
-                                    v-perms="['company/postsms']"
-                                    type="primary"
-                                    link
-                                    @click=";(showPop = true), (contractId = row.id)"
-                                    >发送短信</el-button
                                 >
+                                <template v-if="row.is_contract == 0">
+                                    <el-button
+                                        v-perms="['company/Draftingcontracts']"
+                                        type="primary"
+                                        link
+                                        @click="showCreateConctPop(row)"
+                                        >生成合同</el-button
+                                    >
+                                    <el-button
+                                        v-perms="['company/postsms']"
+                                        type="primary"
+                                        link
+                                        @click=";(showPop = true), (contractId = row.id)"
+                                        >发送短信</el-button
+                                    >
+                                </template>
                             </div>
                         </template>
                     </el-table-column>
@@ -194,13 +209,20 @@
 <script lang="ts" setup name="companyLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiCompanyLists, apiCompanyDelete } from '@/api/company'
+import useUserStore from '@/stores/modules/user'
-import { generateGontract, sendMsgApi } from '@/api/perms/admin'
+import {
+    apiCompanyLists,
+    apiCompanyDelete,
+    generateGontract,
+    sendMsgApi,
+    authentication
+} from '@/api/company'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import { dictDataLists } from '@/api/setting/dict'
 import { getRoutePath } from '@/router'
 
+const userStore = useUserStore()
 const route = useRoute()
 const company_type_show = ref(true)
 // 创建合同与发送短信
@@ -272,6 +294,11 @@ const handleDelete = async (id: number | any[]) => {
     await apiCompanyDelete({ id })
     getLists()
 }
+const handleAuthentication = async (id: number | any[]) => {
+    await feedback.confirm('确定要认证？')
+    await authentication({ id })
+    getLists()
+}
 
 getLists()
 </script>

src/views/company/subordinate.vue

@@ -4,14 +4,23 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column label="id" prop="id" show-overflow-tooltip width="60" />
-                    <el-table-column label="签约公司" prop="company_name" show-overflow-tooltip />
+                    <el-table-column label="公司名称" prop="company_name" show-overflow-tooltip />
                     <el-table-column label="公司类型" prop="company_type" show-overflow-tooltip />
-                    <el-table-column label="区县" prop="area" show-overflow-tooltip />
+                    <el-table-column label="区县" prop="area_name" show-overflow-tooltip />
-                    <el-table-column label="乡镇" prop="street" show-overflow-tooltip />
+                    <el-table-column label="乡镇" prop="street_name" show-overflow-tooltip />
                     <el-table-column label="主联系人" prop="master_name" show-overflow-tooltip />
                     <el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip />
-                    <el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
+                    <el-table-column
-                    <el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip />
+                        label="片区经理"
+                        prop="area_manager_name"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
+                            <span v-else style="color: #fe0000">未签约</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作" align="center" width="450" fixed="right">
                         <template #default="{ row }">
                             <div style="display: flex">

src/views/contract/contractDetil.vue

@@ -1,130 +1,118 @@
 <template>
-  <el-dialog @confirm="handleSubmit" title="合同详情" v-model="show">
+    <el-dialog @confirm="handleSubmit" title="合同详情" v-model="show">
-    <el-form
+        <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-      ref="formRef"
+            <el-form-item label="合同类型" prop="contract_type">
-      :model="formData"
+                <el-input
-      label-width="90px"
+                    v-model="formData.contract_type_name"
-      :rules="formRules"
+                    :disabled="true"
-    >
+                    clearable
-      <el-form-item label="公司" prop="company_id">
+                    placeholder="请输入合同类型"
-        <el-input
+                />
-          v-model="formData.company_name"
+            </el-form-item>
-          :disabled="true"
+            <el-form-item label="合同编号" prop="contract_no">
-          clearable
+                <el-input
-          placeholder="请输入公司"
+                    v-model="formData.contract_no"
-        />
+                    :disabled="true"
-      </el-form-item>
+                    clearable
-      <el-form-item label="合同类型" prop="contract_type">
+                    placeholder="暂无合同编号"
-        <el-input
+                />
-          v-model="formData.contract_type_name"
+            </el-form-item>
-          :disabled="true"
+            <el-form-item label="甲方" prop="party_a">
-          clearable
+                <el-input
-          placeholder="请输入合同类型"
+                    v-model="formData.party_a_name"
-        />
+                    :disabled="true"
-      </el-form-item>
+                    clearable
-      <el-form-item label="合同编号" prop="contract_no">
+                    placeholder="暂无甲方"
-        <el-input
+                />
-          v-model="formData.contract_no"
+            </el-form-item>
-          :disabled="true"
+            <el-form-item label="乙方" prop="party_b">
-          clearable
+                <el-input
-          placeholder="暂无合同编号"
+                    v-model="formData.party_b_name"
-        />
+                    :disabled="true"
-      </el-form-item>
+                    clearable
-      <el-form-item label="文件" prop="file">
+                    placeholder="暂无乙方"
-        <el-input
+                />
-          v-model="formData.file"
+            </el-form-item>
-          :disabled="true"
+            <el-form-item label="片区经理" prop="area_manager_name">
-          clearable
+                <el-input
-          placeholder="暂无文件"
+                    v-model="formData.area_manager"
-        />
+                    :disabled="true"
-      </el-form-item>
+                    clearable
-      <el-form-item label="状态" prop="status">
+                    placeholder="暂无经理"
-        <el-input
+                />
-          v-model="formData.status"
+            </el-form-item>
-          :disabled="true"
+            <el-form-item label="类型" prop="type">
-          clearable
+                <el-input
-          placeholder="暂无状态"
+                    v-model="formData.type_name"
-        />
+                    :disabled="true"
-      </el-form-item>
+                    clearable
-      <el-form-item label="甲方" prop="party_a_name">
+                    placeholder="暂无状态"
-        <el-input
+                />
-          v-model="formData.party_a_name"
+            </el-form-item>
-          :disabled="true"
+            <el-form-item label="状态" prop="status">
-          clearable
+                <el-input
-          placeholder="暂无甲方"
+                    v-model="formData.status_name"
-        />
+                    :disabled="true"
-      </el-form-item>
+                    clearable
-      <el-form-item label="乙方" prop="party_b_name">
+                    placeholder="暂无状态"
-        <el-input
+                />
-          v-model="formData.party_b_name"
+            </el-form-item>
-          :disabled="true"
+            <el-form-item label="合同地址" v-if="formData.status == 1">
-          clearable
+                <el-link type="success" :href="formData.url" target="_blank">在线查看</el-link>
-          placeholder="暂无乙方"
+            </el-form-item>
-        />
+        </el-form>
-      </el-form-item>
+        <div class="btn_men">
-      <el-form-item label="片区经理" prop="area_manager">
+            <el-button @click="show = false">取消</el-button>
-        <el-input
+            <el-button type="primary" @click="show = false">确定</el-button>
-          v-model="formData.area_manager"
+        </div>
-          :disabled="true"
+    </el-dialog>
-          clearable
-          placeholder="暂无经理"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="type">
-        <el-input
-          v-model="formData.type"
-          :disabled="true"
-          clearable
-          placeholder="暂无状态"
-        />
-      </el-form-item>
-    </el-form>
-    <div class="btn_men">
-      <el-button @click="show = false">取消</el-button>
-      <el-button type="primary" @click="show = false">确定</el-button>
-    </div>
-  </el-dialog>
 </template>
 
 <script setup>
-import { ref, reactive, defineExpose } from "vue";
+import { ref, reactive, defineExpose } from 'vue'
 const formData = reactive({
-  id: "",
+    id: '',
-  company_id: "",
+    company_id: '',
-  company_name: "",
+    contract_type: '',
-  contract_type: "",
+    contract_type_name: '',
-  contract_type_name: "",
+    contract_no: '',
-  contract_no: "",
+    file: '',
-  file: "",
+    status: '',
-  status: "",
+    party_a: '',
-  party_a: "",
+    party_a_name: '',
-  party_a_name: "",
+    party_b: '',
-  party_b: "",
+    party_b_name: '',
-  party_b_name: "",
+    area_manager: '',
-  area_manager: "",
+    area_manager_name: '',
-});
+    type_name: '',
-const show = ref(false);
+    url: '',
+    status_name: ''
+})
+const show = ref(false)
 const shoeEditFn = (flag) => {
-  show.value = flag;
+    show.value = flag
-};
+}
 // 传值赋值
 const setFormData = async (data) => {
-  for (const key in formData) {
+    for (const key in formData) {
-    if (data[key] != null && data[key] != undefined) {
+        if (data[key] != null && data[key] != undefined) {
-      //@ts-ignore
+            //@ts-ignore
-      formData[key] = data[key];
+            formData[key] = data[key]
+            if (key == 'type') {
+                formData.type = data.type == 1 ? '公司' : '个人'
+            }
+        }
     }
-  }
+}
-};
 
 defineExpose({
-  shoeEditFn,
+    shoeEditFn,
-  setFormData,
+    setFormData
-});
+})
 </script>
 
 <style lang="scss" scoped>
 .btn_men {
-  text-align: right;
+    text-align: right;
 }
 </style>

src/views/contract/edit.vue

@@ -1,9 +1,7 @@
 <template>
     <div class="edit-popup">
-
         <popup
-
+            v-if="true"
-        v-if="true"
             ref="popupRef"
             :title="popupTitle"
             :async="true"
@@ -12,29 +10,35 @@
             @close="handleClose"
         >
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="公司" prop="company_id">
+                <el-form-item label="合同类型" prop="contract_type_name">
-                    <el-input v-model="formData.company_id" clearable placeholder="请输入公司" />
+                    <el-input
-                </el-form-item>
+                        v-model="formData.contract_type_name"
-                <el-form-item label="合同类型" prop="contract_type">
+                        clearable
-                    <el-input v-model="formData.contract_type" clearable placeholder="请输入合同类型" />
+                        placeholder="请输入合同类型"
+                    />
                 </el-form-item>
                 <el-form-item label="合同编号" prop="contract_no">
-                    <el-input v-model="formData.contract_no" clearable placeholder="请输入合同编号" />
+                    <el-input
-                </el-form-item>
+                        v-model="formData.contract_no"
-                <el-form-item label="文件" prop="file">
+                        clearable
-                    <el-input v-model="formData.file" clearable placeholder="请输入文件" />
+                        placeholder="请输入合同编号"
+                    />
                 </el-form-item>
                 <el-form-item label="状态" prop="status">
                     <el-input v-model="formData.status" clearable placeholder="请输入状态" />
                 </el-form-item>
-                <el-form-item label="甲方" prop="party_a">
+                <el-form-item label="甲方" prop="party_a_name">
-                    <el-input v-model="formData.party_a" clearable placeholder="请输入甲方" />
+                    <el-input v-model="formData.party_a_name" clearable placeholder="请输入甲方" />
                 </el-form-item>
-                <el-form-item label="乙方" prop="party_b">
+                <el-form-item label="乙方" prop="party_b_name">
-                    <el-input v-model="formData.party_b" clearable placeholder="请输入乙方" />
+                    <el-input v-model="formData.party_b_name" clearable placeholder="请输入乙方" />
                 </el-form-item>
-                <el-form-item label="片区经理" prop="area_manager">
+                <el-form-item label="片区经理" prop="area_manager_name">
-                    <el-input v-model="formData.area_manager" clearable placeholder="请输入片区经理" />
+                    <el-input
+                        v-model="formData.area_manager_name"
+                        clearable
+                        placeholder="请输入片区经理"
+                    />
                 </el-form-item>
             </el-form>
         </popup>
@@ -68,50 +72,64 @@ const formData = reactive({
     id: '',
     company_id: '',
     contract_type: '',
+    contract_type_name: '',
     contract_no: '',
     file: '',
     status: '',
     party_a: '',
+    party_a_name: '',
     party_b: '',
+    party_b_name: '',
     area_manager: '',
+    area_manager_name: ''
 })
 
-
 // 表单验证
 const formRules = reactive<any>({
-    company_id: [{
+    company_id: [
-        required: true,
+        {
-        message: '请输入公司',
+            required: true,
-        trigger: ['blur']
+            message: '请输入公司',
-    }],
+            trigger: ['blur']
-    contract_type: [{
+        }
-        required: true,
+    ],
-        message: '请输入合同类型',
+    contract_type: [
-        trigger: ['blur']
+        {
-    }],
+            required: true,
-    contract_no: [{
+            message: '请输入合同类型',
-        required: true,
+            trigger: ['blur']
-        message: '请输入合同编号',
+        }
-        trigger: ['blur']
+    ],
-    }],
+    contract_no: [
-    file: [{
+        {
-        required: true,
+            required: true,
-        message: '请输入文件',
+            message: '请输入合同编号',
-        trigger: ['blur']
+            trigger: ['blur']
-    }],
+        }
-    party_a: [{
+    ],
-        required: true,
+    file: [
-        message: '请输入甲方',
+        {
-        trigger: ['blur']
+            required: true,
-    }],
+            message: '请输入文件',
-    party_b: [{
+            trigger: ['blur']
-        required: true,
+        }
-        message: '请输入乙方',
+    ],
-        trigger: ['blur']
+    party_a: [
-    }]
+        {
+            required: true,
+            message: '请输入甲方',
+            trigger: ['blur']
+        }
+    ],
+    party_b: [
+        {
+            required: true,
+            message: '请输入乙方',
+            trigger: ['blur']
+        }
+    ]
 })
 
-
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     for (const key in formData) {
@@ -120,8 +138,6 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -131,14 +147,11 @@ const getDetail = async (row: Record<string, any>) => {
     setFormData(data)
 }
 
-
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
+    const data = { ...formData }
-    mode.value == 'edit' 
+    mode.value == 'edit' ? await apiContractEdit(data) : await apiContractAdd(data)
-        ? await apiContractEdit(data) 
-        : await apiContractAdd(data)
     popupRef.value?.close()
     emit('success')
 }
@@ -154,8 +167,6 @@ const handleClose = () => {
     emit('close')
 }
 
-
-
 defineExpose({
     open,
     setFormData,

src/views/contract/index.vue

@@ -3,20 +3,45 @@
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="公司名称" prop="company_id">
-                    <el-input class="w-[280px]" v-model="queryParams.company_id" clearable placeholder="请输入公司" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.company_id"
+                        clearable
+                        placeholder="请输入公司"
+                    />
                 </el-form-item>
                 <el-form-item label="合同类型" prop="contract_type">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_type" clearable placeholder="请输入合同类型" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.contract_type"
+                        clearable
+                        placeholder="请输入合同类型"
+                    />
                 </el-form-item>
                 <el-form-item label="合同编号" prop="contract_no">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_no" clearable placeholder="请输入合同编号" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.contract_no"
+                        clearable
+                        placeholder="请输入合同编号"
+                    />
                 </el-form-item>
                 <el-form-item label="状态" prop="status">
-                    <el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入状态" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.status"
+                        clearable
+                        placeholder="请输入状态"
+                    />
                 </el-form-item>
 
                 <el-form-item label="片区经理" prop="area_manager">
-                    <el-input class="w-[280px]" v-model="queryParams.area_manager" clearable placeholder="请输入片区经理" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.area_manager"
+                        clearable
+                        placeholder="请输入片区经理"
+                    />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -31,49 +56,59 @@
                 </template>
                 新增
       </el-button>-->
-            <el-button v-perms="['contract.contract/delete']" :disabled="!selectData.length"
+            <el-button
-                @click="handleDelete(selectData)">删除</el-button>
+                v-perms="['contract.contract/delete']"
+                :disabled="!selectData.length"
+                @click="handleDelete(selectData)"
+                >删除</el-button
+            >
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="id" prop="id" show-overflow-tooltip />
                     <el-table-column label="公司" prop="company_name" show-overflow-tooltip />
-                    <el-table-column label="合同类型" prop="contract_type_name" show-overflow-tooltip />
+                    <el-table-column
+                        label="合同类型"
+                        prop="contract_type_name"
+                        show-overflow-tooltip
+                    />
                     <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="status" show-overflow-tooltip />
                     <el-table-column label="甲方" prop="party_a_name" show-overflow-tooltip />
                     <el-table-column label="乙方" prop="party_b_name" show-overflow-tooltip />
+
+                    <el-table-column
+                        label="片区经理"
+                        prop="area_manager_name"
+                        show-overflow-tooltip
+                    />
                     <el-table-column label="类型" prop="type" show-overflow-tooltip>
                         <template #default="scope">
-                            <span>{{ scope.row.type == 1 ? '公司' : scope.row.type == 0 ? "" : '个人' }}</span>
+                            <span>{{
-
+                                scope.row.type == 1 ? '公司' : scope.row.type == 0 ? '' : '个人'
+                            }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="状态" prop="status_name" show-overflow-tooltip>
+                        <template #default="scope">
+                            <span v-if="scope.row.status_name == '已签约'" style="color: #67c23a"
+                                >已签约</span
+                            >
+                            <span v-else style="color: #fe0000">未签约</span>
                         </template>
-
                     </el-table-column>
-                    <el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
                     <el-table-column label="操作" width="180" fixed="right" align="center">
                         <template #default="{ row }">
-                            <!-- <el-button
+                            <el-button
-                                v-perms="['contract.contract/edit']"
+                                v-perms="['contract.contract/delete']"
                                 type="primary"
                                 link
-                                @click="handleEdit(row)"
+                                @click="showDetil(row.id)"
                             >
-                                编辑
-              </el-button>-->
-                            <el-button v-perms="['contract.contract/delete']" type="primary" link
-                                @click="checkContcat(row.id)">
-                                <!-- <a href="https://www.zhihu.com/signin?next=%2F">查看</a> -->
-                                查看
-                            </el-button>
-                            <el-button v-perms="['contract.contract/delete']" type="primary" link
-                                @click="showDetil(row.id)">
-                                <!-- <a href="https://www.zhihu.com/signin?next=%2F">查看</a> -->
                                 详情
                             </el-button>
 
-                            <el-button v-perms="['contract.contract/delete']" type="danger" link
+                            <!-- <el-button v-perms="['contract.contract/delete']" type="danger" link
-                                @click="handleDelete(row.id)">删除</el-button>
+                                @click="handleDelete(row.id)">删除</el-button> -->
                         </template>
                     </el-table-column>
                 </el-table>
@@ -87,64 +122,60 @@
 </template>
 
 <script lang="ts" setup name="contractLists">
-import contractDetil from "./contractDetil.vue";
+import contractDetil from './contractDetil.vue'
-import { usePaging } from "@/hooks/usePaging";
+import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from "@/hooks/useDictOptions";
+import { useDictData } from '@/hooks/useDictOptions'
-import {
+import { apiContractLists, apiContractDelete, apiContractDetail } from '@/api/contract'
-    apiContractLists,
+import { timeFormat } from '@/utils/util'
-    apiContractDelete,
+import feedback from '@/utils/feedback'
-    apiContractDetail,
-} from "@/api/contract";
-import { timeFormat } from "@/utils/util";
-import feedback from "@/utils/feedback";
 
-const editRef = shallowRef<InstanceType<typeof EditPopup>>();
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
-const showEdit = ref(false);
+const showEdit = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    company_id: "",
+    company_id: '',
-    contract_type: "",
+    contract_type: '',
-    contract_no: "",
+    contract_no: '',
-    status: "",
+    status: '',
-    party_a: "",
+    party_a: '',
-    party_b: "",
+    party_b: '',
-    area_manager: "",
+    area_manager: ''
-});
+})
 
 // 选中数据
-const selectData = ref<any[]>([]);
+const selectData = ref<any[]>([])
 
 // 表格选择后回调事件
 const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id);
+    selectData.value = val.map(({ id }) => id)
-};
+}
 
 // 获取字典数据
-const { dictData } = useDictData("");
+const { dictData } = useDictData('')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
     fetchFun: apiContractLists,
-    params: queryParams,
+    params: queryParams
-});
+})
 
 // 详情
-let childDetil = ref();
+const childDetil = ref()
 const showDetil = async (id) => {
-    let res = await apiContractDetail({ id });
+    const res = await apiContractDetail({ id })
-    childDetil.value.setFormData(res);
+    childDetil.value.setFormData(res)
-    childDetil.value.shoeEditFn(true);
+    childDetil.value.shoeEditFn(true)
-};
+}
 // 查看合同
-const checkContcat = (id: Number) => {
+const checkContcat = (id: number) => {
     apiContractDetail({ id }).then((res) => {
-        res.file ? window.open(res.file) : feedback.msgError("暂无合同可以查看");
+        res.file ? window.open(res.file) : feedback.msgError('暂无合同可以查看')
-    });
+    })
 
     // window.open('https://www.zhihu.com/signin?next=%2F')
-};
+}
 
 // 添加
 // const handleAdd = async () => {
@@ -163,12 +194,12 @@ const checkContcat = (id: Number) => {
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm("确定要删除？");
+    await feedback.confirm('确定要删除？')
-    await apiContractDelete({ id });
+    await apiContractDelete({ id })
-    getLists();
+    getLists()
-};
+}
 
-getLists();
+getLists()
 // pager.lists.forEach((item) => {
 //   console.log(item.type);
 // });

src/views/examined/dialog_index.vue

@@ -0,0 +1,139 @@
+<template>
+  <div>
+    <el-card class="!border-none" shadow="never">
+      <el-form class="mb-[-16px]" :model="queryParams" inline>
+        <el-form-item label="公司名称" prop="company_name">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.company_name"
+            clearable
+            placeholder="请输入公司名称"
+          />
+        </el-form-item>
+        <el-form-item label="公司类型" prop="company_type">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.company_type"
+            clearable
+            placeholder="请输入公司类型"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="resetPage">查询</el-button>
+          <el-button @click="resetParams">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+      <div class="mt-4">
+        <el-table
+          :data="pager.lists"
+          size="large"
+          @cell-click="handleCurrentChange"
+        >
+          <el-table-column label="ID" prop="id" min-width="60" />>
+          <el-table-column label="头像" min-width="100">
+            <template #default="{ row }">
+              <el-avatar :size="50" :src="row.avatar"></el-avatar>
+            </template>
+          </el-table-column>
+          <el-table-column label="姓名" prop="name" min-width="100" />
+          <el-table-column label="联系方式" prop="account" min-width="130" />
+          <el-table-column
+            label="隶属公司"
+            prop="company.company_name"
+            min-width="120"
+            align="center"
+          >
+            <template #default="{ row }">
+              {{ row.company.company_name || "/" }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="所在乡镇"
+            prop="street_name"
+            min-width="120"
+          />
+          <el-table-column label="授权身份" prop="role_name" min-width="120" />
+          <el-table-column
+            label="是否签约"
+            prop="is_contract"
+            align="center"
+            min-width="120"
+          >
+            <template #default="{ row }">
+              <span v-if="row.is_contract == 1" style="color: #67c23a"
+                >已签约</span
+              >
+              <span v-else style="color: #fe0000">未签约</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="最近登录时间"
+            prop="login_time"
+            min-width="180"
+          />
+          <el-table-column
+            label="创建时间"
+            prop="create_time"
+            min-width="180"
+            align="center"
+          />
+          <el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
+        </el-table>
+      </div>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script lang="ts" setup name="companyLists">
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import { apiCompanyLists, apiCompanyDelete } from "@/api/company";
+import { defineEmits } from "vue";
+import { adminLists } from "@/api/perms/admin";
+
+// 查询条件
+const queryParams = reactive({
+  level_two: "",
+  level_one: "",
+  company_name: "",
+  organization_code: "",
+  city: "",
+  area: "",
+  street: "",
+  company_type: "",
+  master_name: "",
+  master_position: "",
+  master_phone: "",
+  master_email: "",
+  other_contacts: "",
+  area_manager: "",
+  is_contract: "",
+  account: "",
+  password: "",
+  deposit: "",
+  deposit_time: "",
+  qualification: "",
+  status: "",
+});
+
+// 选中数据
+const emits = defineEmits(["customEvent"]);
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+  emits("customEvent", value);
+};
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+  fetchFun: adminLists,
+  params: queryParams,
+});
+
+getLists();
+</script>

src/views/examined/editCate.vue

@@ -0,0 +1,126 @@
+<template>
+  <div class="edit-popup">
+    <popup
+      ref="popupRef"
+      :title="popupTitle"
+      :async="true"
+      width="550px"
+      @confirm="handleSubmit"
+      @close="handleClose"
+    >
+      <el-form ref="formRef" :model="formData" label-width="84px">
+        <el-col class="pt-6 !border-none">
+          <el-row>
+            <el-col>
+              <el-form-item label="名称" prop="title">
+                <el-input
+                  v-model="formData.title"
+                  placeholder="请输入名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col>
+              <el-form-item label="标识" prop="name">
+                <el-input
+                  v-model="formData.name"
+                  placeholder="请输入审批类型标识"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col>
+              <el-form-item label="图标" prop="icon">
+                <el-input
+                  v-model="formData.icon"
+                  placeholder="请输入审批类型图标"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-form>
+    </popup>
+  </div>
+</template>
+
+<script lang="ts" setup name="flowTypeEdit">
+import type { FormInstance } from "element-plus";
+import Popup from "@/components/popup/index.vue";
+import { apiCateCreat } from "@/api/examined";
+import { timeFormat } from "@/utils/util";
+import type { PropType } from "vue";
+defineProps({
+  dictData: {
+    type: Object as PropType<Record<string, any[]>>,
+    default: () => ({}),
+  },
+});
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+
+// 弹窗标题
+const popupTitle = computed(() => {
+  return mode.value == "edit" ? "编辑审批类型" : "新增审批类型";
+});
+
+// 表单数据
+const formData = reactive({
+  id: "",
+  type: "",
+  title: "",
+  name: "",
+  icon: "",
+  department_ids: "",
+  status: "",
+});
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+  for (const key in formData) {
+    if (data[key] != null && data[key] != undefined) {
+      //@ts-ignore
+      formData[key] = data[key];
+    }
+  }
+};
+
+const getDetail = async (row: Record<string, any>) => {
+  const data = await apiFlowTypeDetail({
+    id: row.id,
+  });
+  setFormData(data);
+};
+
+// 提交按钮
+const handleSubmit = async () => {
+  const data = { ...formData };
+  mode.value == "edit" ? await apiCateCreat(data) : await apiCateCreat(data);
+  popupRef.value?.close();
+  emit("success");
+};
+
+//打开弹窗
+const open = (type = "add") => {
+  mode.value = type;
+  popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+  emit("close");
+};
+
+defineExpose({
+  open,
+  setFormData,
+  getDetail,
+});
+</script>

src/views/examined/editFlow.vue

@@ -0,0 +1,373 @@
+<template>
+  <div class="edit-popup">
+    <popup
+      ref="popupRef"
+      :title="popupTitle"
+      :async="true"
+      width="80vw"
+      @confirm="handleSubmit"
+      @close="handleClose"
+    >
+      <el-form ref="formRef" :model="formData" :rules="formRules">
+        <el-col>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="审批流名称" prop="name">
+                <el-input
+                  v-model="formData.name"
+                  clearable
+                  placeholder="请输入审批流名称"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="应用模块" prop="type">
+                <el-select
+                  v-model="formData.type"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                  <el-option label="假勤" value="1"></el-option>
+                  <el-option label="行政" value="2"></el-option>
+                  <el-option label="财务" value="3"></el-option>
+                  <el-option label="人事" value="3"></el-option>
+                  <el-option label="其他" value="3"></el-option>
+                  <el-option label="报销" value="3"></el-option>
+                  <el-option label="发票" value="3"></el-option>
+                  <el-option label="合同" value="3"></el-option>
+                </el-select> </el-form-item
+            ></el-col>
+            <el-col :span="8">
+              <el-form-item label="审批类型" prop="flow_cate">
+                <el-select
+                  v-model="formData.flow_cate"
+                  placeholder="审批类型"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                  <el-option label="8" value="1"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col>
+              <el-form-item label="流程说明" prop="remark">
+                <el-input
+                  v-model="formData.remark"
+                  clearable
+                  type="textarea"
+                  placeholder="请输入流程说明"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item
+            label="流程类型"
+            prop="check_type"
+            clearable
+            :style="{ width: '100%' }"
+          >
+            <!-- <el-select v-model="formData.check_type">
+              <el-option label="固定审批" value="1"></el-option>
+              <el-option label="授权审批人" value="2"></el-option>
+              <el-option label="可回退审批" value="3"></el-option>
+            </el-select>  -->
+            <el-radio-group
+              v-model="formData.flow_detail.type"
+              @change="checkTypeFn"
+            >
+              <el-radio :label="1">固定审批</el-radio>
+              <el-radio :label="2">授权审批人</el-radio>
+              <el-radio :label="3">可回退审批 </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <p v-if="formData.flow_detail.type == 1">
+          <el-row v-for="(item, index) in formData.flow_detail.step">
+            <el-col :span="12">
+              <el-form-item label="审批流程">
+                <el-select
+                  v-model="formData.flow_detail.step[index].type"
+                  placeholder="审批类型"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                  <el-option label="当前部门负责人" value="1"></el-option>
+                  <el-option label="上一级部门负责人" value="2"></el-option>
+                  <el-option label="指定人员(多人或签)" value="3"></el-option>
+                  <el-option label="指定人员(多人会签)" value="4"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="item.type == '3' || item.type == '4'">
+              <el-form-item label="指定人员">
+                <el-input
+                  clearable
+                  v-model="item.user.name"
+                  placeholder="指定人员"
+                  @click="test(index)"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-col :span="24">
+            <el-form-item prop="field126">
+              <el-button
+                type="primary"
+                @click="
+                  formData.flow_detail.step.push({
+                    type: '',
+                    user: [{ id: '', name: '' }],
+                  })
+                "
+                >其他联系人</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </p>
+        <el-row v-if="formData.flow_detail.type == 2">
+          <el-col :span="12"> 无需审批 </el-col>
+        </el-row>
+
+        <p v-if="formData.flow_detail.type == 3">
+          <el-row v-for="(item, index) in formData.flow_detail.step">
+            <el-col :span="12">
+              <el-form-item label="审批流程" prop="copy_uids">
+                <el-input
+                  v-model="item.type"
+                  clearable
+                  placeholder="请输入流程名称"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="指定人员">
+                <el-input
+                  v-model="item.user.name"
+                  @click="test(index)"
+                  clearable
+                  placeholder="指定人员"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-col :span="24">
+            <el-form-item prop="field126">
+              <el-button
+                type="primary"
+                @click="
+                  formData.flow_detail.step.push({
+                    type: '',
+                    user: [{ id: '', name: '' }],
+                  })
+                "
+                >其他联系人</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </p>
+
+        <el-form-item label="抄送人ID" prop="copy_unames">
+          <el-input
+            v-model="formData.copy_to[0].name"
+            clearable
+            @click="isCompany = true"
+            placeholder="请输入抄送人"
+          />
+        </el-form-item>
+
+        <!-- <el-form-item label="创建人ID" prop="admin_id">
+          <el-input
+            v-model="formData.admin_id"
+            clearable
+            placeholder="请输入创建人ID"
+          />
+        </el-form-item> -->
+        <!-- <el-form-item label="状态 1启用，0禁用" prop="status">
+          <el-select v-model="formData.status">
+            <el-option label="启用" value="1"></el-option>
+            <el-option label="禁用" value="2"></el-option>
+          </el-select>
+        </el-form-item> -->
+        <!-- <el-form-item label="删除人ID" prop="delete_user_id">
+          <el-input
+            v-model="formData.delete_user_id"
+            clearable
+            placeholder="请输入删除人ID"
+          />
+        </el-form-item> -->
+      </el-form>
+    </popup>
+    <el-dialog v-model="isCompany" title="选择签约方" width="60%">
+      <DialogIndex @customEvent="customEvent" />
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts" setup name="flowEdit">
+import type { FormInstance } from "element-plus";
+import Popup from "@/components/popup/index.vue";
+import { apiFlowCreat, apiFlowDetil } from "@/api/examined";
+import { timeFormat } from "@/utils/util";
+import DialogIndex from "./dialog_index.vue";
+import type { PropType } from "vue";
+defineProps({
+  dictData: {
+    type: Object as PropType<Record<string, any[]>>,
+    default: () => ({}),
+  },
+});
+const isCompany = ref(false);
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+
+// 弹窗标题
+const popupTitle = computed(() => {
+  return mode.value == "edit" ? "编辑审批流程表" : "新增审批流程表";
+});
+
+// 表单数据
+const formData = reactive({
+  //   flow_detail: {
+  //     type: 1,
+  //     layer: [
+  //       { type: 1 },
+  //       { type: 3, user: [{ id: 1, name: "sdf" }] },
+  //       { name: "看见对方" },
+  //     ],
+  //   },
+
+  id: "",
+  name: "4444",
+  check_type: 1,
+  type: "1",
+  flow_cate: "6",
+  remark: "666666",
+  //   admin_id: "",
+  flow_detail: {
+    type: 1,
+    step: [{ type: "", user: [{ id: "", name: "" }] }],
+  },
+  //   flowType: [""],
+  //   flowUnamesA: [""],
+  //   flowUidsA: [],
+  //   flowName: [""],
+  //   flowUnamesB: [""],
+  //   flowUidsB: [],
+  copy_to: [{ id: "", name: "4524545" }],
+});
+//单选框改变时清空单选下的表单数据
+const checkTypeFn = () => {
+  formData.flow_detail.step = [{ type: "", user: [{ id: "", name: "" }] }];
+};
+// 表单验证
+const formRules = reactive<any>({
+  name: [
+    {
+      required: true,
+      message: "请输入审批流名称",
+      trigger: ["blur"],
+    },
+  ],
+  check_type: [
+    {
+      required: true,
+      message: "请输入1固定审批,2授权审批人",
+      trigger: ["blur"],
+    },
+  ],
+  type: [
+    {
+      required: true,
+      message: "请输入应用模块,1假勤,2行政,3财务,4人事,5其他,6报销,7发票,8合同",
+      trigger: ["blur"],
+    },
+  ],
+  flow_cate: [
+    {
+      required: true,
+      message: "请输入应用审批类型id",
+      trigger: ["blur"],
+    },
+  ],
+
+  remark: [
+    {
+      required: true,
+      message: "请输入流程说明",
+      trigger: ["blur"],
+    },
+  ],
+});
+// dialog弹出框选择时i=-1代表抄送人,其余为flow_detail的step下标
+let i = -1;
+const test = (index: number) => {
+  isCompany.value = true;
+  i = index;
+};
+function customEvent(data: any) {
+  isCompany.value = false;
+  if (i == -1) {
+    formData.copy_to[0].id = data.id;
+    formData.copy_to[0].name = data.name;
+  } else {
+    formData.flow_detail.step[i].user.id = data.id;
+    formData.flow_detail.step[i].user.name = data.name;
+  }
+  i = -1;
+}
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+  let res = await apiFlowDetil(data.id);
+
+  for (const key in formData) {
+    if (data[key] != null && data[key] != undefined) {
+      //@ts-ignore
+      formData[key] = res[key];
+    }
+  }
+  console.log(formData);
+};
+
+const getDetail = async (row: Record<string, any>) => {
+  const data = await apiFlowDetail({
+    id: row.id,
+  });
+  setFormData(data);
+};
+const a = {};
+// 提交按钮
+const handleSubmit = async () => {
+  console.log(formData);
+  await formRef.value?.validate();
+  mode.value == "edit"
+    ? await apiFlowCreat(formData)
+    : await apiFlowCreat(formData);
+  popupRef.value?.close();
+  emit("success");
+};
+
+//打开弹窗
+const open = (type = "add") => {
+  mode.value = type;
+  popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+  emit("close");
+};
+
+defineExpose({
+  open,
+  setFormData,
+  getDetail,
+});
+</script>

src/views/examined/examinedCate.vue

@@ -0,0 +1,149 @@
+<template>
+  <div>
+    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+      <el-button v-perms="['flow_type/add']" type="primary" @click="handleAdd">
+        <template #icon>
+          <icon name="el-icon-Plus" />
+        </template>
+        新增
+      </el-button>
+      <!-- <el-button
+        v-perms="['flow_type/delete']"
+        :disabled="!selectData.length"
+        @click="handleDelete(selectData)"
+      >
+        删除
+      </el-button> -->
+      <div class="mt-4">
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+          {{ pager }}
+          <el-table-column
+            label="id"
+            prop="id"
+            show-overflow-tooltip
+            width="60"
+          />
+          <el-table-column label="名称" prop="title" show-overflow-tooltip />
+          <el-table-column
+            label="应用部门"
+            prop="department"
+            show-overflow-tooltip
+          />
+          <el-table-column label="标识" prop="name" show-overflow-tooltip />
+          <el-table-column label="图标" prop="icon" show-overflow-tooltip />
+          <el-table-column
+            label="所属分类"
+            prop="type_name"
+            show-overflow-tooltip
+          />
+          <el-table-column label="状态" prop="status" show-overflow-tooltip>
+            <template #default="{ row }">
+              <span v-if="row.status == 1" style="color: #67c23a">正常</span>
+              <span v-else style="color: #fe0000">禁用</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="auto"
+            fixed="right"
+          >
+            <template #default="{ row }">
+              <el-button
+                v-perms="['flow/edit']"
+                type="primary"
+                link
+                @click="handleEdit(row)"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-perms="['flow/delete']"
+                type="danger"
+                link
+                @click="handleDelete(row.id)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+    <edit-popup
+      v-if="showEdit"
+      ref="editRef"
+      :dict-data="dictData"
+      @success="getLists"
+      @close="showEdit = false"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup name="flowTypeLists">
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import { apiCateLists } from "@/api/examined";
+import { timeFormat } from "@/utils/util";
+import feedback from "@/utils/feedback";
+// import { getRoutePath } from "router";
+import EditPopup from "./editCate.vue";
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>();
+// 是否显示编辑框
+const showEdit = ref(false);
+
+// 查询条件
+const queryParams = reactive({
+  type: "",
+  title: "",
+  name: "",
+  icon: "",
+  department_ids: "",
+  status: "",
+});
+
+// 选中数据
+const selectData = ref<any[]>([]);
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+  selectData.value = val.map(({ id }) => id);
+};
+
+// 获取字典数据
+const { dictData } = useDictData("");
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+  fetchFun: apiCateLists,
+  params: queryParams,
+});
+
+// 添加
+const handleAdd = async () => {
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("add");
+};
+
+// 编辑
+const handleEdit = async (data: any) => {
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("edit");
+  editRef.value?.setFormData(data);
+};
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+  await feedback.confirm("确定要删除？");
+  await apiFlowTypeDelete({ id });
+  getLists();
+};
+
+getLists();
+</script>

src/views/examined/examinedFlow.vue

@@ -0,0 +1,228 @@
+<template>
+  <div>
+    <!-- <el-card class="!border-none mb-4" shadow="never">
+            <el-form
+                class="mb-[-16px]"
+                :model="queryParams"
+                inline
+            >
+                <el-form-item label="审批流名称" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入审批流名称" />
+                </el-form-item>
+                <el-form-item label="1固定审批,2授权审批人" prop="check_type">
+                    <el-input class="w-[280px]" v-model="queryParams.check_type" clearable placeholder="请输入1固定审批,2授权审批人" />
+                </el-form-item>
+                <el-form-item label="应用模块,1假勤,2行政,3财务,4人事,5其他,6报销,7发票,8合同" prop="type">
+                    <el-input class="w-[280px]" v-model="queryParams.type" clearable placeholder="请输入应用模块,1假勤,2行政,3财务,4人事,5其他,6报销,7发票,8合同" />
+                </el-form-item>
+                <el-form-item label="应用审批类型id" prop="flow_cate">
+                    <el-input class="w-[280px]" v-model="queryParams.flow_cate" clearable placeholder="请输入应用审批类型id" />
+                </el-form-item>
+                <el-form-item label="应用部门ID（0为全部）1,2,3" prop="department_ids">
+                    <el-input class="w-[280px]" v-model="queryParams.department_ids" clearable placeholder="请输入应用部门ID（0为全部）1,2,3" />
+                </el-form-item>
+                <el-form-item label="抄送人ID" prop="copy_uids">
+                    <el-input class="w-[280px]" v-model="queryParams.copy_uids" clearable placeholder="请输入抄送人ID" />
+                </el-form-item>
+                <el-form-item label="流程说明" prop="remark">
+                    <el-input class="w-[280px]" v-model="queryParams.remark" clearable placeholder="请输入流程说明" />
+                </el-form-item>
+                <el-form-item label="流程数据序列化" prop="flow_list">
+                    <el-input class="w-[280px]" v-model="queryParams.flow_list" clearable placeholder="请输入流程数据序列化" />
+                </el-form-item>
+                <el-form-item label="创建人ID" prop="admin_id">
+                    <el-input class="w-[280px]" v-model="queryParams.admin_id" clearable placeholder="请输入创建人ID" />
+                </el-form-item>
+                <el-form-item label="状态 1启用，0禁用" prop="status">
+                    <el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入状态 1启用，0禁用" />
+                </el-form-item>
+                <el-form-item label="删除人ID" prop="delete_user_id">
+                    <el-input class="w-[280px]" v-model="queryParams.delete_user_id" clearable placeholder="请输入删除人ID" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card> -->
+    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+      <el-button v-perms="['flow/add']" type="primary" @click="handleAdd">
+        <template #icon>
+          <icon name="el-icon-Plus" />
+        </template>
+        新增
+      </el-button>
+      <!-- <el-button
+                v-perms="['flow/delete']"
+                :disabled="!selectData.length"
+                @click="handleDelete(selectData)"
+            >
+                删除
+            </el-button> -->
+      <div class="mt-4">
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" />
+          <el-table-column
+            label="审批流名称"
+            prop="name"
+            show-overflow-tooltip
+          />
+          <!-- <el-table-column label="1固定审批,2授权审批人" prop="check_type" show-overflow-tooltip /> -->
+          <el-table-column label="应用模块" prop="type" show-overflow-tooltip>
+            <template #default="{ row }">
+              <span v-if="row.type == 1">假勤</span>
+              <span v-if="row.type == 2">行政</span>
+              <span v-if="row.type == 3">财务</span>
+              <span v-if="row.type == 4">人事</span>
+              <span v-if="row.type == 5">其他</span>
+              <span v-if="row.type == 6">报销</span>
+              <span v-if="row.type == 7">发票</span>
+              <span v-if="row.type == 8">合同</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="应用审批类型id"
+            prop="flow_cate"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="应用部门"
+            prop="department"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            label="抄送人ID"
+            prop="copy_uids"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="流程说明"
+            prop="remark"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="流程数据序列化"
+            prop="flow_list"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="创建人ID"
+            prop="admin_id"
+            show-overflow-tooltip
+          />
+          <el-table-column label="状态" prop="status" show-overflow-tooltip>
+            <template #default="{ row }">
+              <span v-if="row.status == 1">启用</span>
+              <span v-if="row.status == 0">禁用</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="删除人ID"
+            prop="delete_user_id"
+            show-overflow-tooltip
+          />
+          <el-table-column label="操作" width="120" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                v-perms="['flow/edit']"
+                type="primary"
+                link
+                @click="handleEdit(row)"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-perms="['flow/delete']"
+                type="danger"
+                link
+                @click="handleDelete(row.id)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+    <edit-popup
+      v-if="showEdit"
+      ref="editRef"
+      :dict-data="dictData"
+      @success="getLists"
+      @close="showEdit = false"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup name="flowLists">
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import { apiFlowLists, apiFlowDetil } from "@/api/examined";
+import { timeFormat } from "@/utils/util";
+import feedback from "@/utils/feedback";
+import EditPopup from "./editFlow.vue";
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>();
+// 是否显示编辑框
+const showEdit = ref(false);
+
+// 查询条件
+const queryParams = reactive({
+  name: "",
+  check_type: "",
+  type: "",
+  flow_cate: "",
+  department_ids: "",
+  copy_uids: "",
+  remark: "",
+  flow_list: "",
+  admin_id: "",
+  status: "",
+  delete_user_id: "",
+});
+
+// 选中数据
+const selectData = ref<any[]>([]);
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+  selectData.value = val.map(({ id }) => id);
+};
+
+// 获取字典数据
+const { dictData } = useDictData("");
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+  fetchFun: apiFlowLists,
+  params: queryParams,
+});
+
+// 添加
+const handleAdd = async () => {
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("add");
+};
+
+// 编辑
+const handleEdit = async (data: any) => {
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("edit");
+  editRef.value?.setFormData(data);
+};
+
+// 删除
+// const handleDelete = async (id: number | any[]) => {
+//   await feedback.confirm("确定要删除？");
+//   await apiFlowDelete({ id });
+//   getLists();
+// };
+
+getLists();
+</script>

src/views/permission/admin/edit.vue

@@ -166,14 +166,14 @@
 
         <el-col :span="24" style="margin-top: 1vh">
           <el-row>
-            <!-- <el-col :span="12" v-if="userStore.userInfo.root == 0"> -->
+            <el-col :span="12">
-            <el-col :span="12" v-if="true">
               <el-form-item label="授权身份" prop="role_id">
                 <el-select
                   v-model="formData.role_id"
                   :disabled="formData.root == 1 || isCheck"
                   placeholder="请选择授权身份"
                   :style="{ width: '100%' }"
+                  @change="role_change"
                   clearable
                 >
                   <el-option
@@ -190,31 +190,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" v-else>
+            <el-col :span="12" v-if="disabledPartyA">
-              <el-form-item label="授权身份" prop="role_id">
-                <el-select
-                  v-model="formData.role_id"
-                  :disabled="formData.root == 1 || isCheck"
-                  placeholder="请选择授权身份"
-                  :style="{ width: '100%' }"
-                  clearable
-                >
-                  <el-option
-                    v-if="formData.root == 1"
-                    label="系统管理员"
-                    :value="0"
-                  />
-                  <el-option
-                    v-for="(item, index) in optionsData.role"
-                    :key="index"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :span="12" v-if="userStore.userInfo.root == 0"> -->
-            <el-col :span="12" v-if="true">
               <el-form-item label="签约方" prop="field130">
                 <el-input
                   :disabled="isCheck"
@@ -223,6 +199,7 @@
                   clearable
                   :style="{ width: '100%' }"
                   @click="isCompany = true"
+                  @clear="clearPartyA"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -354,8 +331,7 @@
             </el-form-item>
           </div>
         </div>
-        <!-- <template v-if="userStore.userInfo.root == 0"> -->
+        <template v-if="disabledPartyA">
-        <template v-if="true">
           <el-col :span="24">
             <el-row>
               <el-col :span="12">
@@ -376,7 +352,7 @@
                     :disabled="true"
                     clearable
                     :style="{ width: '100%' }"
-                    :value="formData.sex == '1' ? '男' : '女'"
+                    :value="formData.sex == 1 ? '男' : '女'"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -403,7 +379,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12" v-if="formData.name">
-                <el-form-item label="账号" prop="account">
+                <el-form-item label="账号">
                   <el-input
                     v-model="formData.account"
                     :disabled="true"
@@ -413,9 +389,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12" v-if="formData.name">
-                <el-form-item label="密码" prop="password">
+                <el-form-item label="初始密码" prop="password">
                   <el-input
-                    v-model="formData.account"
+                    :model-value="'m' + formData.account"
                     :disabled="true"
                     clearable
                     :style="{ width: '100%' }"
@@ -444,11 +420,11 @@
               </el-col>
             </el-row>
           </el-col>
-          <el-col :span="24" v-if="!isCheck">
+          <el-col :span="24" v-if="!isCheck && mode != 'view'">
             <el-form-item label="合同上传" prop="field127">
               <el-upload
                 :headers="{ Token: userStore.token }"
-                v-model="formData.file"
+                v-model:file-list="fileList"
                 class="upload-demo"
                 action="https://worker-task.lihaink.cn/adminapi/upload/file"
                 :on-success="handleAvatarSuccess_four"
@@ -459,6 +435,16 @@
               </el-upload>
             </el-form-item>
           </el-col>
+          <el-col :span="24" v-if="mode == 'view'">
+            <el-form-item label="合同地址">
+              <el-link
+                type="success"
+                :href="formData.contract.url"
+                target="_blank"
+                >在线查看</el-link
+              >
+            </el-form-item>
+          </el-col>
         </template>
       </el-form>
     </popup>
@@ -468,7 +454,12 @@
   </div>
 </template>
 <script lang="ts" setup>
-import type { FormInstance, UploadProps } from "element-plus";
+import type {
+  FormInstance,
+  UploadProps,
+  ElMessage,
+  UploadUserFile,
+} from "element-plus";
 import Popup from "@/components/popup/index.vue";
 import { useDictOptions } from "@/hooks/useDictOptions";
 import { adminAdd, adminDetail, adminEdit } from "@/api/perms/admin";
@@ -484,6 +475,7 @@ import {
 import { dictDataLists } from "@/api/setting/dict";
 import DialogIndex from "./dialog_index.vue";
 import useUserStore from "@/stores/modules/user";
+const disabledPartyA = ref(true);
 const isCheck = ref(false);
 const isCheckFn = (flag: boolean) => {
   isCheck.value = flag;
@@ -525,6 +517,10 @@ const formData = reactive({
   avatar: "",
   multipoint_login: 1,
   root: 0,
+  disable: 0,
+  contract: {
+    url: "",
+  },
 });
 // 字典信息
 const datas: any = reactive({
@@ -549,6 +545,10 @@ function customEvent(data: any) {
   formData.party_a = data.id;
   formData.party_a_name = data.company_name;
 }
+function clearPartyA() {
+  formData.party_a = "";
+  formData.party_a_name = "";
+}
 // 表单验证
 // 手机号校验
 const ValidatorPhone = (rule: object, value: string, callback: any) => {
@@ -585,6 +585,14 @@ const ValidatorBankcardB = (rule: object, value: string, callback: any) => {
     ? callback()
     : callback(new Error("请输入银行卡反面"));
 };
+function role_change(e: any) {
+  if (e == 8) {
+    disabledPartyA.value = false;
+    formData.party_a = "";
+  } else {
+    disabledPartyA.value = true;
+  }
+}
 const formRules = reactive({
   account: [
     {
@@ -607,6 +615,7 @@ const formRules = reactive({
       trigger: ["blur"],
     },
   ],
+
   name: [
     {
       required: true,
@@ -681,36 +690,60 @@ const handleSubmit = async () => {
 const open = (type = "add") => {
   mode.value = type;
   popupRef.value?.open();
+  if (type == "view") {
+    isCheck.value = true;
+  }
 };
+const fileList = ref<UploadUserFile[]>([]);
 // 图片上传成功返回的url
 const handleAvatarSuccessIdA: UploadProps["onSuccess"] = (
   response,
   uploadFile
 ) => {
+  if (response.code == 0) {
+    ElMessage.error(response.msg);
+    return;
+  }
   formData.qualification.id_card = response.data.uri;
 };
 const handleAvatarSuccessAvatar: UploadProps["onSuccess"] = (
   response,
   uploadFile
 ) => {
+  if (response.code == 0) {
+    ElMessage.error(response.msg);
+    return;
+  }
   formData.avatar = response.data.uri;
 };
 const handleAvatarSuccessIdB: UploadProps["onSuccess"] = (
   response,
   uploadFile
 ) => {
+  if (response.code == 0) {
+    ElMessage.error(response.msg);
+    return;
+  }
   formData.qualification.id_card_b = response.data.uri;
 };
 const handleAvatarSuccessCarA: UploadProps["onSuccess"] = (
   response,
   uploadFile
 ) => {
+  if (response.code == 0) {
+    ElMessage.error(response.msg);
+    return;
+  }
   formData.qualification.car_card = response.data.uri;
 };
 const handleAvatarSuccessCarB: UploadProps["onSuccess"] = (
   response,
   uploadFile
 ) => {
+  if (response.code == 0) {
+    ElMessage.error(response.msg);
+    return;
+  }
   formData.qualification.car_card_b = response.data.uri;
 };
 const beforeAvatarUpload_two: UploadProps["beforeUpload"] = (rawFile) => {
@@ -720,19 +753,34 @@ const handleAvatarSuccessBankA: UploadProps["onSuccess"] = (
   response,
   uploadFile
 ) => {
+  if (response.code == 0) {
+    ElMessage.error(response.msg);
+    return;
+  }
   formData.qualification.bank_account = response.data.uri;
 };
 const handleAvatarSuccessBankB: UploadProps["onSuccess"] = (
   response,
   uploadFile
 ) => {
+  if (response.code == 0) {
+    ElMessage.error(response.msg);
+    return;
+  }
   formData.qualification.bank_account_b = response.data.uri;
 };
 const handleAvatarSuccess_four: UploadProps["onSuccess"] = (
   response,
   uploadFile
 ) => {
+  if (response.code == 0) {
+    ElMessage.error(response.msg);
+    return;
+  }
   formData.file = response.data.uri;
+
+  fileList.value[0].url = response.data.uri;
+  fileList.value[0].name = "合同文件";
 };
 const beforeAvatarUpload_three: UploadProps["beforeUpload"] = (rawFile) => {
   return true;
@@ -787,11 +835,17 @@ const setFormData = async (row: any) => {
   formData.party_a_name = data.contract.party_a_name;
   formData.party_a = data.contract.party_a;
   formData.file = data.contract.file;
+  if (data.role_id[0] == 8) {
+    disabledPartyA.value = false;
+  }
+  fileList.value[0] = {
+    url: data["contract"]["file"],
+    name: "合同文件",
+  };
   await getCityList();
   await getAreaList();
   await getStreetList();
 };
-
 const handleClose = () => {
   emit("close");
 };

src/views/permission/admin/index.vue

@@ -1,322 +1,307 @@
 <template>
-  <div class="admin">
+    <div class="admin">
-    <el-card class="!border-none" shadow="never">
+        <el-card class="!border-none" shadow="never">
-      <el-form class="mb-[-16px]" :model="formData" inline>
+            <el-form class="mb-[-16px]" :model="formData" inline>
-        <el-form-item label="管理员名称">
+                <el-form-item label="管理员名称">
-          <el-input
+                    <el-input
-            v-model="formData.name"
+                        v-model="formData.name"
-            class="w-[280px]"
+                        class="w-[280px]"
-            clearable
+                        clearable
-            @keyup.enter="resetPage"
+                        @keyup.enter="resetPage"
-          />
+                    />
-        </el-form-item>
+                </el-form-item>
-        <el-form-item label="管理员角色">
+                <el-form-item label="管理员角色">
-          <el-select class="w-[280px]" v-model="formData.role_id">
+                    <el-select class="w-[280px]" v-model="formData.role_id">
-            <el-option label="全部" value />
+                        <el-option label="全部" value />
-            <el-option
+                        <el-option
-              v-for="(item, index) in optionsData.role"
+                            v-for="(item, index) in optionsData.role"
-              :key="index"
+                            :key="index"
-              :label="item.name"
+                            :label="item.name"
-              :value="item.id"
+                            :value="item.id"
-            />
+                        />
-          </el-select>
+                    </el-select>
-        </el-form-item>
+                </el-form-item>
-        <el-form-item>
+                <el-form-item>
-          <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
-          <el-button @click="resetParams">重置</el-button>
+                    <el-button @click="resetParams">重置</el-button>
-          <export-data
+                    <export-data
-            class="ml-2.5"
+                        class="ml-2.5"
-            :fetch-fun="adminLists"
+                        :fetch-fun="adminLists"
-            :params="formData"
+                        :params="formData"
-            :page-size="pager.size"
+                        :page-size="pager.size"
-          />
+                    />
-        </el-form-item>
+                </el-form-item>
-      </el-form>
+            </el-form>
-    </el-card>
+        </el-card>
-    <el-card v-loading="pager.loading" class="mt-4 !border-none" shadow="never">
+        <el-card v-loading="pager.loading" class="mt-4 !border-none" shadow="never">
-      <el-button v-perms="['auth.admin/add']" type="primary" @click="handleAdd">
+            <el-button v-perms="['auth.admin/add']" type="primary" @click="handleAdd">
-        <template #icon>
+                <template #icon>
-          <icon name="el-icon-Plus" />
+                    <icon name="el-icon-Plus" />
-        </template>
+                </template>
-        新增
+                新增
-      </el-button>
+            </el-button>
-      <div class="mt-4">
+            <div class="mt-4">
-        <el-table :data="pager.lists" size="large">
+                <el-table :data="pager.lists" size="large">
-          <el-table-column label="ID" prop="id" min-width="60" />>
+                    <el-table-column label="ID" prop="id" min-width="60" />>
-          <el-table-column label="头像" min-width="100">
+                    <el-table-column label="头像" min-width="100">
-            <template #default="{ row }">
+                        <template #default="{ row }">
-              <el-avatar :size="50" :src="row.avatar"></el-avatar>
+                            <el-avatar :size="50" :src="row.avatar"></el-avatar>
-            </template>
+                        </template>
-          </el-table-column>
+                    </el-table-column>
-          <el-table-column label="姓名" prop="name" min-width="100" />
+                    <el-table-column label="姓名" prop="name" min-width="100" />
-          <el-table-column label="联系方式" prop="account" min-width="130" />
+                    <el-table-column label="联系方式" prop="account" min-width="130" />
-          <el-table-column
+                    <el-table-column
-            label="隶属公司"
+                        label="隶属公司"
-            prop="company.company_name"
+                        prop="company.company_name"
-            min-width="120"
+                        min-width="120"
-            align="center"
+                        align="center"
-          >
+                    >
-            <template #default="{ row }">
+                        <template #default="{ row }">
-              {{ row.company.company_name || "/" }}
+                            {{ row.company.company_name || '/' }}
-            </template>
+                        </template>
-          </el-table-column>
+                    </el-table-column>
-          <el-table-column
+                    <el-table-column label="所在乡镇" prop="street_name" min-width="120" />
-            label="所在乡镇"
+                    <el-table-column label="授权身份" prop="role_name" min-width="120" />
-            prop="street_name"
+                    <el-table-column
-            min-width="120"
+                        label="是否签约"
-          />
+                        prop="is_contract"
-          <el-table-column label="授权身份" prop="role_name" min-width="120" />
+                        align="center"
-          <el-table-column
+                        min-width="120"
-            label="是否签约"
+                    >
-            prop="contract_id"
+                        <template #default="{ row }">
-            align="center"
+                            <span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
-            min-width="120"
+                            <span v-else style="color: #fe0000">未签约</span>
-          >
+                        </template>
-            <template #default="{ row }">
+                    </el-table-column>
-              {{ row.contract_id == 0 ? "未签约" : "已签约" }}
+                    <el-table-column label="最近登录时间" prop="login_time" min-width="180" />
-            </template>
+                    <el-table-column
-          </el-table-column>
+                        label="创建时间"
-          <el-table-column
+                        prop="create_time"
-            label="最近登录时间"
+                        min-width="180"
-            prop="login_time"
+                        align="center"
-            min-width="180"
+                    />
-          />
+                    <el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
-          <el-table-column
+                    <el-table-column label="账号状态" min-width="100" v-perms="['auth.admin/edit']">
-            label="创建时间"
+                        <template #default="{ row }">
-            prop="create_time"
+                            <el-switch
-            min-width="180"
+                                v-if="row.root != 1"
-            align="center"
+                                v-model="row.disable"
-          />
+                                :active-value="0"
-          <el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
+                                :inactive-value="1"
-          <el-table-column
+                                @change="changeStatus(row)"
-            label="账号状态"
+                            />
-            min-width="100"
+                        </template>
-            v-perms="['auth.admin/edit']"
+                    </el-table-column>
-          >
-            <template #default="{ row }">
-              <el-switch
-                v-if="row.root != 1"
-                v-model="row.disable"
-                :active-value="0"
-                :inactive-value="1"
-                @change="changeStatus(row)"
-              />
-            </template>
-          </el-table-column>
 
-          <el-table-column
+                    <el-table-column label="操作" width="330" align="center" fixed="right">
-            label="操作"
+                        <template #default="{ row }">
-            width="330"
+                            <div style="display: flex">
-            align="center"
+                                <el-button
-            fixed="right"
+                                    v-perms="['auth.admin/view']"
-          >
+                                    type="primary"
-            <template #default="{ row }">
+                                    link
-              <div style="display: flex">
+                                    @click="handleView(row)"
-                <el-button
+                                    >查看</el-button
-                  v-perms="['auth.admin/edit']"
+                                >
-                  type="primary"
+                                <el-button
-                  link
+                                    v-perms="['auth.admin/edit']"
-                  @click="handleCheck(row)"
+                                    type="primary"
-                  >查看</el-button
+                                    link
+                                    @click="handleEdit(row)"
+                                    >编辑</el-button
+                                >
+                                <el-button
+                                    v-if="row.root != 1"
+                                    v-perms="['auth.admin/delete']"
+                                    type="danger"
+                                    link
+                                    @click="handleDelete(row.id)"
+                                    >删除</el-button
+                                >
+                                <template v-if="row.company_id != 0 && row.is_contract == 0">
+                                    <el-button
+                                        v-perms="['auth.admin/Draftingcontracts']"
+                                        type="primary"
+                                        link
+                                        @click="
+                                            ;(showPop = true),
+                                                (showConctactPop = true),
+                                                (contractId = row.id)
+                                        "
+                                        >生成个人合同</el-button
+                                    >
+                                    <el-button
+                                        v-perms="['auth.admin/postsms']"
+                                        type="primary"
+                                        link
+                                        @click=";(showPop = true), (contractId = row.id)"
+                                        >重新短信</el-button
+                                    >
+                                </template>
+                            </div>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup
+            v-if="showEdit"
+            ref="editRef"
+            :isCheck="isCheck"
+            @success="getLists"
+            @close="showEdit = false"
+        />
+        <el-dialog v-model="showPop" @close="offPop">
+            <h1>重要提醒</h1>
+            <div class="content" v-if="showConctactPop">
+                请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
+            </div>
+            <div class="content" v-else>
+                确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
+            </div>
+            <p class="btn_menu">
+                <el-button type="primary" size="large" v-if="showConctactPop" @click="creContct"
+                    >确认创建</el-button
                 >
-                <el-button
+                <el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button>
-                  v-perms="['auth.admin/edit']"
+                <el-button type="info" size="large" @click="offPop">返回</el-button>
-                  type="primary"
+            </p>
-                  link
+        </el-dialog>
-                  @click="handleEdit(row)"
+    </div>
-                  >编辑</el-button
-                >
-                <el-button
-                  v-if="row.root != 1"
-                  v-perms="['auth.admin/delete']"
-                  type="danger"
-                  link
-                  @click="handleDelete(row.id)"
-                  >删除</el-button
-                >
-                <el-button
-                  v-perms="['company/edit', 'company/add']"
-                  type="primary"
-                  link
-                  @click="
-                    (showPop = true),
-                      (showConctactPop = true),
-                      (contractId = row.id)
-                  "
-                  >生成个人合同</el-button
-                >
-                <el-button
-                  v-perms="['company/edit', 'company/add']"
-                  type="primary"
-                  link
-                  @click="(showPop = true), (contractId = row.id)"
-                  >发送短信</el-button
-                >
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="flex mt-4 justify-end">
-        <pagination v-model="pager" @change="getLists" />
-      </div>
-    </el-card>
-    <edit-popup
-      v-if="showEdit"
-      ref="editRef"
-      @success="getLists"
-      @close="showEdit = false"
-    />
-    <el-dialog v-model="showPop" @close="offPop">
-      <h1>重要提醒</h1>
-      <div class="content" v-if="showConctactPop">
-        请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
-      </div>
-      <div class="content" v-else>
-        确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
-      </div>
-      <p class="btn_menu">
-        <el-button
-          type="primary"
-          size="large"
-          v-if="showConctactPop"
-          @click="creContct"
-          >确认创建</el-button
-        >
-        <el-button type="primary" size="large" v-else @click="sendMsg"
-          >确认</el-button
-        >
-        <el-button type="info" size="large" @click="offPop">返回</el-button>
-      </p>
-    </el-dialog>
-  </div>
 </template>
 
 <script lang="ts" setup name="admin">
-import {
+import { adminEdit, adminLists, adminDelete, generateGontract, sendMsgApi } from '@/api/perms/admin'
-  adminEdit,
+import { roleAll } from '@/api/perms/role'
-  adminLists,
+import { useDictOptions } from '@/hooks/useDictOptions'
-  adminDelete,
+import { usePaging } from '@/hooks/usePaging'
-  generateGontract,
+import feedback from '@/utils/feedback'
-  sendMsgApi,
+import EditPopup from './edit.vue'
-} from "@/api/perms/admin";
+const route = useRoute()
-import { roleAll } from "@/api/perms/role";
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-import { useDictOptions } from "@/hooks/useDictOptions";
-import { usePaging } from "@/hooks/usePaging";
-import feedback from "@/utils/feedback";
-import EditPopup from "./edit.vue";
-const editRef = shallowRef<InstanceType<typeof EditPopup>>();
 // 表单数据
 const formData = reactive({
-  name: "",
+    name: '',
-  role_id: "",
+    role_id: '',
-});
+    company_id: ''
-const contractId = ref("");
+})
+const contractId = ref('')
 // 弹窗
-const showPop = ref(false);
+const showPop = ref(false)
-const showConctactPop = ref(false);
+const showConctactPop = ref(false)
 const offPop = () => {
-  showPop.value = false;
+    showPop.value = false
-  showConctactPop.value = false;
+    showConctactPop.value = false
-};
+}
 const creContct = () => {
-  //   feedback.msgSuccess("复制成功");
+    //   feedback.msgSuccess("复制成功");
-  generateGontract({ id: contractId.value }).then(() => {
+    generateGontract({ id: contractId.value }).then(() => {
-    feedback.msgSuccess("发送成功");
+        feedback.msgSuccess('发送成功')
-  });
+    })
-  offPop();
+    offPop()
-};
+}
 const sendMsg = () => {
-  sendMsgApi({ id: contractId.value }).then((res) => {
+    sendMsgApi({ id: contractId.value }).then((res) => {
-    feedback.msgSuccess("发送成功");
+        feedback.msgSuccess('发送成功')
-  });
+    })
-  offPop();
+    offPop()
-};
+}
 //
-const showEdit = ref(false);
+const showEdit = ref(false)
 const { pager, getLists, resetParams, resetPage } = usePaging({
-  fetchFun: adminLists,
+    fetchFun: adminLists,
-  params: formData,
+    params: formData
-});
+})
 
 const changeStatus = (data: any) => {
-  adminEdit({
+    adminEdit({
-    id: data.id,
+        id: data.id,
-    account: data.account,
+        account: data.account,
-    name: data.name,
+        name: data.name,
-    role_id: data.role_id,
+        role_id: data.role_id,
-    disable: data.disable,
+        disable: data.disable,
-    multipoint_login: data.multipoint_login,
+        multipoint_login: data.multipoint_login
-  }).finally(() => {
+    }).finally(() => {
-    getLists();
+        getLists()
-  });
+    })
-};
+}
 // 查看
-// isCheckFn
+const isCheck = ref(false)
 const handleCheck = async (data: any) => {
-  showEdit.value = true;
+    isCheck.value = true
-  await nextTick();
+    showEdit.value = true
-  editRef.value?.open("edit");
+    await nextTick()
-  editRef.value?.isCheckFn(true);
+    editRef.value?.open('edit')
-  editRef.value?.setFormData(data);
+    editRef.value?.setFormData(data)
-};
+}
 const handleAdd = async () => {
-  showEdit.value = true;
+    isCheck.value = false
-  await nextTick();
+    showEdit.value = true
-  editRef.value?.isCheckFn(false);
+    await nextTick()
-  editRef.value?.open("add");
+    editRef.value?.open('add')
-};
+}
 
 const handleEdit = async (data: any) => {
-  showEdit.value = true;
+    isCheck.value = false
-  await nextTick();
+    showEdit.value = true
-  editRef.value?.isCheckFn(false);
+    await nextTick()
-  editRef.value?.open("edit");
+    editRef.value?.open('edit')
-  editRef.value?.setFormData(data);
+    editRef.value?.setFormData(data)
-};
+}
-
+const handleView = async (data: any) => {
+    isCheck.value = false
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('view')
+    editRef.value?.setFormData(data)
+}
 const handleDelete = async (id: number) => {
-  await feedback.confirm("确定要删除？");
+    await feedback.confirm('确定要删除？')
-  await adminDelete({ id });
+    await adminDelete({ id })
-  getLists();
+    getLists()
-};
+}
 
 const { optionsData } = useDictOptions<{
-  role: any[];
+    role: any[]
 }>({
-  role: {
+    role: {
-    api: roleAll,
+        api: roleAll
-  },
+    }
-});
+})
-
+if (route.query.company_id) {
+    formData.company_id = route.query.company_id?.toString()
+}
 onMounted(() => {
-  getLists();
+    getLists()
-});
+})
 </script>
 <style lang="scss" scoped>
 h1 {
-  text-align: center;
+    text-align: center;
-  font-weight: bold;
+    font-weight: bold;
-  font-size: 30px;
+    font-size: 30px;
-  color: red;
+    color: red;
-  margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 
 .content {
-  font-size: 20px;
+    font-size: 20px;
 }
 
 .info {
-  color: red;
+    color: red;
-  font-weight: bold;
+    font-weight: bold;
-  font-size: 18px;
+    font-size: 18px;
-  display: inline-block;
+    display: inline-block;
-  margin: 0 5px;
+    margin: 0 5px;
 }
 
 .btn_menu {
-  margin-top: 10vh;
+    margin-top: 10vh;
-  display: flex;
+    display: flex;
-  justify-content: space-around;
+    justify-content: space-around;
 }
 </style>