diff --git a/.gitignore b/.gitignore
index 365ba09..487e841 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
+.vscode
 .DS_Store
 dist
 dist-ssr
diff --git a/src/api/perms/admin.ts b/src/api/perms/admin.ts
index d1d0e7f..b0c611e 100644
--- a/src/api/perms/admin.ts
+++ b/src/api/perms/admin.ts
@@ -34,4 +34,4 @@ export function generateGontract(params: any) {
 // 发送短信
 export function sendMsgApi(params: any) {
     return request.get({ url: '/company/postsms', params })
-}
\ No newline at end of file
+}
diff --git a/src/views/company/dialog_index_personnel.vue b/src/views/company/dialog_index_personnel.vue
new file mode 100644
index 0000000..c094fdd
--- /dev/null
+++ b/src/views/company/dialog_index_personnel.vue
@@ -0,0 +1,83 @@
+<template>
+    <div>
+        <el-card class="!border-none" 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="请选择管理员角色" prop="role_id">
+                    <el-select class="w-[280px]" v-model="queryParams.role_id">
+            <el-option label="全部" value />
+            <el-option
+              v-for="(item, index) in optionsData.role"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+                </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" @cell-click="handleCurrentChange">
+          <el-table-column label="账号" prop="account" min-width="120" />
+          <el-table-column label="名称" prop="name" min-width="100" />
+          <el-table-column label="角色" prop="role_name" min-width="100" show-tooltip-when-overflow />
+          <el-table-column label="部门" prop="dept_name" min-width="100" show-tooltip-when-overflow />
+          <el-table-column label="创建时间" prop="create_time" min-width="180" />
+          <el-table-column label="最近登录时间" prop="login_time" min-width="180" />
+          <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 { roleAll } from "@/api/perms/role";
+import { useDictData,useDictOptions } from '@/hooks/useDictOptions'
+import { adminLists} from "@/api/perms/admin";
+import { defineEmits } from 'vue'
+const { optionsData } = useDictOptions<{
+  role: any[];
+}>({
+  role: {
+    api: roleAll,
+  },
+});
+// 查询条件
+const queryParams = reactive({
+    name: "",
+    role_id: "",
+})
+
+// 选中数据
+const emits = defineEmits(['customEvent'])
+
+// 选中数据子父传递
+const handleCurrentChange = (value: any) => {
+    emits('customEvent', value)
+}
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: adminLists,
+    params: queryParams
+})
+
+getLists()
+</script>
diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index ba4604d..d469d7c 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -1,390 +1,246 @@
 <template>
-  <div class="edit-popup">
-    <!-- <popup ref="popupRef" :title="popupTitle" :async="true" width="70%" @confirm="handleSubmit" @close="handleClose"> -->
-    <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-      <div style="font-size: 1.2rem; margin: 10px 0">公司基本信息创建</div>
-      <el-col :span="24" class="el-card pt-6">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="公司名称" prop="company_name">
-              <el-input
-                v-model="formData.company_name"
-                placeholder="请输入公司名称"
-                clearable
-                :disabled="isDisabled"
-                :style="{ width: '100%' }"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="社会代码" prop="organization_code">
-              <el-input
-                :disabled="isDisabled"
-                v-model="formData.organization_code"
-                placeholder="请输入社会代码"
-                clearable
-                :style="{ width: '100%' }"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="公司类型" prop="company_type">
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.company_type"
-                placeholder="请选择公司类型"
-                clearable
-                :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in datas.dictTypeLists"
-                  :key="index"
-                  :label="item.name"
-                  :value="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item label="省" prop="province">
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.province"
-                placeholder="请选择省"
-                clearable
-                @change="province_change"
-                :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in datas.provinceOptions"
-                  :key="index"
-                  :label="item.province_name"
-                  :value="item.province_code"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item label="市" prop="city">
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.city"
-                placeholder="请选择市"
-                clearable
-                @change="city_change"
-                :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in datas.cityOptions"
-                  :key="index"
-                  :label="item.city_name"
-                  :value="item.city_code"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item label="区" prop="area">
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.area"
-                placeholder="请选择区"
-                clearable
-                @change="area_change"
-                :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in datas.areaOptions"
-                  :key="index"
-                  :label="item.area_name"
-                  :value="item.area_code"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item label="镇" prop="street">
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.street"
-                placeholder="请选择镇"
-                clearable
-                @change="street_change"
-                :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in datas.streetOptions"
-                  :key="index"
-                  :label="item.street_name"
-                  :value="item.street_code"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="地址" prop="address">
-              <el-input
-                :disabled="isDisabled"
-                v-model="formData.address"
-                placeholder="请输入地址"
-                clearable
-                :style="{ width: '100%' }"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-col>
-      <div style="font-size: 1.2rem; margin: 10px 0">主要联系人</div>
-      <el-col :span="24" class="el-card pt-6">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="姓名" prop="master_name">
-              <el-input
-                :disabled="isDisabled"
-                v-model="formData.master_name"
-                placeholder="请输入姓名"
-                clearable
-                :style="{ width: '100%' }"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="职务" prop="master_position">
-              <el-input
-                :disabled="isDisabled"
-                v-model="formData.master_position"
-                placeholder="请输入职务"
-                clearable
-                :style="{ width: '100%' }"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="手机" prop="master_phone">
-              <el-input
-                :disabled="isDisabled"
-                v-model="formData.master_phone"
-                placeholder="请输入手机"
-                clearable
-                :style="{ width: '100%' }"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="master_email">
-              <el-input
-                :disabled="isDisabled"
-                v-model="formData.master_email"
-                placeholder="请输入邮箱"
-                clearable
-                :style="{ width: '100%' }"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-col>
-      <div style="font-size: 1.2rem; margin: 10px 0">其他联系人</div>
-      <el-col :span="24" class="el-card pt-6">
-        <el-row>
-          <template v-for="(item, index) in formData.other_contacts" :key="index">
-            <el-col :span="12">
-              <el-form-item label="姓名" prop="field120">
-                <el-input
-                  :disabled="isDisabled"
-                  v-model="item.name"
-                  placeholder="请输入姓名"
-                  clearable
-                  :style="{ width: '100%' }"
-                ></el-input>
-              </el-form-item>
+    <div class="edit-popup">
+        <!-- <popup ref="popupRef" :title="popupTitle" :async="true" width="70%" @confirm="handleSubmit" @close="handleClose"> -->
+        <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+            <div style="font-size: 1.2rem; margin: 10px 0">公司基本信息创建</div>
+            <el-col :span="24" class="el-card pt-6">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="公司名称" prop="company_name">
+                            <el-input v-model="formData.company_name" placeholder="请输入公司名称" clearable :disabled="isDisabled"
+                                :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="社会代码" prop="organization_code">
+                            <el-input :disabled="isDisabled" v-model="formData.organization_code" placeholder="请输入社会代码"
+                                clearable :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="公司类型" prop="company_type">
+                            <el-select :disabled="isDisabled" v-model="formData.company_type" placeholder="请选择公司类型"
+                                clearable :style="{ width: '100%' }">
+                                <el-option v-for="(item, index) in datas.dictTypeLists" :key="index" :label="item.name"
+                                    :value="item.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <el-form-item label="省" prop="province">
+                            <el-select :disabled="isDisabled" v-model="formData.province" placeholder="请选择省" clearable
+                                @change="province_change" :style="{ width: '100%' }">
+                                <el-option v-for="(item, index) in datas.provinceOptions" :key="index"
+                                    :label="item.province_name" :value="item.province_code"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <el-form-item label="市" prop="city">
+                            <el-select :disabled="isDisabled" v-model="formData.city" placeholder="请选择市" clearable
+                                @change="city_change" :style="{ width: '100%' }">
+                                <el-option v-for="(item, index) in datas.cityOptions" :key="index" :label="item.city_name"
+                                    :value="item.city_code"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <el-form-item label="区" prop="area">
+                            <el-select :disabled="isDisabled" v-model="formData.area" placeholder="请选择区" clearable
+                                @change="area_change" :style="{ width: '100%' }">
+                                <el-option v-for="(item, index) in datas.areaOptions" :key="index" :label="item.area_name"
+                                    :value="item.area_code"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="3">
+                        <el-form-item label="镇" prop="street">
+                            <el-select :disabled="isDisabled" v-model="formData.street" placeholder="请选择镇" clearable
+                                @change="street_change" :style="{ width: '100%' }">
+                                <el-option v-for="(item, index) in datas.streetOptions" :key="index"
+                                    :label="item.street_name" :value="item.street_code"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="地址" prop="address">
+                            <el-input :disabled="isDisabled" v-model="formData.address" placeholder="请输入地址" clearable
+                                :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="职务" prop="field121">
-                <el-input
-                  :disabled="isDisabled"
-                  v-model="item.position"
-                  placeholder="请输入职务"
-                  clearable
-                  :style="{ width: '100%' }"
-                ></el-input>
-              </el-form-item>
+            <div style="font-size: 1.2rem; margin: 10px 0">主要联系人</div>
+            <el-col :span="24" class="el-card pt-6">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="姓名" prop="master_name">
+                            <el-input :disabled="isDisabled" v-model="formData.master_name" placeholder="请输入姓名" clearable
+                                :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="职务" prop="master_position">
+                            <el-input :disabled="isDisabled" v-model="formData.master_position" placeholder="请输入职务"
+                                clearable :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="手机" prop="master_phone">
+                            <el-input :disabled="isDisabled" v-model="formData.master_phone" placeholder="请输入手机" clearable
+                                :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="邮箱" prop="master_email">
+                            <el-input :disabled="isDisabled" v-model="formData.master_email" placeholder="请输入邮箱" clearable
+                                :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="选择人员" prop="man">
+                            <el-input :disabled="isDisabled" v-model="formData.man" placeholder="请选择人员" clearable
+                                :style="{ width: '100%' }" @click="isMan = true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="手机" prop="field122">
-                <el-input
-                  :disabled="isDisabled"
-                  v-model="item.phone"
-                  placeholder="请输入手机"
-                  clearable
-                  :style="{ width: '100%' }"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="邮箱" prop="field123">
-                <el-input
-                  :disabled="isDisabled"
-                  v-model="item.email"
-                  placeholder="请输入邮箱"
-                  clearable
-                  :style="{ width: '100%' }"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </template>
+            <div style="font-size: 1.2rem; margin: 10px 0">其他联系人</div>
+            <el-col :span="24" class="el-card pt-6">
+                <el-row>
+                    <template v-for="(item, index) in formData.other_contacts" :key="index">
+                        <el-col :span="12">
+                            <el-form-item label="姓名" prop="field120">
+                                <el-input :disabled="isDisabled" v-model="item.name" placeholder="请输入姓名" clearable
+                                    :style="{ width: '100%' }"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="职务" prop="field121">
+                                <el-input :disabled="isDisabled" v-model="item.position" placeholder="请输入职务" clearable
+                                    :style="{ width: '100%' }"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="手机" prop="field122">
+                                <el-input :disabled="isDisabled" v-model="item.phone" placeholder="请输入手机" clearable
+                                    :style="{ width: '100%' }"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="邮箱" prop="field123">
+                                <el-input :disabled="isDisabled" v-model="item.email" placeholder="请输入邮箱" clearable
+                                    :style="{ width: '100%' }"></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </template>
 
