Skip to content

C
confucius
Commit 472866c7 authored by Mac's avatar Mac
Browse files
Options

1

parent 2997beee
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 31 deletions
src/components/enterprise/chaneelcode-form.vue
View file @ 472866c7
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<el-form-item label="固定时段：" v-if="peopletype==1"> <el-form-item label="固定时段：" v-if="peopletype==1">
<div v-for="(x,y) in addMsg " :key="y" <div v-for="(x,y) in addMsg " :key="y"
style="display: flex;align-items: center;margin-top: 10px;"> style="display: flex;align-items: center;margin-top: 10px;">
<el-time-select :disabled="x.IsDefault==1" placeholder="起始时间" v-model="x.StartHours" <el-time-select :disabled="x.IsDefault==1" placeholder="起始时间" v-model="x.StartHours" @change="changeTime(y,2)"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', }"> :picker-options="{ start: '00:00', step: '01:00', end: '23:00', }">
</el-time-select> </el-time-select>
<el-time-select :disabled="x.IsDefault==1" placeholder="结束时间" v-model="x.EndHours" @change="changeTime(y,2)" <el-time-select :disabled="x.IsDefault==1" placeholder="结束时间" v-model="x.EndHours" @change="changeTime(y,2)"
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<el-form-item label="固定时段：" v-if="peopletype==2"> <el-form-item label="固定时段：" v-if="peopletype==2">
<div v-for="(x,y) in addMsg " :key="y" > <div v-for="(x,y) in addMsg " :key="y" >
<div style="display: flex;align-items: flex-start;margin-top: 10px;"> <div style="display: flex;align-items: flex-start;margin-top: 10px;">
<el-time-select :disabled="x.IsDefault==1" placeholder="起始时间" v-model="x.StartHours" <el-time-select :disabled="x.IsDefault==1" placeholder="起始时间" v-model="x.StartHours" @change="changeTime(y,2)"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', }"> :picker-options="{ start: '00:00', step: '01:00', end: '23:00', }">
</el-time-select> </el-time-select>
<el-time-select :disabled="x.IsDefault==1" placeholder="结束时间" v-model="x.EndHours"@change="changeTime(y,2)" <el-time-select :disabled="x.IsDefault==1" placeholder="结束时间" v-model="x.EndHours"@change="changeTime(y,2)"
...@@ -516,15 +516,12 @@ ...@@ -516,15 +516,12 @@
}) })
}, },
changeTime(index,type){ changeTime(index,type){
if(this.addMsg[index].StartHours==''){ if(this.addMsg[index].StartHours=='' || this.addMsg[index].EndHours=='' || this.addMsg[index].StartHours==null || this.addMsg[index].EndHours==null){
this.$q.notify({
type: 'negative',
message: `先选择开始时间`,
position: 'top'
})
this.addMsg[index].EndHours='';
return return
} }
if(this.addMsg[index].StartHours>this.addMsg[index].EndHours){
this.addMsg[index].EndHours = ''
}
let a = this.addMsg[index].StartHours let a = this.addMsg[index].StartHours
let b = this.addMsg[index].EndHours let b = this.addMsg[index].EndHours
let continuemap = true let continuemap = true
......
src/pages/enterprise/addchannelcode.vue
View file @ 472866c7
...@@ -238,11 +238,11 @@ ...@@ -238,11 +238,11 @@
</el-date-picker> </el-date-picker>
<div class="tsbox" v-for="(item,index) in x.list" :key='index'> <div class="tsbox" v-for="(item,index) in x.list" :key='index'>
<div style="display: flex;align-items: flex-start;margin-top: 10px;"> <div style="display: flex;align-items: flex-start;margin-top: 10px;">
<el-time-select :disabled="item.IsDefault==1" placeholder="起始时间" <el-time-select :disabled="item.IsDefault==1" placeholder="起始时间" @change="changeTime(y,index,1)"
v-model="item.StartHours" size="small" v-model="item.StartHours" size="small"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', }"> :picker-options="{ start: '00:00', step: '01:00', end: '23:00', }">
</el-time-select> </el-time-select>
<el-time-select :disabled="item.IsDefault==1" placeholder="结束时间" <el-time-select :disabled="item.IsDefault==1" placeholder="结束时间" @change="changeTime(y,index,1)"
v-model="item.EndHours" size="small" v-model="item.EndHours" size="small"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: item.StartHours}"> :picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: item.StartHours}">
</el-time-select> </el-time-select>
...@@ -396,12 +396,12 @@ ...@@ -396,12 +396,12 @@
<el-form-item label="时间段：" v-for="(x,y) in item.childrenlist" :key="y+'a1'" style="border-bottom: 1px solid #e8e8e8;padding: 15px 0 ;"> <el-form-item label="时间段：" v-for="(x,y) in item.childrenlist" :key="y+'a1'" style="border-bottom: 1px solid #e8e8e8;padding: 15px 0 ;">
<div > <div >
<div style="display: flex;align-items: flex-start;" class="tsbox"> <div style="display: flex;align-items: flex-start;" class="tsbox">
<el-time-select placeholder="起始时间" <el-time-select placeholder="起始时间" @change="changeTime(index,y,2)"
v-model="x.StartHours" size="small" v-model="x.StartHours" size="small"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', }"> :picker-options="{ start: '00:00', step: '01:00', end: '23:00', }">
</el-time-select> </el-time-select>
<el-time-select placeholder="结束时间" <el-time-select placeholder="结束时间"
v-model="x.EndHours" size="small" v-model="x.EndHours" size="small" @change="changeTime(index,y,2)"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: x.StartHours}"> :picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: x.StartHours}">
</el-time-select> </el-time-select>
<q-btn flat color="red" v-if="y>0" label="删除" <q-btn flat color="red" v-if="y>0" label="删除"
...@@ -453,11 +453,11 @@ ...@@ -453,11 +453,11 @@
<el-form-item label="时间段：" v-for="(x,y) in item.childrenlist" :key="y+'a1'" style="border-bottom: 1px solid #e8e8e8;padding: 15px 0 ;"> <el-form-item label="时间段：" v-for="(x,y) in item.childrenlist" :key="y+'a1'" style="border-bottom: 1px solid #e8e8e8;padding: 15px 0 ;">
<div > <div >
<div style="display: flex;align-items: flex-start;" class="tsbox"> <div style="display: flex;align-items: flex-start;" class="tsbox">
<el-time-select placeholder="起始时间" <el-time-select placeholder="起始时间" @change="changeTime(index,y,3)"
v-model="x.StartHours" size="small" v-model="x.StartHours" size="small"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', }"> :picker-options="{ start: '00:00', step: '01:00', end: '23:00', }">
</el-time-select> </el-time-select>
<el-time-select placeholder="结束时间" <el-time-select placeholder="结束时间" @change="changeTime(index,y,3)"
v-model="x.EndHours" size="small" v-model="x.EndHours" size="small"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: x.StartHours}"> :picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: x.StartHours}">
</el-time-select> </el-time-select>
...@@ -1601,26 +1601,26 @@ ...@@ -1601,26 +1601,26 @@
}, },
changeTime(index,minindex,type){ changeTime(dindex,index,type){//时间段的冲突判断
let list let list
if(type==1){ if(type==1){
list = this.spweeklist[index].list list = this.spweeklist[dindex].list
}else if(type==2){
list = this.wwlist[dindex].childrenlist
}else if(type==3){
list = this.wsplist[dindex].childrenlist
} }
console.log(index,minindex) if(list[index].StartHours=='' || list[index].StartHours==null || list[index].EndHours=='' || list[index].EndHours==null){
if(this.addMsg[index].StartHours==''){
this.$q.notify({
type: 'negative',
message: `先选择开始时间`,
position: 'top'
})
this.addMsg[index].EndHours='';
return return
} }
let a = this.addMsg[index].StartHours if(list[index].StartHours>list[index].EndHours){//开始时间大于结束时间
let b = this.addMsg[index].EndHours list[index].EndHours = ''
}
let a = list[index].StartHours
let b = list[index].EndHours
let continuemap = true let continuemap = true
this.addMsg.map((x,y)=>{ list.map((x,y)=>{
if(continuemap == false){ if(continuemap == false){
return return
} }
...@@ -1634,8 +1634,8 @@ ...@@ -1634,8 +1634,8 @@
message: `时间段存在冲突`, message: `时间段存在冲突`,
position: 'top' position: 'top'
}) })
this.addMsg[index].StartHours=''; list[index].StartHours='';
this.addMsg[index].EndHours=''; list[index].EndHours='';
} }
} }
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment