Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/components/K-FileUpload/index.vue

@@ -1,15 +1,16 @@
 <template>
   <div class="upload-file">
-    <el-upload 
+    <el-upload
     multiple
-    drag 
-    :action="uploadFileUrl" 
-    :before-upload="handleBeforeUpload" 
+    drag
+    :action="uploadFileUrl"
+    :before-upload="handleBeforeUpload"
     :on-error="uploadedSuccessfully"
     :on-success="handleUploadSuccess"
-      :file-list="fileList" :limit="limit" 
-      :accept="accept" 
-      :http-request="uploadFile" 
+      :file-list="fileList"
+
+      :accept="accept"
+      :http-request="uploadFile"
       :show-file-list="true"
       :on-remove="handleDelete"
       :headers="headers" class="upload-file-uploader" ref="fileUpload">
@@ -150,7 +151,7 @@ export default {
           return false;
         }
       }
-    
+
 
       // 校检文件大小
       if (this.fileSize) {
@@ -201,10 +202,10 @@ export default {
       }
       //this.fileValueList.splice(item, 1);
       console.log("handleDelete deleted",this.fileValueList)
-      
+
       this.$emit("input", this.listToTagObj(this.fileValueList));
     }
-    
+
     },
     // 上传失败结束处理 必须调用，否则失败文件也会显示
     uploadedSuccessfully(err,file,fileList) {
@@ -228,20 +229,24 @@ export default {
     uploadFile(fileObj) {
       let formData = new FormData();
       formData.append('file', fileObj.file);
-      upload(formData, 'image').then(res => {
-        /*上传成功*/
-        this.$modal.closeLoading();
-        //let imgUrl = process.env.VUE_APP_BASE_API + res.data.url;
-        let arr = [];        
-        arr.push({ name: res.data.realName, url: res.data.url });        
-        this.fileValueList = this.fileValueList.concat(arr);
-        // console.log("uploadFile", this.fileList)
-        fileObj.onSuccess();
-      }).catch(err => {
-        /*上传失败*/
-        this.$modal.closeLoading();
-        fileObj.onError()
-      })
+      console.log("this.fileValueList.length",this.fileValueList.length)
+      if (this.fileValueList.length<=this.limit){
+        upload(formData, 'image').then(res => {
+          /*上传成功*/
+          this.$modal.closeLoading();
+          //let imgUrl = process.env.VUE_APP_BASE_API + res.data.url;
+          let arr = [];
+          arr.push({ name: res.data.realName, url: res.data.url });
+          this.fileValueList = this.fileValueList.concat(arr);
+          // console.log("uploadFile", this.fileList)
+          fileObj.onSuccess();
+        }).catch(err => {
+          /*上传失败*/
+          this.$modal.closeLoading();
+          fileObj.onError()
+        })
+      }
+
     },
     // 对象转成指定字符串分隔
     listToString(list, separator) {
@@ -254,14 +259,14 @@ export default {
       return strs != '' ? strs.substring(0, strs.length - 1) : '';
     },
 
-    listToTagObj(list) {      
+    listToTagObj(list) {
       let tempArry=[];
-      for (let i in list) {        
+      for (let i in list) {
         // console.log("listToString2 i",i);
         tempArry.push(JSON.stringify( {url:list[i].url,name:list[i].name}));
       }
       console.log("listToString2",tempArry);
-      return tempArry;      
+      return tempArry;
     }
   }
 };

src/components/elDialog/dialog.vue

@@ -29,8 +29,8 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
-  .centerDialog{
-    position: absolute;
-    top: 20%;
-  } 
+  //.centerDialog{
+  //  position: absolute;
+  //  top: 20%;
+  //}
 </style>

src/components/orgTreeSelect/index.vue

@@ -73,6 +73,7 @@ export default {
       type: Array,
       required: false,
     },
+    //组件禁用
     disabled: {
       type: Boolean,
       default: false,
@@ -83,6 +84,7 @@ export default {
       default: null,
       required: false,
     },
+    // 机构类型筛选条件禁用
     disable: {
       type: Boolean,
       default: false,

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="选择结束日期">

src/views/core/edu/plan/index.vue

@@ -140,7 +140,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="培训主题" prop="planName">
-              <el-input v-model="form.planName" placeholder="请输入培训主题"/>
+              <el-input v-model="form.planName" maxlength="50" show-word-limit placeholder="请输入培训主题"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -218,16 +218,16 @@
                                        :normalizer="tenantIdnormalizer" :props="{ checkStrictly: true, label: 'name' }"
                                        placeholder="请选择培训机构"/>
                         </el-form-item>-->
-            <el-form-item label="培训机构" prop="planExecOrgIdList">
-              <org-tree-select :queryData="form.execOrgType" ref="orgTreeSelect" @selectNode="queryNode"
-                               :placeholder="'请选择培训机构'" :disable="true"></org-tree-select>
+            <el-form-item v-show="form.execOrgType" label="培训机构" prop="planExecOrgIdList">
+              <org-tree-select v-model="form.planExecOrgIdList" :queryData="form.execOrgType" ref="orgTreeSelect" @selectNode="queryNode" :disable="true">
+              </org-tree-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注"/>
+              <el-input v-model="form.remark" maxlength="200" show-word-limit placeholder="请输入备注"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -431,6 +431,7 @@ export default {
       return row.createByTopOrg !== 1
     },
     execOrgTypeChanged(row) {
+      this.$refs['orgTreeSelect'].clear();
       this.initRoleList(this.form.execOrgType);
       // this.form.planExecOrgIdList = [];
     },

src/views/core/knowledge/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="标签名称" prop="name">
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入标签名称"
+          placeholder="请输入名称"
           clearable
           maxlength="50"
           show-word-limit
@@ -65,7 +65,7 @@
 
     <el-table v-loading="loading" :data="knowledgeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="标签名称" align="center" prop="name" />
+      <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -97,8 +97,8 @@
     <!-- 添加或修改知识库标签对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="标签名称" prop="name">
-          <el-input type="text" v-model="form.name" placeholder="请输入标签名称" maxlength="50" show-word-limit/>
+        <el-form-item label="名称" prop="name">
+          <el-input type="text" v-model="form.name" placeholder="请输入名称" maxlength="50" show-word-limit/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -146,7 +146,7 @@ export default {
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "标签名称不能为空", trigger: "blur" }
+          { required: true, message: "名称不能为空", trigger: "blur" }
         ],
       }
     };
@@ -197,7 +197,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加知识库标签";
+      this.title = "添加标签";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -206,7 +206,7 @@ export default {
       getKnowledge(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改知识库标签";
+        this.title = "修改标签";
       });
     },
     /** 提交按钮 */

src/views/core/materials/index.vue

@@ -93,10 +93,10 @@
         </el-row>
         <!-- 表格数据 -->
         <el-table v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column label="序号" align="center" prop="no"/>
           <el-table-column label="资料标题" align="center" prop="title"/>
           <el-table-column label="资料类型" align="center" prop="knowledgeName"/>
-          <el-table-column label="机构名称" align="center" prop="orgName"/>
+          <el-table-column label="所属机构" align="center" prop="orgName"/>
           <el-table-column label="公开状态" align="center" prop="isOpen">
             <template slot-scope="r">{{ r.row.isOpen == 0 ? '未公开' : '公开' }}</template>
           </el-table-column>
@@ -142,6 +142,15 @@
               >修改
               </el-button>
               <el-button
+                v-if="checkCanShowInfo(scope.row)"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleInfo(scope.row)"
+                v-hasPermi="['core:materials:edit']"
+              >详情
+              </el-button>
+              <el-button
                 v-if="checkCanEditOrDel(scope.row)"
                 size="mini"
                 type="text"
@@ -165,7 +174,7 @@
     </el-row>
     <!-- 添加或修改学习资料对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form :disabled="title=='学习资料详情'" ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="资料标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入资料标题" maxlength="50" show-word-limit/>
         </el-form-item>
@@ -316,6 +325,9 @@ export default {
     checkCanEditOrDel(row) {
       return row.createId == this.$store.getters.userId && row.isOpen == 0;
     },
+    checkCanShowInfo(row) {
+      return row.isOpen == 1;
+    },
     checkCanEditOpen(row) {
       return row.createId == this.$store.getters.userId;
     },
@@ -441,6 +453,17 @@ export default {
         this.title = "修改学习资料";
       });
     },
+    /** 详情按钮操作 */
+    handleInfo(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getMaterials(id).then(response => {
+        this.form = response.data;
+        this.formFileListDefualtValue=this.form.fileList;
+        this.open = true;
+        this.title = "学习资料详情";
+      });
+    },
     /** 提交按钮 */
     submitForm() {
 

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>

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>

src/views/system/workTimeSet/dialog.add.vue

@@ -63,7 +63,7 @@
 <!--                    v-model="r.row.workTime"/>-->
 <!--                </template>-->
 <!--              </el-table-column>-->
-              <el-table-column label="营业时间" width="120">
+              <el-table-column label="营业开始" width="120">
                 <template slot-scope="r">
                   <el-time-select
                     style="width: 100%;"
@@ -93,7 +93,7 @@
 <!--                    v-model="r.row.noonbreakEnd"/>-->
 <!--                </template>-->
 <!--              </el-table-column>-->
-              <el-table-column label="营业终了" width="120">
+              <el-table-column label="营业结束" width="120">
                 <template slot-scope="r">
                   <el-time-select
                     style="width: 100%"
@@ -241,7 +241,7 @@ export default {
           return;
         }
         if(!timeCheck([other.openTime,other.closeTime])){
-          this.$message.error(`${ds}：营业时间应在营业终了之前`);
+          this.$message.error(`${ds}：营业开始时间应在营业结束之前`);
           return false;
         }
       }