-          <el-col :span="24">
-            <el-form-item label prop="field126">
-              <el-button type="primary" :disabled="isDisabled" size="medium" @click="other">其他联系人</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-col>
-      <div style="font-size: 1.2rem; margin: 10px 0">资质信息</div>
-      <el-col :span="24" class="el-card pt-6">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="营业执照" required>
-              <el-upload
-                :disabled="isDisabled"
-                v-model="formData.qualification.business_license"
-                class="avatar-uploader"
-                :data="{ cid: 1 }"
-                action="https://worker-task.lihaink.cn/api/upload/image"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccess"
-                :before-upload="beforeAvatarUpload"
-              >
-                <img
-                  v-if="formData.qualification.business_license"
-                  :src="formData.qualification.business_license"
-                  class="avatar"
-                />
-                <el-icon v-else class="avatar-uploader-icon">
-                  <Plus />
-                </el-icon>
-              </el-upload>
-              <el-upload
-                :disabled="isDisabled"
-                v-model="formData.qualification.business_licenseB"
-                class="avatar-uploader"
-                :data="{ cid: 1 }"
-                action="https://worker-task.lihaink.cn/api/upload/image"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccessB"
-              >
-                <img
-                  v-if="formData.qualification.business_licenseB"
-                  :src="formData.qualification.business_licenseB"
-                  class="avatar"
-                />
-                <el-icon v-else class="avatar-uploader-icon">
-                  <Plus />
-                </el-icon>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="对公银行" required>
-              <el-upload
-                :disabled="isDisabled"
-                v-model="formData.qualification.bank_account"
-                class="avatar-uploader"
-                :data="{ cid: 1 }"
-                action="https://worker-task.lihaink.cn/api/upload/image"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccess_two"
-                :before-upload="beforeAvatarUpload_two"
-              >
-                <img
-                  v-if="formData.qualification.bank_account"
-                  :src="formData.qualification.bank_account"
-                  class="avatar"
-                />
-                <el-icon v-else class="avatar-uploader-icon">
-                  <Plus />
-                </el-icon>
-              </el-upload>
-              <el-upload
-                :disabled="isDisabled"
-                v-model="formData.qualification.bank_accountB"
-                class="avatar-uploader"
-                :data="{ cid: 1 }"
-                action="https://worker-task.lihaink.cn/api/upload/image"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccess_twoB"
-                :before-upload="beforeAvatarUpload_two"
-              >
-                <img
-                  v-if="formData.qualification.bank_accountB"
-                  :src="formData.qualification.bank_accountB"
-                  class="avatar"
-                />
-                <el-icon v-else class="avatar-uploader-icon">
-                  <Plus />
-                </el-icon>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-col>
-      <div style="font-size: 1.2rem; margin: 10px 0">电子合同</div>
-      <el-col :span="24" class="el-card pt-6">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="签约方" prop="field130">
-              <el-input
-                :disabled="isDisabled"
-                v-model="formData.party_a_name"
-                placeholder="请选择签约方"
-                clearable
-                :style="{ width: '100%' }"
-                @click="openCompany"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label-width="100px" label="被签约公司" prop="field131">
-              <el-input
-                :disabled="isDisabled"
-                v-model="formData.company_name"
-                placeholder="请输入被签约公司"
-                clearable
-                :style="{ width: '100%' }"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label-width="100px" label="合同类型" prop="contract_type">
-              <el-select
-                :disabled="isDisabled"
-                v-model="formData.contract.contract_type"
-                placeholder="请选择合同类型"
-                clearable
-                :style="{ width: '100%' }"
-              >
-                <el-option
-                  v-for="(item, index) in datas.contract_type"
-                  :key="index"
-                  :label="item.name"
-                  :value="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                    <el-col :span="24">
+                        <el-form-item label prop="field126">
+                            <el-button type="primary" :disabled="isDisabled" size="medium" @click="other">其他联系人</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-col>
+            <div style="font-size: 1.2rem; margin: 10px 0">资质信息</div>
+            <el-col :span="24" class="el-card pt-6">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="营业执照" required>
+                            <el-upload :disabled="isDisabled" v-model="formData.qualification.business_license"
+                                class="avatar-uploader" :data="{ cid: 1 }"
+                                action="https://worker-task.lihaink.cn/api/upload/image" :show-file-list="false"
+                                :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
+                                <img v-if="formData.qualification.business_license"
+                                    :src="formData.qualification.business_license" class="avatar" />
+                                <el-icon v-else class="avatar-uploader-icon">
+                                    <Plus />
+                                </el-icon>
+                            </el-upload>
+                            <el-upload :disabled="isDisabled" v-model="formData.qualification.business_licenseB"
+                                class="avatar-uploader" :data="{ cid: 1 }"
+                                action="https://worker-task.lihaink.cn/api/upload/image" :show-file-list="false"
+                                :on-success="handleAvatarSuccessB">
+                                <img v-if="formData.qualification.business_licenseB"
+                                    :src="formData.qualification.business_licenseB" class="avatar" />
+                                <el-icon v-else class="avatar-uploader-icon">
+                                    <Plus />
+                                </el-icon>
+                            </el-upload>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="对公银行" required>
+                            <el-upload :disabled="isDisabled" v-model="formData.qualification.bank_account"
+                                class="avatar-uploader" :data="{ cid: 1 }"
+                                action="https://worker-task.lihaink.cn/api/upload/image" :show-file-list="false"
+                                :on-success="handleAvatarSuccess_two" :before-upload="beforeAvatarUpload_two">
+                                <img v-if="formData.qualification.bank_account" :src="formData.qualification.bank_account"
+                                    class="avatar" />
+                                <el-icon v-else class="avatar-uploader-icon">
+                                    <Plus />
+                                </el-icon>
+                            </el-upload>
+                            <el-upload :disabled="isDisabled" v-model="formData.qualification.bank_accountB"
+                                class="avatar-uploader" :data="{ cid: 1 }"
+                                action="https://worker-task.lihaink.cn/api/upload/image" :show-file-list="false"
+                                :on-success="handleAvatarSuccess_twoB" :before-upload="beforeAvatarUpload_two">
+                                <img v-if="formData.qualification.bank_accountB" :src="formData.qualification.bank_accountB"
+                                    class="avatar" />
+                                <el-icon v-else class="avatar-uploader-icon">
+                                    <Plus />
+                                </el-icon>
+                            </el-upload>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-col>
+            <div style="font-size: 1.2rem; margin: 10px 0">电子合同</div>
+            <el-col :span="24" class="el-card pt-6">
+                <el-row>
 
-          <el-col :span="12">
-            <el-form-item label-width="100px" label="合同编号" prop="field133">
-              <el-input placeholder="系统自动生成" clearable :style="{ width: '100%' }" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-col>
-      <el-col :span="24" class="el-card pt-6">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="合同文件" required>
-              <!-- <el-upload
+
+
+                    <el-col :span="12">
+                        <el-form-item label="签约方" prop="field130">
+                            <el-input :disabled="isDisabled" v-model="formData.party_a_name" placeholder="请选择签约方" clearable
+                                :style="{ width: '100%' }" @click="openCompany"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label-width="100px" label="被签约公司" prop="field131">
+                            <el-input :disabled="true" v-model="formData.company_name" placeholder="请输入被签约公司" clearable
+                                :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="12">
+                        <el-form-item label="合同类型" prop="contract_type">
+                            <el-select :disabled="isDisabled" v-model="formData.contract.contract_type"
+                                placeholder="请选择合同类型" clearable :style="{ width: '100%' }">
+                                <el-option v-for="(item, index) in datas.contract_type" :key="index" :label="item.name"
+                                    :value="item.id"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="12">
+                        <el-form-item label-width="100px" label="合同编号" prop="field133">
+                            <el-input placeholder="系统自动生成" clearable :style="{ width: '100%' }" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+
+
+
+
+                </el-row>
+            </el-col>
+            <el-col :span="24" class="el-card pt-6">
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="合同上传" required>
+                            <!-- <el-upload
                             :disabled="isDisabled"
                                 class="avatar-uploader"
                                 v-model="formData.contract.file"
@@ -396,51 +252,50 @@
                                
                                 <el-button size="small"  :disabled="isDisabled" type="primary">点击上传</el-button>
               </el-upload>-->
-              <el-upload
-                v-model="formData.contract.file"
-                :headers="{'Token':userStore.token}"
-                class="upload-demo"
-                action="https://worker-task.lihaink.cn/adminapi/upload/file"
-                multiple
-                :limit="1"
-              >
-                <el-button :disabled="isDisabled" type="primary">上传</el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-col>
-      <el-col :span="24" class="el-card pt-6">
-        <el-form-item label prop="field139">
-          <el-button v-if="isEdit" type="primary" size="medium" @click="create">修改</el-button>
-          <el-button v-else type="primary" :disabled="isDisabled" size="medium" @click="create">创建</el-button>
-        </el-form-item>
-      </el-col>
-    </el-form>
-    <el-dialog v-model="isCompany" title="选择签约方" width="60%">
-      <DialogIndex @customEvent="customEvent" />
-    </el-dialog>
-  </div>
+                            <el-upload :disabled="isDisabled" v-model="formData.contract.file"
+                                :headers="{ 'Token': userStore.token }" class="upload-demo"
+                                action="https://worker-task.lihaink.cn/adminapi/upload/file" multiple :limit="1">
+                                <el-button :disabled="isDisabled" type="primary">上传</el-button>
+                            </el-upload>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-col>
+            <el-col :span="24" class="el-card pt-6">
+                <el-form-item label prop="field139">
+                    <el-button v-if="isEdit" type="primary" size="medium" @click="create">修改</el-button>
+                    <el-button v-else type="primary" :disabled="isDisabled" size="medium" @click="create">创建</el-button>
+                </el-form-item>
+            </el-col>
+        </el-form>
+        <el-dialog v-model="isCompany" title="选择签约方" width="60%">
+            <DialogIndex @customEvent="customEvent" />
+        </el-dialog>
+        <el-dialog v-model="isMan" title="选择人员" width="60%">
+            <DialogIndexMan @customEvent="customEventMan" />
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup name="companyEdit">
 import type { FormInstance, UploadProps, ElMessage } from "element-plus";
 import Popup from "@/components/popup/index.vue";
 import {
-  apiCompanyAdd,
-  apiCompanyEdit,
-  apiCompanyDetail,
-  apiCompanyLists,
+    apiCompanyAdd,
+    apiCompanyEdit,
+    apiCompanyDetail,
+    apiCompanyLists,
 } from "@/api/company";
 import {
-  apiCityList,
-  apiAreaList,
-  apiStreetList,
-  apiProvinceList,
+    apiCityList,
+    apiAreaList,
+    apiStreetList,
+    apiProvinceList,
 } from "@/api/common";
 import { dictDataLists } from "@/api/setting/dict";
 import { timeFormat } from "@/utils/util";
 import DialogIndex from "./dialog_index.vue";
+import DialogIndexMan from "./dialog_index_personnel.vue";
 import type { PropType } from "vue";
 import useMultipleTabs from "@/hooks/useMultipleTabs";
 import useUserStore from "@/stores/modules/user";
@@ -452,10 +307,10 @@ const route = useRoute();
 let isDisabled = ref(false);
 let isEdit = ref(false);
 defineProps({
-  dictData: {
-    type: Object as PropType<Record<string, any[]>>,
-    default: () => ({}),
-  },
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({}),
+    },
 });
 const emit = defineEmits(["success", "close"]);
 const formRef = shallowRef<FormInstance>();
