修改作息

src/assets/styles/index.scss

@@ -32,6 +32,7 @@
 
 body {
   height: 100%;
+  font-size: 16px;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;

src/assets/styles/ruoyi.scss

@@ -336,6 +336,9 @@
 .el-checkbox__label{
   font-size: 16px!important;
 }
+.el-form-item__content{
+  font-size: 16px!important;
+}
 .el-input__inner{
   font-size: 14px!important;
 }

src/components/orgTreeSelect/index.vue

@@ -5,7 +5,7 @@
     <div slot="reference" class="tags-box" :class="{'tags-box-disabled':!disabled,'tags-box-mini':size === 'mini'}">
       <span v-show="sNodeList.length > 0" class="tags-num">{{sNodeList.length}}</span>
       <i v-if="sNodeList.length > 0 && !disabled" class="el-icon-circle-close close-icon" @click="clear"></i>
-      <el-tag type="success" :size="size==='mini' && 'mini'" v-for="v in sNodeList" :key="v.id">{{ v.shortName }}</el-tag>
+      <el-tag type="success" :size="size" v-for="v in sNodeList" :key="v.id">{{ v.shortName }}</el-tag>
     </div>
     <!--  文本框    -->
     <el-input style="width: 100%; margin-bottom: 20px" v-model="queryForm.value" @input="serchTreeHandler"
@@ -63,7 +63,7 @@ export default {
     },
     size:{
       type: String,
-      default: 'default',
+      default: 'small',
     },
     //组件禁用
     disabled: {

src/utils/request.js

@@ -93,7 +93,7 @@ let success = res => {
         isRelogin.show = false;
       });
     }
