From 5e907096919057fd82225ea63f86f124b4f2627d Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Sun, 23 Jul 2023 23:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/company/dialog_index.vue   |   4 +-
 src/views/company/edit.vue           |  11 +-
 src/views/company/index.vue          |   3 +-
 src/views/company/subordinate.vue    |   3 +-
 src/views/contract/contractDetil.vue | 162 ++++++++++++++++----------
 src/views/contract/edit.vue          | 129 +++++++++++----------
 src/views/contract/index.vue         | 167 ++++++++++++++++-----------
 src/views/permission/admin/edit.vue  |  36 +++---
 src/views/permission/admin/index.vue |  21 ++--
 9 files changed, 316 insertions(+), 220 deletions(-)

diff --git a/src/views/company/dialog_index.vue b/src/views/company/dialog_index.vue
index ed316d7..9af4cf7 100644
--- a/src/views/company/dialog_index.vue
+++ b/src/views/company/dialog_index.vue
@@ -27,14 +27,12 @@
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
             <div class="mt-4">
                 <el-table :data="pager.lists" @cell-click="handleCurrentChange">
-                    <el-table-column label="签约公司" property="company_name" />
+                    <el-table-column label="公司名称" property="company_name" />
                     <el-table-column label="公司类型" property="company_type" />
                     <el-table-column label="区县" property="area" />
                     <el-table-column label="乡镇" property="street" />
                     <el-table-column label="主联系人" property="master_name" />
                     <el-table-column label="联系方式" property="master_phone" />
-                    <el-table-column label="片区经理" property="area_manager" />
-                    <el-table-column label="是否签约" property="is_contract" />
                 </el-table>
             </div>
             <div class="flex mt-4 justify-end">
diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index dabb0cb..eed27f4 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -273,7 +273,7 @@
             <el-col :span="24" class="el-card pt-6">
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="营业执照" required>
+                        <el-form-item label="公司资质" required>
                             <el-upload
                                 :disabled="isDisabled"
                                 v-model="formData.qualification.business_license"
@@ -313,7 +313,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="对公银行" required>
+                        <el-form-item label="其他资质" required>
                             <el-upload
                                 :disabled="isDisabled"
                                 v-model="formData.qualification.bank_account"
@@ -557,12 +557,7 @@ const datas = reactive({
     dictTypeLists: [],
     contract_type: []
 })