@@ -470,326 +325,340 @@ isEdit = route.query.edit;
 
 // 表单数据
 const formData = reactive({
-  id: "",
-  // level_two: '',
-  // level_one: '',
-  company_name: "",
-  organization_code: "",
-  province: "",
-  city: "",
-  area: "",
-  street: "",
-  address: "",
-  company_type: "",
-  master_name: "",
-  master_position: "",
-  master_phone: "",
-  master_email: "",
-  other_contacts: [
-    {
-      name: "",
-      position: "",
-      phone: "",
-      email: "",
+    man: "",
+    id: "",
+    // level_two: '',
+    // level_one: '',
+    company_name: "",
+    organization_code: "",
+    province: "",
+    city: "",
+    area: "",
+    street: "",
+    address: "",
+    company_type: "",
+    master_name: "",
+    master_position: "",
+    master_phone: "",
+    master_email: "",
+
+    other_contacts: [
+        {
+            name: "",
+            position: "",
+            phone: "",
+            email: "",
+        },
+    ],
+    // area_manager: '',
+    // is_contract: '',
+    // account: '',
+    // password: '',
+    // deposit: '',
+    // deposit_time: '',
+    qualification: {
+        business_license: "",
+        business_licenseB: "",
+        bank_account: "",
+        bank_accountB: "",
     },
-  ],
-  // area_manager: '',
-  // is_contract: '',
-  // account: '',
-  // password: '',
-  // deposit: '',
-  // deposit_time: '',
-  qualification: {
-    business_license: "",
-    business_licenseB: "",
-    bank_account: "",
-    bank_accountB: "",
-  },
-  contract: {
-    contract_type: "",
-    party_a: "",
-    file: "",
-  },
-  party_a_name: "",
-  file_image: "",
-  // status: ''
+    contract: {
+        contract_type: "",
+        party_a: "",
+        file: "",
+    },
+    //签约方
+    party_a_name: "",
+    file_image: "",
+    // status: ''
 });
 const datas = reactive({
-  provinceOptions: [],
-  cityOptions: [],
-  areaOptions: [],
-  streetOptions: [],
-  dictTypeLists: [],
-  contract_type: [],
+    provinceOptions: [],
+    cityOptions: [],
+    areaOptions: [],
+    streetOptions: [],
+    dictTypeLists: [],
+    contract_type: [],
 });
 // 表单验证
 const formRules = reactive<any>({
-  company_name: [
-    {
-      required: true,
-      message: "请输入公司名称",
-      trigger: ["blur"],
-    },
-  ],
-  organization_code: [
-    {
-      required: true,
-      message: "请输入组织机构代码",
-      trigger: ["blur"],
-    },
-  ],
-  master_name: [
-    {
-      required: true,
-      message: "请输入主联系人姓名",
-      trigger: ["blur"],
-    },
-  ],
-  master_position: [
-    {
-      required: true,
-      message: "请输入主联系人职务",
-      trigger: ["blur"],
-    },
-  ],
-  master_phone: [
-    {
-      required: true,
-      message: "请输入主联系人手机",
-      trigger: ["blur"],
-    },
-  ],
-  master_email: [
-    {
-      required: true,
-      message: "请输入主联系人邮箱",
-      trigger: ["blur"],
-    },
-  ],
-  account: [
-    {
-      required: true,
-      message: "请输入账号",
-      trigger: ["blur"],
-    },
-  ],
-  password: [
-    {
-      required: true,
-      message: "请输入密码",
-      trigger: ["blur"],
-    },
-  ],
+    company_name: [
+        {
+            required: true,
+            message: "请输入公司名称",
+            trigger: ["blur"],
+        },
+    ],
+    organization_code: [
+        {
+            required: true,
+            message: "请输入组织机构代码",
+            trigger: ["blur"],
+        },
+    ],
+    master_name: [
+        {
+            required: true,
+            message: "请输入主联系人姓名",
+            trigger: ["blur"],
+        },
+    ],
+    master_position: [
+        {
+            required: true,
+            message: "请输入主联系人职务",
+            trigger: ["blur"],
+        },
+    ],
+    master_phone: [
+        {
+            required: true,
+            message: "请输入主联系人手机",
+            trigger: ["blur"],
+        },
+    ],
+    master_email: [
+        {
+            required: true,
+            message: "请输入主联系人邮箱",
+            trigger: ["blur"],
+        },
+    ],
+    account: [
+        {
+            required: true,
+            message: "请输入账号",
+            trigger: ["blur"],
+        },
+    ],
+    password: [
+        {
+            required: true,
+            message: "请输入密码",
+            trigger: ["blur"],
+        },
+    ],
 });
 const isCompany = ref(false);
+const isMan = ref(false)
 
 function customEvent(data: any) {
-  isCompany.value = false;
-  formData.contract.party_a = data.id;
-  formData.party_a_name = data.company_name;
+    isCompany.value = false;
+    formData.contract.party_a = data.id;
+    formData.party_a_name = data.company_name;
+}
+function customEventMan(data: any) {
+    isMan.value = false;
+    console.log(data)
+    //   formData.contract.party_a = data.id;
+    formData.man = data.name;
 }
-
 function openCompany() {
-  isCompany.value = true;
-  console.log(isCompany);
+    isCompany.value = true;
 }
 
 // 获取详情
 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];
+    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 apiCompanyDetail({
-    id: row.id,
-  });
-  setFormData(data);
+    const data = await apiCompanyDetail({
+        id: row.id,
+    });
+    setFormData(data);
 };
 
 //上传图片1
 const handleAvatarSuccess: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.qualification.business_license = response.data.uri;
+    formData.qualification.business_license = response.data.uri;
 };
 const handleAvatarSuccessB: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.qualification.business_licenseB = response.data.uri;
+    formData.qualification.business_licenseB = response.data.uri;
 };
 const beforeAvatarUpload: UploadProps["beforeUpload"] = (rawFile) => {
-  // if (rawFile.type !== 'image/jpeg') {
-  //     ElMessage.error('Avatar picture must be JPG format!')
-  //     return false
-  // } else if (rawFile.size / 1024 / 1024 > 2) {
-  //     ElMessage.error('Avatar picture size can not exceed 2MB!')
-  //     return false
-  // }
-  return true;
+    // if (rawFile.type !== 'image/jpeg') {
+    //     ElMessage.error('Avatar picture must be JPG format!')
+    //     return false
+    // } else if (rawFile.size / 1024 / 1024 > 2) {
+    //     ElMessage.error('Avatar picture size can not exceed 2MB!')
+    //     return false
+    // }
+    return true;
 };
 //上传图片2
 const handleAvatarSuccess_two: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.qualification.bank_account = response.data.uri;
+    formData.qualification.bank_account = response.data.uri;
 };
 const handleAvatarSuccess_twoB: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.qualification.bank_accountB = response.data.uri;
+    formData.qualification.bank_accountB = response.data.uri;
 };
 const beforeAvatarUpload_two: UploadProps["beforeUpload"] = (rawFile) => {
-  // if (rawFile.type !== 'image/jpeg') {
-  //     ElMessage.error('Avatar picture must be JPG format!')
-  //     return false
-  // } else if (rawFile.size / 1024 / 1024 > 2) {
-  //     ElMessage.error('Avatar picture size can not exceed 2MB!')
-  //     return false
-  // }
-  return true;
+    // if (rawFile.type !== 'image/jpeg') {
+    //     ElMessage.error('Avatar picture must be JPG format!')
+    //     return false
+    // } else if (rawFile.size / 1024 / 1024 > 2) {
+    //     ElMessage.error('Avatar picture size can not exceed 2MB!')
+    //     return false
+    // }
+    return true;
 };
 //上传文件3
 const handleAvatarSuccess_three: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.file_image = response.data.uri;
-  formData.contract.file = response.data.uri;
+    formData.file_image = response.data.uri;
+    formData.contract.file = response.data.uri;
 };
 
 const beforeAvatarUpload_three: UploadProps["beforeUpload"] = (rawFile) => {
-  // if (rawFile.type !== 'application/msword') {
-  //     ElMessage.error('请选择word格式的文件!')
-  //     return false
-  // }
-  //  else if (rawFile.size / 1024 / 1024 > 2) {
-  //     ElMessage.error('Avatar picture size can not exceed 2MB!')
-  //     return false
-  // }
-  return true;
+    // if (rawFile.type !== 'application/msword') {
+    //     ElMessage.error('请选择word格式的文件!')
+    //     return false
+    // }
+    //  else if (rawFile.size / 1024 / 1024 > 2) {
+    //     ElMessage.error('Avatar picture size can not exceed 2MB!')
+    //     return false
+    // }
+    return true;
 };
 //增加其他联系人
 function other() {
-  formData.other_contacts.push({
-    name: "",
-    position: "",
-    phone: "",
-    email: "",
-  });
+    formData.other_contacts.push({
+        name: "",
+        position: "",
+        phone: "",
+        email: "",
+    });
 }
 //获取省份
 function province_change(value: string) {
-  formData.province = value;
-  getCityList(value);
+    getCityList();
 }
 function city_change(value: string) {
-  formData.city = value;
-  getAreaList(value);
+    getAreaList();
 }
 function area_change(value: string) {
-  formData.area = value;
-  getStreetList(value);
+    getStreetList();
 }
 function street_change(value: string) {
-  formData.street = value;
+    formData.street = value;
 }
+const getProvinceList = async () => {
+    const data = await apiProvinceList({});
+    datas["provinceOptions"] = data;
+};
+const getCityList = async () => {
+    const data = await apiCityList({ city: formData.province });
+    datas["cityOptions"] = data;
+};
+const getAreaList = async () => {
+    const data = await apiAreaList({ area: formData.city });
+    datas["areaOptions"] = data;
+};
+const getStreetList = async () => {
+    const data = await apiStreetList({ street: formData.area });
+    datas["streetOptions"] = data;
+};
+getProvinceList();
 
 const getcontract_type = async () => {
-  const data = await dictDataLists({ type_id: 7 });
-  datas["contract_type"] = data["lists"];
+    const data = await dictDataLists({ type_id: 7 });
+    datas["contract_type"] = data["lists"];
 };
 const getdictTypeLists = async () => {
-  const data = await dictDataLists({ type_id: 6 });
-  datas["dictTypeLists"] = data["lists"];
-};
-const getProvinceList = async () => {
-  const data = await apiProvinceList({});
-  datas["provinceOptions"] = data;
-};
-const getCityList = async (id: any) => {
-  const data = await apiCityList({ city: id });
-  datas["cityOptions"] = data;
-};
-const getAreaList = async (id: any) => {
-  const data = await apiAreaList({ area: id });
-  datas["areaOptions"] = data;
-};
-const getStreetList = async (id: any) => {
-  const data = await apiStreetList({ street: id });
-  datas["streetOptions"] = data;
+    const data = await dictDataLists({ type_id: 6 });
+    datas["dictTypeLists"] = data["lists"];
 };
+
 const getDetails = async () => {
-  const data = await apiCompanyDetail({
-    id: route.query.id,
-  });
-  Object.keys(formData).forEach((key) => {
-    //@ts-ignore
-    formData[key] = data[key];
-  });
-  formData["party_a_name"] = data["contract"]["party_a_name"];
-  formData["file_image"] = data["contract"]["file"];
+    const data = await apiCompanyDetail({
+        id: route.query.id,
+    });
+    Object.keys(formData).forEach((key) => {
+        let stringArr = ["province", "city", "area", "street"];
+        //@ts-ignore
+        formData[key] = data[key];
+        if (stringArr.includes(key)) {
+            formData[key] = formData[key].toString();
+            getCityList();
+            getAreaList();
+            getStreetList();
+        }
+    });
+    formData["party_a_name"] = data["contract"]["party_a_name"];
+    formData["file_image"] = data["contract"]["file"];
 };
 getProvinceList();
 getdictTypeLists();
 getcontract_type();
 
 const create = async () => {
-  await formRef.value?.validate();
-  const data = { ...formData };
-  if (route.query.id) {
-    await apiCompanyEdit(data);
-  } else {
-    await apiCompanyAdd(data);
-  }
-  removeTab();
-  router.back();
+    await formRef.value?.validate();
+    const data = { ...formData };
+    if (route.query.id) {
+        await apiCompanyEdit(data);
+    } else {
+        await apiCompanyAdd(data);
+    }
+    removeTab();
+    router.back();
 };
 route.query.id && getDetails();
 defineExpose({
-  open,
-  setFormData,
-  getDetail,
+    open,
+    setFormData,
+    getDetail,
 });
 </script>
 <style>
 .avatar-uploader .el-upload {
-  width: 10vw;
-  height: 6.3vw;
-  background-color: #fff;
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
+    width: 10vw;
+    height: 6.3vw;
+    background-color: #fff;
+    border: 1px dashed var(--el-border-color);
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    transition: var(--el-transition-duration-fast);
 }
 
 .avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
+    border-color: var(--el-color-primary);
 }
 
 .el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    text-align: center;
 }
 
 .el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    text-align: center;
 }
 </style>
diff --git a/src/views/company/index.vue b/src/views/company/index.vue
index 4b5d218..9d94a60 100644
--- a/src/views/company/index.vue
+++ b/src/views/company/index.vue
@@ -1,307 +1,275 @@
 <template>
