作息管理需求变更

src/utils/ruoyi.js

@@ -12,7 +12,7 @@ export function timeCheck(arr) {
   for (let i = srcs.length - 1; i > 0; i--) {
     let a = timeToNumber(srcs[i]);
     let b = timeToNumber(srcs[i - 1]);
-    if (a < b) {
+    if (a <= b) {
       return false;
     }
   }

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

@@ -1,7 +1,7 @@
 <template>
   <div class="question-infos">
     <DialogCom title="新增作息" @close="handleClose" :visible.sync="isShow" :close-on-click-modal="false"
-      custom-class="gxDialog" width="80%" append-to-body>
+      custom-class="gxDialog" width="911px" append-to-body>
 <!--      <div class="p-5 work-time">-->
         <el-form label-width="90px" label-suffix=":" label-position="right">
 
@@ -14,7 +14,7 @@
           <!--  -->
           <el-form-item label="作息规则">
             <el-table class="w-auto" height="350" border :data="workTimeList">
-              <el-table-column label="日期" width="160px">
+              <el-table-column label="日期" width="160">
                 <template slot-scope="r" >
                   <el-date-picker
                     style="width: 100%"
@@ -28,72 +28,72 @@
                   </el-date-picker>
                 </template>
               </el-table-column>
-              <el-table-column label="星期" width="80px">
+              <el-table-column label="星期" width="80">
                 <template slot-scope="r">
                   <span>{{parseTime(r.row.ymdDate ,'dddd')}}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="状态" width="160px">
+              <el-table-column label="状态" width="160">
                 <template slot-scope="r">
-                  <el-switch
-                  v-model="r.row.isEnable"
-                  :active-value="1"
-                  :inactive-value="0"
-                  @change="onEnableChange(r.row)"
-                  active-text="营业"
-                  inactive-text="歇业">
-                </el-switch>
+<!--                  <el-switch-->
+<!--                  v-model="r.row.isEnable"-->
+<!--                  :active-value="1"-->
+<!--                  :inactive-value="0"-->
+<!--                  @change="onEnableChange(r.row)"-->
+<!--                  active-text="营业"-->
+<!--                  inactive-text="歇业">-->
+<!--                </el-switch>-->
 
-<!--                  <el-radio-group-->
-<!--                      :disabled="r.row.disabled"-->
-<!--                      v-model="r.row.isEnable"-->
-<!--                      @change="onEnableChange(r.row)">-->
-<!--                    <el-radio text-color="#48bb78" :label="1">营业</el-radio>-->
-<!--                    <el-radio text-color="#f56565" :label="0">歇业</el-radio>-->
-<!--                  </el-radio-group>-->
+                  <el-radio-group
+                      :disabled="r.row.disabled"
+                      v-model="r.row.isEnable"
+                      @change="onEnableChange(r.row)">
+                    <el-radio text-color="#48bb78" :label="1">营业</el-radio>
+                    <el-radio text-color="#f56565" :label="0">歇业</el-radio>
+                  </el-radio-group>
                 </template>
               </el-table-column>
-              <el-table-column label="上班时间" >
+<!--              <el-table-column label="上班时间" >-->
+<!--                <template slot-scope="r">-->
+<!--                  <el-time-select-->
+<!--                    style="width: 100%"-->
+<!--                    size="mini"-->
+<!--                    :picker-options="pickerOptions"-->
+<!--                    :disabled="r.row.disabled || !r.row.isEnable"-->
+<!--                    v-model="r.row.workTime"/>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+              <el-table-column label="营业时间" width="120">
                 <template slot-scope="r">
                   <el-time-select
-                    style="width: 100%"
-                    size="mini"
-                    :picker-options="pickerOptions"
-                    :disabled="r.row.disabled || !r.row.isEnable"
-                    v-model="r.row.workTime"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="营业时间" >
-                <template slot-scope="r">
-                  <el-time-select
-                    style="width: 100%"
+                    style="width: 100%;"
                     size="mini"
                     :picker-options="pickerOptions"
                     :disabled="r.row.disabled || !r.row.isEnable"
                     v-model="r.row.openTime"/>
                 </template>
               </el-table-column>
-              <el-table-column label="午休开始">
-                <template slot-scope="r">
-                  <el-time-select
-                    style="width: 100%"
-                    size="mini"
-                    :picker-options="pickerOptions"
-                    :disabled="r.row.disabled || !r.row.isEnable"
-                    v-model="r.row.noonbreakStart"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="午休结束">
-                <template slot-scope="r">
-                  <el-time-select
-                    style="width: 100%"
-                    size="mini"
-                    :picker-options="pickerOptions"
-                    :disabled="r.row.disabled || !r.row.isEnable"
-                    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%"-->
+<!--                    size="mini"-->
+<!--                    :picker-options="pickerOptions"-->
+<!--                    :disabled="r.row.disabled || !r.row.isEnable"-->
+<!--                    v-model="r.row.noonbreakStart"/>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="午休结束">-->
+<!--                <template slot-scope="r">-->
+<!--                  <el-time-select-->
+<!--                    style="width: 100%"-->
+<!--                    size="mini"-->
+<!--                    :picker-options="pickerOptions"-->
+<!--                    :disabled="r.row.disabled || !r.row.isEnable"-->
+<!--                    v-model="r.row.noonbreakEnd"/>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+              <el-table-column label="营业终了" width="120">
                 <template slot-scope="r">
                   <el-time-select
                     style="width: 100%"
@@ -103,17 +103,17 @@
                     v-model="r.row.closeTime"/>
                 </template>
               </el-table-column>
-              <el-table-column label="下班时间" >
-                <template slot-scope="r">
-                  <el-time-select
-                    style="width: 100%"
-                    size="mini"
-                    :picker-options="pickerOptions"
-                    :disabled="r.row.disabled || !r.row.isEnable"
-                    v-model="r.row.workOffTime"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作列表" width="140px">
+<!--              <el-table-column label="下班时间" >-->
+<!--                <template slot-scope="r">-->
+<!--                  <el-time-select-->
+<!--                    style="width: 100%"-->
+<!--                    size="mini"-->
+<!--                    :picker-options="pickerOptions"-->
+<!--                    :disabled="r.row.disabled || !r.row.isEnable"-->
+<!--                    v-model="r.row.workOffTime"/>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+              <el-table-column label="操作列表" width="140">
                 <template slot-scope="r">
                   <btn-tip type="text" @click="deleteData(r.row,r.$index)">删除</btn-tip>
                   <el-button type="text" @click="coppy(r.$index)">复制至全部</el-button>
@@ -167,7 +167,7 @@ export default {
       return {
         start: "00:00",
         end: "24:00",
-        step: "00:10",
+        step: "00:05",
       };
     },
   },
@@ -190,12 +190,12 @@ export default {
       //获取workTimeList最后一条数据
       let workTime = {
         isEnable: 1,
-        workTime: '08:30',
+        // workTime: '08:30',
         openTime: '09:00',
-        noonbreakStart: '12:00',
-        noonbreakEnd: '14:00',
+        // noonbreakStart: '12:00',
+        // noonbreakEnd: '14:00',
         closeTime: '17:00',
-        workOffTime: '17:30',
+        // workOffTime: '17:30',
         ymdDate: new Date(),
         disabled: false,
       };
@@ -211,19 +211,19 @@ export default {
       let workTime = this.workTimeList[index];
       for(let i=0;i<this.workTimeList.length;i++){
         this.workTimeList[i].isEnable = workTime.isEnable;
-        this.workTimeList[i].workTime = workTime.workTime;
+        // this.workTimeList[i].workTime = workTime.workTime;
         this.workTimeList[i].openTime = workTime.openTime;
-        this.workTimeList[i].noonbreakStart = workTime.noonbreakStart;
-        this.workTimeList[i].noonbreakEnd = workTime.noonbreakEnd;
+        // this.workTimeList[i].noonbreakStart = workTime.noonbreakStart;
+        // this.workTimeList[i].noonbreakEnd = workTime.noonbreakEnd;
         this.workTimeList[i].closeTime = workTime.closeTime;
-        this.workTimeList[i].workOffTime = workTime.workOffTime;
+        // this.workTimeList[i].workOffTime = workTime.workOffTime;
       }
     },
     deleteData(row,index){
       console.log(index);
       this.workTimeList.splice(index,1);
     },
-    //
+    //检查每一项
     check(other) {
       if(!other.ymdDate){
         this.$message.error(`日期不能为空`);
@@ -232,42 +232,53 @@ export default {
       const ds = this.formatTime(other.ymdDate,"YYYY-MM-DD");
       console.log(other,'ds')
       if ( !other.isEnable === null && !other.disabled ) {
-        this.$message.error(`${ds}未进行配置`);
+        this.$message.error(`${ds}：未进行配置`);
         return;
       }
-      if (other.isEnable) {
-        if (
-            !(
-                other.workTime &&
-                other.openTime &&
-                other.closeTime &&
-                other.workOffTime
-            )
-        ) {
-          this.$message.error(`${ds}未配置时间`);
-          return;
-        }
-        if (!other.noonbreakStart ^ !other.noonbreakEnd) {
-          this.$message.error(`午休开始及结束时间必须同时配置`);
+      if(other.isEnable){
+        if(!other.openTime || !other.closeTime){
+          this.$message.error(`${ds}：未配置时间`);
           return;
         }
-        if (
-            !timeCheck([
-              other.workTime,
-              other.openTime,
-              other.noonbreakStart,
-              other.noonbreakEnd,
-              other.closeTime,
-              other.workOffTime,
-            ])
-        ) {
-          this.$message.error(
-              `${ds}上班时间<=营业时间<=午休开始<=午休结束<=营业终了<=下班时间`
-          );
+        if(!timeCheck([other.openTime,other.closeTime])){
+          this.$message.error(`${ds}：营业时间应在营业终了之前`);
           return false;
         }
       }
-      return true;
+      return true
+      // if (other.isEnable) {
+      //   if (
+      //       !(
+      //           other.workTime &&
+      //           other.openTime &&
+      //           other.closeTime &&
+      //           other.workOffTime
+      //       )
+      //   ) {
+      //     this.$message.error(`${ds}未配置时间`);
+      //     return;
+      //   }
+      //   if (!other.noonbreakStart ^ !other.noonbreakEnd) {
+      //     this.$message.error(`午休开始及结束时间必须同时配置`);
+      //     return;
+      //   }
+      //   if (
+      //       !timeCheck([
+      //         other.workTime,
+      //         other.openTime,
+      //         other.noonbreakStart,
+      //         other.noonbreakEnd,
+      //         other.closeTime,
+      //         other.workOffTime,
+      //       ])
+      //   ) {
+      //     this.$message.error(
+      //         `${ds}上班时间<=营业时间<=午休开始<=午休结束<=营业终了<=下班时间`
+      //     );
+      //     return false;
+      //   }
+      // }
+      // return true;
     },
     handleClose() {
       this.isShow = false;
@@ -279,13 +290,15 @@ export default {
       if (!workTime.isEnable) {
         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;
       }
     },
     async onSubmit() {
+      if(this.orgIdList.length === 0)return  this.$message.warning('请选择机构！');
+      if(this.workTimeList.length === 0)return  this.$message.warning('请添加日期！');
       //判断是否有重复的日期
       let dateList = [];
       let workTimeList = JSON.parse(JSON.stringify(this.workTimeList))
@@ -309,20 +322,12 @@ export default {
         orgIdList:this.orgIdList,
         workTimeList:workTimeList
       }
+      debugger
       addWorkTimeDay(data).then(res=>{
         this.$emit("ok");
         this.handleClose();
       })
-
-      // await this.$api.workTimeMonth.edit({
-      //   ...this.data,
-      //   workTimeList: this.workTimeList,
-      // }).then((v) => {
-      //   this.$emit("success");
-      //   this.onHide();
-      // });
     },
-    //apimark//
   },
 };
 </script>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="question-infos">
     <DialogCom :title="title" @close="handleClose" :visible.sync="isShow" :close-on-click-modal="false"
-      custom-class="gxDialog" width="75%"  append-to-body>
+      custom-class="gxDialog" width="800"  append-to-body>
 <!--      <div class="p-5 work-time-modify">-->
         <el-form
             :disabled="title === '查看作息模版'"
@@ -35,34 +35,34 @@
               <el-table class="w-auto" border :data="formData.dayOfWeeks">
                 <el-table-column label="星期" width="100px" prop="dayOfWeekText">
                 </el-table-column>
-                <el-table-column label="营业状态" width="160px">
+                <el-table-column label="营业状态">
                   <template slot-scope="r">
-                    <el-switch
-                      v-model="r.row.isWorkday"
-                      :active-value="1"
-                      :inactive-value="0"
-                      @change="onEnableChange(r.row)"
-                      active-text="营业"
-                      inactive-text="歇业">
-                    </el-switch>
-<!--                    <el-radio-group-->
-<!--                        v-model="r.row.isWorkday"-->
-<!--                        @change="onEnableChange(r.row)">-->
-<!--                      <el-radio text-color="#48bb78" :label="1">营业</el-radio>-->
-<!--                      <el-radio text-color="#f56565" :label="0">歇业</el-radio>-->
-<!--                    </el-radio-group>-->
-                  </template>
-                </el-table-column>
-                <el-table-column label="上班时间">
-                  <template slot-scope="r">
-                    <el-time-select
-                      style="width: 100%"
-                      size="mini"
-                      :picker-options="pickerOptions"
-                      :disabled="!r.row.isWorkday || !r.row.isWorkday"
-                      v-model="r.row.workTime"/>
+<!--                    <el-switch-->
+<!--                      v-model="r.row.isWorkday"-->
+<!--                      :active-value="1"-->
+<!--                      :inactive-value="0"-->
+<!--                      @change="onEnableChange(r.row)"-->
+<!--                      active-text="营业"-->
+<!--                      inactive-text="歇业">-->
+<!--                    </el-switch>-->
+                    <el-radio-group
+                        v-model="r.row.isWorkday"
+                        @change="onEnableChange(r.row)">
+                      <el-radio text-color="#48bb78" :label="1">营业</el-radio>
+                      <el-radio text-color="#f56565" :label="0">歇业</el-radio>
+                    </el-radio-group>
                   </template>
                 </el-table-column>
+<!--                <el-table-column label="上班时间">-->
+<!--                  <template slot-scope="r">-->
+<!--                    <el-time-select-->
+<!--                      style="width: 100%"-->
+<!--                      size="mini"-->
+<!--                      :picker-options="pickerOptions"-->
+<!--                      :disabled="!r.row.isWorkday || !r.row.isWorkday"-->
+<!--                      v-model="r.row.workTime"/>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="营业时间">
                   <template slot-scope="r">
                     <el-time-select
@@ -73,26 +73,26 @@
                       v-model="r.row.openTime"/>
                   </template>
                 </el-table-column>
-                <el-table-column label="午休开始">
-                  <template slot-scope="r">
-                    <el-time-select
-                      style="width: 100%"
-                      size="mini"
-                      :picker-options="pickerOptions"
-                      :disabled="!r.row.isWorkday || !r.row.isWorkday"
-                      v-model="r.row.noonbreakStart"/>
-                  </template>
-                </el-table-column>
-                <el-table-column label="午休结束">
-                  <template slot-scope="r">
-                    <el-time-select
-                      style="width: 100%"
-                      size="mini"
-                      :picker-options="pickerOptions"
-                      :disabled="!r.row.isWorkday || !r.row.isWorkday"
-                      v-model="r.row.noonbreakEnd"/>
-                  </template>
-                </el-table-column>
+<!--                <el-table-column label="午休开始">-->
+<!--                  <template slot-scope="r">-->
+<!--                    <el-time-select-->
+<!--                      style="width: 100%"-->
+<!--                      size="mini"-->
+<!--                      :picker-options="pickerOptions"-->
+<!--                      :disabled="!r.row.isWorkday || !r.row.isWorkday"-->
+<!--                      v-model="r.row.noonbreakStart"/>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column label="午休结束">-->
+<!--                  <template slot-scope="r">-->
+<!--                    <el-time-select-->
+<!--                      style="width: 100%"-->
+<!--                      size="mini"-->
+<!--                      :picker-options="pickerOptions"-->
+<!--                      :disabled="!r.row.isWorkday || !r.row.isWorkday"-->
+<!--                      v-model="r.row.noonbreakEnd"/>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="营业终了">
                   <template slot-scope="r">
                     <el-time-select
@@ -103,16 +103,16 @@
                       v-model="r.row.closeTime"/>
                   </template>
                 </el-table-column>
-                <el-table-column label="下班时间">
-                  <template slot-scope="r">
-                    <el-time-select
-                      style="width: 100%"
-                      size="small"
-                      :picker-options="pickerOptions"
-                      :disabled="!r.row.isWorkday || !r.row.isWorkday"
-                      v-model="r.row.workOffTime"/>
-                  </template>
-                </el-table-column>
+<!--                <el-table-column label="下班时间">-->
+<!--                  <template slot-scope="r">-->
+<!--                    <el-time-select-->
+<!--                      style="width: 100%"-->
+<!--                      size="small"-->
+<!--                      :picker-options="pickerOptions"-->
+<!--                      :disabled="!r.row.isWorkday || !r.row.isWorkday"-->
+<!--                      v-model="r.row.workOffTime"/>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
 
               </el-table>
 
@@ -161,8 +161,8 @@
 import BtnTip from "@/components/btnTip";
 import OrgTreeSelect from '@/components/orgTreeSelect'
 import { timeCheck } from "@/utils/ruoyi";
-import {addTimeWeek,checkData, queryInfoById} from "@/views/system/workTimeSet/api";
-import {json} from './json'
+import {addTimeWeek, queryInfoById} from "@/views/system/workTimeSet/api";
+import {json} from './json'  //导入默认数据
 export default {
   components:{BtnTip,OrgTreeSelect},
   data() {
@@ -190,16 +190,6 @@ export default {
           },
         ],
       },
-      // options: [
-      //   {
-      //     value: new Date().getFullYear(),
-      //     label: new Date().getFullYear(),
-      //   },
-      //   {
-      //     value: new Date().getFullYear() + 1,
-      //     label: new Date().getFullYear() + 1,
-      //   },
-      // ],
       startDatepickerOptions: {
         disabledDate(time) {
           const date = new Date();
@@ -223,7 +213,7 @@ export default {
       return {
         start: "00:00",
         end: "24:00",
-        step: "00:10",
+        step: "00:05",
       };
     },
   },
@@ -240,10 +230,6 @@ export default {
     add(){
       this.title = '新增作息模版';
       this.isShow = true;
-      //this.getData()
-      // for (let i=0; i <= 6;i++){
-      //   this.formData.dayOfWeeks.push({})
-      // }
     },
     show(row) {
       this.title = '查看作息模版';
@@ -264,40 +250,40 @@ export default {
         this.$message.error("生效日期不能为空");
         return;
       }
-      if (this.formData.dayOfWeeks.filter((w) => w.isWorkday == 1 || w.isWorkday).length === 0) {
+      if (this.formData.dayOfWeeks.filter(w => w.isWorkday == 1 || w.isWorkday).length === 0) {
         this.$message.error("工作日不能为空");
         return;
       }
-      this.formData.dayOfWeeks.forEach(v=>{
-        let dayOfWeek = v;
-        console.log(dayOfWeek,'dayOfWeek');
-        //是否启用
-        if(!dayOfWeek.isWorkday ) return ;
-        if (!(dayOfWeek.workTime && dayOfWeek.openTime && dayOfWeek.closeTime && dayOfWeek.workOffTime)) {
-          this.$message.error(`${dayOfWeek.dayOfWeekText}的上班时间、营业时间未配置完整`);
+      // 校验
+      for (let workTime of this.formData.dayOfWeeks) {
+        if (!this.checkItem(workTime)) {
           return;
         }
-        if (!dayOfWeek.noonbreakStart ^ !dayOfWeek.noonbreakEnd) {
-          this.$message.error(`${dayOfWeek.dayOfWeekText}的午休开始及结束时间必须同时配置`);
-          return;
-        }
-        let arr = [dayOfWeek.workTime, dayOfWeek.openTime, dayOfWeek.noonbreakStart, dayOfWeek.noonbreakEnd, dayOfWeek.closeTime, dayOfWeek.workOffTime];
-        let flag = timeCheck(arr);
-        if (!flag) {
-          this.$message.error(`${dayOfWeek.dayOfWeekText}的上班时间<=营业时间<=午休开始<=午休结束<=营业终了<=下班时间`);
-          return false;
-        }
-      })
-      checkData(this.formData).then(res=>{
-        this.checkData = res.checkData;
-        if(!res.checkData) {
-          addTimeWeek(this.formData).then(res=>{
-            this.$emit("success");
-            this.handleClose();
-          })
-        }
+      }
+      addTimeWeek(this.formData).then(res=>{
+        this.$emit("ok");
+        this.handleClose();
       })
     },
+    checkItem(dayOfWeek){
+      console.log(dayOfWeek,'dayOfWeek');
+      //是否启用
+      if(!dayOfWeek.isWorkday) return true;
+      if (!( dayOfWeek.openTime && dayOfWeek.closeTime)) {
+        this.$message.error(`${dayOfWeek.dayOfWeekText}的营业时间未完整配置`);
+        return;
+      }
+      // if (!dayOfWeek.noonbreakStart ^ !dayOfWeek.noonbreakEnd) {
+      //   this.$message.error(`${dayOfWeek.dayOfWeekText}的午休开始及结束时间必须同时配置`);
+      //   return;
+      // }
+      let arr = [dayOfWeek.openTime,dayOfWeek.closeTime];
+      if (!timeCheck(arr)) {
+        this.$message.error(`${dayOfWeek.dayOfWeekText}的营业时间应在营业终了之前`);
+        return false;
+      }
+      return true;
+    },
     async submitData(result){
       this.centerDialogVisible=false;
       this.centerDialogVisiblea=false;

src/views/system/workTimeSet/index.vue

@@ -5,7 +5,7 @@
       <el-tab-pane label="作息配置" name="作息配置">
         <work-time></work-time>
       </el-tab-pane>
-      <el-tab-pane v-hasPermi="['system:time:week']" label="按周配置作息" name="按周配置作息" lazy>
+      <el-tab-pane v-hasPermi="['system:time:week']" label="模板配置作息" name="按周配置作息" lazy>
         <work-time-week ></work-time-week>
       </el-tab-pane>
     </el-tabs>

src/views/system/workTimeSet/workTime.vue

@@ -79,7 +79,7 @@
               icon="el-icon-thumb"
               @click="clickAdd"
               v-hasPermi="['system:time:add']"
-            >指定日期配置</el-button>
+            >新增作息配置</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- <el-button
@@ -90,7 +90,7 @@
               @click="handleExport"
               v-hasPermi="['system:time:export']">导出</el-button> -->
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          <right-toolbar :showSearch.sync="showSearch" size="mini" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" style="width: auto;" size="mini" border :data="tableList">
@@ -98,25 +98,25 @@
           <el-table-column v-if="columns[1].visible" label="日期" >
             <span slot-scope="scope">{{scope.row.ymdDate}}</span>
           </el-table-column>
-          <el-table-column v-if="columns[2].visible" label="营业状态" :width="100">
+          <el-table-column v-if="columns[2].visible" label="营业状态">
             <template slot-scope="r">{{r.row.isEnable?'营业':'歇业'}}</template>
           </el-table-column>
-          <el-table-column v-if="columns[3].visible" label="上下班时间段">
-            <template slot-scope="r">
-              <span>{{r.row.workTime}}-{{r.row.workOffTime}}</span>
-            </template>
-          </el-table-column>
+<!--          <el-table-column v-if="columns[3].visible" label="上下班时间段">-->
+<!--            <template slot-scope="r">-->
+<!--              <span>{{r.row.workTime}}-{{r.row.workOffTime}}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column v-if="columns[4].visible" label="营业时间段">
             <template slot-scope="r">
               <span>{{r.row.openTime}}-{{r.row.closeTime}}</span>
             </template>
           </el-table-column>
-          <el-table-column v-if="columns[5].visible" label="午休时间段">
-            <template slot-scope="scope">
-              <span>{{scope.row.noonbreakStart}}-{{scope.row.noonbreakEnd}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column v-if="columns[6].visible" prop="modifiedName" label="更新人" width="100"></el-table-column>
+<!--          <el-table-column v-if="columns[5].visible" label="午休时间段">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span>{{scope.row.noonbreakStart}}-{{scope.row.noonbreakEnd}}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column v-if="columns[6].visible" prop="modifiedName" label="更新人" ></el-table-column>
           <el-table-column v-if="columns[7].visible" label="更新时间" >
             <span slot-scope="scope">{{scope.row.updateTime}}</span>
           </el-table-column>

src/views/system/workTimeSet/workTimeWeek.vue

@@ -102,7 +102,7 @@
     </el-row>
 
 
-    <dialog-template ref="modalTemplate" ></dialog-template>
+    <dialog-template ref="modalTemplate" @ok="getList" ></dialog-template>
 
   </div>
 </template>