src/views/system/workTimeSet/dialog.edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="question-infos">
-    <DialogCom title="编辑作息" @close="handleClose" :visible="show" width="800px">
+    <DialogCom title="编辑作息" @close="handleClose" :visible="show" width="800px"  append-to-body>
       <div class="page-body">
         <el-form :model="formData" :rules="formData.isEnable?formDataRules:{}" size="small" ref="form" label-position="right"
                  label-width="120px" label-prefix=":">
@@ -30,47 +30,47 @@
                 </template>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item prop="workTime" label="上班时间：">
-                <template >
-                  <el-time-select
-                      :picker-options="pickerOptions"
-                      v-model="formData.workTime"
-                      :disabled="!formData.isEnable || formData.isEnable === false"/>
-                </template>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="workOffTime" label="下班时间：">
-                <template >
-                  <el-time-select
-                    :picker-options="pickerOptions"
-                    v-model="formData.workOffTime"
-                    :disabled="!formData.isEnable || formData.isEnable === false"/>
-                </template>
-              </el-form-item>
-            </el-col>
-              <el-col :span="12">
+<!--            <el-col :span="12">-->
+<!--              <el-form-item prop="workTime" label="上班时间：">-->
+<!--                <template >-->
+<!--                  <el-time-select-->
+<!--                      :picker-options="pickerOptions"-->
+<!--                      v-model="formData.workTime"-->
+<!--                      :disabled="!formData.isEnable || formData.isEnable === false"/>-->
+<!--                </template>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item prop="workOffTime" label="下班时间：">-->
+<!--                <template >-->
+<!--                  <el-time-select-->
+<!--                    :picker-options="pickerOptions"-->
+<!--                    v-model="formData.workOffTime"-->
+<!--                    :disabled="!formData.isEnable || formData.isEnable === false"/>-->
+<!--                </template>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--              <el-col :span="12">-->
 
-              <el-form-item prop="noonbreakStart" label="午休开始：">
-                <template>
-                  <el-time-select
-                      :picker-options="pickerOptions"
-                      v-model="formData.noonbreakStart"
-                      :disabled="!formData.isEnable || formData.isEnable === false"/>
-                </template>
-              </el-form-item>
-              </el-col>
-            <el-col :span="12">
-              <el-form-item prop="noonbreakEnd" label="午休结束：">
-                <template >
-                  <el-time-select
-                      :picker-options="pickerOptions"
-                      v-model="formData.noonbreakEnd"
-                      :disabled="!formData.isEnable || formData.isEnable === false"/>
-                </template>
-              </el-form-item>
-            </el-col>
+<!--              <el-form-item prop="noonbreakStart" label="午休开始：">-->
+<!--                <template>-->
+<!--                  <el-time-select-->
+<!--                      :picker-options="pickerOptions"-->
+<!--                      v-model="formData.noonbreakStart"-->
+<!--                      :disabled="!formData.isEnable || formData.isEnable === false"/>-->
+<!--                </template>-->
+<!--              </el-form-item>-->
+<!--              </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item prop="noonbreakEnd" label="午休结束：">-->
+<!--                <template >-->
+<!--                  <el-time-select-->
+<!--                      :picker-options="pickerOptions"-->
+<!--                      v-model="formData.noonbreakEnd"-->
+<!--                      :disabled="!formData.isEnable || formData.isEnable === false"/>-->
+<!--                </template>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="12">
               <el-form-item prop="openTime" label="营业开始：">
                 <template >