-const fileList = ref<UploadUserFile[]>([
-    {
-        name: '',
-        url: ''
-    }
-])
+const fileList = ref<UploadUserFile[]>([])
 // 表单验证
 const formRules = reactive<any>({
     company_name: [
diff --git a/src/views/company/index.vue b/src/views/company/index.vue
index 57de25c..eedd2d9 100644
--- a/src/views/company/index.vue
+++ b/src/views/company/index.vue
@@ -92,7 +92,8 @@
                     <el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
                     <el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
                         <template #default="{ row }">
-                            {{ row.is_contract == 1 ? '已签约' : '未签约' }}
+                            <span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
+                            <span v-else style="color: #fe0000">未签约</span>
                         </template></el-table-column
                     >
                     <el-table-column label="操作" align="center" width="500" fixed="right">
diff --git a/src/views/company/subordinate.vue b/src/views/company/subordinate.vue
index deb77a7..756e3f9 100644
--- a/src/views/company/subordinate.vue
+++ b/src/views/company/subordinate.vue
@@ -17,7 +17,8 @@
                     />
                     <el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
                         <template #default="{ row }">
-                            {{ row.is_contract == 1 ? '已签约' : '未签约' }}
+                            <span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
+                            <span v-else style="color: #fe0000">未签约</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="操作" align="center" width="450" fixed="right">
diff --git a/src/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue
index 4d17130..68d74d1 100644
--- a/src/views/contract/contractDetil.vue
+++ b/src/views/contract/contractDetil.vue
@@ -1,76 +1,118 @@
 <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>
+    <el-dialog @confirm="handleSubmit" title="合同详情" v-model="show">
+        <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+            <el-form-item label="合同类型" prop="contract_type">
+                <el-input
+                    v-model="formData.contract_type_name"
+                    :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="party_a">
+                <el-input
+                    v-model="formData.party_a_name"
+                    :disabled="true"
+                    clearable
+                    placeholder="暂无甲方"
+                />
+            </el-form-item>
+            <el-form-item label="乙方" prop="party_b">
+                <el-input
+                    v-model="formData.party_b_name"
+                    :disabled="true"
+                    clearable
+                    placeholder="暂无乙方"
+                />
+            </el-form-item>
+            <el-form-item label="片区经理" prop="area_manager_name">
+                <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_name"
+                    :disabled="true"
+                    clearable
+                    placeholder="暂无状态"
+                />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+                <el-input
+                    v-model="formData.status_name"
+                    :disabled="true"
+                    clearable
+                    placeholder="暂无状态"
+                />
+            </el-form-item>
+            <el-form-item label="合同地址" v-if="formData.status == 1">
+                <el-link type="success" :href="formData.url" target="_blank">在线查看</el-link>
+            </el-form-item>
+        </el-form>
+        <div class="btn_men">
+            <el-button @click="show = false">取消</el-button>
+            <el-button type="primary" @click="show = false">确定</el-button>
+        </div>
+    </el-dialog>
 </template>
 
 <script setup>
-import { ref, reactive, defineExpose } from "vue";
+import { ref, reactive, defineExpose } from 'vue'
 const formData = reactive({
-  id: "",
-  company_id: "",
-  contract_type: "",
-  contract_no: "",
-  file: "",
-  status: "",
-  party_a: "",
-  party_b: "",
-  area_manager: "",
-});
-const show = ref(false);
+    id: '',
+    company_id: '',
+    contract_type: '',
+    contract_type_name: '',
+    contract_no: '',
+    file: '',
+    status: '',
+    party_a: '',
+    party_a_name: '',
+    party_b: '',
+    party_b_name: '',
+    area_manager: '',
+    area_manager_name: '',
+    type_name: '',
+    url: '',
+    status_name: ''
+})
+const show = ref(false)
 const shoeEditFn = (flag) => {
-  show.value = flag;
-};
+    show.value = flag
+}
 // 传值赋值
 const setFormData = async (data) => {
-  for (const key in formData) {
-    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]
+            if (key == 'type') {
+                formData.type = data.type == 1 ? '公司' : '个人'
+            }
+        }
     }
