client/.env.base

@@ -5,7 +5,7 @@ VITE_DEV=true
 
 # 请求路径
 VITE_BASE_URL='http://10.10.10.7:48080'
-
+# VITE_BASE_URL='http://10.10.9.168:48080'
 # 上传路径
 VITE_UPLOAD_URL='/infra/file/upload'
 

client/.env.dev

@@ -5,6 +5,7 @@ VITE_DEV=false
 
 # 请求路径
 VITE_BASE_URL='http://10.10.10.7:48080'
+# VITE_BASE_URL='http://10.10.9.168:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='/infra/file/upload'

client/src/views/OaSystem/personnelManagement/ygdaPage/index.ts

@@ -76,7 +76,21 @@ export const formConfigList = [
 
       {
         name: 'hyzk',
-        title: '婚姻状况'
+        title: '婚姻状况',
+        options: [
+          {
+            value: 1,
+            label: '已婚'
+          },
+          {
+            value: 2,
+            label: '未婚'
+          },
+          {
+            value: 3,
+            label: '未知'
+          }
+        ]
       },
       {
         name: 'hkxz',
@@ -207,7 +221,29 @@ export const formConfigList = [
       },
       {
         name: 'jjlxrgx',
-        title: '紧急联系人关系'
+        title: '紧急联系人关系',
+        options: [
+          {
+            value: 1,
+            label: '父母'
+          },
+          {
+            value: 2,
+            label: '夫妻'
+          },
+          {
+            value: 3,
+            label: '子女'
+          },
+          {
+            value: 4,
+            label: '兄弟姐妹'
+          },
+          {
+            value: 5,
+            label: '其他'
+          }
+        ]
       }
     ]
   }

client/src/views/OaSystem/personnelManagement/ygdaPage/staffDetail.vue

@@ -3,7 +3,7 @@ defineOptions({ name: 'StaffDetail' })
 
 import { useQuery, useMutation } from '@tanstack/vue-query'
 import { getRecordsDetail, editRecordsDetail } from '@/api/oa/staffRecords'
-import { formConfigList, formRules } from './index'
+import { formConfigList } from './index'
 import { FormInstance } from 'element-plus'
 
 const { query } = useRoute()
@@ -80,13 +80,7 @@ const isEdit = computed(() => {
       v-if="formData != undefined"
       :class="isEdit ? 'my-portrait' : 'my-portrait form-unable-edit'"
     >
-      <el-form
-        ref="formRef"
-        :model="formData"
-        :rules="formRules"
-        label-width="150px"
-        :disabled="!isEdit"
-      >
+      <el-form ref="formRef" :model="formData" label-width="150px" :disabled="!isEdit">
         <div class="my-portrait-item" v-for="(item, index) in formConfigList" :key="index">
           <div class="title">
             <i></i>
@@ -220,6 +214,11 @@ const isEdit = computed(() => {
         box-shadow: none;
       }
 
+      .el-input.is-disabled .el-input__inner {
+        color: #2d333c;
+        -webkit-text-fill-color: #2d333c;
+      }
+
       .el-form-item__label {
         font-size: 16px;
         color: #455773;

client/src/views/OaSystem/projectCenter/purchaseContract/myContract.vue

@@ -15,13 +15,7 @@
       </div>
       <div class="form">
         <span class="formSpan">签订状态：</span>
-        <el-select
-          width="160px"
-          v-model="queryParams.isSign"
-          class="m-2"
-          placeholder="请选择行业"
-          size="large"
-        >
+        <el-select width="160px" v-model="queryParams.isSign" placeholder="请选择行业">
           <el-option
             v-for="item in isSignListAll"
             :key="item.value"
@@ -32,13 +26,7 @@
       </div>
       <div class="form">
         <span class="formSpan">签订方式：</span>
-        <el-select
-          width="160px"
-          v-model="queryParams.signWay"
-          class="m-2"
-          placeholder="请选择行业"
-          size="large"
-        >
+        <el-select width="160px" v-model="queryParams.signWay" placeholder="请选择行业">
           <el-option
             v-for="item in signWayAllList"
             :key="item.value"
@@ -54,7 +42,6 @@
           v-model="queryParams.mainType"
           class="m-2"
           placeholder="请选择行业"
-          size="large"
         >
           <el-option
             v-for="item in mainTypeAllList"
@@ -71,7 +58,6 @@
           v-model="queryParams.secondType"
           class="m-2"
           placeholder="请选择行业"
-          size="large"
         >
           <el-option
             v-for="item in secondTypeAllList"