Przeglądaj źródła

luowei修改bug

luowei 2 lat temu
rodzic
commit
0fcb376b59

+ 0 - 16
src/views/core/accessPlan/index.vue

@@ -130,27 +130,11 @@
             }}</el-radio>
           </el-radio-group>
         </el-form-item>
-
-
-
-        <!-- <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="开始时间" prop="startTime">
-          <el-date-picker clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择时间">
-          </el-date-picker>
-        </el-form-item> -->
         <el-form-item prop="startTime" v-if="form.planCycle == 0" label="开始日期">
           <el-date-picker v-model="form.startTime" @change="startDateChanged" :picker-options="startDatepickerOptions"
             align="right" type="date" placeholder="选择开始日期">
           </el-date-picker>
         </el-form-item>
-
-
-
-        <!-- <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="结束时间" prop="endTime">
-          <el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择时间">:picker-options="endDatepickerOptions"
-          </el-date-picker>
-        </el-form-item> -->
         <el-form-item prop="endTime" v-if="form.planCycle == 0" label="结束日期">
           <el-date-picker v-model="form.endTime"  :picker-options="endDatepickerOptions" align="right" type="date"
             placeholder="选择结束日期">

+ 57 - 60
src/views/information/configuration/index.vue

@@ -9,36 +9,40 @@
             </div>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="营业前提醒:" prop="workType">
-              
-                <el-input-number size="mini" style="width: 70%;" v-model="day.font" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            <el-form-item label="营业前提醒:" prop="front">
+
+              <el-input-number size="mini" style="width: 70%;" v-model="day.font" @change="handleChange" :min="1"
+                :max="10" label="描述文字"></el-input-number>
               分钟
-            
-            
+
+
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="营业中提醒:" prop="educationType">
-              <el-input-number size="mini" style="width: 70%;" v-model="day.z" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            <el-form-item label="营业中提醒:" prop="centre">
+              <el-input-number size="mini" style="width: 70%;" v-model="day.z" @change="handleChange" :min="1" :max="10"
+                label="描述文字"></el-input-number>
               分钟
             </el-form-item>
           </el-col>
 
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="营业后提醒:" prop="professionalQualifications">
-              <el-input-number size="mini" style="width: 70%;" v-model="day.h" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            <el-form-item label="营业后提醒:" prop="after">
+              <el-input-number size="mini" style="width: 70%;" v-model="day.h" @change="handleChange" :min="1" :max="10"
+                label="描述文字"></el-input-number>
               分钟
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
-            <el-form-item label="全天提醒:" prop="professionalQualifications">
-              <el-input-number size="mini" style="width: 70%;" v-model="day.all" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+            <el-form-item label="全天提醒:" prop="allDay">
+              <el-input-number size="mini" style="width: 70%;" v-model="day.all" @change="handleChange" :min="1" :max="10"
+                label="描述文字"></el-input-number>
               分钟
             </el-form-item>
           </el-col>
         </el-row>
       </div>
-    </el-form> 
+    </el-form>
     <el-form :model="week" :rules="rules" ref="week" label-width="130px">
       <div class="form-item">
         <el-row>
@@ -49,13 +53,14 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="提前提醒:" prop="educationType">
-              <el-input-number size="mini" style="width: 70%" v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+              <el-input-number size="mini" style="width: 70%" v-model="num" @change="handleChange" :min="1" :max="10"
+                label="描述文字"></el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
       </div>
-    </el-form> 
+    </el-form>
     <el-form :model="month" :rules="rules" ref="month" label-width="130px">
       <div class="form-item">
         <el-row>
@@ -66,13 +71,14 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="提前提醒:" prop="educationType">
-              <el-input-number  size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
+                label="描述文字"></el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
       </div>
-    </el-form> 
+    </el-form>
     <el-form :model="season" :rules="rules" ref="season" label-width="130px">
       <div class="form-item">
         <el-row>
@@ -83,13 +89,14 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="提前提醒:" prop="educationType">
-              <el-input-number  size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
+                label="描述文字"></el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
       </div>