-    <div>
-        <el-card class="!border-none mb-4" 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="area" v-show="company_type_show">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.area"
-                        clearable
-                        placeholder="请输入区"
-                    />
-                </el-form-item>
-                <el-form-item label="镇" prop="street" v-show="company_type_show">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.street"
-                        clearable
-                        placeholder="请输入镇"
-                    />
-                </el-form-item>
-                <el-form-item label="公司类型" prop="company_type" v-show="company_type_show">
-                    <el-select
-                        v-model="queryParams.company_type"
-                        placeholder="请选择公司类型"
-                        clearable
-                        :style="{ width: '100%' }"
-                    >
-                        <el-option
-                            v-for="(item, index) in datas.dictTypeLists"
-                            :key="index"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="片区经理" prop="area_manager">
-                    <el-input
-                        class="w-[280px]"
-                        v-model="queryParams.area_manager"
-                        clearable
-                        placeholder="请输入片区经理"
-                    />
-                </el-form-item>
-                <el-form-item label="是否签约" prop="is_contract">
-                    <el-select
-                        v-model="queryParams.is_contract"
-                        placeholder="是否签约"
-                        clearable
-                        :style="{ width: '100%' }"
-                    >
-                        <el-option label="已签约" value="1"></el-option>
-                        <el-option label="未签约" value="0"></el-option>
-                    </el-select>
-                </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="['company/add']" type="primary" @click="handleAdd">
+  <div>
+    <el-card class="!border-none mb-4" 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="area" v-show="company_type_show">
+          <el-input class="w-[280px]" v-model="queryParams.area" clearable placeholder="请输入区" />
+        </el-form-item>
+        <el-form-item label="镇" prop="street" v-show="company_type_show">
+          <el-input class="w-[280px]" v-model="queryParams.street" clearable placeholder="请输入镇" />
+        </el-form-item>
+        <el-form-item label="公司类型" prop="company_type" v-show="company_type_show">
+          <el-select
+            v-model="queryParams.company_type"
+            placeholder="请选择公司类型"
+            clearable
+            :style="{ width: '100%' }"
+          >
+            <el-option
+              v-for="(item, index) in datas.dictTypeLists"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="片区经理" prop="area_manager">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.area_manager"
+            clearable
+            placeholder="请输入片区经理"
+          />
+        </el-form-item>
+        <el-form-item label="是否签约" prop="is_contract">
+          <el-select
+            v-model="queryParams.is_contract"
+            placeholder="是否签约"
+            clearable
+            :style="{ width: '100%' }"
+          >
+            <el-option label="已签约" value="1"></el-option>
+            <el-option label="未签约" value="0"></el-option>
+          </el-select>
+        </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="['company/add']" type="primary" @click="handleAdd">
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
                 新增
-            </el-button> -->
-            <router-link
-                v-perms="['company/add', 'company/edit']"
-                :to="{
+      </el-button>-->
+      <router-link
+        v-perms="['company/add', 'company/edit']"
+        :to="{
                     path: getRoutePath('company/add:edit')
                 }"
-            >
-                <el-button type="primary" class="mb-4">
-                    <template #icon>
-                        <icon name="el-icon-Plus" />
-                    </template>
-                    创建
-                </el-button>
-            </router-link>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <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="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="操作" align="center" width="300" fixed="right">
-                        <template #default="{ row }">
-                            <div style="display: flex">
-                               
-                                <el-button
-                                    v-perms="['company/edit', 'company/add']"
-                                    type="primary"
-                                    link
-                                >
-                                    <router-link
-                                        :to="{
+      >
+        <el-button type="primary" class="mb-4">
+          <template #icon>
+            <icon name="el-icon-Plus" />
+          </template>
+          创建
+        </el-button>
+      </router-link>
+      <div class="mt-4">
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+          <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="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="操作" align="center" width="330" fixed="right">
+            <template #default="{ row }">
+              <div style="display: flex">
+                <el-button v-perms="['company/edit', 'company/add']" type="primary" link>
+                  <router-link
+                    :to="{
                                             path: getRoutePath('company/add:edit'),
                                             query: {
                                                 id: row.id,
                                                 read: true
                                             }
                                         }"
-                                    >
-                                        查看</router-link
-                                    >
-                                </el-button>
-                                <el-button
-                                    v-perms="['company/edit', 'company/add']"
-                                    type="primary"
-                                    link
-                                >
-                                    <router-link
-                                        :to="{
+                  >查看</router-link>
+                </el-button>
+                <el-button v-perms="['company/edit', 'company/add']" type="primary" link>
+                  <router-link
+                    :to="{
                                             path: getRoutePath('company/add:edit'),
                                             query: {
                                                 id: row.id,
                                                 edit: true
                                             }
                                         }"
-                                    >
-                                        编辑
-                                    </router-link>
-                                </el-button>
-                                <el-button
-                                    v-perms="['company/delete']"
-                                    type="danger"
-                                    link
-                                    @click="handleDelete(row.id)"
-                                >
-                                    删除
-                                </el-button>
-                                <el-button
-                                    v-perms="['company/edit', 'company/add']"
-                                    type="primary"
-                                    link
-                                    @click="showCreateConctPop(row)  "
-                                >
-                                    创建合同
-                                </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>
-        <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>
+                  >编辑</router-link>
+                </el-button>
+                <el-button
+                  v-perms="['company/delete']"
+                  type="danger"
+                  link
+                  @click="handleDelete(row.id)"
+                >删除</el-button>
+                <el-button
+                  v-perms="['company/edit', 'company/add']"
+                  type="primary"
+                  link
+                  @click="showCreateConctPop(row)  "
+                >生成个人合同</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>
+    <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="companyLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiCompanyLists, apiCompanyDelete } from '@/api/company'
-import { generateGontract,sendMsgApi } from '@/api/perms/admin'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import { dictDataLists } from '@/api/setting/dict'
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import { apiCompanyLists, apiCompanyDelete } from "@/api/company";
+import { generateGontract, sendMsgApi } from "@/api/perms/admin";
+import { timeFormat } from "@/utils/util";
+import feedback from "@/utils/feedback";
+import { dictDataLists } from "@/api/setting/dict";
 // import EditPopup from './edit.vue'
-import { getRoutePath } from '@/router'
+import { getRoutePath } from "@/router";
 
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-const route = useRoute()
-const company_type_show = ref(true)
+const editRef = shallowRef<InstanceType<typeof EditPopup>>();
+const route = useRoute();
+const company_type_show = ref(true);
 // 创建合同与发送短信
-//弹窗 
-const showPop = ref(false)
-const showConctactPop=ref(false)
-const offPop=()=>{
-    showPop.value=false
-    showConctactPop.value=false
-}
+//弹窗
+const showPop = ref(false);
+const showConctactPop = ref(false);
+const offPop = () => {
+  showPop.value = false;
+  showConctactPop.value = false;
+};
 // 创建合同的id
-const contractId=ref('')
-const showCreateConctPop=(row)=>{
-    showPop.value=true,
-    showConctactPop.value=true,
-    contractId.value=row.id
-}
-const creContct=()=>{
-    generateGontract({id:contractId.value})
-    offPop()
-}
-const sendMsg=()=>{
-    sendMsgApi({id:contractId.value})
-    offPop()
-}
+const contractId = ref("");
+const showCreateConctPop = (row) => {
+  (showPop.value = true),
+    (showConctactPop.value = true),
+    (contractId.value = row.id);
+};
+const creContct = async () => {
+  let res = await generateGontract({ id: contractId.value });
+  feedback.msgSuccess("发送成功");
+  offPop();
+};
+const sendMsg = async () => {
+  let res = await sendMsgApi({ id: contractId.value });
+  feedback.msgSuccess("发送成功");
+  offPop();
+};
 // 创建合同与发送短信结束
 // 查询条件
 const queryParams = reactive({
-    company_name: '',
-    area: '',
-    street: '',
-    company_type: '',
-    area_manager: '',
-    // 是否签约
-    is_contract: ''
-})
+  company_name: "",
+  area: "",
+  street: "",
+  company_type: "",
+  area_manager: "",
+  // 是否签约
+  is_contract: "",
+});
 
 if (route.query.company_type) {
-    company_type_show.value = false
-    queryParams['company_type'] = route.query.company_type?.toString() || ''
+  company_type_show.value = false;
+  queryParams["company_type"] = route.query.company_type?.toString() || "";
 }
 
 const datas = reactive({
-    dictTypeLists: []
-})
+  dictTypeLists: [],
+});
 const getdictTypeLists = async () => {
-    const data = await dictDataLists({ type_id: 6 })
-    datas['dictTypeLists'] = data['lists']
-}
-getdictTypeLists()
+  const data = await dictDataLists({ type_id: 6 });
+  datas["dictTypeLists"] = data["lists"];
+};
+getdictTypeLists();
 // 选中数据
-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: apiCompanyLists,
-    params: queryParams
-})
+  fetchFun: apiCompanyLists,
+  params: queryParams,
+});
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiCompanyDelete({ id })
-    getLists()
-}
+  await feedback.confirm("确定要删除？");
+  await apiCompanyDelete({ id });
+  getLists();
+};
 
-getLists()
+getLists();
 </script>
 <style lang="scss">
 .btn {
-    position: absolute;
+  position: absolute;
 }
 h1 {
-    text-align: center;
-    font-weight: bold;
-    font-size: 30px;
-    color: red;
-    margin-bottom: 10px;
+  text-align: center;
+  font-weight: bold;
+  font-size: 30px;
+  color: red;
+  margin-bottom: 10px;
 }
 
 .content {
-    font-size: 20px;
+  font-size: 20px;
 }
 
 .info {
-    color: red;
-    font-weight: bold;
-    font-size: 18px;
-    display: inline-block;
-    margin: 0 5px;
+  color: red;
+  font-weight: bold;
+  font-size: 18px;
+  display: inline-block;
+  margin: 0 5px;
 }
 
 .btn_menu {
-    margin-top: 10vh;
-    display: flex;
-    justify-content: space-around;
+  margin-top: 10vh;
+  display: flex;
+  justify-content: space-around;
 }
 </style>
