|
@@ -26,13 +26,13 @@
|
|
|
<div class="mui-input-row">
|
|
|
<label><span class="colorfe616c">*</span>开始日期</label>
|
|
|
<div class="mui-navigate-right" @click="selectStartTime()">
|
|
|
- <button class="mui-btn mui-btn-block" type='button' v-text="tjForm.startTime">请选择</button>
|
|
|
+ <button class="mui-btn mui-btn-block" type='button' v-text="tjForm.startTime+(tjForm.startTimeQuantum!=''?(tjForm.startTimeQuantum=='1'?'下午':'上午'):'')">请选择</button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="mui-input-row">
|
|
|
<label><span class="colorfe616c">*</span>结束日期</label>
|
|
|
<div class="mui-navigate-right" @click="selectEndTime()">
|
|
|
- <button class="mui-btn mui-btn-block" type='button' v-text="tjForm.endTime">请选择</button>
|
|
|
+ <button class="mui-btn mui-btn-block" type='button' v-text="tjForm.endTime+(tjForm.endTimeQuantum!=''?(tjForm.endTimeQuantum=='1'?'下午':'上午'):'')">请选择</button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</form>
|
|
@@ -101,6 +101,8 @@
|
|
|
tjForm: {
|
|
|
startTime: '请选择',
|
|
|
endTime: '请选择',
|
|
|
+ startTimeQuantum: '',
|
|
|
+ endTimeQuantum: '',
|
|
|
leaveType: '',
|
|
|
|
|
|
imageUrl: '',
|
|
@@ -221,15 +223,25 @@
|
|
|
}
|
|
|
|
|
|
var picker = new mui.DtPicker({
|
|
|
- "type": "datetime",
|
|
|
+ "type": "hour",
|
|
|
"beginYear": 2020,
|
|
|
"endYear": 2040,
|
|
|
"endDate": endDate,
|
|
|
|
|
|
- });
|
|
|
- picker.show(function(rs) {
|
|
|
- _this.tjForm.startTime = rs.text;
|
|
|
- });
|
|
|
+ "customData":{"h":[{"text":"上午","value":"0"},{"text":"下午","value":"1"}]}
|
|
|
+
|
|
|
+
|
|
|
+ });
|
|
|
+ picker.show(function(selectItems) {
|
|
|
+ var year = selectItems.y.value;
|
|
|
+ var month = selectItems.m.value;
|
|
|
+ var day = selectItems.d.value;
|
|
|
+ var curDate = year + "-" + month + "-" + day;
|
|
|
+ _this.tjForm.startTime = curDate;
|
|
|
+ debugger
|
|
|
+ _this.tjForm.startTimeQuantum = selectItems.h.value;
|
|
|
+
|
|
|
+ });
|
|
|
},
|
|
|
//选择时间
|
|
|
selectEndTime() {
|
|
@@ -243,14 +255,30 @@
|
|
|
var beginDate = new Date(_this.tjForm.startTime);
|
|
|
|
|
|
var picker = new mui.DtPicker({
|
|
|
- "type": "datetime",
|
|
|
+ "type": "hour",
|
|
|
"beginYear": 2020,
|
|
|
"endYear": 2040,
|
|
|
"beginDate": beginDate,
|
|
|
- });
|
|
|
- picker.show(function(rs) {
|
|
|
- _this.tjForm.endTime = rs.text;
|
|
|
- });
|
|
|
+ "customData":{"h":[{"text":"上午","value":"0"},{"text":"下午","value":"1"}]}
|
|
|
+ });
|
|
|
+ var _mui=mui;
|
|
|
+ picker.show(function(selectItems) {
|
|
|
+
|
|
|
+ var year = selectItems.y.value;
|
|
|
+ var month = selectItems.m.value;
|
|
|
+ var day = selectItems.d.value;
|
|
|
+ var curDate = year + "-" + month + "-" + day;
|
|
|
+
|
|
|
+ if(curDate==_this.tjForm.startTime&&_this.tjForm.startTimeQuantum=='1'&&selectItems.h.value=='0'){
|
|
|
+ //debugger
|
|
|
+ _mui.alert('结束日期不能小于开始日期');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ _this.tjForm.endTime = curDate;
|
|
|
+ _this.tjForm.endTimeQuantum = selectItems.h.value;
|
|
|
+
|
|
|
+ });
|
|
|
},
|
|
|
//类型选择
|
|
|
selectType() {
|