Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/enterprise/welcome-from.vue

@@ -464,6 +464,8 @@
             },
             deleteModel(index){
                 this.addMsg.MediumModel.splice(index,1)
+                this.$forceUpdate()
+                this.gettrigger()
             },
             gettrigger(){//文本触发时
                 this.$emit('success', this.addMsg, this.welcomeindex,this.childrenindex,this.welcomename)

src/pages/enterprise/addchannelcode.vue

@@ -297,7 +297,7 @@
 
                 <el-form-item label="员工添加上限：">
                     <div class="q-gutter-sm" style="align-items: center;display: flex;">
-                        <q-radio v-model="addMsg.EmpAddLimit" :val="x.Id" :label="x.Name" v-for="(x,y) in radiolist" :key='y' />
+                        <q-radio v-model="addMsg.EmpAddLimit" :val="x.Id" :label="x.Name" v-for="(x,y) in radiolist" :key='y' @input="addMsg.EmpAddLimit==1?getalluser():'' "/>
                         <span style="color: red;">(因受官方限制，无法对动态部门的员工设置添加好友上限，只可针对指定活码成员进行设置)</span>
                     </div>
                     <div style="width: 70%;" v-if="addMsg.EmpAddLimit==1">
@@ -383,7 +383,7 @@
                                   v-for="(item, index) in wwlist"
                                   :name="index.toString()"
                                 >
-                                <span slot="label"> {{'欢迎语'+(index+1)}}<i class="el-icon-circle-close" v-if="index>0" style="margin-left: 10px;font-size: 16px;" @click='handleTabsclose(index)'></i></span>
+                                <span slot="label"> {{'欢迎语'+(index+1)}}<i class="el-icon-circle-close" v-if="wwlist.length>1" style="margin-left: 10px;font-size: 16px;" @click='handleTabsclose(index)'></i></span>
                                 <el-form label-width="120px" style="padding-top: 15px 0 ;">
                                     <el-form-item label="选择周期：">
                                         <span class="ant-tag" :class="{'ant-tag-has-color':x.chek}"
@@ -404,7 +404,7 @@
                                                     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}">
                                                 </el-time-select>
-                                                <q-btn flat color="red" v-if="y>0" label="删除"
+                                                <q-btn flat color="red" v-if="item.childrenlist.length>1" label="删除"
                                                     @click="abv(index,y,x)" />
 
                                             </div>
@@ -440,7 +440,7 @@
                                   v-for="(item, index) in wsplist"
                                   :name="index.toString()"
                                 >
-                                <span slot="label"> {{'欢迎语'+(index+1)}}<i class="el-icon-circle-close" v-if="index>0" style="margin-left: 10px;font-size: 16px;" @click='handleTabsclose(index,2)'></i></span>
+                                <span slot="label"> {{'欢迎语'+(index+1)}}<i class="el-icon-circle-close" v-if="wsplist.length>1" style="margin-left: 10px;font-size: 16px;" @click='handleTabsclose(index,2)'></i></span>
                                 <el-form label-width="120px" style="padding-top: 15px 0 ;">
                                     <el-form-item label="选择日期：">
                                         <el-date-picker v-model="item.value" type="daterange" value-format="yyyy-MM-dd"
@@ -461,7 +461,7 @@
                                                     v-model="x.EndHours" size="small"
                                                     :picker-options="{ start: '00:00', step: '01:00', end: '23:00',  minTime: x.StartHours}">
                                                 </el-time-select>
-                                                <q-btn flat color="red" v-if="y>0" label="删除"
+                                                <q-btn flat color="red" v-if="item.childrenlist.length>1" label="删除"
                                                     @click="abv(index,y,x,2)" />
                                             </div>
                                             <div style="padding: 15px 0 ;">