@@ -121,10 +121,10 @@ export default {
       //表单验证
       formDataRules: {
         isEnable: [{ required: true, message: "请选择状态" }],
-        workTime: [{ required: true, message: "请输入上班时间" }],
-        workOffTime: [{ required: true, message: "请输入下班时间" }],
-        noonbreakStart: [{ required: true, message: "请输入午休开始时间" }],
-        noonbreakEnd: [{ required: true, message: "请输入午休结束时间" }],
+        // workTime: [{ required: true, message: "请输入上班时间" }],
+        // workOffTime: [{ required: true, message: "请输入下班时间" }],
+        // noonbreakStart: [{ required: true, message: "请输入午休开始时间" }],
+        // noonbreakEnd: [{ required: true, message: "请输入午休结束时间" }],
         openTime: [{ required: true, message: "请输入营业时间" }],
         closeTime: [{ required: true, message: "请输入营业终了时间" }],
       },
@@ -138,7 +138,7 @@ export default {
       return {
         start: "00:00",
         end: "24:00",
-        step: "00:10",
+        step: "00:05",
       };
     },
   },
@@ -156,20 +156,20 @@ export default {
         isEnable: 1,
         openTime: null,
         closeTime: null,
-        noonbreakStart: null,
-        noonbreakEnd: null,
-        workTime: null,
-        workOffTime: null,
+        // noonbreakStart: null,
+        // noonbreakEnd: null,
+        // workTime: null,
+        // workOffTime: null,
       };
     },
     onEnableChange(workTime) {
       if (workTime.isEnable === false) {
         workTime.openTime = null;
         workTime.closeTime = null;
-        workTime.noonbreakStart = null;
-        workTime.noonbreakEnd = null;
-        workTime.workTime = null;
-        workTime.workOffTime = null;
+        // workTime.noonbreakStart = null;
+        // workTime.noonbreakEnd = null;
+        // workTime.workTime = null;
+        // workTime.workOffTime = null;
       }
     },
     handleClose() {
@@ -182,23 +182,13 @@ export default {
     onSubmit() {
       this.$refs.form.validate((isValidate) => {
         if (!isValidate) return;
-        if (!this.formData.noonbreakStart ^ !this.formData.noonbreakEnd) {
-          this.$message.warning(`午休开始及结束时间必须同时配置`);
-          return;
-        }
         if (
             !timeCheck([
-              this.formData.workTime,
               this.formData.openTime,
-              this.formData.noonbreakStart,
-              this.formData.noonbreakEnd,
               this.formData.closeTime,
-              this.formData.workOffTime,
             ])
         ) {
-          this.$message.warning(
-              `时间配置规则：上班时间<=午休开始<=午休结束<=下班时间`
-          );
+          this.$message.warning(`营业开始时间应在营业结束之前`);
           return false;
         }
         editWorkTime(this.formData).then(res=>{

src/views/system/workTimeSet/dialog.template.vue

@@ -63,7 +63,7 @@
 <!--                      v-model="r.row.workTime"/>-->
 <!--                  </template>-->
 <!--                </el-table-column>-->
-                <el-table-column label="营业时间">
+                <el-table-column label="营业开始">
                   <template slot-scope="r">
                     <el-time-select
                       style="width: 100%"
@@ -93,7 +93,7 @@
 <!--                      v-model="r.row.noonbreakEnd"/>-->
 <!--                  </template>-->
 <!--                </el-table-column>-->
-                <el-table-column label="营业终了">
+                <el-table-column label="营业结束">
                   <template slot-scope="r">
                     <el-time-select
                       style="width: 100%"
@@ -279,7 +279,7 @@ export default {
       // }
       let arr = [dayOfWeek.openTime,dayOfWeek.closeTime];
       if (!timeCheck(arr)) {
-        this.$message.error(`${dayOfWeek.dayOfWeekText}的营业时间应在营业终了之前`);
+        this.$message.error(`${dayOfWeek.dayOfWeekText}的营业开始时间应在营业结束之前`);
         return false;
       }
       return true;
@@ -323,10 +323,10 @@ export default {
       if (!workTime.isWorkday) {
         workTime.openTime = null;
         workTime.closeTime = null;
-        workTime.noonbreakStart = null;
-        workTime.noonbreakEnd = null;
-        workTime.workTime = null;
-        workTime.workOffTime = null;
+        // workTime.noonbreakStart = null;
+        // workTime.noonbreakEnd = null;
+        // workTime.workTime = null;
+        // workTime.workOffTime = null;
       }
     },
     handleClose() {