页面完善

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();

src/views/permission/admin/index.vue

@@ -3,19 +3,33 @@
     <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"
+            <el-option
-                            :value="item.id" />
+              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>
@@ -34,32 +48,110 @@
               <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="name" min-width="100" />
+          <el-table-column label="联系方式" prop="account" min-width="130" />
-                    <el-table-column label="角色" prop="role_name" min-width="100" show-tooltip-when-overflow />
+          <el-table-column
-                    <el-table-column label="部门" prop="dept_name" min-width="100" show-tooltip-when-overflow />
+            label="隶属公司"
-                    <el-table-column label="创建时间" prop="create_time" min-width="180" />
+            prop="company.company_name"
-                    <el-table-column label="最近登录时间" prop="login_time" min-width="180" />
+            min-width="120"
-                    <el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
+            align="center"
-                    <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"
+              {{ row.company.company_name || "/" }}
-                                @change="changeStatus(row)" />
             </template>
           </el-table-column>
-                    <el-table-column label="操作" width="330" align="center" fixed="right">
+          <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
+                <el-button
-                                    @click="handleCheck(row)">查看</el-button>
+                  v-perms="['auth.admin/edit']"
-                                <el-button v-perms="['auth.admin/edit']" type="primary" link
+                  type="primary"
-                                    @click="handleEdit(row)">编辑</el-button>
+                  link
-                                <el-button v-if="row.root != 1" v-perms="['auth.admin/delete']" type="danger" link
+                  @click="handleCheck(row)"
-                                    @click="handleDelete(row.id)">删除</el-button>
+                  >查看</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
-                                <el-button v-perms="['company/edit', 'company/add']" type="primary" link
+                  v-perms="['auth.admin/edit']"
-                                    @click=" showPop = true, contractId = row.id">发送短信</el-button>
+                  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>
@@ -69,14 +161,32 @@
         <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-if="showConctactPop">
-            <div class="content" v-else>确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约</div>
+        请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
+      </div>
+      <div class="content" v-else>
+        确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
+      </div>
       <p class="btn_menu">
-                <el-button type="primary" size="large" v-if="showConctactPop" @click="creContct">确认创建</el-button>
+        <el-button
-                <el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button>
+          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>