再次提交

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

@@ -73,13 +73,13 @@
                     </el-radio-group>
                 </el-form-item>
                 <!-- 时间选择 -->
-                <el-form-item :label="flg ? '选择日期' : '选择时间'" style="width: 48%;margin-right:500px">
-                    <el-col :span="9">
+                <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-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>
-                    <el-col :span="9">
+                    <el-col class="line" v-if="flg" style="display: inline-block; width: 50px">-</el-col>
+                    <el-col style="display: inline-block; width: 240px">
                         <el-date-picker v-if="flg" type="date" placeholder="结束日期" value-format="yyyy-MM-dd" :picker-options="pickerOptionsEnd" v-model="addForm.endDate" style="width: 250px;" @blur="datas()"></el-date-picker>
                         <!-- <el-select v-else v-model="addForm.timeHours" placeholder="请假时长" @change="chanSele()">
                             <el-option v-for="(item, index) in options" :key="index" :label="item" :value="item"></el-option>
@@ -161,7 +161,8 @@
                 <el-table-column prop="endDate" label="请假结束时间" width="150"></el-table-column>
                 <el-table-column label="请假天数" width="120">
                   <template slot-scope="scope">
-                    <div>{{scope.row.timeDays}}天</div>
+                    <div v-if="scope.row.timeType == '1'">/</div>
+                    <div v-else>{{scope.row.timeDays}}天</div>
                   </template>
                 </el-table-column>
                 <el-table-column label="请假时长" width="120">
@@ -421,7 +422,7 @@ export default {
       pickerOptionsEnd: {
           disabledDate: (time) => {
           if (this.addForm.startDate) {
-              return time.getTime() < new Date(this.addForm.startDate).getTime();
+              return time.getTime() < new Date(this.addForm.startDate).getTime() - 86400000;
           }
           return time.getTime() <= new Date(this.createDate).getTime() - 86400000;
           },
@@ -436,8 +437,8 @@ export default {
       },
       pickerOptionsEnds: {
         disabledDate: (time) => {
-          if (this.endData) {
-              return time.getTime() < new Date(this.endData).getTime();
+          if (this.statData) {
+              return time.getTime() < new Date(this.statData).getTime() - 86400000;
           }
           return time.getTime() <= new Date(this.createDate).getTime() - 86400000;
           },