Explorar el Código

作息管理修改bug

凉纪 hace 2 años
padre
commit
d76f4b385b

+ 5 - 0
src/assets/styles/element-ui.scss

@@ -93,3 +93,8 @@
   height: calc(100vh - 185px);
   overflow: auto;
 }
+
+.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{
+  background-color:#008CD6 !important;
+  color:#fff;
+}

+ 1 - 0
src/mixins/tableList.js

@@ -10,6 +10,7 @@ export default {
       // 遮罩层
       loading: false,
       queryParams:{},
+      dateRange:[],
     }
   },
   methods:{

+ 16 - 6
src/views/system/workTimeSet/workTime.vue

@@ -25,6 +25,7 @@
             :filter-node-method="filterNode"
             ref="tree"
             node-key="id"
+            highlight-current
             :default-expanded-keys="defaultKeys"
             :default-checked-keys="defaultKeys"
             @node-click="handleNodeClick"
@@ -153,7 +154,11 @@ import DialogAdd from './dialog.add'
 import { deptTreeSelect } from "@/api/system/public";
 import { tableList } from "./api";
 import {formatTime} from "@/utils/ruoyi";
-
+//初始化查询日期
+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);
 export default {
   /**  得先引入字典才能使用 */
   dicts: ['sys_business_type'],
@@ -161,11 +166,6 @@ export default {
   mixins:[tableListMixins],
   components: {DialogEdit,DialogAdd},
   data() {
-    //初始化查询日期
-    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);
     return {
       //选中的行
       selectRow:null,
@@ -250,6 +250,7 @@ export default {
         this.deptOptions = response.data;
         this.defaultKeys.push(response.data[0].id);
         this.queryParams.orgId = response.data[0].id;
+        this.$refs.tree.setCurrentKey(response.data[0].id);
         this.handleQuery();
       });
     },
@@ -283,6 +284,15 @@ export default {
         ...this.queryParams
       }, `user_${new Date().getTime()}.xlsx`)
     },
+    /* 重置搜索 */
+    resetForm(name){
+      this.queryParams = {
+        orgId: null,
+        isEnable:'1',
+        range: [formatTime(timeb), formatTime(timea)],
+      }
+    },
   }
 };
+
 </script>

+ 10 - 4
src/views/system/workTimeSet/workTimeWeek.vue

@@ -25,6 +25,7 @@
             :filter-node-method="filterNode"
             ref="tree"
             node-key="id"
+            highlight-current
             :default-expanded-keys="defaultKeys"
             :default-checked-keys="defaultKeys"
             @node-click="handleNodeClick"
@@ -38,7 +39,7 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="生效日期">
             <el-date-picker
-              v-model="queryParams.params"
+              v-model="dateRange"
               style="width: 240px"
               value-format="yyyy-MM-dd hh:mm:ss"
               type="daterange"
@@ -113,7 +114,6 @@ import DialogTemplate from './dialog.template'
 /** 引入节点树接口*/
 import { deptTreeSelect} from "@/api/system/public";
 import {weekTableList} from './api'
-
 export default {
   /**  得先引入字典才能使用 */
   dicts: ['sys_business_type'],
@@ -145,7 +145,6 @@ export default {
         checkSub: false,
         orgId: null,
         isEnable:false,
-        params: null,
       },
       // 列信息
       columns: [
@@ -204,7 +203,7 @@ export default {
         ...this.queryParams,
         ...this.pages
       }
-      weekTableList(this.addDateRange(data, this.queryParams.params)).then(response => {
+      weekTableList(this.addDateRange(data, this.dateRange)).then(response => {
           this.tableList = response.data.records;
           this.pages.total = response.data.total;
           this.loading = false;
@@ -244,6 +243,13 @@ export default {
         ...this.queryParams
       }, `user_${new Date().getTime()}.xlsx`)
     },
+    /* 重置搜索 */
+    resetForm(name){
+      this.queryParams = {
+          orgId: null,
+          isEnable:false,
+      }
+    },
   }
 };
 </script>