-  }
-};
+}
 
 defineExpose({
-  shoeEditFn,
-  setFormData,
-});
+    shoeEditFn,
+    setFormData
+})
 </script>
 
 <style lang="scss" scoped>
 .btn_men {
-  text-align: right;
+    text-align: right;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/contract/edit.vue b/src/views/contract/edit.vue
index 1614d4d..69648ce 100644
--- a/src/views/contract/edit.vue
+++ b/src/views/contract/edit.vue
@@ -1,9 +1,7 @@
 <template>
     <div class="edit-popup">
-
         <popup
-
-        v-if="true"
+            v-if="true"
             ref="popupRef"
             :title="popupTitle"
             :async="true"
@@ -12,29 +10,35 @@
             @close="handleClose"
         >
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="公司" prop="company_id">
-                    <el-input v-model="formData.company_id" clearable placeholder="请输入公司" />
-                </el-form-item>
-                <el-form-item label="合同类型" prop="contract_type">
-                    <el-input v-model="formData.contract_type" clearable placeholder="请输入合同类型" />
+                <el-form-item label="合同类型" prop="contract_type_name">
+                    <el-input
+                        v-model="formData.contract_type_name"
+                        clearable
+                        placeholder="请输入合同类型"
+                    />
                 </el-form-item>
                 <el-form-item label="合同编号" prop="contract_no">
-                    <el-input v-model="formData.contract_no" clearable placeholder="请输入合同编号" />
-                </el-form-item>
-                <el-form-item label="文件" prop="file">
-                    <el-input v-model="formData.file" clearable placeholder="请输入文件" />
+                    <el-input
+                        v-model="formData.contract_no"
+                        clearable
+                        placeholder="请输入合同编号"
+                    />
                 </el-form-item>
                 <el-form-item label="状态" prop="status">
                     <el-input v-model="formData.status" clearable placeholder="请输入状态" />
                 </el-form-item>
-                <el-form-item label="甲方" prop="party_a">
-                    <el-input v-model="formData.party_a" clearable placeholder="请输入甲方" />
+                <el-form-item label="甲方" prop="party_a_name">
+                    <el-input v-model="formData.party_a_name" clearable placeholder="请输入甲方" />
                 </el-form-item>
-                <el-form-item label="乙方" prop="party_b">
-                    <el-input v-model="formData.party_b" clearable placeholder="请输入乙方" />
+                <el-form-item label="乙方" prop="party_b_name">
+                    <el-input v-model="formData.party_b_name" clearable placeholder="请输入乙方" />
                 </el-form-item>
-                <el-form-item label="片区经理" prop="area_manager">
-                    <el-input v-model="formData.area_manager" clearable placeholder="请输入片区经理" />
+                <el-form-item label="片区经理" prop="area_manager_name">
+                    <el-input
+                        v-model="formData.area_manager_name"
+                        clearable
+                        placeholder="请输入片区经理"
+                    />
                 </el-form-item>
             </el-form>
         </popup>
@@ -68,50 +72,64 @@ const formData = reactive({
     id: '',
     company_id: '',
     contract_type: '',
+    contract_type_name: '',
     contract_no: '',
     file: '',
     status: '',
     party_a: '',
+    party_a_name: '',
     party_b: '',
+    party_b_name: '',
     area_manager: '',
+    area_manager_name: ''
 })
 
-
 // 表单验证
 const formRules = reactive<any>({
-    company_id: [{
-        required: true,
-        message: '请输入公司',
-        trigger: ['blur']
-    }],
-    contract_type: [{
-        required: true,
-        message: '请输入合同类型',
-        trigger: ['blur']
-    }],
-    contract_no: [{
-        required: true,
-        message: '请输入合同编号',
-        trigger: ['blur']
-    }],
-    file: [{
-        required: true,
-        message: '请输入文件',
-        trigger: ['blur']
-    }],
-    party_a: [{
-        required: true,
-        message: '请输入甲方',
-        trigger: ['blur']
-    }],
-    party_b: [{
-        required: true,
-        message: '请输入乙方',
-        trigger: ['blur']
-    }]
+    company_id: [
+        {
+            required: true,
+            message: '请输入公司',
+            trigger: ['blur']
+        }
+    ],
+    contract_type: [
+        {
+            required: true,
+            message: '请输入合同类型',
+            trigger: ['blur']
+        }
+    ],
+    contract_no: [
+        {
+            required: true,
+            message: '请输入合同编号',
+            trigger: ['blur']
+        }
+    ],
+    file: [
+        {
+            required: true,
+            message: '请输入文件',
+            trigger: ['blur']
+        }
+    ],
+    party_a: [
+        {
+            required: true,
+            message: '请输入甲方',
+            trigger: ['blur']
+        }
+    ],
+    party_b: [
+        {
+            required: true,
+            message: '请输入乙方',
+            trigger: ['blur']
+        }
+    ]
 })
 
-
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     for (const key in formData) {
@@ -120,8 +138,6 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -131,14 +147,11 @@ const getDetail = async (row: Record<string, any>) => {
     setFormData(data)
 }
 
-
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiContractEdit(data) 
-        : await apiContractAdd(data)
+    const data = { ...formData }
+    mode.value == 'edit' ? await apiContractEdit(data) : await apiContractAdd(data)
     popupRef.value?.close()
     emit('success')
 }
@@ -154,8 +167,6 @@ const handleClose = () => {
     emit('close')
 }
 
-
-
 defineExpose({
     open,
     setFormData,
diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue
index 615474b..09d77f9 100644
--- a/src/views/contract/index.vue
+++ b/src/views/contract/index.vue
@@ -3,20 +3,45 @@
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="公司名称" prop="company_id">
-                    <el-input class="w-[280px]" v-model="queryParams.company_id" clearable placeholder="请输入公司" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.company_id"
+                        clearable
+                        placeholder="请输入公司"
+                    />
                 </el-form-item>
                 <el-form-item label="合同类型" prop="contract_type">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_type" clearable placeholder="请输入合同类型" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.contract_type"
+                        clearable
+                        placeholder="请输入合同类型"
+                    />
                 </el-form-item>
                 <el-form-item label="合同编号" prop="contract_no">
-                    <el-input class="w-[280px]" v-model="queryParams.contract_no" clearable placeholder="请输入合同编号" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.contract_no"
+                        clearable
+                        placeholder="请输入合同编号"
+                    />
                 </el-form-item>
                 <el-form-item label="状态" prop="status">
-                    <el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入状态" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.status"
+                        clearable
+                        placeholder="请输入状态"
+                    />
                 </el-form-item>
 
                 <el-form-item label="片区经理" prop="area_manager">
-                    <el-input class="w-[280px]" v-model="queryParams.area_manager" clearable placeholder="请输入片区经理" />
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.area_manager"
+                        clearable
+                        placeholder="请输入片区经理"
+                    />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -31,49 +56,59 @@
                 </template>
                 新增
       </el-button>-->
-            <el-button v-perms="['contract.contract/delete']" :disabled="!selectData.length"
-                @click="handleDelete(selectData)">删除</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="area_manager_name"
+                        show-overflow-tooltip
+                    />
                     <el-table-column label="类型" prop="type" show-overflow-tooltip>
                         <template #default="scope">
-                            <span>{{ scope.row.type == 1 ? '公司' : scope.row.type == 0 ? "" : '个人' }}</span>
-
+                            <span>{{
+                                scope.row.type == 1 ? '公司' : scope.row.type == 0 ? '' : '个人'
+                            }}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="状态" prop="status_name" show-overflow-tooltip>
+                        <template #default="scope">
+                            <span v-if="scope.row.status_name == '已签约'" style="color: #67c23a"
+                                >已签约</span
+                            >
+                            <span v-else style="color: #fe0000">未签约</span>
                         </template>
-
                     </el-table-column>
-                    <el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
                     <el-table-column label="操作" width="180" fixed="right" align="center">
                         <template #default="{ row }">
-                            <!-- <el-button
-                                v-perms="['contract.contract/edit']"
+                            <el-button
+                                v-perms="['contract.contract/delete']"
                                 type="primary"
                                 link
-                                @click="handleEdit(row)"
+                                @click="showDetil(row.id)"
                             >
-                                编辑
-              </el-button>-->
-                            <el-button v-perms="['contract.contract/delete']" type="primary" link
-                                @click="checkContcat(row.id)">
-                                <!-- <a href="https://www.zhihu.com/signin?next=%2F">查看</a> -->
-                                查看
-                            </el-button>
-                            <el-button v-perms="['contract.contract/delete']" type="primary" link
-                                @click="showDetil(row.id)">
-                                <!-- <a href="https://www.zhihu.com/signin?next=%2F">查看</a> -->
                                 详情
                             </el-button>
 
-                            <el-button v-perms="['contract.contract/delete']" type="danger" link
-                                @click="handleDelete(row.id)">删除</el-button>
+                            <!-- <el-button v-perms="['contract.contract/delete']" type="danger" link
+                                @click="handleDelete(row.id)">删除</el-button> -->
                         </template>
                     </el-table-column>
                 </el-table>
@@ -87,64 +122,60 @@
 </template>
 
 <script lang="ts" setup name="contractLists">
-import contractDetil from "./contractDetil.vue";
-import { 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 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 childDetil = ref()
 const showDetil = async (id) => {
-    let res = await apiContractDetail({ id });
-    childDetil.value.setFormData(res);
-    childDetil.value.shoeEditFn(true);
-};
+    const res = await apiContractDetail({ id })
+    childDetil.value.setFormData(res)
+    childDetil.value.shoeEditFn(true)
+}
 // 查看合同
-const checkContcat = (id: Number) => {
+const checkContcat = (id: number) => {
     apiContractDetail({ id }).then((res) => {
-        res.file ? window.open(res.file) : feedback.msgError("暂无合同可以查看");
-    });
+        res.file ? window.open(res.file) : feedback.msgError('暂无合同可以查看')
+    })
 
     // window.open('https://www.zhihu.com/signin?next=%2F')
-};
+}
 
 // 添加
 // const handleAdd = async () => {
@@ -163,12 +194,12 @@ const checkContcat = (id: Number) => {
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm("确定要删除？");
-    await apiContractDelete({ id });
-    getLists();
-};
+    await feedback.confirm('确定要删除？')
+    await apiContractDelete({ id })
+    getLists()
+}
 
