Skip to content

C
confucius
Commit 751032fc authored by Mac's avatar Mac
Browse files
Options

1

parent dba236bb
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 15 deletions
src/components/enterprise/chaneelcode-form.vue
View file @ 751032fc
...@@ -119,10 +119,10 @@ ...@@ -119,10 +119,10 @@
: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>
<div style="max-width: 320px;"> <div style="max-width: 320px;">
<div> <div style="line-height: 20px;">
<span v-if="x.EmpList.length>0" v-for="(item,index) in x.EmpList " :key="index">{{item.DeptName}}{{x.EmpList.length-1 !=index?'、':''}}</span> <span v-if="x.EmpList.length>0" v-for="(item,index) in x.EmpList " :key="index">{{item.DeptName}}{{x.EmpList.length-1 !=index?'、':''}}</span>
</div> </div>
<el-button @click="outerVisible=true,outerindex=y,byval=x.EmpList">选择企业成员</el-button> <el-button @click="outerVisible=true,outerindex=y,byval=x.EmpList" style="margin-top: 0;">选择企业成员</el-button>
</div> </div>
</div> </div>
<div> <div>
...@@ -138,10 +138,13 @@ ...@@ -138,10 +138,13 @@
</el-form-item> </el-form-item>
<el-form-item label="适用周期："> <el-form-item label="适用周期：">
<div style="line-height: 40px;">
<span class="ant-tag" :class="{'ant-tag-has-color':item.chek}" <span class="ant-tag" :class="{'ant-tag-has-color':item.chek}"
v-for="(item,index) in weekList" :key='index' v-for="(item,index) in weekList" :key='index'
@click=" weekList[index].chek = !weekList[index].chek,$forceUpdate()" @click=" weekList[index].chek = !weekList[index].chek,$forceUpdate()"
:style="{background:item.chek?'#1890ff':'#FFF'}">{{item.Name}}</span> :style="{background:item.chek?'#1890ff':'#FFF'}">{{item.Name}}</span>
</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
</q-card-section> </q-card-section>
......
src/pages/enterprise/addchannelcode.vue
View file @ 751032fc
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
.addchannelcode .tag-content { .addchannelcode .tag-content {
flex: 1; flex: 1;
margin-left: 20px; margin-left: 20px;
line-height: 32px;
} }
.addchannelcode .tag-content .ant-tag { .addchannelcode .tag-content .ant-tag {
...@@ -134,7 +135,7 @@ ...@@ -134,7 +135,7 @@
<ul v-if="Lableshow == false"> <ul v-if="Lableshow == false">
<li class="tag-item" v-for="(x,y) in LableList" :key='y'> <li class="tag-item" v-for="(x,y) in LableList" :key='y'>
<el-tag effect="plain" style="min-width: 70px;text-align: center;overflow: hidden;"> {{ x.Name }} </el-tag> <el-tag effect="plain" style="min-width: 70px;text-align: center;overflow: hidden;"> {{ x.Name }} </el-tag>
<div class="tag-content"> <div class="tag-content" >
<span class="ant-tag" :class="{'ant-tag-has-color':item.chek}" <span class="ant-tag" :class="{'ant-tag-has-color':item.chek}"
v-for="(item,index) in x.ChildList" :key='index' v-for="(item,index) in x.ChildList" :key='index'
@click="LableList[y].ChildList[index].chek = !LableList[y].ChildList[index].chek,$forceUpdate()" @click="LableList[y].ChildList[index].chek = !LableList[y].ChildList[index].chek,$forceUpdate()"
...@@ -144,7 +145,7 @@ ...@@ -144,7 +145,7 @@
</ul> </ul>
<ul v-if="Lableshow == true"> <ul v-if="Lableshow == true">
<li class="tag-item" v-for="(x,y) in LableList" :key='y' v-if="y<5"> <li class="tag-item" v-for="(x,y) in LableList" :key='y' v-if="y<5">
<el-tag effect="plain"> {{ x.Name }} </el-tag> <el-tag effect="plain" style="min-width: 70px;text-align: center;overflow: hidden;"> {{ x.Name }} </el-tag>
<div class="tag-content"> <div class="tag-content">
<span class="ant-tag" :class="{'ant-tag-has-color':item.chek}" <span class="ant-tag" :class="{'ant-tag-has-color':item.chek}"
v-for="(item,index) in x.ChildList" :key='index' v-for="(item,index) in x.ChildList" :key='index'
...@@ -257,7 +258,7 @@ ...@@ -257,7 +258,7 @@
</el-option> </el-option>
</el-select> </el-select>
<div style="flex:1;width: 1px;margin-top: 3px;" v-if="addMsg.Type==2"> <div style="flex:1;width: 1px;margin-top: 3px;" v-if="addMsg.Type==2">
<div v-if="item.EmpList.length>0"> <div v-if="item.EmpList.length>0" style="line-height:20px" >
<span v-for="(c,v) in item.EmpList " <span v-for="(c,v) in item.EmpList "
:key="v">{{c.DeptName}}{{item.EmpList.length-1 :key="v">{{c.DeptName}}{{item.EmpList.length-1
!=v?'、':''}}</span> !=v?'、':''}}</span>
...@@ -265,6 +266,7 @@ ...@@ -265,6 +266,7 @@
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<el-button <el-button
@click="outerVisible=true,outerindex0=y,outerindex=index,byval=item.EmpList" @click="outerVisible=true,outerindex0=y,outerindex=index,byval=item.EmpList"
style="margin-top: 0;"
size="small">选择企业成员</el-button> size="small">选择企业成员</el-button>
<q-btn flat color="red" v-if="item.IsDefault!=1" label="删除" <q-btn flat color="red" v-if="item.IsDefault!=1" label="删除"
@click="spweeklist[y].list.splice(index,1),getalluser()" /> @click="spweeklist[y].list.splice(index,1),getalluser()" />
...@@ -295,7 +297,7 @@ ...@@ -295,7 +297,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<q-btn color="primary" label="添加时期" icon='add' size='sm' @click="addalldata()" /> <q-btn color="primary" label="添加时期" icon='add' size='sm' style="margin-top: 10px;" @click="addalldata()" />
</div> </div>
</el-form-item> </el-form-item>
...@@ -321,7 +323,7 @@ ...@@ -321,7 +323,7 @@
<q-select v-if="addMsg.Type==1" style="width: 60%;" filled stack-label option-value="Id" option-label="EmployeeName" v-model="addMsg.EmpBackUp" <q-select v-if="addMsg.Type==1" style="width: 60%;" filled stack-label option-value="Id" option-label="EmployeeName" v-model="addMsg.EmpBackUp"
ref="Id" :options="Employeelist" label="备用员工" :dense="false" emit-value map-options /> ref="Id" :options="Employeelist" label="备用员工" :dense="false" emit-value map-options />
<div style="width: 60%;"> <div style="width: 60%;">
<div style="width: 100%;display: flex;flex-wrap: wrap;" v-if="EmpBackUpList.length>0"> <div style="width: 100%;display: flex;flex-wrap: wrap;line-height: 20px;" v-if="EmpBackUpList.length>0">
<span v-for="(c,v) in EmpBackUpList " <span v-for="(c,v) in EmpBackUpList "
:key="v">{{c.DeptName}}{{EmpBackUpList.length-1 :key="v">{{c.DeptName}}{{EmpBackUpList.length-1
!=v?'、':''}}</span> !=v?'、':''}}</span>
...@@ -380,8 +382,12 @@ ...@@ -380,8 +382,12 @@
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="width: 100%;text-align: right;">
<q-btn color="accent" class="q-mr-md" size="sm" label="新增" @click="handleTabsEdit()" v-if="addMsg.WelcomeWeekEnable==1"/>
</div>
<div style="width: 100%;display: flex;align-items: center;justify-content: space-between;" v-if="addMsg.WelcomeWeekEnable==1"> <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;" v-if="addMsg.WelcomeWeekEnable==1">
<el-tabs v-model="editableTabsValue" type="card" addable @edit="handleTabsEdit" style="width: 1px;flex:1">
<el-tabs v-model="editableTabsValue" type="card" style="width: 1px;flex:1">
<el-tab-pane <el-tab-pane
:key="index" :key="index"
v-for="(item, index) in wwlist" v-for="(item, index) in wwlist"
...@@ -437,8 +443,11 @@ ...@@ -437,8 +443,11 @@
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="width: 100%;text-align: right;">
<q-btn color="accent" class="q-mr-md" size="sm" label="新增" @click="handleTabsEdit2()" v-if="addMsg.WelcomeSpecialEnable==1"/>
</div>
<div style="width: 100%;display: flex;align-items: center;justify-content: space-between;" v-if="addMsg.WelcomeSpecialEnable==1"> <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;" v-if="addMsg.WelcomeSpecialEnable==1">
<el-tabs v-model="editableTabsValue2" type="card" addable @edit="handleTabsEdit2" style="width: 1px;flex:1"> <el-tabs v-model="editableTabsValue2" type="card" style="width: 1px;flex:1">
<el-tab-pane <el-tab-pane
:key="index" :key="index"
v-for="(item, index) in wsplist" v-for="(item, index) in wsplist"
...@@ -1542,27 +1551,30 @@ ...@@ -1542,27 +1551,30 @@
this.$forceUpdate() this.$forceUpdate()
}, },
handleTabsEdit(targetName, action){ handleTabsEdit(targetName, action){
if(action=='add'){
this.wwlist.push({weeklist:[{ Id: 1, Name: '周一', chek: false }, { Id: 2, Name: '周二', chek: false }, { Id: 3, Name: '周三', chek: false }, { Id: 4, Name: '周四', chek: false }, { Id: 5, Name: '周五', chek: false }, { Id: 6, Name: '周六', chek: false }, { Id: 0, Name: '周日', chek: false }], this.wwlist.push({weeklist:[{ Id: 1, Name: '周一', chek: false }, { Id: 2, Name: '周二', chek: false }, { Id: 3, Name: '周三', chek: false }, { Id: 4, Name: '周四', chek: false }, { Id: 5, Name: '周五', chek: false }, { Id: 6, Name: '周六', chek: false }, { Id: 0, Name: '周日', chek: false }],
childrenlist:[{StartHours:'',EndHours:'',Id:0,Content:'',MediumIds:'',MediumModel:[]}] childrenlist:[{StartHours:'',EndHours:'',Id:0,Content:'',MediumIds:'',MediumModel:[]}]
}) })
this.$forceUpdate(); this.$forceUpdate();
}
}, },
handleTabsEdit2(targetName, action){ handleTabsEdit2(targetName, action){
if(action=='add'){
this.wsplist.push({StartDate:'',EndDate:'', value:[],childrenlist:[{StartHours:'',EndHours:'',Id:0,Content:'',MediumIds:'',MediumModel:[]}] }) this.wsplist.push({StartDate:'',EndDate:'', value:[],childrenlist:[{StartHours:'',EndHours:'',Id:0,Content:'',MediumIds:'',MediumModel:[]}] })
this.$forceUpdate(); this.$forceUpdate();
}
}, },
handleTabsclose(index,type=1){ handleTabsclose(index,type=1){
let that = this; let that = this;
if(type==1){//周期 if(type==1){//周期
that.wwlist.splice(index,1) that.wwlist.splice(index,1)
that.editableTabsValue='0' that.editableTabsValue='0'
this.wwlist.sort()
}else{//特殊 }else{//特殊
that.wsplist.splice(index,1) that.wsplist.splice(index,1)
that.editableTabsValue2='0' that.editableTabsValue2='0'
this.wsplist.sort()
} }
......
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