Commit e3cdf48e authored by Mac's avatar Mac

1

parent 45462d72
...@@ -312,7 +312,7 @@ export function SetSynvEduEmployee(data) { ...@@ -312,7 +312,7 @@ export function SetSynvEduEmployee(data) {
*/ */
export function getWeChatChannelInfo(data) { export function getWeChatChannelInfo(data) {
return request({ return request({
url: '/QYWeChat/GetWeChatChannelInfo', url: '/QYWeChat/GetWeChatChannelInfo_V2',
method: 'post', method: 'post',
data data
}) })
......
...@@ -93,11 +93,11 @@ ...@@ -93,11 +93,11 @@
<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="y==0" placeholder="起始时间" v-model="x.SrartHours" <el-time-select :disabled="y==0" placeholder="起始时间" v-model="x.StartHours"
: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="y==0" placeholder="结束时间" v-model="x.EndHours" <el-time-select :disabled="y==0" placeholder="结束时间" v-model="x.EndHours"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: x.SrartHours}"> :picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: x.StartHours}">
</el-time-select> </el-time-select>
<el-select v-model="x.EmpId" placeholder="请选择" @change="selectPersonnel(y)"> <el-select v-model="x.EmpId" placeholder="请选择" @change="selectPersonnel(y)">
<el-option filterable v-for="item in Employeelist" :key="item.Id" <el-option filterable v-for="item in Employeelist" :key="item.Id"
...@@ -112,11 +112,11 @@ ...@@ -112,11 +112,11 @@
<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="y==0" placeholder="起始时间" v-model="x.SrartHours" <el-time-select :disabled="y==0" placeholder="起始时间" v-model="x.StartHours"
: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="y==0" placeholder="结束时间" v-model="x.EndHours" <el-time-select :disabled="y==0" placeholder="结束时间" v-model="x.EndHours"
:picker-options="{ start: '00:00', step: '01:00', end: '23:00', minTime: x.SrartHours}"> :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>
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
default: '', default: '',
}, },
peopletype: { peopletype: {
type: String, type: Number,
default: 1, default: 1,
}, },
...@@ -212,11 +212,11 @@ ...@@ -212,11 +212,11 @@
created() { created() {
if (this.peopletype == 1) {//单人模式 if (this.peopletype == 1) {//单人模式
this.addMsg = [ this.addMsg = [
{ Id: 0, Week: '', IsDefault: 1, SrartHours: '00:00', EndHours: "00:00", EmpId: '', EmpName: '', } { Id: 0, Week: '', IsDefault: 1, StartHours: '00:00', EndHours: "00:00", EmpId: '', EmpName: '', }
] ]
} else { } else {
this.addMsg = [ this.addMsg = [
{ Id: 0, Week: '', IsDefault: 1, SrartHours: '00:00', EndHours: "00:00", EmpList: [], DeptList: [], returnString:[],} { Id: 0, Week: '', IsDefault: 1, StartHours: '00:00', EndHours: "00:00", EmpList: [], DeptList: [], returnString:[],}
] ]
} }
if (this.lsday != '') {//修改单独周几 if (this.lsday != '') {//修改单独周几
...@@ -271,10 +271,10 @@ ...@@ -271,10 +271,10 @@
}, },
adddata() { adddata() {
if (this.peopletype == 1) {//单人模式 if (this.peopletype == 1) {//单人模式
let obj = { Id: 0, Week: '', IsDefault: 2, SrartHours: '', EndHours: "", EmpId: '', EmpName: '', } let obj = { Id: 0, Week: '', IsDefault: 2, StartHours: '', EndHours: "", EmpId: '', EmpName: '', }
this.addMsg.push(obj) this.addMsg.push(obj)
} else { } else {
let obj = { Id: 0, Week: '', IsDefault: 2, SrartHours: '', EndHours: "", EmpList: [], DeptList: [], returnString:[],} let obj = { Id: 0, Week: '', IsDefault: 2, StartHours: '', EndHours: "", EmpList: [], DeptList: [], returnString:[],}
this.addMsg.push(obj) this.addMsg.push(obj)
} }
}, },
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
let isHours = false; let isHours = false;
this.addMsg.map((x, i) => { this.addMsg.map((x, i) => {
if (i > 0) { if (i > 0) {
if (x.SrartHours == '' || x.EndHours == '') { if (x.StartHours == '' || x.EndHours == '') {
isHours = true; isHours = true;
return return
} }
...@@ -386,7 +386,7 @@ ...@@ -386,7 +386,7 @@
let isHours = false; let isHours = false;
this.addMsg.map((x, i) => { this.addMsg.map((x, i) => {
if (i > 0) { if (i > 0) {
if (x.SrartHours == '' || x.EndHours == '') { if (x.StartHours == '' || x.EndHours == '') {
isHours = true; isHours = true;
return return
} }
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="添加内容:"> <el-form-item label="添加内容:">
<div v-if="addMsg.MediumModel.length>0"> <div v-if="addMsg.MediumModel && addMsg.MediumModel.length>0">
<div class="row items-center" v-for="(x,y) in addMsg.MediumModel" :key="y"> <div class="row items-center" v-for="(x,y) in addMsg.MediumModel" :key="y">
<i class="el-icon-link"></i> <i class="el-icon-link"></i>
<span style="margin-left: 10px;cursor: pointer;" >{{getType(x,'title')}}</span> <span style="margin-left: 10px;cursor: pointer;" >{{getType(x,'title')}}</span>
...@@ -229,7 +229,6 @@ ...@@ -229,7 +229,6 @@
if(type==1){ if(type==1){
this.outerVisible = true this.outerVisible = true
} }
this.dialogTitle = this.$t('fnc.xzrenyuan');
queryEmployee({}).then(res => { queryEmployee({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.memberList = res.Data; this.memberList = res.Data;
......
This diff is collapsed.
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