-getLists();
+getLists()
 // pager.lists.forEach((item) => {
 //   console.log(item.type);
 // });
diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue
index 3315216..4d42b96 100644
--- a/src/views/permission/admin/edit.vue
+++ b/src/views/permission/admin/edit.vue
@@ -374,7 +374,7 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12" v-if="formData.name">
-                                <el-form-item label="账号" prop="account">
+                                <el-form-item label="账号">
                                     <el-input
                                         v-model="formData.account"
                                         :disabled="true"
@@ -384,9 +384,9 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12" v-if="formData.name">
-                                <el-form-item label="密码" prop="password">
+                                <el-form-item label="初始密码" prop="password">
                                     <el-input
-                                        v-model="formData.account"
+                                        :model-value="'m' + formData.account"
                                         :disabled="true"
                                         clearable
                                         :style="{ width: '100%' }"
@@ -415,7 +415,7 @@
                             </el-col>
                         </el-row>
                     </el-col>
-                    <el-col :span="24" v-if="!isCheck">
+                    <el-col :span="24" v-if="!isCheck && mode != 'view'">
                         <el-form-item label="合同上传" prop="field127">
                             <el-upload
                                 :headers="{ Token: userStore.token }"
@@ -430,6 +430,13 @@
                             </el-upload>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="24" v-if="mode == 'view'">