-    </el-form> 
-    <el-form :model="holfYear" :rules="rules" ref="holfYear" label-width="130px">
+    </el-form>
+    <el-form :model="halfYear" :rules="rules" ref="halfYear" label-width="130px">
       <div class="form-item">
         <el-row>
           <el-col :xs="24" :sm="12" :md="8" :lg="4">
@@ -99,12 +106,13 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="提前提醒:" prop="educationType">
-              <el-input-number  size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
+                label="描述文字"></el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
       </div>
-    </el-form> 
+    </el-form>
     <el-form :model="year" :rules="rules" ref="year" label-width="130px">
       <div class="form-item">
         <el-row>
@@ -115,7 +123,8 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="提前提醒:" prop="educationType">
-              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+              <el-input-number size="mini" v-model="num" style="width: 70%" @change="handleChange" :min="1" :max="10"
+                label="描述文字"></el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
@@ -126,7 +135,6 @@
       <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button>
     </div>
   </div>
-  
 </template>
 
 <script>
@@ -136,30 +144,19 @@ export default {
   data() {
     return {
       num: 1,
-      day:{},
-      week:{},
-      month:{},
-      season:{},
-      holfYear:{},
-      year:{},
-      formData:{
-        deptId: null,
-        duties: null,
-        workType: null,
-        isFullTime: "1",
-        highestEducation: null,
-        educationType: null,
-        certificateWork: "1",
-        professionalQualifications: null,
-        certificateFailReason: null,
-        workTime: null,
-        entryTime: null,
-        bornTime: null,
-        responsibilitiesLeaderName: null,
-        responsibilitiesLeaderDuties: null,
-        qualificationCertificateUrl: null,
-        userId: null,
+      day: {
+        resumptionCycle: 1,
+        allDay: null,
+        centre: null,
+        after: null,
+        timeUnit: null,
       },
+      week: {},
+      month: {},
+      season: {},
+      halfYear: {},
+      year: {},
+
       rules: {
         name: [
           {
@@ -237,17 +234,17 @@ export default {
     hello() {
       alert("来自预设逻辑代码的问候")
     },
-    saveExtend(){
-     // this.formData.userId = this.$route.params.userId;
-     
+    saveExtend() {
+      // this.formData.userId = this.$route.params.userId;
+
       this.$refs['form'].validate((valid) => {
-          if (valid) {
-            extendUserInformation(this.formData).then(res=>{
-                this.$message.success('保存成功!')
-                this.$router.go(-1)
-            })
-          }
-        });
+        if (valid) {
+          extendUserInformation(this.formData).then(res => {
+            this.$message.success('保存成功!')
+            this.$router.go(-1)
+          })
+        }
+      });
 
     },
 
@@ -258,14 +255,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.form-item{
+.form-item {
   border: 1px solid #f1f1f1;
   margin-bottom: 2px;
   min-height: 100px;
   display: flex;
   align-items: center;
 }
-.item-title{
+
+.item-title {
   width: 100px;
   color: #fff;
   background-color: #ccc;
@@ -273,5 +271,4 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-}
-</style>
+}</style>

+ 202 - 217
src/views/system/user/extend.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <h3 class="title">编辑管理人员信息</h3>
     <div class="info-box">
-      <el-descriptions >
+      <el-descriptions>
         <el-descriptions-item v-for="v in dataInfo" :label="v.label" :key="v.key">{{ v.value }}</el-descriptions-item>
         <el-descriptions-item label="角色">{{ roleName }}</el-descriptions-item>
         <el-descriptions-item label="性别">{{ sex }}</el-descriptions-item>
@@ -10,100 +10,70 @@
       </el-descriptions>
     </div>
     <div class="info-box">
-      <el-form inline  :model="formData" :rules="rules" ref="form"  label-position="left" label-width="140px">
+      <el-form inline :model="formData" :rules="rules" ref="form" label-position="left" label-width="140px">
         <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6" >
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="是否专职" prop="isFullTime">
 
-              <el-switch
-                v-model="formData.isFullTime"
-          
-                active-value="1"
-                inactive-value="0"
-              ></el-switch>
+              <el-switch v-model="formData.isFullTime" active-value="1" inactive-value="0"></el-switch>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6" >
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="是否持证上岗" prop="certificateWork">
-              <el-switch
-                v-model="formData.certificateWork"
-          
-                active-value="1"
-                inactive-value="0"
-              ></el-switch>
+              <el-switch v-model="formData.certificateWork" active-value="1" inactive-value="0"></el-switch>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row  >
-  
-          <el-col :xs="24" :sm="12" :md="8" :lg="6" >
-            <el-form-item  label="所属部门"  prop="deptId">
+        <el-row>
+
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="所属部门" prop="deptId">
               <el-select style="width: 217px;" v-model="formData.deptId" placeholder="请选择">
-        <el-option
-                v-for="dict in dict.type.sys_department_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+                <el-option v-for="dict in dict.type.sys_department_type" :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="6" >
-            <el-form-item  label="责任职务"  prop="duties">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="责任职务" prop="duties">
               <el-select style="width: 217px;" v-model="formData.duties" placeholder="请选择">
-        <el-option
-                v-for="dict in dict.type.sys_duties"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+                <el-option v-for="dict in dict.type.sys_duties" :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="6" >
-            <el-form-item  label="最高学历" prop="highestEducation">
+
+          <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-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-row>
         <el-row>
-      
-          <el-col :xs="24" :sm="12" :md="8" :lg="6" >
-            <el-form-item  label="用工形式" prop="workType">
+
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="用工形式" prop="workType">
               <el-select style="width: 217px;" v-model="formData.workType" placeholder="请选择">
-        <el-option
-                v-for="dict in dict.type.sys_work_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+                <el-option v-for="dict in dict.type.sys_work_type" :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="6" >
-            <el-form-item  label="学历取得方式" prop="educationType">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="学历取得方式" prop="educationType">
               <el-select style="width: 217px;" v-model="formData.educationType" placeholder="请选择">
-        <el-option
-                v-for="dict in dict.type.sys_education_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-              </el-select> 
+                <el-option v-for="dict in dict.type.sys_education_type" :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="6" >
-            <el-form-item  label="初级以上相关专业技术职业资格" prop="professionalQualifications">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="初级以上相关专业技术职业资格" prop="professionalQualifications">
               <el-input style="width: 217px;" v-model="formData.professionalQualifications" placeholder="请输入">
               </el-input>
             </el-form-item>
@@ -111,71 +81,58 @@
         </el-row>
 
         <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6" >
-            <el-form-item  label="持证上岗未通过原因" prop="certificateFailReason">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="持证上岗未通过原因" prop="certificateFailReason">
               <el-input style="width: 217px;" v-model="formData.certificateFailReason" placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6" >
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item style="width: 517px;" label="参加工作时间" prop="workTime">
-              <el-date-picker
-                clearable
-                v-model="formData.workTime"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
+              <el-date-picker clearable v-model="formData.workTime" @change="startDateChanged"
+                :picker-options="startDatepickerOptions" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="请选择时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6" >
-            <el-form-item style="width: 517px;" label="现任职时间"  prop="workTime">
-              <el-date-picker
-                clearable
-                v-model="formData.entryTime"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择时间">
+
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item prop="bornTime" label="出生日期">
+              <el-date-picker v-model="formData.bornTime" @change="startDateChanged"
+                :picker-options="startDatepickerOptions" align="right" type="date" placeholder="选择开始日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6" >
-            <el-form-item style="width: 517px;" label="出生日期" prop="bornTime">
-              <el-date-picker
-                clearable
-                v-model="formData.bornTime"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择时间">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item prop="entryTime" label="现任职时间">
+              <el-date-picker v-model="formData.entryTime" :picker-options="endDatepickerOptions" align="right"
+                type="date" placeholder="选择结束日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6" >
-            <el-form-item  label="分管领导姓名" prop="responsibilitiesLeaderName">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="分管领导姓名" prop="responsibilitiesLeaderName">
               <el-input style="width: 217px;" v-model="formData.responsibilitiesLeaderName" placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6" >
-            <el-form-item  label="分管领导职务" prop="responsibilitiesLeaderDuties">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item label="分管领导职务" prop="responsibilitiesLeaderDuties">
               <el-select style="width: 217px;" v-model="formData.responsibilitiesLeaderDuties" placeholder="请选择">
-              <el-option
-                v-for="dict in dict.type.sys_duties"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
+                <el-option v-for="dict in dict.type.sys_duties" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6" >
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="上传相关证书">
-              <image-upload :limit="5" :value="formData.qualificationCertificateUrl" :fileSize="2" @input="getImgUrl"></image-upload>
+              <image-upload :limit="5" :value="formData.qualificationCertificateUrl" :fileSize="2"
+                @input="getImgUrl"></image-upload>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="8" :lg="6" >
+          <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="示例图">
               <div style="width: 280px;">
                 <el-image :src="uplp"></el-image>
@@ -196,32 +153,42 @@
 <script>
 import uploadpng from "@/assets/images/upload.png";
 import uplpng from "@/assets/images/upl.png";
-import {getUser} from "@/api/system/user";
+import { getUser } from "@/api/system/user";
 import TreeSelect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { deptTreeList } from "@/api/system/public";
 
-import {extendUserInformation} from "@/api/system/information";
+import { extendUserInformation } from "@/api/system/information";
 
 export default {
   props: [],
-  components: {TreeSelect},
-  dicts:['sys_highest_education',"sys_work_type","sys_duties","sys_education_type",'sys_department_type'],
+  components: { TreeSelect },
+  dicts: ['sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type'],
   data() {
     return {
+      startDatepickerOptions: {
+        disabledDate(time) {
+          const date = new Date();
+          date.setTime(date.getTime() - 3600 * 1000 * 24);
+          return time.getTime() > date;
+        },
+      },
+      endDatepickerOptions: {
+        disabledDate: this.disabledDate,
+      },
       //基础信息key
-      infoKeys:[
-        {label:'用户名称',key:'username'},
-        {label:'用户昵称',key:'name'},
-        {label:'工号',key:'jobNumber'},
-      //  {label:'部门',key:'orgName'},
-        {label:'手机',key:'phone'},
+      infoKeys: [
+        { label: '用户名称', key: 'username' },
+        { label: '用户昵称', key: 'name' },
+        { label: '工号', key: 'jobNumber' },
+        //  {label:'部门',key:'orgName'},
+        { label: '手机', key: 'phone' },
         // {label:'性别',key:'gender'},
         // {label:'状态',key:'isLock'},
-        {label:'机构',key:'orgName'},
+        { label: '机构', key: 'orgName' },
       ],
-      dataInfo:[],
-      formData:{
+      dataInfo: [],
+      formData: {
         deptId: null,
         duties: null,
         workType: null,
@@ -240,63 +207,63 @@ export default {
         userId: null,
       },
       rules: {
-         deptId: [
-            { required: true,message: '请选择所属部门', trigger: 'blur' },
-          ],
-          duties:[
-            { required: true,message: '请选择职务', trigger: 'blur' },
-          ],
-          workType:[
-            { required: true, message: '请选择用工形式',trigger: 'blur' },
-          ],
-          isFullTime:[
-            { required: true,message: '请选择是否专职', trigger: 'blur' },
-          ],
-          highestEducation:[
-            { required: true,message: '请选择最高学历', trigger: 'blur' },
-          ],
-          educationType:[
-            { required: true,message: '请选择学历取得形式', trigger: 'blur' },
-          ],
-          certificateWork:[
-            { required: true,message: '请选择是否持证上岗', trigger: 'blur' },
-          ],
-          workTime:[
-            { required: true,message: '请选择参加工作时间',trigger: 'blur' },
-          ],
-          entryTime: [
-            { required: true,message: '请选择入职时间', trigger: 'change' }
-          ],
-          bornTime: [
-            { required: true,message: '请选择出生时间', trigger: 'change' }
-          ],
-          responsibilitiesLeaderName: [
-            { required: true,message: '请输入分管领导名字', trigger: 'change' }
-          ],
-          responsibilitiesLeaderDuties: [
-            { required: true,message: '请选择分管领导职务', trigger: 'change' }
-          ],
-          qualificationCertificateUrl: [
-            { required: true,message: '请选择上传资格证', trigger: 'change' }
-          ],
-          professionalQualifications:[
-            { required: true,message: '请输入初级以上相关专业技术职业资格', trigger: 'change' }
-          ],
-          date1: [
-            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
-          ],
-          date2: [
-            { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
-          ],
-          type: [
-            { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
-          ],
-          resource: [
-            { required: true, message: '请选择活动资源', trigger: 'change' }
-          ],
-          desc: [
-            { required: true, message: '请填写活动形式', trigger: 'blur' }
-          ]
+        deptId: [
+          { required: true, message: '请选择所属部门', trigger: 'blur' },
+        ],
+        duties: [
+          { required: true, message: '请选择职务', trigger: 'blur' },
+        ],
+        workType: [
+          { required: true, message: '请选择用工形式', trigger: 'blur' },
+        ],
+        isFullTime: [
+          { required: true, message: '请选择是否专职', trigger: 'blur' },
+        ],
+        highestEducation: [
+          { required: true, message: '请选择最高学历', trigger: 'blur' },
+        ],
+        educationType: [
+          { required: true, message: '请选择学历取得形式', trigger: 'blur' },
+        ],
+        certificateWork: [
+          { required: true, message: '请选择是否持证上岗', trigger: 'blur' },
+        ],
+        workTime: [
+          { required: true, message: '请选择参加工作时间', trigger: 'blur' },
+        ],
+        entryTime: [
+          { required: true, message: '请选择入职时间', trigger: 'change' }
+        ],
+        bornTime: [
+          { required: true, message: '请选择出生时间', trigger: 'change' }
+        ],
+        responsibilitiesLeaderName: [
+          { required: true, message: '请输入分管领导名字', trigger: 'change' }
+        ],
+        responsibilitiesLeaderDuties: [
+          { required: true, message: '请选择分管领导职务', trigger: 'change' }
+        ],
+        qualificationCertificateUrl: [
+          { required: true, message: '请选择上传资格证', trigger: 'change' }
+        ],
+        professionalQualifications: [
+          { required: true, message: '请输入初级以上相关专业技术职业资格', trigger: 'change' }
+        ],
+        date1: [
+          { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        date2: [
+          { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+        ],
+        type: [
+          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
+        ],
+        resource: [
+          { required: true, message: '请选择活动资源', trigger: 'change' }
+        ],
+        desc: [
+          { required: true, message: '请填写活动形式', trigger: 'blur' }
+        ]
       },
       // 机构树选项
       deptList: undefined,
@@ -359,7 +326,7 @@ export default {
       propItem: "",
 
       row: "",
-      imgs:[]
+      imgs: []
     };
   },
 
@@ -377,14 +344,16 @@ export default {
     this.getInfo();
     this.getDeptTreeList();
   },
-  mounted() {},
+  mounted() { },
   methods: {
-    getImgUrl(img){
-      
+
+
+    getImgUrl(img) {
+
       this.imgs.push(img);
-      console.log(this.imgs,'imgs')
+      console.log(this.imgs, 'imgs')
     },
-    handleChange(value) {},
+    handleChange(value) { },
     //自定义数据
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {
@@ -398,34 +367,32 @@ export default {
     },
     getInfo() {
       getUser(this.$route.params.userId).then((data) => {
-        console.log(data,'userdata');
-        if (!data.data ) return;
+        console.log(data, 'userdata');
+        if (!data.data) return;
         let res = data.data;
-        this.dataInfo = this.infoKeys.map((v,i)=> {
-          v.value =  res[v.key];
+        this.dataInfo = this.infoKeys.map((v, i) => {
+          v.value = res[v.key];
           return v
         })
-        this.roleName=data.roleName;
-        this.sex=data.sex;
-        this.status=data.status;
-        
-         this.formData=data.information;
-       
-       
-        console.log(this.formData, 'formData')
+        this.roleName = data.roleName;
+        this.sex = data.sex;
+        this.status = data.status;
+        this.formData = data.information;
       });
     },
-    saveExtend(){
+
+
+    saveExtend() {
       this.formData.userId = this.$route.params.userId;
       this.formData.qualificationCertificateUrl = this.imgs.toString(',');
       this.$refs['form'].validate((valid) => {
-          if (valid) {
-            extendUserInformation(this.formData).then(res=>{
-                this.$message.success('保存成功!')
-                this.$router.go(-1)
-            })
-          }
-        });
+        if (valid) {
+          extendUserInformation(this.formData).then(res => {
+            this.$message.success('保存成功!')
+            this.$router.go(-1)
+          })
+        }
+      });
 
     },
     getExtendInfo() {
@@ -446,9 +413,23 @@ export default {
         }
       });
     },
-
-        /** 查询机构下拉树结构 */
-        getDeptTreeList() {
+    startDateChanged(time) {
+      if (this.formData.bornTime > this.formData.entryTime) {
+        this.formData.entryTime = this.formData.bornTime;
+      }
+    },
+    disabledDate(time) {
+      //小于开始日期禁止选择
+      let bornTime = new Date();
+      bornTime.setTime(bornTime.getTime() - 3600 * 1000 * 24);
+      if (this.formData.bornTime) {
+        bornTime = new Date(this.formatTime(this.formData.bornTime, 'YYYY-MM-DD'));
+        bornTime.setTime(bornTime.getTime() - 3600 * 1000 * 24);
+      }
+      return time.getTime() > new Date(bornTime).getTime()
+    },
+    /** 查询机构下拉树结构 */
+    getDeptTreeList() {
       deptTreeList().then(response => {
         this.deptList = response.data;
         this.defaultKeys = response.data[0];
@@ -466,7 +447,7 @@ export default {
       this.bankloading = true;
       let dat = { orgId: this.$route.params.id };
       listBankPhysicalDefenseConstruction(dat).then((data) => {
-      
+
         this.BankPhysicalDefenseConstructionList = data.rows;
         this.bankloading = false;
       });
@@ -552,7 +533,7 @@ export default {
           this.getBankPhysicalDefenseConstructionInfo();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 表单重置
     orgreset() {
@@ -634,7 +615,7 @@ export default {
           this.getOrgPhysicalDefenseConstructionInfo();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
 
     nosaveExtend() {
@@ -684,32 +665,34 @@ export default {
 </script>
 
 <style scoped lang="scss">
-
-.title{
+.title {
   font-size: 18px;
   text-align: left;
   background: #008CD6bd;
-  color:#fff;
+  color: #fff;
   height: 36px;
   line-height: 36px;
   padding-left: 8px;
   margin: 0;
 }
-.info-box{
+
+.info-box {
   margin: 30px;
 }
-.demo-form-inline {
-}
-.dialog-footer {
-  
-}
-.container {
-}
+
+.demo-form-inline {}
+
+.dialog-footer {}
+
+.container {}
+
 .image-container {
   display: inline-block;
   width: 200px;
-  margin-right: 20px; /* 设置与下一个div的水平间距 */
+  margin-right: 20px;
+  /* 设置与下一个div的水平间距 */
 }
+
 .zoom-image {
   transition: transform 0.3s ease;
 }
@@ -717,12 +700,14 @@ export default {
 .zoom-image:hover {
   transform: scale(1.02);
 }
+
 .border-color-change {
   border: 1px solid #ccc;
   transition: border-color 0.3s ease;
 }
 
 .border-color-change:hover {
-  border-color: #1ea8e9; /* 您可以将此颜色更改为所需的颜色 */
+  border-color: #1ea8e9;
+  /* 您可以将此颜色更改为所需的颜色 */
 }
 </style>