From 629e17a48f5247a44e8d59a31e9ead1c5ebb611f Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Tue, 23 Apr 2024 18:04:08 +0800
Subject: [PATCH] =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basics_info_management/operation_vehicle/add.vue  |  2 +-
 .../basics_info_management/operation_vehicle/edit.vue |  2 +-
 .../operation_vehicle/index.vue                       |  4 ++--
 .../basics_info_management/operation_vehicle/view.vue |  2 +-
 .../enterprise_management/user_practitioner/add.vue   | 11 -----------
 .../enterprise_safety_production_shift/edit.vue       |  2 ++
 .../safety_production_related/security_notice/add.vue |  6 ++++--
 7 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
index 42b7895..2e0b5e0 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue
@@ -21,7 +21,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="车辆颜色" prop="VEHICLE_COLOR">
+          <el-form-item label="车牌颜色" prop="VEHICLE_COLOR">
             <el-select v-model="form.VEHICLE_COLOR">
               <el-option
                 v-for="item in getVehicleColorList"
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
index 950364f..9ba6a2b 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/edit.vue
@@ -17,7 +17,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="车辆颜色" prop="VEHICLE_COLOR">
+          <el-form-item label="车牌颜色" prop="VEHICLE_COLOR">
             <el-select v-model="form.VEHICLE_COLOR">
               <el-option
                 v-for="item in getVehicleColorList"
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
index b792621..2d9be62 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
@@ -16,7 +16,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="车辆颜色" prop="VEHICLE_COLOR">
+            <el-form-item label="车牌颜色" prop="VEHICLE_COLOR">
               <el-select v-model="searchForm.VEHICLE_COLOR" clearable>
                 <el-option
                   v-for="item in troubleshootingCycleList"
@@ -104,7 +104,7 @@
         </el-table-column>
         <el-table-column prop="GOODSSELFNUMBER" label="编号" />
         <el-table-column prop="PLATE_NUMBER" label="车牌号" />
-        <el-table-column prop="VEHICLE_COLOR" label="车辆颜色" />
+        <el-table-column prop="VEHICLE_COLOR" label="车牌颜色" />
         <el-table-column prop="FRAMES_NUMBER" label="车架号" width="140" />
         <el-table-column prop="CONTACT" label="联系人" />
         <el-table-column
diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue
index 1fe2956..d2f60cc 100644
--- a/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue
+++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue
@@ -9,7 +9,7 @@
         <el-descriptions-item label="车牌号">
           {{ info.PLATE_NUMBER }}
         </el-descriptions-item>
-        <el-descriptions-item label="车辆颜色">
+        <el-descriptions-item label="车牌颜色">
           {{ info.VEHICLE_COLOR }}
         </el-descriptions-item>
         <el-descriptions-item label="车架号">
diff --git a/src/views/enterprise_management/user_practitioner/add.vue b/src/views/enterprise_management/user_practitioner/add.vue
index 33dbe47..35677f4 100644
--- a/src/views/enterprise_management/user_practitioner/add.vue
+++ b/src/views/enterprise_management/user_practitioner/add.vue
@@ -756,15 +756,9 @@ const rules = {
   ],
   NATION: [{ required: true, message: "民族不能为空", trigger: "change" }],
   SEX: [{ required: true, message: "性别不能为空", trigger: "change" }],
-  POLITICAL_OUTLOOK: [
-    { required: true, message: "政治面貌不能为空", trigger: "change" },
-  ],
   DATE_OF_BIRTH: [
     { required: true, message: "请选择出生年月", trigger: "change" },
   ],
-  DEGREE_OF_EDUCATION: [
-    { required: true, message: "文化程度不能为空", trigger: "change" },
-  ],
   PERSONNEL_TYPE: [
     { required: true, message: "人员类型不能为空", trigger: "change" },
   ],
@@ -772,14 +766,9 @@ const rules = {
   ENTRY_DATE: [
     { required: true, message: "请选择入职日期", trigger: "change" },
   ],
-  WORKING_DATE: [
-    { required: true, message: "请选择参加工作日期", trigger: "change" },
-  ],
   INCUMBENCY: [
     { required: true, message: "在职情况不能为空", trigger: "change" },
   ],
-  TITLE: [{ required: true, message: "职称不能为空", trigger: "change" }],
-  DUTIES: [{ required: true, message: "职务不能为空", trigger: "change" }],
   SHIFTDUTYONE: [{ required: true, message: "请选择排班", trigger: "change" }],
   SHIFTDUTYTWO: [{ required: true, message: "请选择排班", trigger: "change" }],
   periodStr: [
diff --git a/src/views/production_course_regulate/enterprise_safety_production_shift/edit.vue b/src/views/production_course_regulate/enterprise_safety_production_shift/edit.vue
index 65c8894..ed79c38 100644
--- a/src/views/production_course_regulate/enterprise_safety_production_shift/edit.vue
+++ b/src/views/production_course_regulate/enterprise_safety_production_shift/edit.vue
@@ -38,6 +38,8 @@
             <el-input
               v-model="form.WATCH_PHONE"
               placeholder="请输入值班人电话"
+              maxlength="11"
+              show-word-limit
             />
           </el-form-item>
         </el-col>
diff --git a/src/views/safety_production_related/security_notice/add.vue b/src/views/safety_production_related/security_notice/add.vue
index 9e529f9..7928852 100644
--- a/src/views/safety_production_related/security_notice/add.vue
+++ b/src/views/safety_production_related/security_notice/add.vue
@@ -107,8 +107,8 @@
 
 <script setup>
 import {
-  layoutFnGetNotificationsClassification,
   addSecurityNotice,
+  layoutFnGetMicrosoftSecurityEstate
 } from "@/request/safety_production_related.js";
 import { reactive, ref } from "vue";
 import LayoutUpload from "@/components/upload/index.vue";
@@ -134,7 +134,9 @@ const rules = {
   ],
 };
 const relatedClassificationTempList =
-  await layoutFnGetNotificationsClassification();
+  await layoutFnGetMicrosoftSecurityEstate();
+
+console.log(relatedClassificationTempList);
 
 const router = useRouter();
 const data = reactive({