Skip to content

C
confucius
Commit 010b7bbc authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 9de1fefc
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 150 deletions
src/pages/school/sysuser.vue
View file @ 010b7bbc
...@@ -34,36 +34,31 @@ ...@@ -34,36 +34,31 @@
v-model="msg.Post_Id" ref="Post_Id" :options="PostList" label="岗位" :dense="false" emit-value map-options /> v-model="msg.Post_Id" ref="Post_Id" :options="PostList" label="岗位" :dense="false" emit-value map-options />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select filled @input="resetSearch" clearable stack-label option-value="Id" option-label="Name" <q-select filled @input="resetSearch" stack-label option-value="Id" option-label="Name"
v-model="msg.LeaveStatus" ref="LeaveStatus" :options="LeaveStatusList" label="在职状态" :dense="false" v-model="msg.IsLeave " :options="LeaveStatusList" label="在职状态" :dense="false" emit-value map-options />
emit-value map-options />
</div> </div>
<div class="col-3 Sysuser_Date"> <div class="col-3 Sysuser_Date">
<q-field filled> <q-field filled>
 <template v-slot:control> <template v-slot:control>
<el-date-picker v-model="dateListOne" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;" <el-date-picker v-model="dateListOne" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
 range-separator="至"  start-placeholder="入职开始日期"  end-placeholder="入职结束日期">  range-separator="至"  start-placeholder="入职开始日期"  end-placeholder="入职结束日期" />
 </el-date-picker>       
</template> </template>
</q-field> </q-field>
</div> </div>
<div class="col-3 Sysuser_Date"> <div class="col-3 Sysuser_Date">
<q-field filled> <q-field filled>
  <template v-slot:control>            <template v-slot:control>
<el-date-picker v-model="dateListThree" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;" <el-date-picker v-model="dateListThree" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
  range-separator="至"  start-placeholder="离职开始日期"  end-placeholder="离职结束日期">   range-separator="至"  start-placeholder="离职开始日期"  end-placeholder="离职结束日期" />
</el-date-picker>
 
</template> </template>
 </q-field> </q-field>
</div> </div>
<div class="col-3 Sysuser_Date"> <div class="col-3 Sysuser_Date">
<q-field filled class="col-6"> <q-field filled class="col-6">
  <template v-slot:control> <template v-slot:control>
<el-date-picker v-model="dateListTwo" @change="resetSearch()" format="MM-dd"  value-format="yyyy-MM-dd" <el-date-picker v-model="dateListTwo" @change="resetSearch()" format="MM-dd"  value-format="yyyy-MM-dd"
 type="daterange"  style="border:none;"   range-separator="至"  start-placeholder="生日开始时间"  type="daterange"  style="border:none;"   range-separator="至"  start-placeholder="生日开始时间"
 end-placeholder="生日结束时间">  end-placeholder="生日结束时间" />