@@ -868,7 +868,6 @@
             getsuccess(msg, lsweeklist) {//人员选择返回数据
                 this.lsMsg = JSON.parse(JSON.stringify(msg))
                 this.lsweeklist = lsweeklist;
-                console.log(lsweeklist)
                 if (this.addMsg.Type == 2) {//如果选择多人的时候
                     this.lsweeklist.forEach(x => {
                         if (x.chek == true) {
@@ -886,14 +885,11 @@
 
             },
             getsuccess2(list,type) {
-                console.log(list)
                 if(type==1){
                     this.spweeklist[this.outerindex0].list[this.outerindex].EmpList = JSON.parse(JSON.stringify(list))
                     this.outerVisible = false;
                     this.getalluser()
-                    console.log(this.spweeklist)
                 }else{
-                    console.log(list)
                     this.EmpBackUpList = list
                     this.outerVisible = false;
 
@@ -952,11 +948,9 @@
                 })
                 this.addMsg.WeekList = [];
                 this.getWeekListdata()//处理企业人员的数据 给予后台
-                console.log('特殊验证',this.isall)
                 if (this.addMsg.SpecialDateEnable == 1 && this.isall == false) {
                     this.getSpecialWeekListdata()//特殊时期的数据
                 }
-                console.log('处理备用人员数据',this.isall)
 
                 if(this.addMsg.Type==2 && this.addMsg.EmpAddLimit==1 && this.isall == false){//多人 备用开启 处理备用人员数据
                     if(this.EmpBackUpList.length>0){
@@ -968,15 +962,13 @@
                     }
                 }
                 //验证欢迎语
-                console.log('验证欢迎语',this.isall)
 
                 if(this.addMsg.WelcomeEnable==1 && this.isall == false){
                     this.welcometverification()
                 }
-                this.loading2 = true
                 if(this.isall == false){
-                    console.log(this.addMsg,'最后打印')
                     //调用接口
+                    this.loading2 = true
                     setWeChatChannelInfo(this.addMsg).then(res => {
                     if (res.Code == 1) {
                         this.$q.notify({
@@ -1087,7 +1079,6 @@
                     })
                 }
                 if(this.addMsg.WelcomeSpecialEnable==1){
-                    console.log( this.wsplist)
                     let datevalue =  false;
                     
                     let isContent =  false;
@@ -1217,7 +1208,6 @@
                                 list.push(obj)
                             })
                             eplist= list
-                            console.log(eplist)
                         }
                         
                         let obj = {
@@ -1267,7 +1257,6 @@
             getWeekListdata() {
                 let show = false
                 let show2 = false
-                console.log(this.isall,'进入判断')
                 this.lsweeklist.map(x => {
                     
                     if(show == true){
@@ -1281,7 +1270,6 @@
                             x.lsMsg.map(j => {
                                 if(j.EmpId==0){//判断是否是离职的员工
                                     this.isall = true
-                                    console.log(this.isall,'修改值 1 ')
                                     show2 = true
                                     this.$q.notify({
                                         type: 'negative',
@@ -1331,7 +1319,6 @@
                         }
 
                     }else{
-                        console.log(this.isall,'修改值 2 ')
 
                         this.$q.notify({
                             type: 'negative',
@@ -1379,7 +1366,6 @@
                 let value 
                 let data 
                 if(type==2){
-                    console.log(this.wsplist)
                     value = JSON.parse(JSON.stringify(this.wsplist[index].value))
                     data  = this.wsplist
                 }else{
@@ -1549,6 +1535,7 @@
                     this.wsplist[index].childrenlist[childrenindex] = list
 
                 }
+                this.$forceUpdate()
             },
             handleTabsEdit(targetName, action){
                 if(action=='add'){
@@ -1583,21 +1570,24 @@
                 let obj={StartHours:'',EndHours:'',Id:0,Content:'',MediumIds:'',MediumModel:[]}
                 if(type==1){//周期
                     this.wwlist[index].childrenlist.push(obj)
+                    this.wwlist.sort()
                 }else{//特殊
                     this.wsplist[index].childrenlist.push(obj)
-
+                    this.wsplist.sort()
                 }
+                
+
             },
             abv(index,y,x,type=1){
                 
                 if(type==1){//周期
                     this.wwlist[index].childrenlist.splice(y,1)
+                    this.wwlist.sort()
                     this.$forceUpdate();
-                    console.log(this.wwlist[index].childrenlist)
                 }else{//特殊
                     this.wsplist[index].childrenlist.splice(y,1)
+                    this.wsplist.sort()
                     this.$forceUpdate();
-                    console.log(this.wsplist[index].childrenlist)
 
                 }
 
@@ -1660,10 +1650,8 @@
                     }
                 }
                 if (flag) {
-                    console.log('发生冲突')
                     return false;
                 }else{
-                    console.log('没有冲突')
                     return true;
                 }