+                        <el-form-item label="合同地址">
+                            <el-link type="success" :href="formData.contract.url" target="_blank"
+                                >在线查看</el-link
+                            >
+                        </el-form-item>
+                    </el-col>
                 </template>
             </el-form>
         </popup>
@@ -492,7 +499,10 @@ const formData = reactive({
     avatar: '',
     multipoint_login: 1,
     root: 0,
-    disable: 0
+    disable: 0,
+    contract: {
+        url: ''
+    }
 })
 // 字典信息
 const datas: any = reactive({
@@ -649,13 +659,11 @@ const handleSubmit = async () => {
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
-}
-const fileList = ref<UploadUserFile[]>([
-    {
-        name: '',
-        url: ''
+    if (type == 'view') {
+        isCheck.value = true
     }
-])
+}
+const fileList = ref<UploadUserFile[]>([])
 // 图片上传成功返回的url
 const handleAvatarSuccessIdA: UploadProps['onSuccess'] = (response, uploadFile) => {
     if (response.code == 0) {
@@ -773,8 +781,10 @@ const setFormData = async (row: any) => {
     if (data.role_id[0] == 8) {
         disabledPartyA.value = false
     }
-    fileList.value[0].url = data['contract']['file']
-    fileList.value[0].name = '合同文件'
+    fileList.value[0] = {
+        url: data['contract']['file'],
+        name: '合同文件'
+    }
     await getCityList()
     await getAreaList()
     await getStreetList()
diff --git a/src/views/permission/admin/index.vue b/src/views/permission/admin/index.vue
index 17d50c7..2759dec 100644
--- a/src/views/permission/admin/index.vue
+++ b/src/views/permission/admin/index.vue
@@ -69,7 +69,8 @@
                         min-width="120"
                     >
                         <template #default="{ row }">
-                            {{ row.is_contract == 1 ? '已签约' : '未签约' }}
+                            <span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
+                            <span v-else style="color: #fe0000">未签约</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="最近登录时间" prop="login_time" min-width="180" />
@@ -96,10 +97,10 @@
                         <template #default="{ row }">
                             <div style="display: flex">
                                 <el-button
-                                    v-perms="['auth.admin/edit']"
+                                    v-perms="['auth.admin/view']"
                                     type="primary"
                                     link
-                                    @click="handleCheck(row)"
+                                    @click="handleView(row)"
                                     >查看</el-button
                                 >
                                 <el-button
@@ -119,7 +120,7 @@
                                 >
                                 <template v-if="row.company_id != 0 && row.is_contract == 0">
                                     <el-button
-                                        v-perms="['company/edit', 'company/add']"
+                                        v-perms="['auth.admin/Draftingcontracts']"
                                         type="primary"
                                         link
                                         @click="
@@ -130,11 +131,11 @@
                                         >生成个人合同</el-button
                                     >
                                     <el-button
-                                        v-perms="['company/edit', 'company/add']"
+                                        v-perms="['auth.admin/postsms']"
                                         type="primary"
                                         link
                                         @click=";(showPop = true), (contractId = row.id)"
-                                        >发送短信</el-button
+                                        >重新短信</el-button
                                     >
                                 </template>
                             </div>
@@ -250,7 +251,13 @@ const handleEdit = async (data: any) => {
     editRef.value?.open('edit')
     editRef.value?.setFormData(data)
 }
-
+const handleView = async (data: any) => {
+    isCheck.value = false
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('view')
+    editRef.value?.setFormData(data)
+}
 const handleDelete = async (id: number) => {
     await feedback.confirm('确定要删除？')
     await adminDelete({ id })