休息时间段

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/MonthWorkingTimeVO.java

@@ -0,0 +1,11 @@
+package com.management.platform.entity.vo;
+
+/**
+ * @author cs
+ * @version 1.0
+ * @ClassName MonthWorkingTimeVO
+ * @Description
+ * @date 2023-04-18 15:25
+ */
+public class MonthWorkingTimeVO {
+}

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -444,19 +444,19 @@
         </el-dialog>
 
         <!-- 设置休息时间段 -->
-        <el-dialog :title="$t('settingrestPeriod')" v-if="setupRestDialog" :visible.sync="setupRestDialog" :close-on-click-modal="false" customClass="customWidth" width="600px">
+        <el-dialog :title="$t('settingrestPeriod')" v-if="setupRestDialog" :visible.sync="setupRestDialog" :close-on-click-modal="false" customClass="customWidth" width="400px">
             <el-table :data="restList" highlight-current-row height="400" style="width: 100%;">
                 <el-table-column prop="id" width="60" :label="$t('headerTop.serialNumber')">
                     <template slot-scope="scope" >
                         {{scope.$index + 1}}
                     </template>
                 </el-table-column>
-                <el-table-column :label="$t('message.period')"  width="100" >
+                <el-table-column :label="$t('message.period')"  width="150">
                     <template slot-scope="scope">
                         <span>{{scope.row.startTime + '-' + scope.row.endTime}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="有效范围">
+                <!-- <el-table-column label="有效范围">
                     <template slot-scope="scope">
                         <div v-if="scope.row.dname==null">
                             <div>全公司</div>
@@ -468,7 +468,7 @@
                             <div v-else>{{scope.row.dname}}</div>
                         </div>
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column :label="$t('operation')" width="150">
                     <template slot-scope="scope" >
                         <el-button size="small" type="primary" @click="setupRestEdit(scope.row)">{{ $t('bian-ji') }}</el-button>
@@ -488,12 +488,12 @@
                     <el-form-item :label="$t('time.endTime')">
                         <el-time-picker v-model="restTime.endTime" :placeholder="$t('message.Pleaseselectatime')" format="HH:mm" value-format="HH:mm" @change="timeRule(1)"></el-time-picker>
                     </el-form-item>
-                    <el-form-item label="有效范围">
+                    <!-- <el-form-item label="有效范围">
                         <template>
                             <el-radio v-model="restTime.type" label="1">全公司</el-radio>
                             <el-radio v-model="restTime.type" label="2">部门</el-radio>
                         </template>
-                    </el-form-item>
+                    </el-form-item> -->
                     <div style="max-height: 280px;overflow: auto;">
                         <el-tree
                             v-if="restTime.type == 2"