|
@@ -32,10 +32,10 @@
|
|
|
<hours-cell required is-row :disabled="ifOrg() || formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="营业结束" v-model="formData.closeTime"></hours-cell>
|
|
<hours-cell required is-row :disabled="ifOrg() || formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="营业结束" v-model="formData.closeTime"></hours-cell>
|
|
|
</van-cell-group>
|
|
</van-cell-group>
|
|
|
<!-- 选择时间 -->
|
|
<!-- 选择时间 -->
|
|
|
- <van-cell-group>
|
|
|
|
|
|
|
+ <!-- <van-cell-group>
|
|
|
<hours-cell required is-row :disabled="ifOrg() || formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="上班时间" v-model="formData.workTime"></hours-cell>
|
|
<hours-cell required is-row :disabled="ifOrg() || formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="上班时间" v-model="formData.workTime"></hours-cell>
|
|
|
<hours-cell required is-row :disabled="ifOrg() || formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="下班时间" v-model="formData.workOffTime"></hours-cell>
|
|
<hours-cell required is-row :disabled="ifOrg() || formData.isDisabled || !formData.isEnable || formData.isEnable =='0'" title="下班时间" v-model="formData.workOffTime"></hours-cell>
|
|
|
- </van-cell-group>
|
|
|
|
|
|
|
+ </van-cell-group> -->
|
|
|
|
|
|
|
|
<!-- 操作 -->
|
|
<!-- 操作 -->
|
|
|
<van-cell-group>
|
|
<van-cell-group>
|
|
@@ -77,8 +77,8 @@ export default {
|
|
|
formData:{
|
|
formData:{
|
|
|
openTime:null,
|
|
openTime:null,
|
|
|
closeTime:null,
|
|
closeTime:null,
|
|
|
- workTime:null,
|
|
|
|
|
- workOffTime:null,
|
|
|
|
|
|
|
+ // workTime:null,
|
|
|
|
|
+ // workOffTime:null,
|
|
|
isEnable:null,
|
|
isEnable:null,
|
|
|
ymdDate:null,
|
|
ymdDate:null,
|
|
|
isDisabled:false,
|
|
isDisabled:false,
|
|
@@ -118,8 +118,8 @@ export default {
|
|
|
this.formData.isEnable = s;
|
|
this.formData.isEnable = s;
|
|
|
this.formData.openTime = null;
|
|
this.formData.openTime = null;
|
|
|
this.formData.closeTime = null;
|
|
this.formData.closeTime = null;
|
|
|
- this.formData.workTime = null;
|
|
|
|
|
- this.formData.workOffTime = null;
|
|
|
|
|
|
|
+ // this.formData.workTime = null;
|
|
|
|
|
+ // this.formData.workOffTime = null;
|
|
|
},
|
|
},
|
|
|
//获取复制的数据
|
|
//获取复制的数据
|
|
|
getCopyData(arr){
|
|
getCopyData(arr){
|
|
@@ -131,10 +131,10 @@ export default {
|
|
|
if(this.formData.isEnable == '1'){
|
|
if(this.formData.isEnable == '1'){
|
|
|
if(!this.formData.openTime) return this.$toast('请选择开始时间');
|
|
if(!this.formData.openTime) return this.$toast('请选择开始时间');
|
|
|
if(!this.formData.closeTime) return this.$toast('请选择结束时间');
|
|
if(!this.formData.closeTime) return this.$toast('请选择结束时间');
|
|
|
- if(!this.formData.workTime) return this.$toast('请选择上班时间');
|
|
|
|
|
- if(!this.formData.workOffTime) return this.$toast('请选择下班时间');
|
|
|
|
|
|
|
+ // if(!this.formData.workTime) return this.$toast('请选择上班时间');
|
|
|
|
|
+ // if(!this.formData.workOffTime) return this.$toast('请选择下班时间');
|
|
|
if(!timeCheck([this.formData.openTime,this.formData.closeTime])) return this.$toast('开始时间不能大于结束时间');
|
|
if(!timeCheck([this.formData.openTime,this.formData.closeTime])) return this.$toast('开始时间不能大于结束时间');
|
|
|
- if(!timeCheck([this.formData.workTime,this.formData.workOffTime])) return this.$toast('上班时间不能大于下班时间');
|
|
|
|
|
|
|
+ // if(!timeCheck([this.formData.workTime,this.formData.workOffTime])) return this.$toast('上班时间不能大于下班时间');
|
|
|
}
|
|
}
|
|
|
this.$refs.calendar.copyMouth(this.formData);
|
|
this.$refs.calendar.copyMouth(this.formData);
|
|
|
this.isCopy = true;
|
|
this.isCopy = true;
|
|
@@ -160,10 +160,10 @@ export default {
|
|
|
if(this.formData.isEnable == '1'){
|
|
if(this.formData.isEnable == '1'){
|
|
|
if(!this.formData.openTime) return this.$toast('请选择开始时间');
|
|
if(!this.formData.openTime) return this.$toast('请选择开始时间');
|
|
|
if(!this.formData.closeTime) return this.$toast('请选择结束时间');
|
|
if(!this.formData.closeTime) return this.$toast('请选择结束时间');
|
|
|
- if(!this.formData.workTime) return this.$toast('请选择上班时间');
|
|
|
|
|
- if(!this.formData.workOffTime) return this.$toast('请选择下班时间');
|
|
|
|
|
|
|
+ // if(!this.formData.workTime) return this.$toast('请选择上班时间');
|
|
|
|
|
+ // if(!this.formData.workOffTime) return this.$toast('请选择下班时间');
|
|
|
if(!timeCheck([this.formData.openTime,this.formData.closeTime])) return this.$toast('开始时间不能大于结束时间');
|
|
if(!timeCheck([this.formData.openTime,this.formData.closeTime])) return this.$toast('开始时间不能大于结束时间');
|
|
|
- if(!timeCheck([this.formData.workTime,this.formData.workOffTime])) return this.$toast('上班时间不能大于下班时间');
|
|
|
|
|
|
|
+ // if(!timeCheck([this.formData.workTime,this.formData.workOffTime])) return this.$toast('上班时间不能大于下班时间');
|
|
|
}
|
|
}
|
|
|
let data = {
|
|
let data = {
|
|
|
orgIdList:[this.formData.orgId],
|
|
orgIdList:[this.formData.orgId],
|
|
@@ -178,14 +178,15 @@ export default {
|
|
|
},
|
|
},
|
|
|
//日期选择
|
|
//日期选择
|
|
|
onChange(day){
|
|
onChange(day){
|
|
|
|
|
+ console.log("onChange",day);
|
|
|
this.selectDate = day;
|
|
this.selectDate = day;
|
|
|
this.formData.ymdDate = this.selectDate.ymdDate;
|
|
this.formData.ymdDate = this.selectDate.ymdDate;
|
|
|
this.formData.isEnable = this.selectDate.isEnable;
|
|
this.formData.isEnable = this.selectDate.isEnable;
|
|
|
this.formData.openTime = this.selectDate.openTime;
|
|
this.formData.openTime = this.selectDate.openTime;
|
|
|
this.formData.closeTime = this.selectDate.closeTime;
|
|
this.formData.closeTime = this.selectDate.closeTime;
|
|
|
this.formData.isDisabled = this.selectDate.isDisabled;
|
|
this.formData.isDisabled = this.selectDate.isDisabled;
|
|
|
- this.formData.workTime = this.selectDate.workTime;
|
|
|
|
|
- this.formData.workOffTime = this.selectDate.workOffTime;
|
|
|
|
|
|
|
+ // this.formData.workTime = this.selectDate.workTime;
|
|
|
|
|
+ // this.formData.workOffTime = this.selectDate.workOffTime;
|
|
|
this.formData.isDuty = this.selectDate.isDuty;
|
|
this.formData.isDuty = this.selectDate.isDuty;
|
|
|
},
|
|
},
|
|
|
}
|
|
}
|