diff --git a/src/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue
new file mode 100644
index 0000000..4d17130
--- /dev/null
+++ b/src/views/contract/contractDetil.vue
@@ -0,0 +1,76 @@
+<template>
+  <el-dialog @confirm="handleSubmit" title="合同详情" v-model="show">
+    <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+      <el-form-item label="公司" prop="company_id">
+        <el-input v-model="formData.company_id" :disabled="true" clearable placeholder="请输入公司" />
+      </el-form-item>
+      <el-form-item label="合同类型" prop="contract_type">
+        <el-input v-model="formData.contract_type" :disabled="true" clearable placeholder="请输入合同类型" />
+      </el-form-item>
+      <el-form-item label="合同编号" prop="contract_no">
+        <el-input v-model="formData.contract_no" :disabled="true" clearable placeholder="暂无合同编号" />
+      </el-form-item>
+      <el-form-item label="文件" prop="file">
+        <el-input v-model="formData.file" :disabled="true" clearable placeholder="暂无文件" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-input v-model="formData.status" :disabled="true" clearable placeholder="暂无状态" />
+      </el-form-item>
+      <el-form-item label="甲方" prop="party_a">
+        <el-input v-model="formData.party_a" :disabled="true" clearable placeholder="暂无甲方" />
+      </el-form-item>
+      <el-form-item label="乙方" prop="party_b">
+        <el-input v-model="formData.party_b" :disabled="true" clearable placeholder="暂无乙方" />
+      </el-form-item>
+      <el-form-item label="片区经理" prop="area_manager">
+        <el-input v-model="formData.area_manager" :disabled="true" 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";
+const formData = reactive({
+  id: "",
+  company_id: "",
+  contract_type: "",
+  contract_no: "",
+  file: "",
+  status: "",
+  party_a: "",
+  party_b: "",
+  area_manager: "",
+});
+const show = ref(false);
+const shoeEditFn = (flag) => {
+  show.value = flag;
+};
+// 传值赋值
+const setFormData = async (data) => {
+  for (const key in formData) {
+    if (data[key] != null && data[key] != undefined) {
+      //@ts-ignore
+      formData[key] = data[key];
+    }
+  }
+};
+
+defineExpose({
+  shoeEditFn,
+  setFormData,
+});
+</script>
+
+<style lang="scss" scoped>
+.btn_men {
+  text-align: right;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/contract/edit.vue b/src/views/contract/edit.vue
index 9db2cba..1614d4d 100644
--- a/src/views/contract/edit.vue
+++ b/src/views/contract/edit.vue
@@ -1,6 +1,9 @@
 <template>
     <div class="edit-popup">
+
         <popup
+
+        v-if="true"
             ref="popupRef"
             :title="popupTitle"
             :async="true"
@@ -55,7 +58,6 @@ const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 
-
 // 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑合同' : '新增合同'
diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue
index 9b37873..615474b 100644
--- a/src/views/contract/index.vue
+++ b/src/views/contract/index.vue
@@ -2,46 +2,21 @@
     <div>
         <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-form-item label="公司名称" prop="company_id">
+                    <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>
@@ -55,29 +30,28 @@
                     <icon name="el-icon-Plus" />
                 </template>
                 新增
-            </el-button> -->
-            <el-button
-                v-perms="['contract.contract/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
+      </el-button>-->
+            <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="type" show-overflow-tooltip>
+                        <template #default="scope">
+                            <span>{{ scope.row.type == 1 ? '公司' : scope.row.type == 0 ? "" : '个人' }}</span>
+
+                        </template>
+
+                    </el-table-column>
                     <el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
+                    <el-table-column label="操作" width="180" fixed="right" align="center">
                         <template #default="{ row }">
                             <!-- <el-button
                                 v-perms="['contract.contract/edit']"
@@ -86,25 +60,20 @@
                                 @click="handleEdit(row)"
                             >
                                 编辑
-                            </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="checkContcat(row.id)">
+                                <!-- <a href="https://www.zhihu.com/signin?next=%2F">查看</a> -->
+                                查看
                             </el-button>
-           
-                            <el-button
-                                v-perms="['contract.contract/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
+                            <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
+                                @click="handleDelete(row.id)">删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -113,90 +82,94 @@
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
-        <edit-popup
-            v-if="showEdit"
-            ref="editRef"
-            :dict-data="dictData"
-            @success="getLists"
-            @close="showEdit = false"
-        />
+        <contractDetil ref="childDetil"></contractDetil>
     </div>
 </template>
 
 <script lang="ts" setup name="contractLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiContractLists, apiContractDelete,apiContractDetail } from '@/api/contract'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import { ElMessage } from 'element-plus'
+import contractDetil from "./contractDetil.vue";
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import {
+    apiContractLists,
+    apiContractDelete,
+    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: '',
-    contract_type: '',
-    contract_no: '',
-    status: '',
-    party_a: '',
-    party_b: '',
-    area_manager: ''
-})
+    company_id: "",
+    contract_type: "",
+    contract_no: "",
+    status: "",
+    party_a: "",
+    party_b: "",
+    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 showDetil = async (id) => {
+    let res = await apiContractDetail({ id });
+    childDetil.value.setFormData(res);
+    childDetil.value.shoeEditFn(true);
+};
 // 查看合同
-const checkContcat=(id)=>{
-    // console.log(pager)
-    apiContractDetail({id}).then(res=>{
-        res.file? window.open(res.file): ElMessage.error ("暂无合同可以查看")
-        // console.log(res)
-        // if(res.file)
-    })
+const checkContcat = (id: Number) => {
+    apiContractDetail({ id }).then((res) => {
+        res.file ? window.open(res.file) : feedback.msgError("暂无合同可以查看");
+    });
 
     // window.open('https://www.zhihu.com/signin?next=%2F')
-}
+};
 
 // 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
+// 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 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 apiContractDelete({ id })
-    getLists()
-}
+    await feedback.confirm("确定要删除？");
+    await apiContractDelete({ id });
+    getLists();
+};
 
-getLists()
+getLists();
+// pager.lists.forEach((item) => {
+//   console.log(item.type);
+// });
 </script>
diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue
index 4081c19..8acaf14 100644
--- a/src/views/permission/admin/edit.vue
+++ b/src/views/permission/admin/edit.vue
@@ -1,484 +1,281 @@
 <template>
-  <div class="edit-popup">
-    <popup
-      ref="popupRef"
-      :title="popupTitle"
-      :async="true"
-      width="80%"
-      @confirm="handleSubmit"
-      @close="handleClose"
-    >
-      <el-form
-        ref="formRef"
-        :model="formData"
-        label-width="84px"
-        :rules="formRules"
-      >
-        <div style="font-size: 1.2rem; margin: 10px 0">基本信息创建</div>
-        <div style="display: flex; justify-content: space-between">
-          <p style="flex: 1">
-            <el-upload
-              :disabled="isCheck"
-              v-model="formData.avatar"
-              class="avatar-uploader-head"
-              :data="{ cid: 1 }"
-              action="https://worker-task.lihaink.cn/api/upload/image"
-              :show-file-list="false"
-              :on-success="handleAvatarSuccessAvatar"
-            >
-              <img
-                v-if="formData.avatar"
-                :src="formData.avatar"
-                class="avatar"
-              />
-              <el-icon v-else class="avatar-uploader-icon">
-                <Plus />
-              </el-icon>
-            </el-upload>
-          </p>
-          <el-col style="flex: 8" class="pt-6 !border-none">
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="姓名" prop="name">
-                  <el-input
-                    :disabled="isCheck"
-                    v-model="formData.name"
-                    placeholder="请输入姓名"
-                    clearable
-                    :style="{ width: '100%' }"
-                  >
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="性别" prop="sex">
-                  <el-select
-                    v-model="formData.sex"
-                    placeholder="请选择性别"
-                    :disabled="isCheck"
-                    :style="{ width: '100%' }"
-                  >
-                    <el-option label="男" value="1" />
-                    <el-option label="女" value="2" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="身份证号" prop="id_card">
-                  <el-input
-                    :disabled="isCheck"
-                    v-model="formData.id_card"
-                    placeholder="请输入身份证号"
-                    clearable
-                    :style="{ width: '100%' }"
-                  >
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="联系电话" prop="account">
-                  <el-input
-                    :disabled="isCheck"
-                    v-model="formData.account"
-                    placeholder="请输入联系电话"
-                    clearable
-                    :style="{ width: '100%' }"
-                  >
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <p style="display: flex">
-                <el-form-item label="省" prop="province" style="flex: 1">
-                  <el-select
-                    :disabled="isCheck"
-                    v-model="formData.province"
-                    placeholder="请选择省"
-                    clearable
-                    @change="province_change"
-                    :style="{ width: '100%' }"
-                  >
-                    <el-option
-                      v-for="(item, index) in datas.provinceOptions"
-                      :key="index"
-                      :label="item.province_name"
-                      :value="item.province_code"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
+                <div style="font-size: 1.2rem; margin: 10px 0">基本信息创建</div>
 
-                <el-form-item label="市" prop="city" style="flex: 1">
-                  <el-select
-                    :disabled="isCheck"
-                    v-model="formData.city"
-                    placeholder="请选择市"
-                    clearable
-                    @change="city_change"
-                    :style="{ width: '100%' }"
-                  >
-                    <el-option
-                      v-for="(item, index) in datas.cityOptions"
-                      :key="index"
-                      :label="item.city_name"
-                      :value="item.city_code"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
+                <div class="headimg">
+                    <el-upload :disabled="isCheck" v-model="formData.avatar" class="avatar-uploader-head"
+                        action="https://worker-task.lihaink.cn/api/upload/image" :show-file-list="false"
+                        :on-success="handleAvatarSuccessAvatar">
+                        <img v-if="formData.avatar" :src="formData.avatar" class="avatar" />
+                        <el-icon v-else class="avatar-uploader-icon">
+                            <Plus />
+                        </el-icon>
+                    </el-upload>
+                </div>
 
-                <el-form-item label="区" prop="area" style="flex: 1">
-                  <el-select
-                    :disabled="isCheck"
-                    v-model="formData.area"
-                    placeholder="请选择区"
-                    clearable
-                    @change="area_change"
-                    :style="{ width: '100%' }"
-                  >
-                    <el-option
-                      v-for="(item, index) in datas.areaOptions"
-                      :key="index"
-                      :label="item.area_name"
-                      :value="item.area_code"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
 
-                <el-form-item label="镇" prop="street" style="flex: 1">
-                  <el-select
-                    :disabled="isCheck"
-                    v-model="formData.street"
-                    placeholder="请选择镇"
-                    clearable
-                    @change="street_change"
-                    :style="{ width: '100%' }"
-                  >
-                    <el-option
-                      v-for="(item, index) in datas.streetOptions"
-                      :key="index"
-                      :label="item.street_name"
-                      :value="item.street_code"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="村社小队" prop="address" style="flex: 1.5">
-                  <el-input
-                    :disabled="isCheck"
-                    v-model="formData.address"
-                    placeholder="请输入村社小队"
-                    clearable
-                    :style="{ width: '100%' }"
-                  >
-                  </el-input>
-                </el-form-item>
-              </p>
-            </el-row>
-          </el-col>
-        </div>
+                <el-col style="flex: 8" class="pt-6 !border-none">
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="姓名" prop="name">
+                                <el-input :disabled="isCheck" v-model="formData.name" placeholder="请输入姓名" clearable
+                                    :style="{ width: '100%' }"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="性别" prop="sex">
+                                <el-select v-model="formData.sex" placeholder="请选择性别" :disabled="isCheck"
+                                    :style="{ width: '100%' }">
+                                    <el-option label="男" value="1" />
+                                    <el-option label="女" value="2" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="身份证号" prop="id_card">
+                                <el-input :disabled="isCheck" v-model="formData.id_card" placeholder="请输入身份证号" clearable
+                                    :style="{ width: '100%' }"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="联系电话" prop="account">
+                                <el-input :disabled="isCheck" v-model="formData.account" placeholder="请输入联系电话" clearable
+                                    :style="{ width: '100%' }"></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
 
-        <el-col :span="24">
-          <el-form-item label="授权身份" prop="role_id">
-            <el-col :span="12">
-              <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-col>
-            <el-col :span="12">
-              <el-form-item label="签约方" prop="field130">
-                <el-input
-                  :disabled="isCheck"
-                  v-model="formData.party_a_name"
-                  placeholder="请选择签约方"
-                  clearable
-                  :style="{ width: '100%' }"
-                  @click="isCompany = true"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-        </el-col>
-        <div style="font-size: 1.2rem; margin: 10px 0">资质信息</div>
+                        <el-form-item label="省" prop="province" style="flex: 1">
+                            <el-select :disabled="isCheck" v-model="formData.province" placeholder="请选择省" clearable
+                                @change="province_change" :style="{ width: '100%' }">
+                                <el-option v-for="(item, index) in datas.provinceOptions" :key="index"
+                                    :label="item.province_name" :value="item.province_code"></el-option>
+                            </el-select>
+                        </el-form-item>
 
