优化

src/views/system/device/index.vue

@@ -95,8 +95,9 @@
           v-loading="loading"
           :data="deviceList"
           @selection-change="handleSelectionChange"
-          :header-cell-style="{backgroundColor:'#CCE8F7'}"
+        
         >
+        <!-- :header-cell-style="{backgroundColor:'#CCE8F7'}" -->
           <!--<el-table-column type="selection" width="55" align="center" />-->
           <el-table-column label="序号" align="center" min-width="50">
             <template v-slot:default="scope">

src/views/system/user/extend.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <h3 class="title">编辑管理人员信息</h3>
+    <h3 class="title">基础信息</h3>
     <div class="info-box">
       <el-descriptions>
         <el-descriptions-item v-for="v in dataInfo" :label="v.label" :key="v.key">{{ v.value }}</el-descriptions-item>
@@ -9,13 +9,25 @@
         <el-descriptions-item label="状态">{{ status }}</el-descriptions-item>
       </el-descriptions>
     </div>
+    <h3 class="title">安保部门从业人员补充信息</h3>
     <div class="info-box">
       <el-form inline :model="formData" :rules="rules" ref="form" label-position="left" label-width="120px">
         <el-row>
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="是否专职" prop="isFullTime">
+            <!-- <el-form-item label="是否专职" prop="isFullTime">
 
               <el-switch v-model="formData.isFullTime" active-value="1" inactive-value="0"></el-switch>
+            </el-form-item> -->
+            <el-form-item label="是否专职" prop="isFullTime">
+              <el-radio-group v-model="formData.isFullTime">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="`${dict.value}`"
+                  :label="dict.value"
+              
+                  >{{ dict.label }}</el-radio
+                >
+              </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
@@ -27,21 +39,14 @@
 
             <el-form-item label="持证上岗未通过原因" v-if="formData.certificateWork == 0" label-width="240" 
               prop="certificateFailReason">
-              <el-select style="width: 280px;" v-model="formData.certificateFailReason" placeholder="请选择持证上岗未通过原因">
+              <el-select style="width: 280px;" v-model="formData.certificateFailReason" placeholder="请选择未通过原因">
                 <el-option v-for="dict in dict.type.post_no_pass" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col> 
 
-          <el-col :xs="24" :sm="12" :md="8" :lg="8">
-            <el-form-item label="初级以上相关专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240"
-             prop="professionalQualifications">
-              <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
-                placeholder="请输入初级以上相关专业技术职业资格">
-              </el-input>
-            </el-form-item>
-          </el-col>
+     
         </el-row>
         <el-row>
 
@@ -64,13 +69,14 @@
           </el-col>
 
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item label="最高学历" prop="highestEducation">
-              <el-select style="width: 217px;" v-model="formData.highestEducation" placeholder="请选择最高学历">
-                <el-option v-for="dict in dict.type.sys_highest_education" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
+            <el-form-item prop="entryTime" label="现任职日期">
+              <el-date-picker v-model="formData.entryTime"  align="right"
+                type="date" placeholder="选择现任职日期">
+              </el-date-picker>
             </el-form-item>
           </el-col>
+
+     
         </el-row>
         <el-row>
 
@@ -91,6 +97,14 @@
             </el-form-item>
           </el-col>
 
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="最高学历" prop="highestEducation">
+              <el-select style="width: 217px;" v-model="formData.highestEducation" placeholder="请选择最高学历">
+                <el-option v-for="dict in dict.type.sys_highest_education" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <!-- <el-col :xs="24" :sm="12" :md="8" :lg="8">
             <el-form-item label="初级以上相关专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240" prop="professionalQualifications">
               <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
@@ -115,15 +129,15 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
-          <!-- :picker-options="endDatepickerOptions" -->
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item prop="entryTime" label="现任职时间">
-              <el-date-picker v-model="formData.entryTime"  align="right"
-                type="date" placeholder="选择现任职时间">
-              </el-date-picker>
+    <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="身份证号码" prop="idCard">
+              <el-input maxlength="18" style="width: 217px;" v-model="formData.idCard"
+                placeholder="请输入身份证号码">
+              </el-input>
             </el-form-item>
           </el-col>
+          <!-- :picker-options="endDatepickerOptions" -->
+   
 
         </el-row>
         <el-row>
@@ -142,10 +156,18 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="8">
+            <el-form-item label="专业技术职业资格" v-if="formData.certificateWork != 0" label-width="240"
+             prop="professionalQualifications">
+              <el-input style="width: 280px;" maxlength="50" v-model="formData.professionalQualifications"
+                placeholder="请输入初级以上证书名称">
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :xs="24" :sm="24" :md="24" :lg="24">
-            <el-form-item v-if="formData.certificateWork != 0" label="上传相关证书">
+            <el-form-item v-if="formData.certificateWork != 0" label="上传初级以上专业技术职业资格证书">
               <imgs-upload :limit="5" v-model="formData.qualificationCertificateUrl" :fileSize="2"></imgs-upload>
             </el-form-item>
           </el-col>
@@ -181,7 +203,7 @@ import { extendUserInformation } from "@/api/system/information";
 export default {
   props: [],
   components: { TreeSelect ,ImgsUpload},
-  dicts: ['sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position','department_name'],
+  dicts: ['sys_yes_no','sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position','department_name'],
   data() {
     return {
       startDatepickerOptions: {