Skip to content

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

页面修改

parent 34b4d1c6
Show whitespace changes
Inline Side-by-side
Showing with 486 additions and 682 deletions
src/components/school/manager/manager-form.vue
View file @ bc6ac4b9
<template>
<q-dialog
v-model="persistent"
content-class="bg-grey-1"
persistent
transition-show="scale"
transition-hide="scale"
>
<q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale">
<q-card style="width: 800px;max-width:900px;">
<q-card-section>
<div class="text-h6">
......@@ -15,347 +9,127 @@
<q-card-section class="q-pt-none scroll" style="max-height: 70vh">
<div class="text-caption q-mb-md q-px-xs text-grey-6">基本资料</div>
<div class="row wrap">
<q-select
filled
v-if="isEditShow"
stack-label
option-value="SId"
option-label="SName"
v-model="objOption.School_Id"
ref="School_Id"
:options="schoolList"
label="所属校区"
class="col-6 q-pb-lg q-pr-lg"
emit-value
map-options
@input="schoolChagne"
/>
<selectTree
:treeData="DeptList"
v-if="isEditShow"
:defaultArray="returnString"
nodeKey="DeptId"
:multiple="false"
labelKey="DeptName"
childrenKey="ChildList"
tipText="选择部门"
@getChild="getChild"
classStr="col-6 q-pr-lg q-pb-lg"
></selectTree>
<q-select
filled
stack-label
v-if="isEditShow"
option-value="PostId"
option-label="PostName"
v-model="objOption.Post_Id"
ref="Post_Id"
:options="PostList"
label="岗位"
:dense="false"
class="col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
<q-input
filled
stack-label
maxlength="20"
:dense="false"
v-model="objOption.EmployeeName"
ref="EmployeeName"
class="col-6 q-pr-lg q-pb-lg"
label="员工姓名"
:rules="[val => !!val || '请填写员工姓名']"
/>
<q-select filled v-if="isEditShow" stack-label option-value="SId" option-label="SName"
v-model="objOption.School_Id" ref="School_Id" :options="schoolList" label="所属校区"
class="col-6 q-pb-lg q-pr-lg" emit-value map-options @input="schoolChagne" />
<selectTree :treeData="DeptList" v-if="isEditShow" :defaultArray="returnString" nodeKey="DeptId"
:multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="选择部门" @getChild="getChild"
classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
<q-select filled stack-label v-if="isEditShow" option-value="PostId" option-label="PostName"
v-model="objOption.Post_Id" ref="Post_Id" :options="PostList" label="岗位" :dense="false"
class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.EmployeeName" ref="EmployeeName"
class="col-6 q-pr-lg q-pb-lg" label="员工姓名" :rules="[val => !!val || '请填写员工姓名']" />
<q-input
filled
stack-label
maxlength="20"
:dense="false"
v-model="objOption.IDCard"
ref="IDCard"
class="col-6 q-pr-lg q-pb-lg"
label="身份证号码"
:rules="[val => !!val || '请填写身份证号码']"
/>
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.IDCard" ref="IDCard"
class="col-6 q-pr-lg q-pb-lg" label="身份证号码" :rules="[val => !!val || '请填写身份证号码']" />
<q-select
filled
stack-label
option-value="Id"
option-label="Name"
ref="ID"
v-model="objOption.Sex"
:options="SexList"
label="性别"
:dense="false"
class="col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
<q-select filled stack-label option-value="Id" option-label="Name" ref="ID" v-model="objOption.Sex"
:options="SexList" label="性别" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
<q-select
filled
stack-label
option-value="Id"
option-label="Name"
v-model="objOption.Education"
ref="Education"
:options="EducationList"
label="学历"
:dense="false"
class="col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
<q-input
type="tel"
filled
stack-label
maxlength="100"
:dense="false"
v-model="objOption.EmployeeTel"
ref="EmployeeTel"
class="col-6 q-pr-lg q-pb-lg"
label="联系电话"
/>
<q-input
filled
v-model="objOption.EntryTime"
class="col-6 q-pr-lg q-pb-lg"
mask="date"
label="入职时间"
>
<q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.Education"
ref="Education" :options="EducationList" label="学历" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value
map-options />
<q-input type="tel" filled stack-label maxlength="100" :dense="false" v-model="objOption.EmployeeTel"
ref="EmployeeTel" class="col-6 q-pr-lg q-pb-lg" label="联系电话" />
<q-input filled v-model="objOption.EntryTime" class="col-6 q-pr-lg q-pb-lg" mask="date" label="入职时间">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy
ref="qDateProxy1"
transition-show="scale"
transition-hide="scale"
>
<q-date
v-model="objOption.EntryTime"
@input="() => $refs.qDateProxy1.hide()"
/>
<q-popup-proxy ref="qDateProxy1" transition-show="scale" transition-hide="scale">
<q-date v-model="objOption.EntryTime" @input="() => $refs.qDateProxy1.hide()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
<q-input
filled
v-model="objOption.BirthDate"
class="col-6 q-pr-lg q-pb-lg"
mask="date"
label="生日"
>
<q-input filled v-model="objOption.BirthDate" class="col-6 q-pr-lg q-pb-lg" mask="date" label="生日">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy
ref="qDateProxy3"
transition-show="scale"
transition-hide="scale"
>
<q-date
v-model="objOption.BirthDate"
@input="() => $refs.qDateProxy3.hide()"
/>
<q-popup-proxy ref="qDateProxy3" transition-show="scale" transition-hide="scale">
<q-date v-model="objOption.BirthDate" @input="() => $refs.qDateProxy3.hide()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
<q-input
filled
stack-label
maxlength="100"
:dense="false"
v-model="objOption.Address"
ref="Address"
class="col-6 q-pr-lg q-pb-lg"
label="地址"
/>
<q-input
filled
stack-label
maxlength="60"
:dense="false"
v-model="objOption.Email"
ref="Email"
class="col-6 q-pr-lg q-pb-lg"
label="邮箱"
/>
<q-input
filled
stack-label
maxlength="20"
:dense="false"
v-model="objOption.Account"
ref="Account"
class="col-6 q-pr-lg q-pb-lg"
label="账号"
:rules="[val => !!val || '账号']"
/>
<q-input
v-if="objOption.AccountId == 0"
filled
stack-label
maxlength="20"
:dense="false"
v-model="objOption.Password"
ref="Password"
class="col-6 q-pr-lg q-pb-lg"
label="密码"
:rules="[val => !!val || '密码']"
/>
<q-select
filled
stack-label
option-value="Id"
option-label="Name"
v-model="objOption.LeaveStatus"
@input="getLeave"
ref="Education"
:options="LeaveStatusList"
label="在职状态"
:dense="false"
class="col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
<q-input
v-show="objOption.AccountId > 0 && objOption.LeaveStatus == 4"
filled
v-model="objOption.LeaveTime"
class="col-6 q-pr-lg q-pb-lg"
mask="date"
label="离职时间"
>
<q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.Address" ref="Address"
class="col-6 q-pr-lg q-pb-lg" label="地址" />
<q-input filled stack-label maxlength="60" :dense="false" v-model="objOption.Email" ref="Email"
class="col-6 q-pr-lg q-pb-lg" label="邮箱" />
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Account" ref="Account"
class="col-6 q-pr-lg q-pb-lg" label="账号" :rules="[val => !!val || '账号']" />
<q-input v-if="objOption.AccountId == 0" filled stack-label maxlength="20" :dense="false"
v-model="objOption.Password" ref="Password" class="col-6 q-pr-lg q-pb-lg" label="密码"
:rules="[val => !!val || '密码']" />
<q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.LeaveStatus"
@input="getLeave" ref="Education" :options="LeaveStatusList" label="在职状态" :dense="false"
class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
<q-input v-show="objOption.AccountId > 0 && objOption.LeaveStatus == 4" filled v-model="objOption.LeaveTime"
class="col-6 q-pr-lg q-pb-lg" mask="date" label="离职时间">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy
ref="qDateProxy2"
transition-show="scale"
transition-hide="scale"
>
<q-date
v-model="objOption.LeaveTime"
@input="() => $refs.qDateProxy2.hide()"
/>
<q-popup-proxy ref="qDateProxy2" transition-show="scale" transition-hide="scale">
<q-date v-model="objOption.LeaveTime" @input="() => $refs.qDateProxy2.hide()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
<q-select
filled
stack-label
:disable="objOption.AccountId == 0 ? false : true"
option-value="Id"
option-label="Value"
ref="ID"
v-model="objOption.AccountType"
:options="AccountTypeList"
label="用户类型"
:dense="false"
class="col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
<q-select
filled
stack-label
option-value="Id"
option-label="EmployeeName"
ref="ID"
v-model="objOption.DirectSupervisor"
:options="EmployeeList"
label="直属上级"
:dense="false"
class="col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
<q-select
filled
stack-label
option-value="Id"
option-label="Name"
ref="UserRole"
clearable
v-model="objOption.UserRole"
:options="roleList"
label="用户角色"
:dense="false"
class="col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
<q-select filled stack-label :disable="objOption.AccountId == 0 ? false : true" option-value="Id"
option-label="Value" ref="ID" v-model="objOption.AccountType" :options="AccountTypeList" label="用户类型"
:dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
<q-select filled stack-label option-value="Id" option-label="EmployeeName" ref="ID"
v-model="objOption.DirectSupervisor" :options="EmployeeList" label="直属上级" :dense="false"
class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
<q-select filled stack-label option-value="Id" option-label="Name" ref="UserRole" clearable
v-model="objOption.UserRole" :options="roleList" label="用户角色" :dense="false" class="col-6 q-pr-lg q-pb-lg"
emit-value map-options />
<div class="col-6 q-pb-lg">
<q-toggle
label="人工客服"
v-model="objOption.IsTenCccUser"
:true-value="1"
:false-value="0"
></q-toggle>
<q-select filled stack-label option-value="Id" option-label="Name" clearable
v-model="objOption.AccountUserType" :options="AccountUserTypeList" label="员工类型" :dense="false"
class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
<q-toggle label="人工客服" v-model="objOption.IsTenCccUser" :true-value="1" :false-value="0"></q-toggle>
</div>
<div class="col-6 q-pb-lg" style="margin-top:20px;">
<q-uploader
style="display: inline-block;max-height: 320px;max-width: 100%; background-repeat:no-repeat"
:style="{ 'background-image': 'url(' + objOption.UserIcon + ')' }"
max-files="1"
hide-upload-btn
@rejected="onRejected"
label="头像"
accept=".jpg, image/*"
auto-upload
:factory="uploadFile"
no-thumbnails
>
<q-uploader style="display: inline-block;max-height: 320px;max-width: 100%; background-repeat:no-repeat"
:style="{ 'background-image': 'url(' + objOption.UserIcon + ')' }" max-files="1" hide-upload-btn
@rejected="onRejected" label="头像" accept=".jpg, image/*" auto-upload :factory="uploadFile" no-thumbnails>
</q-uploader>
</div>
</div>
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white">
<q-btn
label="取消"
flat
color="grey-10"
style="font-weight:400 !important"
@click="closeSaveForm"
/>
<q-btn
label="立即提交"
color="accent"
class="q-px-md"
style="font-weight:400 !important"
:loading="saveLoading"
@click="setStudent"
/>
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeSaveForm" />
<q-btn label="立即提交" color="accent" class="q-px-md" style="font-weight:400 !important" :loading="saveLoading"
@click="setStudent" />
</q-card-actions>
</q-card>
</q-dialog>
</template>
<script>
import {
import {
getSchoolDropdown,
saveManager,
queryEmployeeInfo,
getEducation,
GetLeaveStatus,
getUserLeaveOrderCommission
} from "../../../api/school/index";
//部门
import { getDeptTree } from "../../../api/system/dept";
//岗位
import { queryDeptPostList } from "../../../api/system/post";
import { UploadSelfFile } from "../../../api/common/common";
import selectTree from "../../common/select-tree";
import {
} from "../../../api/school/index";
//部门
import {
getDeptTree
} from "../../../api/system/dept";
//岗位
import {
queryDeptPostList
} from "../../../api/system/post";
import {
UploadSelfFile
} from "../../../api/common/common";
import selectTree from "../../common/select-tree";
import {
queryEmployee, //员工列表
GetUserRoleList
} from "../../../api/users/user";
export default {
} from "../../../api/users/user";
export default {
components: {},
props: {
saveObj: {
......@@ -392,7 +166,8 @@ export default {
Email: "", //邮箱
DirectSupervisor: 0, //直属上级
UserRole: "", //用户角色(1-市场人员，2-课程顾问)
IsTenCccUser: 0 //电话客服
IsTenCccUser: 0, //电话客服
AccountUserType: 1, //员工类型(1-甲鹤员工，2-旅游员工)
},
optionTitle: "",
schoolList: [],
......@@ -400,8 +175,7 @@ export default {
DeptList: [], //部门列表
PostList: [], //岗位列表
returnString: [], //默认岗位
SexList: [
{
SexList: [{
//性别
Id: 0,
Name: "男"
......@@ -411,13 +185,21 @@ export default {
Name: "女"
}
],
AccountUserTypeList: [{
Id: 1,
Name: "甲鹤员工"
},
{
Id: 2,
Name: "旅游员工"
},
],
roleList: [],
EducationList: [], //学历数组
LeaveStatusList: [], //在职状态
isEditShow: false, //是否显示修改应该隐藏
//账号类型
AccountTypeList: [
{
AccountTypeList: [{
Id: 1,
Value: "后台用户"
},
......@@ -531,7 +313,9 @@ export default {
});
},
GetUserLeave(UserId) {
getUserLeaveOrderCommission({ UserId: UserId })
getUserLeaveOrderCommission({
UserId: UserId
})
.then(res => {
if (res.Code == 1) {
this.errdata = "";
......@@ -580,6 +364,7 @@ export default {
this.objOption.DirectSupervisor = res.Data.DirectSupervisor;
this.objOption.UserRole = res.Data.UserRole;
this.objOption.IsTenCccUser = res.Data.IsTenCccUser;
this.objOption.AccountUserType = res.Data.AccountUserType;
if (this.objOption.School_Id) {
this.queryDeptTree();
}
......@@ -740,15 +525,17 @@ export default {
}
},
watch: {}
};
};
</script>
<style>
.upload-assiatant-box .q-uploader__list {
.upload-assiatant-box .q-uploader__list {
display: none;
}
}
.upload-assiatant-box .q-uploader {
.upload-assiatant-box .q-uploader {
width: auto;
}
}
</style>
src/pages/school/sysuser.vue
View file @ bc6ac4b9
......@@ -11,6 +11,7 @@
padding: 0 3px;
min-height: 0 !important;
}
</style>
<template>
<div class="page-body">
......@@ -34,8 +35,8 @@
v-model="msg.Post_Id" ref="Post_Id" :options="PostList" label="岗位" :dense="false" emit-value map-options />
</div>
<div class="col-3">
<q-select filled @input="resetSearch" stack-label option-value="Id" option-label="Name"
v-model="msg.IsLeave " :options="LeaveStatusList" label="在职状态" :dense="false" emit-value map-options />
<q-select filled @input="resetSearch" stack-label option-value="Id" option-label="Name" v-model="msg.IsLeave "
:options="LeaveStatusList" label="在职状态" :dense="false" emit-value map-options />
</div>
<div class="col-3 Sysuser_Date">
<q-field filled>
......@@ -53,7 +54,11 @@
</template>
</q-field>
</div>
<div class="col-3 Sysuser_Date">
<div class="col-3">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="msg.AccountUserType" @input="resetSearch()"
:options="AccountUserTypeList" label="员工类型" :dense="false" emit-value map-options />
</div>
<!-- <div class="col-3 Sysuser_Date">
<q-field filled class="col-6">
<template v-slot:control>
<el-date-picker v-model="dateListTwo" @change="resetSearch()" format="MM-dd"  value-format="yyyy-MM-dd"
......@@ -61,7 +66,7 @@
 end-placeholder="生日结束时间" />
</template>
</q-field>
</div>
</div> -->
</div>
</div>
<div class="page-content">
......@@ -433,7 +438,17 @@
StartBirthDate: "", //开始生日
EndBirthDate: "", //结束生日
EmployeeName: "", //员工姓名电话
AccountUserType: 1, //员工类型(1-甲鹤员工，2-旅游员工)
},
AccountUserTypeList: [{
Id: 1,
Name: "甲鹤员工"
},
{
Id: 2,
Name: "旅游员工"
},
],
pageCount: 0,
managerOption: null,
schoolList: [], //校区数组
......@@ -470,15 +485,15 @@
Employeelist: [],
AllEmployeelist: [],
DeptEmpEnable: 0, //是否显示企业微信信息 1 显示
orderIsDetails:false,//离职人员订单交接
orderHandoverMsg:{
UserId:"",//原跟进成员的userid
ReceiveId:"",//接替成员的userid
TypeIds:0,//类型 1 订单转交 2学员转交
CustomerTransfer:"1",//是否订单转移
ChannelTransfer:"1",//是否渠道码人员转移
},//离职人员订单交接数据
orderloading:false,
orderIsDetails: false, //离职人员订单交接
orderHandoverMsg: {
UserId: "", //原跟进成员的userid
ReceiveId: "", //接替成员的userid
TypeIds: 0, //类型 1 订单转交 2学员转交
CustomerTransfer: "1", //是否订单转移
ChannelTransfer: "1", //是否渠道码人员转移
}, //离职人员订单交接数据
orderloading: false,
}
},
mounted() {
......@@ -492,7 +507,7 @@
},
methods: {
// 订单交接
orderHandover(row){
orderHandover(row) {
this.orderHandoverMsg.UserId = row.EmAccountId
this.orderIsDetails = true
},
......@@ -521,18 +536,18 @@
})
return
}
if(this.orderHandoverMsg.CustomerTransfer==1&&this.orderHandoverMsg.ChannelTransfer!=1){
this.orderHandoverMsg.TypeIds="1"
}else if(this.orderHandoverMsg.CustomerTransfer!=1&&this.orderHandoverMsg.ChannelTransfer==1){
this.orderHandoverMsg.TypeIds="2"
}else if(this.orderHandoverMsg.CustomerTransfer==1&&this.orderHandoverMsg.ChannelTransfer==1){
this.orderHandoverMsg.TypeIds="1,2"
if (this.orderHandoverMsg.CustomerTransfer == 1 && this.orderHandoverMsg.ChannelTransfer != 1) {
this.orderHandoverMsg.TypeIds = "1"
} else if (this.orderHandoverMsg.CustomerTransfer != 1 && this.orderHandoverMsg.ChannelTransfer == 1) {
this.orderHandoverMsg.TypeIds = "2"
} else if (this.orderHandoverMsg.CustomerTransfer == 1 && this.orderHandoverMsg.ChannelTransfer == 1) {
this.orderHandoverMsg.TypeIds = "1,2"
}
this.orderloading = true
let msg = {
UserId:this.orderHandoverMsg.UserId,
ReceiveId:this.orderHandoverMsg.ReceiveId,
TypeIds:this.orderHandoverMsg.TypeIds
UserId: this.orderHandoverMsg.UserId,
ReceiveId: this.orderHandoverMsg.ReceiveId,
TypeIds: this.orderHandoverMsg.TypeIds
}
SetUserLeaveOrderCareOf(msg).then(res => {
if (res.Code == 1)
......@@ -971,7 +986,9 @@
}
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
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