-        <el-col :span="24">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="身份证" prop="id_card">
-                <el-upload
-                  :disabled="isCheck"
-                  v-model="formData.qualification.id_card"
-                  class="avatar-uploader"
-                  :data="{ cid: 1 }"
-                  action="https://worker-task.lihaink.cn/api/upload/image"
-                  :show-file-list="false"
-                  :on-success="handleAvatarSuccessIdA"
-                >
-                  <img
-                    v-if="formData.qualification.id_card"
-                    :src="formData.qualification.id_card"
-                    class="avatar"
-                  />
-                  <el-icon v-else class="avatar-uploader-icon">
-                    <Plus />
-                  </el-icon>
-                </el-upload>
-                <el-upload
-                  :disabled="isCheck"
-                  v-model="formData.qualification.id_card_b"
-                  class="avatar-uploader"
-                  :data="{ cid: 1 }"
-                  action="https://worker-task.lihaink.cn/api/upload/image"
-                  :show-file-list="false"
-                  :on-success="handleAvatarSuccessIdB"
-                >
-                  <img
-                    v-if="formData.qualification.id_card_b"
-                    :src="formData.qualification.id_card_b"
-                    class="avatar"
-                  />
-                  <el-icon v-else class="avatar-uploader-icon">
-                    <Plus />
-                  </el-icon>
-                </el-upload>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="行驶证" prop="car_card">
-                <el-upload
-                  :disabled="isCheck"
-                  v-model="formData.qualification.car_card"
-                  class="avatar-uploader"
-                  :data="{ cid: 1 }"
-                  action="https://worker-task.lihaink.cn/api/upload/image"
-                  :show-file-list="false"
-                  :on-success="handleAvatarSuccessCarA"
-                >
-                  <img
-                    v-if="formData.qualification.car_card"
-                    :src="formData.qualification.car_card"
-                    class="avatar"
-                  />
-                  <el-icon v-else class="avatar-uploader-icon">
-                    <Plus />
-                  </el-icon>
-                </el-upload>
-                <el-upload
-                  :disabled="isCheck"
-                  v-model="formData.qualification.car_card_b"
-                  class="avatar-uploader"
-                  :data="{ cid: 1 }"
-                  action="https://worker-task.lihaink.cn/api/upload/image"
-                  :show-file-list="false"
-                  :on-success="handleAvatarSuccessCarB"
-                  :before-upload="beforeAvatarUpload_two"
-                >
-                  <img
-                    v-if="formData.qualification.car_card_b"
-                    :src="formData.qualification.car_card_b"
-                    class="avatar"
-                  />
-                  <el-icon v-else class="avatar-uploader-icon">
-                    <Plus />
-                  </el-icon>
-                </el-upload>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="银行卡号" prop="bank_account">
-                <el-upload
-                  :disabled="isCheck"
-                  v-model="formData.qualification.bank_account"
-                  class="avatar-uploader"
-                  :data="{ cid: 1 }"
-                  action="https://worker-task.lihaink.cn/api/upload/image"
-                  :show-file-list="false"
-                  :on-success="handleAvatarSuccessBankA"
-                  :before-upload="beforeAvatarUpload_three"
-                >
-                  <img
-                    v-if="formData.qualification.bank_account"
-                    :src="formData.qualification.bank_account"
-                    class="avatar"
-                  />
-                  <el-icon v-else class="avatar-uploader-icon">
-                    <Plus />
-                  </el-icon>
-                </el-upload>
-                <el-upload
-                  :disabled="isCheck"
-                  v-model="formData.qualification.bank_account_b"
-                  class="avatar-uploader"
-                  :data="{ cid: 1 }"
-                  action="https://worker-task.lihaink.cn/api/upload/image"
-                  :show-file-list="false"
-                  :on-success="handleAvatarSuccessBankB"
-                  :before-upload="beforeAvatarUpload_three"
-                >
-                  <img
-                    v-if="formData.qualification.bank_account_b"
-                    :src="formData.qualification.bank_account_b"
-                    class="avatar"
-                  />
-                  <el-icon v-else class="avatar-uploader-icon">
-                    <Plus />
-                  </el-icon>
-                </el-upload>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="24">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="签约姓名" prop="name">
-                <el-input
-                  v-model="formData.name"
-                  placeholder="请输入签约姓名"
-                  :disabled="true"
-                  clearable
-                  :style="{ width: '100%' }"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="性别" prop="sex">
-                <el-input
-                  placeholder="请输入性别"
-                  :disabled="true"
-                  clearable
-                  :style="{ width: '100%' }"
-                  :value="formData.sex == 1 ? '男' : '女'"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="身份证号" prop="id_card">
-                <el-input
-                  v-model="formData.id_card"
-                  placeholder="请输入身份证号"
-                  :disabled="true"
-                  clearable
-                  :style="{ width: '100%' }"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="联系电话" prop="account">
-                <el-input
-                  v-model="formData.account"
-                  placeholder="请输入联系电话"
-                  :disabled="true"
-                  clearable
-                  :style="{ width: '100%' }"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" v-if="formData.name">
-              <el-form-item label="账号" prop="account">
-                <el-input
-                  v-model="formData.account"
-                  :disabled="true"
-                  clearable
-                  :style="{ width: '100%' }"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" v-if="formData.name">
-              <el-form-item label="密码" prop="password">
-                <el-input
-                  v-model="formData.account"
-                  :disabled="true"
-                  clearable
-                  :style="{ width: '100%' }"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="合同类型" prop="contract_type">
-                <el-col :span="24">
-                  <el-select
-                    :disabled="isCheck"
-                    v-model="formData.contract_type"
-                    placeholder="请选择合同类型"
-                    clearable
-                    :style="{ width: '100%' }"
-                  >
-                    <el-option
-                      v-for="(item, index) in datas.contract_type"
-                      :key="index"
-                      :label="item.name"
-                      :value="item.id"
-                    ></el-option>
-                  </el-select>
+                        <el-form-item label="市" prop="city" style="flex: 1">
+                            <el-select :disabled="isCheck" v-model="formData.city" placeholder="请选择市" clearable
+                                @change="city_change" :style="{ width: '100%' }">
+                                <el-option v-for="(item, index) in datas.cityOptions" :key="index" :label="item.city_name"
+                                    :value="item.city_code"></el-option>
+                            </el-select>
+                        </el-form-item>
+
+                        <el-form-item label="区" prop="area" style="flex: 1">
+                            <el-select :disabled="isCheck" v-model="formData.area" placeholder="请选择区" clearable
+                                @change="area_change" :style="{ width: '100%' }">
+                                <el-option v-for="(item, index) in datas.areaOptions" :key="index" :label="item.area_name"
+                                    :value="item.area_code"></el-option>
+                            </el-select>
+                        </el-form-item>
+
+                        <el-form-item label="镇" prop="street" style="flex: 1">
+                            <el-select :disabled="isCheck" v-model="formData.street" placeholder="请选择镇" clearable
+                                @change="street_change" :style="{ width: '100%' }">
+                                <el-option v-for="(item, index) in datas.streetOptions" :key="index"
+                                    :label="item.street_name" :value="item.street_code"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="村社小队" prop="address" style="flex: 1.5">
+                            <el-input :disabled="isCheck" v-model="formData.address" placeholder="请输入村社小队" clearable
+                                :style="{ width: '100%' }"></el-input>
+                        </el-form-item>
+
+                    </el-row>
                 </el-col>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-col>
-
-        <el-col :span="24" v-if="!isCheck">
-          <el-form-item label="上传" prop="field127">
-            <el-upload
-              :headers="{ Token: userStore.token }"
-              v-model="formData.file"
-              class="upload-demo"
-              action="https://worker-task.lihaink.cn/adminapi/upload/file"
-              :on-success="handleAvatarSuccess_four"
-              multiple
-              :limit="1"
-            >
-              <el-button type="primary">上传</el-button>
-            </el-upload>
-          </el-form-item>
-        </el-col>
-      </el-form>
-    </popup>
-    <el-dialog v-model="isCompany" title="选择签约方" width="60%">
-      <DialogIndex @customEvent="customEvent" />
-    </el-dialog>
-  </div>
+                <el-col :span="24">
+                    <el-row>
+                        <el-col :span="12">
+                            <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">
+                            <el-form-item label="签约方" prop="field130">
+                                <el-input :disabled="isCheck" v-model="formData.party_a_name" placeholder="请选择签约方" clearable
+                                    :style="{ width: '100%' }" @click="isCompany = true"></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-col>
+                <div style="font-size: 1.2rem; margin: 10px 0">资质信息</div>
+                <el-col :span="24">
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="身份证" prop="id_card">
+                                <el-upload :disabled="isCheck" v-model="formData.qualification.id_card"
+                                    class="avatar-uploader" :data="{ cid: 1 }"
+                                    action="https://worker-task.lihaink.cn/api/upload/image" :show-file-list="false"
+                                    :on-success="handleAvatarSuccessIdA">
+                                    <img v-if="formData.qualification.id_card" :src="formData.qualification.id_card"
+                                        class="avatar" />
+                                    <el-icon v-else class="avatar-uploader-icon">
+                                        <Plus />
+                                    </el-icon>
+                                </el-upload>
+                                <el-upload :disabled="isCheck" v-model="formData.qualification.id_card_b"
+                                    class="avatar-uploader" :data="{ cid: 1 }"
+                                    action="https://worker-task.lihaink.cn/api/upload/image" :show-file-list="false"
+                                    :on-success="handleAvatarSuccessIdB">
+                                    <img v-if="formData.qualification.id_card_b" :src="formData.qualification.id_card_b"
+                                        class="avatar" />
+                                    <el-icon v-else class="avatar-uploader-icon">
+                                        <Plus />
+                                    </el-icon>
+                                </el-upload>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="行驶证" prop="car_card">
+                                <el-upload :disabled="isCheck" v-model="formData.qualification.car_card"
+                                    class="avatar-uploader" :data="{ cid: 1 }"
+                                    action="https://worker-task.lihaink.cn/api/upload/image" :show-file-list="false"
+                                    :on-success="handleAvatarSuccessCarA">
+                                    <img v-if="formData.qualification.car_card" :src="formData.qualification.car_card"
+                                        class="avatar" />
+                                    <el-icon v-else class="avatar-uploader-icon">
+                                        <Plus />
+                                    </el-icon>
+                                </el-upload>
+                                <el-upload :disabled="isCheck" v-model="formData.qualification.car_card_b"
+                                    class="avatar-uploader" :data="{ cid: 1 }"
+                                    action="https://worker-task.lihaink.cn/api/upload/image" :show-file-list="false"
+                                    :on-success="handleAvatarSuccessCarB" :before-upload="beforeAvatarUpload_two">
+                                    <img v-if="formData.qualification.car_card_b" :src="formData.qualification.car_card_b"
+                                        class="avatar" />
+                                    <el-icon v-else class="avatar-uploader-icon">
+                                        <Plus />
+                                    </el-icon>
+                                </el-upload>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="银行卡号" prop="bank_account">
+                                <el-upload :disabled="isCheck" v-model="formData.qualification.bank_account"
+                                    class="avatar-uploader" :data="{ cid: 1 }"
+                                    action="https://worker-task.lihaink.cn/api/upload/image" :show-file-list="false"
+                                    :on-success="handleAvatarSuccessBankA" :before-upload="beforeAvatarUpload_three">
+                                    <img v-if="formData.qualification.bank_account"
+                                        :src="formData.qualification.bank_account" class="avatar" />
+                                    <el-icon v-else class="avatar-uploader-icon">
+                                        <Plus />
+                                    </el-icon>
+                                </el-upload>
+                                <el-upload :disabled="isCheck" v-model="formData.qualification.bank_account_b"
+                                    class="avatar-uploader" :data="{ cid: 1 }"
+                                    action="https://worker-task.lihaink.cn/api/upload/image" :show-file-list="false"
+                                    :on-success="handleAvatarSuccessBankB" :before-upload="beforeAvatarUpload_three">
+                                    <img v-if="formData.qualification.bank_account_b"
+                                        :src="formData.qualification.bank_account_b" class="avatar" />
+                                    <el-icon v-else class="avatar-uploader-icon">
+                                        <Plus />
+                                    </el-icon>
+                                </el-upload>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-col>
+                <el-col :span="24">
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="签约姓名" prop="name">
+                                <el-input v-model="formData.name" placeholder="请输入签约姓名" :disabled="true" clearable
+                                    :style="{ width: '100%' }"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="性别" prop="sex">
+                                <el-input placeholder="请输入性别" :disabled="true" clearable :style="{ width: '100%' }"
+                                    :value="formData.sex == 1 ? '男' : '女'"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="身份证号" prop="id_card">
+                                <el-input v-model="formData.id_card" placeholder="请输入身份证号" :disabled="true" clearable
+                                    :style="{ width: '100%' }"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="联系电话" prop="account">
+                                <el-input v-model="formData.account" placeholder="请输入联系电话" :disabled="true" clearable
+                                    :style="{ width: '100%' }"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12" v-if="formData.name">
+                            <el-form-item label="账号" prop="account">
+                                <el-input v-model="formData.account" :disabled="true" clearable
+                                    :style="{ width: '100%' }"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12" v-if="formData.name">
+                            <el-form-item label="密码" prop="password">
+                                <el-input v-model="formData.account" :disabled="true" clearable
+                                    :style="{ width: '100%' }"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item label="合同类型" prop="contract_type">
+                                <el-col :span="24">
+                                    <el-select :disabled="isCheck" v-model="formData.contract_type" placeholder="请选择合同类型"
+                                        clearable :style="{ width: '100%' }">
+                                        <el-option v-for="(item, index) in datas.contract_type" :key="index"
+                                            :label="item.name" :value="item.id"></el-option>
+                                    </el-select>
+                                </el-col>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-col>
+                <el-col :span="24" v-if="!isCheck">
+                    <el-form-item label="合同上传" prop="field127">
+                        <el-upload :headers="{ Token: userStore.token }" v-model="formData.file" class="upload-demo"
+                            action="https://worker-task.lihaink.cn/adminapi/upload/file"
+                            :on-success="handleAvatarSuccess_four" multiple :limit="1">
+                            <el-button type="primary">上传</el-button>
+                        </el-upload>
+                    </el-form-item>
+                </el-col>
+            </el-form>
+        </popup>
+        <el-dialog v-model="isCompany" title="选择签约方" width="60%">
+            <DialogIndex @customEvent="customEvent" />
+        </el-dialog>
+    </div>
 </template>
 <script lang="ts" setup>
 import type { FormInstance, UploadProps } from "element-plus";
 import Popup from "@/components/popup/index.vue";
 import { useDictOptions } from "@/hooks/useDictOptions";
 import {
-  adminAdd,
-  adminDetail,
-  adminEdit,
-  generateGontract,
+    adminAdd,
+    adminDetail,
+    adminEdit,
+    generateGontract,
 } from "@/api/perms/admin";
 import { roleAll } from "@/api/perms/role";
 import { jobsAll } from "@/api/org/post";
 import { deptAll } from "@/api/org/department";
 import {
-  apiCityList,
-  apiAreaList,
-  apiStreetList,
-  apiProvinceList,
+    apiCityList,
+    apiAreaList,
+    apiStreetList,
+    apiProvinceList,
 } from "@/api/common";
 import { dictDataLists } from "@/api/setting/dict";
 import DialogIndex from "./dialog_index.vue";
 import useUserStore from "@/stores/modules/user";
 defineProps({
-  isCheck: {},
+    isCheck: {},
 });
 
 const emit = defineEmits(["success", "close"]);
