再次提交

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

@@ -75,7 +75,7 @@
                 <!-- 时间选择 -->
                 <el-form-item :label="flg ? '选择日期' : '选择时间'" style="width: 100%;">
                     <el-col style="display: inline-block; width: 240px">
-                        <el-date-picker v-if="flg" type="date" placeholder="开始日期" value-format="yyyy-MM-dd" :picker-options="pickerOptionsStart" v-model="addForm.startDate" style="width: 240px;" @blur="datas()"></el-date-picker>
+                        <el-date-picker v-if="flg" type="date" placeholder="开始日期" value-format="yyyy-MM-dd"  v-model="addForm.startDate" style="width: 240px;" @blur="datas()"></el-date-picker>
                         <el-date-picker v-else type="date" placeholder="开始日期" value-format="yyyy-MM-dd" v-model="addForm.startDate" style="width: 240px;" @change="datasss()"></el-date-picker>
                     </el-col>
                     <el-col class="line" v-if="flg" style="display: inline-block; width: 50px">-</el-col>
@@ -143,7 +143,7 @@
             </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> </el-date-picker>
+              <el-date-picker v-model="createDate" type="date" @change="chufas()" value-format="yyyy-MM-dd" placeholder="选择日期" size="small" clearable="false"> </el-date-picker>
             </div>
           </div>
             <el-table v-loading="loading" :data="tableData" style="width: 100%" height="90%">
@@ -321,7 +321,7 @@
         <!-- 时间选择 -->
         <el-form-item :label="flg ? '选择日期' : '选择时间'" style="width: 74%;margin-right:500px">
             <el-col :span="9">
-                <el-date-picker v-if="flg" type="date" placeholder="开始日期" value-format="yyyy-MM-dd" :picker-options="pickerOptionsStart" v-model="addForm.startDate" style="width: 240px;" @blur="datas()"></el-date-picker>
+                <el-date-picker v-if="flg" type="date" placeholder="开始日期" value-format="yyyy-MM-dd"  v-model="addForm.startDate" style="width: 240px;" @blur="datas()"></el-date-picker>
                 <el-date-picker v-else type="date" placeholder="开始日期" value-format="yyyy-MM-dd" v-model="addForm.startDate" style="width: 240px;" @change="datasss()"></el-date-picker>
             </el-col>
             <el-col class="line" v-if="flg" :span="2">-</el-col>
@@ -411,14 +411,14 @@ export default {
       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;
-        },
-      },
+      // 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;
+      //   },
+      // },
       pickerOptionsEnd: {
           disabledDate: (time) => {
           if (this.addForm.startDate) {
@@ -427,14 +427,14 @@ 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;
-        },
-      },
+      // 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) {
@@ -652,7 +652,7 @@ export default {
       var param = {pageIndex: this.page,
                     pageSize: this.size,
                     status: this.code,
-                    createDate: this.createDate,
+                    startDate: this.createDate,
                     ownerId: this.ownerIds,
                     leaveType: this.type,
                   };
@@ -744,6 +744,9 @@ export default {
     // 计算日期
     datas() {
         // this.addForm.timeDays = this.DateDiff(this.addForm.startDate, this.addForm.endDate)
+        if(this.addForm.startDate > this.addForm.endDate) {
+          this.addForm.endDate = this.addForm.startDate
+        }
         this.addForm.timeDays = this.countWorkDay(this.addForm.startDate, this.addForm.endDate)
         this.timeChoose = this.addForm.timeDays
         this.addForm.timeHours = this.addForm.timeDays * 8