From 7ecb0e26d401c238ce824363f97260737acaea3a Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Mon, 24 Jul 2023 09:52:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/index.ts                  | 20 +++----
 src/views/company/edit.vue           |  1 +
 src/views/contract/contractDetil.vue | 84 +++++++++++++++++++++++-----
 src/views/permission/admin/edit.vue  | 16 +++---
 src/views/permission/admin/index.vue |  9 ++-
 5 files changed, 91 insertions(+), 39 deletions(-)

diff --git a/src/config/index.ts b/src/config/index.ts
index 37ccb77..23d412e 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -1,12 +1,12 @@
 const config = {
-    terminal: 1, //终端
-    title: '后台管理系统', //网站默认标题
-    version: '1.6.0', //版本号
-    baseUrl: `${
-        import.meta.env.VITE_APP_BASE_URL || "https://worker_task.lihaink.cn"
-      }/`, //请求接口域名
-    urlPrefix: 'adminapi', //请求默认前缀
-    timeout: 10 * 1000 //请求超时时长
-}
+  terminal: 1, //终端
+  title: "后台管理系统", //网站默认标题
+  version: "1.6.0", //版本号
+  baseUrl: `${
+    import.meta.env.VITE_APP_BASE_URL || "https://worker-task.lihaink.cn"
+  }/`, //请求接口域名
+  urlPrefix: "adminapi", //请求默认前缀
+  timeout: 10 * 1000, //请求超时时长
+};
 
-export default config
+export default config;
diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index 48f2265..ccf118f 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -674,6 +674,7 @@ function customEventMan(data: any) {
   isMan.value = false;
   formData.admin_name = data.name;
   formData.admin_id = data.id;
+  console.log(formData);
 }
 //区域管理人员
 function EventAreaManager(data: any) {
diff --git a/src/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue
index 4d17130..28014f0 100644
--- a/src/views/contract/contractDetil.vue
+++ b/src/views/contract/contractDetil.vue
@@ -1,37 +1,87 @@
 <template>
   <el-dialog @confirm="handleSubmit" title="合同详情" v-model="show">
-    <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+    <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-input
+          v-model="formData.company_name"
+          :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-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-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-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-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 label="甲方" prop="party_a_name">
+        <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" :disabled="true" clearable placeholder="暂无乙方" />
+      <el-form-item label="乙方" prop="party_b_name">
+        <el-input
+          v-model="formData.party_b_name"
+          :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-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-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>
+      <el-button @click="show = false">取消</el-button>
+      <el-button type="primary" @click="show = false">确定</el-button>
     </div>
   </el-dialog>
 </template>
@@ -41,12 +91,16 @@ import { ref, reactive, defineExpose } from "vue";
 const formData = reactive({
   id: "",
   company_id: "",
+  company_name: "",
   contract_type: "",
+  contract_type_name: "",
   contract_no: "",
   file: "",
   status: "",
   party_a: "",
+  party_a_name: "",
   party_b: "",
+  party_b_name: "",
   area_manager: "",
 });
 const show = ref(false);
@@ -73,4 +127,4 @@ defineExpose({
 .btn_men {
   text-align: right;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue
index ff35bd0..7f142e1 100644
--- a/src/views/permission/admin/edit.vue
+++ b/src/views/permission/admin/edit.vue
@@ -166,8 +166,8 @@
 
         <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-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"
@@ -213,9 +213,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="userStore.userInfo.root == 0">
-              <!-- <el-col :span="12" v-if="true"> -->
-
+            <!-- <el-col :span="12" v-if="userStore.userInfo.root == 0"> -->
+            <el-col :span="12" v-if="true">
               <el-form-item label="签约方" prop="field130">
                 <el-input
                   :disabled="isCheck"
@@ -355,8 +354,8 @@
             </el-form-item>
           </div>
         </div>
-        <template v-if="userStore.userInfo.root == 0">
-          <!-- <template v-if="true"> -->
+        <!-- <template v-if="userStore.userInfo.root == 0"> -->
+        <template v-if="true">
           <el-col :span="24">
             <el-row>
               <el-col :span="12">
@@ -377,7 +376,7 @@
                     :disabled="true"
                     clearable
                     :style="{ width: '100%' }"
-                    :value="formData.sex == 1 ? '男' : '女'"
+                    :value="formData.sex == '1' ? '男' : '女'"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -608,7 +607,6 @@ const formRules = reactive({
       trigger: ["blur"],
     },
   ],
-
   name: [
     {
       required: true,
diff --git a/src/views/permission/admin/index.vue b/src/views/permission/admin/index.vue
index 4cf2429..18b1573 100644
--- a/src/views/permission/admin/index.vue
+++ b/src/views/permission/admin/index.vue
@@ -164,7 +164,6 @@
     <edit-popup
       v-if="showEdit"
       ref="editRef"
-      :isCheck="isCheck"
       @success="getLists"
       @close="showEdit = false"
     />
@@ -253,25 +252,25 @@ const changeStatus = (data: any) => {
   });
 };
 // 查看
-const isCheck = ref(false);
+// isCheckFn
 const handleCheck = async (data: any) => {
-  isCheck.value = true;
   showEdit.value = true;
   await nextTick();
   editRef.value?.open("edit");
+  editRef.value?.isCheckFn(true);
   editRef.value?.setFormData(data);
 };
 const handleAdd = async () => {
-  isCheck.value = false;
   showEdit.value = true;
   await nextTick();
+  editRef.value?.isCheckFn(false);
   editRef.value?.open("add");
 };
 
 const handleEdit = async (data: any) => {
-  isCheck.value = false;
   showEdit.value = true;
   await nextTick();
+  editRef.value?.isCheckFn(false);
   editRef.value?.open("edit");
   editRef.value?.setFormData(data);
 };