@@ -487,36 +284,38 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>();
 const mode = ref("add");
 console.log(mode);
 const popupTitle = computed(() => {
-  return mode.value == "edit" ? "编辑管理员" : "新增管理员";
+    return mode.value == "edit" ? "编辑管理员" : "新增管理员";
 });
 const formData = reactive({
-  id: "",
-  sex: "",
-  id_card: "",
-  name: "",
-  province: "",
-  city: "",
-  area: "",
-  street: "",
-  address: "",
-  account: "",
-  party_a_name: "",
-  qualification: {
+    id: "",
+    sex: "",
     id_card: "",
-    id_card_b: "",
-    car_card: "",
-    car_card_b: "",
-    bank_account: "",
-    bank_account_b: "",
-  },
-  // 合同类型
-  contract_type: "",
-  file: "",
-  is_contract: 0,
-  role_id: "",
-  avatar: "",
-  multipoint_login: 1,
-  root: 0,
+    name: "",
+    province: "",
+    city: "",
+    area: "",
+    street: "",
+    address: "",
+    account: "",
+    is_contract: 0,
+    // 签约方
+    party_a_name: "",
+    qualification: {
+        id_card: "",
+        id_card_b: "",
+        car_card: "",
+        car_card_b: "",
+        bank_account: "",
+        bank_account_b: "",
+    },
+    // 合同类型
+    contract_type: "",
+    file: "",
+    // 授权身份
+    role_id: "",
+    avatar: "",
+    multipoint_login: 1,
+    root: 0,
 });
 // const formData = reactive({
 //     id: '',
@@ -553,307 +352,319 @@ const formData = reactive({
 // })
 // 字典信息
 const datas: any = reactive({
-  provinceOptions: [],
-  cityOptions: [],
-  areaOptions: [],
-  streetOptions: [],
-  dictTypeLists: [],
-  contract_type: [],
-  contract: [],
+    provinceOptions: [],
+    cityOptions: [],
+    areaOptions: [],
+    streetOptions: [],
+    dictTypeLists: [],
+    contract_type: [],
+    contract: [],
 });
 const userStore = useUserStore();
 const getcontract_type = async () => {
-  const data = await dictDataLists({ type_id: 7 });
-  datas["contract_type"] = data["lists"];
+    const data = await dictDataLists({ type_id: 7 });
+    datas["contract_type"] = data["lists"];
 };
 getcontract_type();
 
 const isCompany = ref(false);
 function customEvent(data: any) {
-  isCompany.value = false;
-  // formData.contract.party_a = data.id
-  formData.party_a_name = data.company_name;
+    isCompany.value = false;
+    //   formData.contract.party_a = data.id
+    console.log(data);
+    formData.party_a_name = data.company_name;
 }
 // 表单验证
 // 手机号校验
 const ValidatorPhone = (rule: object, value: string, callback: any) => {
-  const rg = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
-  rg.test(formData.account)
-    ? callback()
-    : callback(new Error("请输入正确的手机号"));
+    const rg = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
+    rg.test(formData.account)
+        ? callback()
+        : callback(new Error("请输入正确的手机号"));
 };
 // 身份证校验
 const ValidatorId = (rule: object, value: string, callback: any) => {
-  const rg =
-    /^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|10|11|12)(?:0[1-9]|[1-2]\d|30|31)\d{3}[\dXx]$/;
-  rg.test(formData.id_card)
-    ? callback()
-    : callback(new Error("请输入正确的身份证号码"));
+    const rg =
+        /^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|10|11|12)(?:0[1-9]|[1-2]\d|30|31)\d{3}[\dXx]$/;
+    rg.test(formData.id_card)
+        ? callback()
+        : callback(new Error("请输入正确的身份证号码"));
 };
 const Validatorcard = (rule: object, value: string, callback: any) => {
-  formData.qualification.car_card
-    ? callback()
-    : callback(new Error("请输入驾驶证正面"));
+    formData.qualification.car_card
+        ? callback()
+        : callback(new Error("请输入驾驶证正面"));
 };
 const ValidatorcardB = (rule: object, value: string, callback: any) => {
-  formData.qualification.car_card_b
-    ? callback()
-    : callback(new Error("请输入驾驶证反面"));
+    formData.qualification.car_card_b
+        ? callback()
+        : callback(new Error("请输入驾驶证反面"));
 };
 const ValidatorBankcard = (rule: object, value: string, callback: any) => {
-  formData.qualification.bank_account
-    ? callback()
-    : callback(new Error("请输入银行卡正面"));
+    formData.qualification.bank_account
+        ? callback()
+        : callback(new Error("请输入银行卡正面"));
 };
 const ValidatorBankcardB = (rule: object, value: string, callback: any) => {
-  formData.qualification.bank_account_b
-    ? callback()
-    : callback(new Error("请输入银行卡反面"));
+    formData.qualification.bank_account_b
+        ? callback()
+        : callback(new Error("请输入银行卡反面"));
 };
 const formRules = reactive({
-  account: [
-    {
-      required: true,
-      trigger: ["blur"],
-      validator: ValidatorPhone,
-    },
-  ],
-  id_card: [
-    {
-      required: true,
-      trigger: ["blur"],
-      validator: ValidatorId,
-    },
-  ],
-  sex: [
-    {
-      required: true,
-      message: "请选择性别",
-      trigger: ["blur"],
-    },
-  ],
+    account: [
+        {
+            required: true,
+            trigger: ["blur"],
+            validator: ValidatorPhone,
+        },
+    ],
+    id_card: [
+        {
+            required: true,
+            trigger: ["blur"],
+            validator: ValidatorId,
+        },
+    ],
+    sex: [
+        {
+            required: true,
+            message: "请选择性别",
+            trigger: ["blur"],
+        },
+    ],
 
-  name: [
-    {
-      required: true,
-      message: "请输入名称",
-      trigger: ["blur"],
-    },
-  ],
-  car_card: [
-    {
-      required: true,
-      trigger: ["change"],
-      validator: Validatorcard,
-    },
-  ],
-  car_card_b: [
-    {
-      required: true,
-      trigger: ["blur"],
-      validator: ValidatorcardB,
-    },
-  ],
-  bank_account: [
-    {
-      required: true,
-      trigger: ["change"],
-      validator: ValidatorBankcard,
-    },
-  ],
-  bank_account_b: [
-    {
-      required: true,
-      trigger: ["change"],
-      validator: ValidatorBankcardB,
-    },
-  ],
-  role_id: [
-    {
-      required: true,
-      message: "请选择角色",
-      trigger: ["blur"],
-    },
-  ],
+    name: [
+        {
+            required: true,
+            message: "请输入名称",
+            trigger: ["blur"],
+        },
+    ],
+    car_card: [
+        {
+            required: true,
+            trigger: ["change"],
+            validator: Validatorcard,
+        },
+    ],
+    car_card_b: [
+        {
+            required: true,
+            trigger: ["blur"],
+            validator: ValidatorcardB,
+        },
+    ],
+    bank_account: [
+        {
+            required: true,
+            trigger: ["change"],
+            validator: ValidatorBankcard,
+        },
+    ],
+    bank_account_b: [
+        {
+            required: true,
+            trigger: ["change"],
+            validator: ValidatorBankcardB,
+        },
+    ],
+    role_id: [
+        {
+            required: true,
+            message: "请选择角色",
+            trigger: ["blur"],
+        },
+    ],
 });
 // 表单验证结束
 const { optionsData } = useDictOptions<{
-  role: any[];
-  jobs: any[];
-  dept: any[];
+    role: any[];
+    jobs: any[];
+    dept: any[];
 }>({
-  role: {
-    api: roleAll,
-  },
-  jobs: {
-    api: jobsAll,
-  },
-  dept: {
-    api: deptAll,
-  },
+    role: {
+        api: roleAll,
+    },
+    jobs: {
+        api: jobsAll,
+    },
+    dept: {
+        api: deptAll,
+    },
 });
 
 const handleSubmit = async () => {
-  await formRef.value?.validate();
-  mode.value == "edit"
-    ? await adminEdit(formData)
-    : await adminAdd(formData).then((res) => console.log(res));
-  popupRef.value?.close();
-  emit("success");
+    await formRef.value?.validate();
+    mode.value == "edit"
+        ? await adminEdit(formData)
+        : await adminAdd(formData).then((res) => console.log(res));
+    popupRef.value?.close();
+    emit("success");
 };
 
 const open = (type = "add") => {
-  mode.value = type;
-  popupRef.value?.open();
+    mode.value = type;
+    popupRef.value?.open();
 };
 // 图片上传成功返回的url
 const handleAvatarSuccessIdA: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.qualification.id_card = response.data.uri;
+    formData.qualification.id_card = response.data.uri;
 };
 const handleAvatarSuccessAvatar: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.avatar = response.data.uri;
+    formData.avatar = response.data.uri;
 };
 const handleAvatarSuccessIdB: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.qualification.id_card_b = response.data.uri;
+    formData.qualification.id_card_b = response.data.uri;
 };
 const handleAvatarSuccessCarA: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.qualification.car_card = response.data.uri;