-    Message({ message: msg, type: 'error' }) ()
+    Message({ message: msg, type: 'error' })
     return  Promise.reject('error')
   } else if (code === 500) {
     Message({ message: msg, type: 'error' })
@@ -114,11 +114,13 @@ let error = error => {
   console.log('err' + error)
   let { message } = error;
   if (message == "Network Error") {
-    message = "后端接口连接异常";
-  } else if (message.includes("timeout")) {
-    message = "系统接口请求超时";
-  } else if (message.includes("Request failed with status code")) {
-    message = "系统接口" + message.substr(message.length - 3) + "异常";
+    message = "网络连接错误";
+  }
+  if (message.includes("timeout")) {
+    message = "系统请求超时";
+  }
+  if (message.includes("Request failed with status code")) {
+    message = "系统错误码：" + message.substr(message.length - 3);
   }
   Message({ message: message, type: 'error', duration: 5 * 1000 })
   return Promise.reject(error)

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

@@ -33,30 +33,28 @@
             <el-col :span="12">
               <el-form-item prop="isEnable" label="值班打卡：">
                 <template >
-                  <el-radio-group v-model="formData.isDuty" @change="onEnableChange(formData)">
+                  <el-radio-group v-model="formData.isDuty">
                     <el-radio text-color="#48bb78" label="1">是</el-radio>
                     <el-radio text-color="#f56565" label="0">否</el-radio>
                   </el-radio-group>
                 </template>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col v-if="formData.isEnable == '1'" :span="12">
               <el-form-item prop="workTime" label="上班时间：">
                 <template >
                   <el-time-select
                       :picker-options="pickerOptions"
-                      v-model="formData.workTime"
-                      :disabled="formData.isEnable != '1'"/>
+                      v-model="formData.workTime"/>
                 </template>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col v-if="formData.isEnable == '1'" :span="12">
               <el-form-item prop="workOffTime" label="下班时间：">
                 <template >
                   <el-time-select
                     :picker-options="pickerOptions"
-                    v-model="formData.workOffTime"
-                    :disabled="formData.isEnable != '1'"/>
+                    v-model="formData.workOffTime"/>
                 </template>
               </el-form-item>
             </el-col>
@@ -81,23 +79,21 @@
 <!--                </template>-->
 <!--              </el-form-item>-->
 <!--            </el-col>-->
-            <el-col :span="12">
+            <el-col v-if="formData.isEnable == '1'" :span="12">
               <el-form-item prop="openTime" label="营业开始：">
                 <template >
                   <el-time-select
                     :picker-options="pickerOptions"
-                    v-model="formData.openTime"
-                    :disabled="formData.isEnable != '1'"/>
+                    v-model="formData.openTime"/>
                 </template>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col v-if="formData.isEnable == '1'" :span="12">
               <el-form-item prop="closeTime" label="营业结束：">
                 <template >
                   <el-time-select
                     :picker-options="pickerOptions"
-                    v-model="formData.closeTime"
-                    :disabled="formData.isEnable != '1'"/>
+                    v-model="formData.closeTime"/>
                 </template>
               </el-form-item>
             </el-col>
@@ -173,7 +169,7 @@ export default {
       };
     },
     onEnableChange(workTime) {
-      if (workTime.isEnable === false) {
+      if (workTime.isEnable == '0') {
         workTime.openTime = null;
         workTime.closeTime = null;
         // workTime.noonbreakStart = null;

src/views/system/workTimeSet/workTime.vue

@@ -22,16 +22,15 @@
               :inline="true"
               v-show="showSearch">
               <el-form-item label="起止日期">
-                <el-date-picker
+                <DataRangePicker
                   v-model="queryParams.range"
-                  style="width: 240px"
-                  value-format="yyyy-MM-dd hh:mm:ss"
+                  key="daterange"
                   type="daterange"
-                  range-separator="-"
+                  :clearable="false"
+                  range-separator="至"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
-                  :clearable="false"
-                ></el-date-picker>
+                />
               </el-form-item>
               <el-form-item label="营业状态" prop="status">
                 <el-select
@@ -122,12 +121,12 @@
                   r.row.isEnable == "1" ? "是" : "否"
                 }}</template>
             </el-table-column>
-          <el-table-column v-if="columns[3].visible" label="上下班时间段">
+          <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 align="center" label="营业时间段">
+          <el-table-column align="center" label="营业时间">
             <template slot-scope="r">
               <span>{{ r.row.openTime }}-{{ r.row.closeTime }}</span>
             </template>
@@ -142,7 +141,7 @@
             prop="modifiedName"
             label="更新人"
           ></el-table-column>
-          <el-table-column align="center" label="更新时间">
+          <el-table-column align="center" label="更新时间" width="180">
             <span slot-scope="scope">{{ scope.row.updateTime }}</span>
           </el-table-column>
           <el-table-column
@@ -192,17 +191,17 @@ import DialogAdd from "./dialog.add";
 import { deptTreeSelect } from "@/api/system/public";
 import { tableList } from "./api";
 import { formatTime } from "@/utils/ruoyi";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 //初始化查询日期
-let timea = new Date();
-timea.setHours(0, 0, 0, 0);
-let timeb = new Date(timea.getTime() - 3600 * 1000 * 24 * 30);
-timeb.setHours(0, 0, 0, 0);
+let sDate = new Date();
+let eDate = new Date();
 export default {
   /**  得先引入字典才能使用 */
   dicts: ["sys_business_type"],
   /** 引入基础minxins*/
-  components: { OrgTree, DialogEdit, DialogAdd },
+  components: {DataRangePicker, OrgTree, DialogEdit, DialogAdd },
   data() {
+
     return {
       nowTime: null,
       // 遮罩层
@@ -230,10 +229,10 @@ export default {
       queryParams: {
         checkSub: true,
         orgId: null,
-        isEnable: "1",
+        isEnable: null,
         pageNum: 1,
         pageSize: 10,
-        range: [formatTime(timeb), formatTime(timea)],
+        range: [sDate, eDate],
       },
       total: 0,
       // 列信息
@@ -339,10 +338,10 @@ export default {
     },
     /* 重置搜索 */
     resetForm(name) {
-      this.queryParams.isEnable = "1";
+      this.queryParams.isEnable = null;
       this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 10;
-      this.queryParams.range = [formatTime(timeb), formatTime(timea)];
+      this.queryParams.range = [sDate, eDate];
       this.getList();
     },
     /** 搜索按钮操作 */