</el-date-picker>  
</template> </template>
</q-field> </q-field>
</div> </div>
...@@ -73,13 +68,12 @@ ...@@ -73,13 +68,12 @@
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat selection="multiple" <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat selection="multiple"
:selected.sync="selected" class="sticky-right-column-table sticky-column-table" separator="none" :data="data" :selected.sync="selected" class="sticky-right-column-table sticky-column-table" separator="none" :data="data"
:columns="columns" row-key="Id"> :columns="columns" row-key="Id">
<template v-slot:top="props"> <template v-slot:top>
<div class="col-2 q-table__title">员工管理</div> <div class="col-2 q-table__title">员工管理</div>
<q-space /> <q-space />
<div class="page-option"> <div class="page-option">
<q-btn color="accent" size="sm" class="q-mr-md" label="同步到微信" @click="synchronization()" <q-btn color="accent" size="sm" class="q-mr-md" label="同步到微信" @click="synchronization()"
v-if="DeptEmpEnable==1" /> v-if="DeptEmpEnable==1" />
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增员工" @click="EditManager(null,0)" /> <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增员工" @click="EditManager(null,0)" />
<q-btn-dropdown outline size="sm" color="dark" label="更多"> <q-btn-dropdown outline size="sm" color="dark" label="更多">
<q-list> <q-list>
...@@ -288,97 +282,97 @@ ...@@ -288,97 +282,97 @@
isDetails: false, isDetails: false,
jtloading: false, jtloading: false,
columns: [{ columns: [{
name: 'desc', name: 'desc',
required: true, required: true,
label: '', label: '',
align: 'left', align: 'left',
}, },
{ {
name: 'EmployeeName', name: 'EmployeeName',
required: true, required: true,
label: '姓名', label: '姓名',
align: 'left', align: 'left',
field: row => row.EmployeeName field: row => row.EmployeeName
}, },
{ {
name: 'SchoolName', name: 'SchoolName',
label: '公司', label: '公司',
field: 'SchoolName', field: 'SchoolName',
align: 'left', align: 'left',
}, },
{ {
name: 'DeptName', name: 'DeptName',
label: '部门', label: '部门',
field: 'DeptName', field: 'DeptName',
align: 'left', align: 'left',
}, },
{ {
name: 'PostName', name: 'PostName',
label: '职位', label: '职位',
field: 'PostName', field: 'PostName',
align: 'left', align: 'left',
}, },
{ {
name: 'Sex', name: 'Sex',
label: '性别', label: '性别',
field: 'Sex', field: 'Sex',
align: 'left' align: 'left'
}, },
{ {
name: 'Account', name: 'Account',
label: '账号', label: '账号',
align: 'left', align: 'left',
field: 'Account' field: 'Account'
}, },
{ {
name: 'EmployeeTel', name: 'EmployeeTel',
label: '联系电话', label: '联系电话',
field: 'EmployeeTel', field: 'EmployeeTel',
align: 'left' align: 'left'
}, },
{ {
name: 'BirthDate', name: 'BirthDate',
label: '生日', label: '生日',
field: 'BirthDate', field: 'BirthDate',
align: 'left' align: 'left'
}, },
{ {
name: 'Education', name: 'Education',
label: '学历', label: '学历',
field: 'Education', field: 'Education',
align: 'left' align: 'left'
}, },
{ {
name: 'LeaveStatus', name: 'LeaveStatus',
label: '状态', label: '状态',
field: 'LeaveStatus', field: 'LeaveStatus',
align: 'left', align: 'left',
}, },
{ {
name: 'DirectSupervisorName', name: 'DirectSupervisorName',
label: '直属上级', label: '直属上级',
field: 'DirectSupervisorName', field: 'DirectSupervisorName',
align: 'left', align: 'left',
}, },
{ {
name: 'AccountRemark', name: 'AccountRemark',
label: '行政备注', label: '行政备注',
field: 'AccountRemark', field: 'AccountRemark',
align: 'left', align: 'left',
}, },
{ {
name: 'PropertyNumber', name: 'PropertyNumber',
required: true, required: true,
label: '使用资产', label: '使用资产',
align: 'left', align: 'left',
field: row => row.PropertyNumber field: row => row.PropertyNumber
}, },
{ {
name: 'optioned', name: 'optioned',
label: '操作', label: '操作',
field: 'MId' field: 'MId'
} }
], ],
data: [], data: [],
loading: true, loading: true,
...@@ -389,7 +383,7 @@ ...@@ -389,7 +383,7 @@
School_Id: "", //校区 School_Id: "", //校区
Dept_Id: 0, //部门 Dept_Id: 0, //部门
Post_Id: "", //岗位编号 Post_Id: "", //岗位编号
LeaveStatus: 0, //在职状态 IsLeave: 1, //在职状态
StartEntryTime: "", //入职开始时间 StartEntryTime: "", //入职开始时间
EndEntryTime: "", //入职结束时间 EndEntryTime: "", //入职结束时间
StartLeaveTime: "", //开始离职时间 StartLeaveTime: "", //开始离职时间
...@@ -406,7 +400,15 @@ ...@@ -406,7 +400,15 @@
resetLoading: false, resetLoading: false,
returnString: [], //默认岗位 returnString: [], //默认岗位
PostList: [], //岗位 PostList: [], //岗位
LeaveStatusList: [], //在职状态 LeaveStatusList: [{
Id: 1,
Name: "在职"
},
{
Id: 2,
Name: "离职"
}
], //在职状态
dateListOne: [], //入职-离职日期 dateListOne: [], //入职-离职日期
dateListTwo: [], //生日开始-结束日期 dateListTwo: [], //生日开始-结束日期
dateListThree: [], //开始-结束离职日期 dateListThree: [], //开始-结束离职日期
...@@ -425,7 +427,7 @@ ...@@ -425,7 +427,7 @@
}, },
Employeelist: [], Employeelist: [],
AllEmployeelist: [], AllEmployeelist: [],
DeptEmpEnable: 0,//是否显示企业微信信息 1 显示 DeptEmpEnable: 0, //是否显示企业微信信息 1 显示
} }
}, },
mounted() { mounted() {
...@@ -434,9 +436,8 @@ ...@@ -434,9 +436,8 @@
this.getManager(); this.getManager();
this.getDepartList(0); this.getDepartList(0);
this.queryPostList(0); this.queryPostList(0);
this.getLeaveState();
this.queryEmployee() this.queryEmployee()
this.getmicrodeploy()//获取企业微信的配置 this.getmicrodeploy() //获取企业微信的配置
}, },
methods: { methods: {
resetSearch() { resetSearch() {
...@@ -695,14 +696,7 @@ ...@@ -695,14 +696,7 @@
} }
}) })
}, },
//获取在职状态
getLeaveState() {
GetLeaveStatus({}).then(res => {
if (res.Code == 1) {
this.LeaveStatusList = res.Data;
}
})
},
getType(num) { getType(num) {
this.setObj.type = num; this.setObj.type = num;
if (this.selected.length == 0) { if (this.selected.length == 0) {
...@@ -763,17 +757,17 @@ ...@@ -763,17 +757,17 @@
spinner: QSpinnerPie spinner: QSpinnerPie
}) })
SetSynvEduEmployee({}).then(res => { SetSynvEduEmployee({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
that.$q.notify({ that.$q.notify({
icon: 'iconfont icon-chenggong', icon: 'iconfont icon-chenggong',
color: 'accent', color: 'accent',
timeout: 2000, timeout: 2000,
message: '操作成功', message: '操作成功',
position: 'top' position: 'top'
}) })
Loading.hide() Loading.hide()
} }
}) })
.catch(err => { .catch(err => {
Loading.hide() Loading.hide()
...@@ -784,8 +778,10 @@ ...@@ -784,8 +778,10 @@
}, },
queryEmployee() {//下拉人员列表 queryEmployee() { //下拉人员列表
queryEmployee({ IsLeave: 1 }).then(res => { queryEmployee({
IsLeave: 1
}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.AllEmployeelist = JSON.parse(JSON.stringify(res.Data)); this.AllEmployeelist = JSON.parse(JSON.stringify(res.Data));
this.Employeelist = res.Data this.Employeelist = res.Data
...@@ -805,13 +801,13 @@ ...@@ -805,13 +801,13 @@
} }
}) })
}, },
khHandover(row) {//客户交接 khHandover(row) { //客户交接
this.joinMsg.TransferUserId = row.EmAccountId this.joinMsg.TransferUserId = row.EmAccountId
this.joinMsg.CustomerTransfer = '1' this.joinMsg.CustomerTransfer = '1'
this.joinMsg.ChannelTransfer = '1' this.joinMsg.ChannelTransfer = '1'
this.isDetails = true this.isDetails = true
}, },
saveOrderInfo() {//保存 saveOrderInfo() { //保存
if (this.joinMsg.ReceiveUserId == '') { if (this.joinMsg.ReceiveUserId == '') {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -838,18 +834,18 @@ ...@@ -838,18 +834,18 @@
} }
this.jtloading = true this.jtloading = true
setUserCoustomerTransfer(this.joinMsg).then(res => { setUserCoustomerTransfer(this.joinMsg).then(res => {
if (res.Code == 1) if (res.Code == 1)
this.$q.notify({ this.$q.notify({
icon: 'iconfont icon-chenggong', icon: 'iconfont icon-chenggong',
color: 'accent', color: 'accent',
timeout: 2000, timeout: 2000,
message: res.Message, message: res.Message,
position: 'top' position: 'top'
}) })
this.isDetails = false this.isDetails = false
this.jtloading = false this.jtloading = false
this.getManager() this.getManager()
}) })
.catch(err => { .catch(err => {
this.jtloading = false this.jtloading = false
...@@ -864,7 +860,6 @@ ...@@ -864,7 +860,6 @@
} }
}, },
} }
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
......
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