+    formData.qualification.car_card = response.data.uri;
 };
 const handleAvatarSuccessCarB: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.qualification.car_card_b = response.data.uri;
+    formData.qualification.car_card_b = response.data.uri;
 };
 const beforeAvatarUpload_two: UploadProps["beforeUpload"] = (rawFile) => {
-  return true;
+    return true;
 };
 const handleAvatarSuccessBankA: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.qualification.bank_account = response.data.uri;
+    formData.qualification.bank_account = response.data.uri;
 };
 const handleAvatarSuccessBankB: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.qualification.bank_account_b = response.data.uri;
+    formData.qualification.bank_account_b = response.data.uri;
 };
 const handleAvatarSuccess_four: UploadProps["onSuccess"] = (
-  response,
-  uploadFile
+    response,
+    uploadFile
 ) => {
-  formData.file = response.data.uri;
+    formData.file = response.data.uri;
 };
 const beforeAvatarUpload_three: UploadProps["beforeUpload"] = (rawFile) => {
-  return true;
+    return true;
 };
 
 //获取省份
 function province_change(value: string) {
-  formData.province = value;
-  getCityList(value);
+    getCityList();
 }
 function city_change(value: string) {
-  formData.city = value;
-  getAreaList(value);
+    getAreaList();
 }
 function area_change(value: string) {
-  formData.area = value;
-  getStreetList(value);
+    getStreetList();
 }
 function street_change(value: string) {
-  formData.street = value;
+    formData.street = value;
 }
 const getProvinceList = async () => {
-  const data = await apiProvinceList({});
-  datas["provinceOptions"] = data;
+    const data = await apiProvinceList({});
+    datas["provinceOptions"] = data;
 };
-const getCityList = async (id: any) => {
-  const data = await apiCityList({ city: id });
-  datas["cityOptions"] = data;
+const getCityList = async () => {
+    const data = await apiCityList({ city: formData.province });
+    datas["cityOptions"] = data;
 };
-const getAreaList = async (id: any) => {
-  const data = await apiAreaList({ area: id });
-  datas["areaOptions"] = data;
+const getAreaList = async () => {
+    const data = await apiAreaList({ area: formData.city });
+    datas["areaOptions"] = data;
 };
-const getStreetList = async (id: any) => {
-  const data = await apiStreetList({ street: id });
-  datas["streetOptions"] = data;
-};
-const setFormData = async (row: any) => {
-  const data = await adminDetail({
-    id: row.id,
-  });
-  for (const key in formData) {
-    let stringArr = ["sex", "province", "city", "area", "street"];
-    if (data[key] != null && data[key] != undefined) {
-      //@ts-ignore
-      key == "role_id"
-        ? (formData[key] = data[key][0])
-        : (formData[key] = data[key]);
-      if (stringArr.includes(key)) formData[key] = formData[key].toString();
-    }
-  }
-};
-
-const handleClose = () => {
-  emit("close");
+const getStreetList = async () => {
+    const data = await apiStreetList({ street: formData.area });
+    datas["streetOptions"] = data;
 };
 getProvinceList();
 
+const setFormData = async (row: any) => {
+    const data = await adminDetail({
+        id: row.id,
+    });
+    for (const key in formData) {
+        let stringArr = ["sex", "province", "city", "area", "street"];
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            key == "role_id"
+                ? (formData[key] = data[key][0])
+                : (formData[key] = data[key]);
+            if (stringArr.includes(key)) {
+                formData[key] = formData[key].toString();
+                getCityList();
+                getAreaList();
+                getStreetList();
+            }
+        }
+    }
+};
+
+const handleClose = () => {
+    emit("close");
+};
 defineExpose({
-  open,
-  setFormData,
+    open,
+    setFormData,
 });
 </script>
 
 <style lang="scss">
-.avatar-uploader-head .el-upload {
-  width: 7.5vw;
-  height: 8.5vw;
-  background-color: #fff;
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
+.headimg {
+    width: 6.5vw;
+    height: 7.5vw;
+    overflow: hidden;
+    float: left;
+    margin-top: 24px;
 }
+
+.avatar-uploader-head .el-upload {
+    width: 6.5vw;
+    height: 7.5vw;
+    background-color: #fff;
+    border: 1px dashed var(--el-border-color);
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    transition: var(--el-transition-duration-fast);
+}
+
 .avatar-uploader .el-upload {
-  width: 10vw;
-  height: 6.3vw;
-  background-color: #fff;
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-  transition: var(--el-transition-duration-fast);
+    width: 10vw;
+    height: 6.3vw;
+    background-color: #fff;
+    border: 1px dashed var(--el-border-color);
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    transition: var(--el-transition-duration-fast);
 }
 
 .avatar-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
+    border-color: var(--el-color-primary);
 }
 
 .el-icon.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  text-align: center;
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    text-align: center;
 }
 </style>
diff --git a/src/views/permission/admin/index.vue b/src/views/permission/admin/index.vue
index 9ed561a..bd655c5 100644
--- a/src/views/permission/admin/index.vue
+++ b/src/views/permission/admin/index.vue
@@ -3,33 +3,19 @@
         <el-card class="!border-none" shadow="never">
             <el-form class="mb-[-16px]" :model="formData" inline>
                 <el-form-item label="管理员名称">
-                    <el-input
-                        v-model="formData.name"
-                        class="w-[280px]"
-                        clearable
-                        @keyup.enter="resetPage"
-                    />
+                    <el-input v-model="formData.name" class="w-[280px]" clearable @keyup.enter="resetPage" />
                 </el-form-item>
                 <el-form-item label="管理员角色">
                     <el-select class="w-[280px]" v-model="formData.role_id">
-                        <el-option label="全部" value="" />
-                        <el-option
-                            v-for="(item, index) in optionsData.role"
-                            :key="index"
-                            :label="item.name"
-                            :value="item.id"
-                        />
+                        <el-option label="全部" value />
+                        <el-option v-for="(item, index) in optionsData.role" :key="index" :label="item.name"
+                            :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
-                    <export-data
-                        class="ml-2.5"
-                        :fetch-fun="adminLists"
-                        :params="formData"
-                        :page-size="pager.size"
-                    />
+                    <export-data class="ml-2.5" :fetch-fun="adminLists" :params="formData" :page-size="pager.size" />
                 </el-form-item>
             </el-form>
         </el-card>
@@ -48,79 +34,33 @@
                             <el-avatar :size="50" :src="row.avatar"></el-avatar>
                         </template>
                     </el-table-column>
-                    <el-table-column label="账号" prop="account" min-width="100" />
+                    <el-table-column label="账号" prop="account" min-width="120" />
                     <el-table-column label="名称" prop="name" min-width="100" />
-                    <el-table-column
-                        label="角色"
-                        prop="role_name"
-                        min-width="100"
-                        show-tooltip-when-overflow
-                    />
-                    <el-table-column
-                        label="部门"
-                        prop="dept_name"
-                        min-width="100"
-                        show-tooltip-when-overflow
-                    />
+                    <el-table-column label="角色" prop="role_name" min-width="100" show-tooltip-when-overflow />
+                    <el-table-column label="部门" prop="dept_name" min-width="100" show-tooltip-when-overflow />
                     <el-table-column label="创建时间" prop="create_time" min-width="180" />
                     <el-table-column label="最近登录时间" prop="login_time" min-width="180" />
                     <el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
                     <el-table-column label="状态" min-width="100" v-perms="['auth.admin/edit']">
                         <template #default="{ row }">
-                            <el-switch
-                                v-if="row.root != 1"
-                                v-model="row.disable"
-                                :active-value="0"
-                                :inactive-value="1"
-                                @change="changeStatus(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 label="操作" width="300" align="center" fixed="right">
+                    <el-table-column label="操作" width="330" align="center" fixed="right">
                         <template #default="{ row }">
                             <div style="display: flex">
-                                <el-button
-                                v-perms="['auth.admin/edit']"
-                                type="primary"
-                                link
-                                @click="handleCheck(row)"
-                            >
-                                查看
-                            </el-button>
-                            <el-button
-                                v-perms="['auth.admin/edit']"
-                                type="primary"
-                                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>
-                            <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>
+                                <el-button v-perms="['auth.admin/edit']" type="primary" link
+                                    @click="handleCheck(row)">查看</el-button>
+                                <el-button v-perms="['auth.admin/edit']" type="primary" 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>
+                                <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>
@@ -129,17 +69,13 @@
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :isCheck="isCheck"  @success="getLists" @close="showEdit = false" />
+        <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>
+            <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-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>
@@ -148,43 +84,51 @@
 </template>
 
 <script lang="ts" setup name="admin">
-import { adminEdit, adminLists, adminDelete,generateGontract,sendMsgApi } from '@/api/perms/admin'
-import { roleAll } from '@/api/perms/role'
-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>>()
+import {
+    adminEdit,
+    adminLists,
+    adminDelete,
+    generateGontract,
+    sendMsgApi,
+} from "@/api/perms/admin";
+import { roleAll } from "@/api/perms/role";
+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: '',
-    role_id: ''
-})
-const contractId=ref('')
+    name: "",
+    role_id: "",
+});
+const contractId = ref("");
 // 弹窗
-const showPop=ref(false)
-const showConctactPop=ref(false)
-const offPop=()=>{
-    showPop.value=false
-    showConctactPop.value=false
-}
-const creContct=()=>{
-    generateGontract({id:contractId.value})
-    offPop()
-}
-const sendMsg=()=>{
-    sendMsgApi({id:contractId.value}).then(res=>{
-        console.log(res)
-    })
-
-    offPop()
-}
-// 
-const showEdit = ref(false)
+const showPop = ref(false);
+const showConctactPop = ref(false);
+const offPop = () => {
+    showPop.value = false;
+    showConctactPop.value = false;
+};
+const creContct = () => {
+    //   feedback.msgSuccess("复制成功");
+    generateGontract({ id: contractId.value }).then(() => {
+        feedback.msgSuccess("发送成功");
+    });
+    offPop();
+};
+const sendMsg = () => {
+    sendMsgApi({ id: contractId.value }).then((res) => {
+        feedback.msgSuccess("发送成功");
+    });
+    offPop();
+};
+//
+const showEdit = ref(false);
 const { pager, getLists, resetParams, resetPage } = usePaging({
     fetchFun: adminLists,
-    params: formData
-})
+    params: formData,
+});
 
 const changeStatus = (data: any) => {
     adminEdit({
@@ -193,53 +137,52 @@ const changeStatus = (data: any) => {
         name: data.name,
         role_id: data.role_id,
         disable: data.disable,
-        multipoint_login: data.multipoint_login
+        multipoint_login: data.multipoint_login,
     }).finally(() => {
-        getLists()
-    })
-}
+        getLists();
+    });
+};
 // 查看
-const isCheck=ref(false)
+const isCheck = ref(false);
 const handleCheck = async (data: any) => {
-    isCheck.value=true
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
+    isCheck.value = true;
+    showEdit.value = true;
+    await nextTick();
+    editRef.value?.open("edit");
+    editRef.value?.setFormData(data);
+};
 const handleAdd = async () => {
-    isCheck.value=false
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
+    isCheck.value = false;
+    showEdit.value = true;
+    await nextTick();
+    editRef.value?.open("add");
+};
 
 const handleEdit = async (data: any) => {
-    isCheck.value=false
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
+    isCheck.value = false;
+    showEdit.value = true;
+    await nextTick();
+    editRef.value?.open("edit");
+    editRef.value?.setFormData(data);
+};
 
 const handleDelete = async (id: number) => {
-    await feedback.confirm('确定要删除？')
-    await adminDelete({ id })
-    getLists()
-}
-
+    await feedback.confirm("确定要删除？");
+    await adminDelete({ id });
+    getLists();
+};
 
 const { optionsData } = useDictOptions<{
-    role: any[]
+    role: any[];
 }>({
     role: {
-        api: roleAll
-    }
-})
+        api: roleAll,
+    },
+});
 
 onMounted(() => {
-    getLists()
-})
+    getLists();
+});
 </script>
 <style lang="scss" scoped>
 h1 {