diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue
index bc109a1..ff35bd0 100644
--- a/src/views/permission/admin/edit.vue
+++ b/src/views/permission/admin/edit.vue
@@ -31,7 +31,6 @@
             </el-icon>
           </el-upload>
         </div>
-
         <el-col class="pt-6 !border-none">
           <el-row>
             <el-col :span="11">
@@ -101,7 +100,6 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-
             <el-form-item label="市" prop="city" style="flex: 1">
               <el-select
                 :disabled="isCheck"
@@ -169,6 +167,7 @@
         <el-col :span="24" style="margin-top: 1vh">
           <el-row>
             <el-col :span="12" v-if="userStore.userInfo.root == 0">
+              <!-- <el-col :span="12" v-if="true"> -->
               <el-form-item label="授权身份" prop="role_id">
                 <el-select
                   v-model="formData.role_id"
@@ -446,7 +445,6 @@
               </el-col>
             </el-row>
           </el-col>
-
           <el-col :span="24" v-if="!isCheck">
             <el-form-item label="合同上传" prop="field127">
               <el-upload
@@ -671,7 +669,6 @@ const { optionsData } = useDictOptions<{
   },
 });
 const handleSubmit = async () => {
-  console.log(formData);
   if (isCheck.value) {
     popupRef.value?.close();
     return;
@@ -788,6 +785,10 @@ const setFormData = async (row: any) => {
       if (stringArr.includes(key)) formData[key] = formData[key].toString();
     }
   }
+  formData.contract_type = data.contract.contract_type;
+  formData.party_a_name = data.contract.party_a_name;
+  formData.party_a = data.contract.party_a;
+  formData.file = data.contract.file;
   await getCityList();
   await getAreaList();
   await getStreetList();
diff --git a/src/views/permission/admin/index.vue b/src/views/permission/admin/index.vue
index 6c8d6e8..4cf2429 100644
--- a/src/views/permission/admin/index.vue
+++ b/src/views/permission/admin/index.vue
@@ -1,95 +1,205 @@
 <template>
-    <div class="admin">
-        <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-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-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" />
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card v-loading="pager.loading" class="mt-4 !border-none" shadow="never">
-            <el-button v-perms="['auth.admin/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" size="large">
-                    <el-table-column label="ID" prop="id" min-width="60" />>
-                    <el-table-column label="头像" min-width="100">
-                        <template #default="{ row }">
-                            <el-avatar :size="50" :src="row.avatar"></el-avatar>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="账号" prop="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-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)" />
-                        </template>
-                    </el-table-column>
-                    <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>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :isCheck="isCheck" @success="getLists" @close="showEdit = false" />
-        <el-dialog v-model="showPop" @close="offPop">
-            <h1>重要提醒</h1>
-            <div class="content" v-if="showConctactPop">请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.</div>
-            <div class="content" v-else>确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约</div>
-            <p class="btn_menu">
-                <el-button type="primary" size="large" v-if="showConctactPop" @click="creContct">确认创建</el-button>
-                <el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button>
-                <el-button type="info" size="large" @click="offPop">返回</el-button>
-            </p>
-        </el-dialog>
-    </div>
+  <div class="admin">
+    <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-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-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"
+          />
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card v-loading="pager.loading" class="mt-4 !border-none" shadow="never">
+      <el-button v-perms="['auth.admin/add']" type="primary" @click="handleAdd">
+        <template #icon>
+          <icon name="el-icon-Plus" />
+        </template>
+        新增
+      </el-button>
+      <div class="mt-4">
+        <el-table :data="pager.lists" size="large">
+          <el-table-column label="ID" prop="id" min-width="60" />>
+          <el-table-column label="头像" min-width="100">
+            <template #default="{ row }">
+              <el-avatar :size="50" :src="row.avatar"></el-avatar>
+            </template>
+          </el-table-column>
+          <el-table-column label="姓名" prop="name" min-width="100" />
+          <el-table-column label="联系方式" prop="account" min-width="130" />
+          <el-table-column
+            label="隶属公司"
+            prop="company.company_name"
+            min-width="120"
+            align="center"
+          >
+            <template #default="{ row }">
+              {{ row.company.company_name || "/" }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="所在乡镇"
+            prop="street_name"
+            min-width="120"
+          />
+          <el-table-column label="授权身份" prop="role_name" min-width="120" />
+          <el-table-column
+            label="是否签约"
+            prop="contract_id"
+            align="center"
+            min-width="120"
+          >
+            <template #default="{ row }">
+              {{ row.contract_id == 0 ? "未签约" : "已签约" }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="最近登录时间"
+            prop="login_time"
+            min-width="180"
+          />
+          <el-table-column
+            label="创建时间"
+            prop="create_time"
+            min-width="180"
+            align="center"
+          />
+          <el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
+          <el-table-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)"
+              />
+            </template>
+          </el-table-column>
+
+          <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>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+    <edit-popup
+      v-if="showEdit"
+      ref="editRef"
+      :isCheck="isCheck"
+      @success="getLists"
+      @close="showEdit = false"
+    />
+    <el-dialog v-model="showPop" @close="offPop">
+      <h1>重要提醒</h1>
+      <div class="content" v-if="showConctactPop">
+        请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
+      </div>
+      <div class="content" v-else>
+        确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
+      </div>
+      <p class="btn_menu">
+        <el-button
+          type="primary"
+          size="large"
+          v-if="showConctactPop"
+          @click="creContct"
+          >确认创建</el-button
+        >
+        <el-button type="primary" size="large" v-else @click="sendMsg"
+          >确认</el-button
+        >
+        <el-button type="info" size="large" @click="offPop">返回</el-button>
+      </p>
+    </el-dialog>
+  </div>
 </template>
 
 <script lang="ts" setup name="admin">
 import {
-    adminEdit,
-    adminLists,
-    adminDelete,
-    generateGontract,
-    sendMsgApi,
+  adminEdit,
+  adminLists,
+  adminDelete,
+  generateGontract,
+  sendMsgApi,
 } from "@/api/perms/admin";
 import { roleAll } from "@/api/perms/role";
 import { useDictOptions } from "@/hooks/useDictOptions";
@@ -99,115 +209,115 @@ import EditPopup from "./edit.vue";
 const editRef = shallowRef<InstanceType<typeof EditPopup>>();
 // 表单数据
 const formData = reactive({
-    name: "",
-    role_id: "",
+  name: "",
+  role_id: "",
 });
 const contractId = ref("");
 // 弹窗
 const showPop = ref(false);
 const showConctactPop = ref(false);
 const offPop = () => {
-    showPop.value = false;
-    showConctactPop.value = false;
+  showPop.value = false;
+  showConctactPop.value = false;
 };
 const creContct = () => {
-    //   feedback.msgSuccess("复制成功");
-    generateGontract({ id: contractId.value }).then(() => {
-        feedback.msgSuccess("发送成功");
-    });
-    offPop();
+  //   feedback.msgSuccess("复制成功");
+  generateGontract({ id: contractId.value }).then(() => {
+    feedback.msgSuccess("发送成功");
+  });
+  offPop();
 };
 const sendMsg = () => {
-    sendMsgApi({ id: contractId.value }).then((res) => {
-        feedback.msgSuccess("发送成功");
-    });
-    offPop();
+  sendMsgApi({ id: contractId.value }).then((res) => {
+    feedback.msgSuccess("发送成功");
+  });
+  offPop();
 };
 //
 const showEdit = ref(false);
 const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: adminLists,
-    params: formData,
+  fetchFun: adminLists,
+  params: formData,
 });
 
 const changeStatus = (data: any) => {
-    adminEdit({
-        id: data.id,
-        account: data.account,
-        name: data.name,
-        role_id: data.role_id,
-        disable: data.disable,
-        multipoint_login: data.multipoint_login,
-    }).finally(() => {
-        getLists();
-    });
+  adminEdit({
+    id: data.id,
+    account: data.account,
+    name: data.name,
+    role_id: data.role_id,
+    disable: data.disable,
+    multipoint_login: data.multipoint_login,
+  }).finally(() => {
+    getLists();
+  });
 };
 // 查看
 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,
-    },
+  role: {
+    api: roleAll,
+  },
 });
 
 onMounted(() => {
-    getLists();
+  getLists();
 });
 </script>
 <style lang="scss" scoped>
 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>