调整请假管理和出差管理的页面为重置的问题

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -1095,6 +1095,7 @@ export default {
         },
         // 筛选刷新
         billss() {
+            this.page = 1
             var param = {
                 pageIndex: this.page,
                 pageSize: this.size,

fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -203,12 +203,14 @@
               </el-select>
             </div>
             <div>
-              <span style="color: #606266">请假时间</span>
-              <el-date-picker v-model="createDate" type="date" @change="chufas()" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" clearable="false"> </el-date-picker>
+              <!-- <span style="color: #606266">请假时间</span>
+              <el-date-picker v-model="createDate" type="date" @change="chufas()" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" clearable="false"> </el-date-picker> -->
+                <span style="color: #606266">时间段</span>
+                <el-date-picker v-model="createDate" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="chufas()" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" clearable style="width:280px"></el-date-picker>
             </div>
           </div>
             <el-table v-loading="loading" :data="tableData" style="width: 100%" height="94%">
-                <el-table-column prop="ownerName" label="请假人" min-width="120" fixed="left"></el-table-column>
+                <el-table-column prop="ownerName" :label="'请假人12' + page" min-width="120" fixed="left"></el-table-column>
                 <el-table-column prop="tel" label="电话" min-width="120"></el-table-column>
                 <el-table-column prop="leaveType" label="请假类型" min-width="120">
                   <template slot-scope="scope">
@@ -275,7 +277,7 @@
                 </el-table-column>
             </el-table>
             <div class="poss">
-                <el-pagination
+                <!-- <el-pagination
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
                   :current-page="currentPage4"
@@ -283,6 +285,15 @@
                   :page-size="20"
                   layout="total, sizes, prev, pager, next"
                   :total="total">
+                </el-pagination> -->
+                <el-pagination
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="page"
+                  :page-sizes="[20, 50, 100, 200]"
+                  :page-size="20"
+                  layout="total, sizes, prev, pager, next"
+                  :total="total">
                 </el-pagination>
           </div>
         </div>
@@ -688,15 +699,7 @@ export default {
       displayTable: false,
       users: [], // 人员信息
       flg: true,
-      createDate: '2020-01-01',
-      // pickerOptionsStart: {
-      //   disabledDate: (time) => {
-      //     if (this.addForm.endDate) {
-      //       return time.getTime() > new Date(this.addForm.endDate).getTime() || time.getTime() <= new Date(this.createDate).getTime() - 86400000;
-      //     }
-      //     return time.getTime() <= new Date(this.createDate).getTime() - 86400000;
-      //   },
-      // },
+      createDate: [],
       pickerOptionsEnd: {
           disabledDate: (time) => {
           if (this.addForm.startDate) {
@@ -705,14 +708,6 @@ export default {
           return time.getTime() <= new Date(this.createDate).getTime() - 86400000;
           },
       },
-      // pickerOptionsStarts: {
-      //   disabledDate: (time) => {
-      //     if (this.endData) {
-      //       return time.getTime() > new Date(this.endData).getTime() || time.getTime() <= new Date(this.createDate).getTime() - 86400000;
-      //     }
-      //     return time.getTime() <= new Date(this.createDate).getTime() - 86400000;
-      //   },
-      // },
       pickerOptionsEnds: {
         disabledDate: (time) => {
           if (this.statData) {
@@ -735,19 +730,6 @@ export default {
       loading: false,
       timeChoose: 1,
       permissions: JSON.parse(sessionStorage.getItem("permissions")),
-      // typess: [{
-      //   name: '事假',
-      //   id: 0
-      // },{
-      //   name: '病假',
-      //   id: 1
-      // },{
-      //   name: '年假',
-      //   id: 2
-      // },{
-      //   name: '产假',
-      //   id: 3
-      // }],
       typess: [{name: '事假',id: 0},{name: '病假',id: 1},{name: '年假',id: 2},{name: '产假',id: 3},{name: '婚假',id: 4},{name: '丧假',id: 5},{name: '调休假',id: 6},{name: '陪产假',id: 7},{name: '其他', id: 8}],
       statuss: [{
         name: '审核通过',
@@ -766,7 +748,6 @@ export default {
       ownerIds: '',
       type: '',
       code: '',
-      createDate: '',
       falg: 0,
       dialog: false,
       adform: {},
@@ -1391,7 +1372,7 @@ export default {
     bills(audit, tr){
       if(tr) {
         this.code = ''
-        this.createDate = ''
+        this.createDate = []
         // this.ownerIds = ''
         this.type = ''
         if(tr == 1) {
@@ -1410,10 +1391,13 @@ export default {
       this.displayTable = true;
       this.isAuditList = audit;
       this.loading = true
-      var param = {pageIndex: this.page,
+      this.page = '1'
+      var param = { pageIndex: this.page,
                     pageSize: this.size,
                     status: this.code,
-                    createDate: this.createDate,
+                    // createDate: this.createDate,
+                    startDate: this.createDate == null ? '' : this.createDate[0],
+                    endDate: this.createDate == null ? '' : this.createDate[1],
                     ownerId: this.ownerIds,
                     leaveType: this.type,
                   };
@@ -1445,10 +1429,13 @@ export default {
         });
     },
     billss() {
+      this.page = 1
       var param = {pageIndex: this.page,
                     pageSize: this.size,
                     status: this.code,
-                    startDate: this.createDate,
+                    // startDate: this.createDate,
+                    startDate: this.createDate == null ? '' : this.createDate[0],
+                    endDate: this.createDate == null ? '' : this.createDate[1],
                     ownerId: this.ownerIds,
                     leaveType: this.type,
                   };

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -13,7 +13,7 @@
             <el-divider style="margin: 0px 0px !important;height:0.5px;"></el-divider>
             <div class="tree" :style="'height:'+ (tableHeight + 83) + 'px'">
                 <!-- <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick" accordion></el-tree> -->
-                <el-tree :data="data" :props="defaultProps" :expand-on-click-node="false" accordion @node-click="handleNodeClick" :default-expanded-keys="jDarr" @node-expand="jieDian" @node-collapse="shutDown" @current-change="chufa">
+                <el-tree :data="data" :props="defaultProps" node-key="id" :expand-on-click-node="false" accordion @node-click="handleNodeClick" :default-expanded-keys="jDarr" @node-expand="jieDian" @node-collapse="shutDown" @current-change="chufa">
                     <span class="custom-tree-node" style="position: relative;box-sizing: border-box;width: 10%;" slot-scope="{ node }" @mouseleave= mouseleave(data,$event) @mouseover= mouseover(data,$event)>
 
                         <span style="padding-right: 50px;box-sizing: border-box;overflow:hidden;text-overflow:ellipsis;line-height: 36px; display: inline-block;">{{ node.label }}</span>
@@ -2353,7 +2353,7 @@ export default {
               label: "未分配",
             });
             this.data = list;
-            // console.log(list, "部门数据")
+            console.log(list, "部门数据")
             this.option = this.changeArr(list1);
           } else {
             this.$message({