Skip to content

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

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

parents f176a6f2 9e380f60
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3222 additions and 105 deletions
src/api/administration/administration.js
View file @ 53a500b2
......@@ -10,3 +10,94 @@ export function getTemplateList(data) {
});
}
/**
* 获取审批启用和停用
*/
export function setTemplate(data) {
return request({
url: '/WorkFlowManagement/SetTemplate',
method: 'post',
data
});
}
/**
*
*/
export function getDefaultCondition(data) {
return request({
url: '/WorkFlowManagement/GetDefaultCondition',
method: 'post',
data
});
}
/**
*
*/
export function getOtherConditionList(data) {
return request({
url: '/WorkFlowManagement/GetOtherConditionList',
method: 'post',
data
});
}
/**
*请假类型
*/
export function getAskForLeaveType(data) {
return request({
url: '/WorkFlowManagement/GetAskForLeaveType',
method: 'post',
data
});
}
/**
*条件审批保存
*/
export function setOtherCondition(data) {
return request({
url: '/WorkFlowManagement/SetOtherCondition',
method: 'post',
data
});
}
/**
*条件审批删除
*/
export function delOtherCondition(data) {
return request({
url: '/WorkFlowManagement/DelOtherCondition',
method: 'post',
data
});
}
/**
*审核的保存
*/
export function setDefaultCondition(data) {
return request({
url: '/WorkFlowManagement/SetDefaultCondition',
method: 'post',
data
});
}
/**
*获取分段流程详情
*/
export function getConditionAndAuditInfo(data) {
return request({
url: '/WorkFlowManagement/GetConditionAndAuditInfo',
method: 'post',
data
});
}
src/api/users/user.js
View file @ 53a500b2
......@@ -14,7 +14,7 @@ export function resetPassword(data) {
/**
* 获取员工列表
* @param {查询参数} data
* @param {查询参数} data
*/
export function queryEmployee(data)
{
......@@ -27,7 +27,7 @@ export function queryEmployee(data)
/**
* 修改离职信息
* @param {查询参数} data
* @param {查询参数} data
*/
export function UpdateEmployeeLeave(data)
{
......@@ -40,7 +40,7 @@ export function UpdateEmployeeLeave(data)
/**
* 修改部门
* @param {查询参数} data
* @param {查询参数} data
*/
export function UpdateEmployeeDept(data)
{
......@@ -53,7 +53,7 @@ export function UpdateEmployeeDept(data)
/**
* 修改岗位
* @param {查询参数} data
* @param {查询参数} data
*/
export function UpdateEmployeePost(data)
{
......@@ -66,7 +66,7 @@ export function UpdateEmployeePost(data)
/**
* 重置密码
* @param {查询参数} data
* @param {查询参数} data
*/
export function BatchResetUserPassword(data)
{
......@@ -75,4 +75,15 @@ export function BatchResetUserPassword(data)
method: 'post',
data
})
}
\ No newline at end of file
}
/**
* 获取部门Id
*/
export function getEmployeeAddrBook(data)
{
return request({
url: '/User/GetEmployeeAddrBook',
method: 'post',
data
})
}
src/components/course/class-form.vue
View file @ 53a500b2
......@@ -52,6 +52,19 @@
background-color: #e6e3fe;
color: #8175FB;
}
.CLM-Form .Emp_Line {
width: 3px;
height: 10px;
background-color: #3FC4FF;
margin-right: 10px;
}
.CLM-Form .EmpLine_title {
display: flex;
align-items: center;
font-size: 12px;
margin-bottom:20px;
}
</style>
<template>
......@@ -61,7 +74,10 @@
<div class="text-h6">{{optionTitle}}</div>
</q-card-section>
<q-card-section class="q-pt-none scroll" style="max-height: 70vh">
<div class="text-caption q-mb-lg q-px-md text-grey-6">基本信息</div>
<div class="EmpLine_title">
<div class="Emp_Line"></div>
<div>基本信息</div>
</div>
<div class="row wrap">
<div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.ClassName" ref="ClassName"
......@@ -178,8 +194,11 @@
 </q-field>
</div>
</div>
<div class="text-caption q-mb-lg q-px-md text-grey-6">上课设置</div>
<div class="row wrap" style="margin-bottom:30px;">
<div class="EmpLine_title" style="margin:10px 0;">
<div class="Emp_Line"></div>
<div>上课设置</div>
</div>
<div class="row wrap" style="margin:30px 0;">
<div class="col-6">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.ClassStyle"
ref="ClassStyle" :options="classSetList" label="排课安排" :dense="false" class="col-6 q-pr-lg q-pr-lg"
......
src/components/course/course-form.vue
View file @ 53a500b2
<template>
<q-dialog v-model="persistent" persistent transition-show="scale" transition-hide="scale">
<q-dialog v-model="persistent" persistent content-class="bg-grey-1" transition-show="scale" transition-hide="scale">
<q-card style="width: 800px;max-width:900px;">
<q-card-section>
<div class="text-h6">{{objOption.CourseId==0?'新增课程信息':'修改课程信息'}}</div>
......
src/components/school/manager/employee-set.vue
View file @ 53a500b2
......@@ -62,9 +62,6 @@
<span class="drawer_Span" v-if="setingObj.type==3">调岗</span>
<span class="drawer_Span" v-if="setingObj.type==4">调部门</span>
</div>
<div>
<i class="iconfont icon-guanbi" @click="closeShenheForm"></i>
</div>
</div>
<div style="margin:20px;">
<div class="EmpLine_title">
......@@ -77,7 +74,7 @@
<img :src="item.UserIcon" />
</q-avatar>
<q-avatar size="md" color="teal-10" text-color="white" v-if="!item.UserIcon">
{{item.EmployeeName}}</q-avatar>
{{GetFirst(item.EmployeeName)}}</q-avatar>
<div style="margin-top:6px;">{{item.EmployeeName}}</div>
</div>
</div>
......@@ -304,6 +301,11 @@
}
})
}
},
GetFirst(val) {
if (val) {
return val.substr(0, 1);
}
}
},
}
......
src/components/system/dept-form.vue
View file @ 53a500b2
<template>
<q-dialog v-model="persistent" persistent transition-show="scale" transition-hide="scale">
<q-dialog v-model="persistent" persistent content-class="bg-grey-1" transition-show="scale" transition-hide="scale">
<q-card style="width: 800px;max-width:900px;">
<q-card-section>
<div class="text-h6">{{objOption.MenuId==0?'新增部门信息':'修改部门信息'}}</div>
......
src/components/system/menu-form.vue
View file @ 53a500b2
<template>
<q-dialog v-model="persistent" 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">{{objOption.MenuId==0?'新增菜单信息':'修改菜单信息'}}</div>
......
src/components/system/post-form.vue
View file @ 53a500b2
......@@ -9,7 +9,7 @@
</style>
<template>
<q-dialog v-model="persistent" 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;" class="post-form">
<q-card-section>
<div class="text-h6">{{objOption.MenuId==0?'新增岗位信息':'修改岗位信息'}}</div>
......
src/pages/administration/Approval.vue
View file @ 53a500b2
<template>
<div>
<div class="query-box appProval">
<div class="appProval">
<div class="query-box ">
<ul>
<li><span><em>所属公司</em>
<li><span><em>所属校区</em>
<el-select :disabled="IsParentCompany!=1" v-model="QueryMsg.BranchId" @change="getList()" >
<el-option
v-for="item in companyList"
......@@ -12,47 +12,47 @@
</el-option>
</el-select>
</span></li>
<li>
<!-- <input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/> -->
</li>
<li></li>
</ul>
</div>
<div class="flexOne">
<div class="approval_title">出勤休假(4)</div>
<div class="approval_list" v-loading='loading'>
<div class="approval_item" v-for="(item,index) in dataList">
<img :src="item.Icon" width="86" style="float: left;margin: 17px 20px 0 0;" />
<div class="approval_desDiv">
<p class="tit">{{item.Name}}</p>
<p class="des" v-html="item.describe"></p>
<p class="tim">{{item.UpdateTime}}</p>
</div>
<div class="approval_fwDiv">
<p>可见范围</p>
<div class="row">
<div class="approval_item col shadow-1" v-for="(item,index) in dataList" :style="{'margin-right':dataList.length!=index+1?'40px':'0' }">
<img :src="item.Icon" width="86" style="" />
<span class="tit">{{item.Name}}</span>
<p class="updateP">全部可见</p>
</div>
<div class="approval_doDiv">
<p>
<button v-if='item.Status==1' class="normalBtn" @click="goUrl('ApprovalProcess',item.Id)">审批流程</button> &nbsp;&nbsp;
<button v-if='item.Status==1' @click="updateTempStatus(item.Id,item.TemplateType,item.Status)" class="hollowFixedBtn">{{$t('fnc.tingyong')}}</button>
<button v-if='item.Status==2' @click="updateTempStatus(item.Id,item.TemplateType,item.Status)" class="hollowFixedBtn">{{$t('fnc.qiyong')}}</button>
</p>
<div style="width: 36px;height: 2px;background: #E2E2E2;margin: 8px;"></div>
<p class="des" v-html="item.describe"></p>
<p class="des" v-html="item.describe2"></p>
<p class="tim">{{item.UpdateTime}}</p>
<div class="row" style="margin-top: 50px;justify-content: space-around;width: 100%" v-if='item.Status==1'>
<q-btn color="primary" label="审批流程" style="padding: 0 20px" @click="workflow(item.Id)"></q-btn>
<q-btn outline style="color: #2961FE;padding: 0 10px" label="停用" @click="updateTempStatus(item.Id,item.TemplateType,item.Status)"></q-btn>
</div>
<div class="row" style="margin-top: 50px;justify-content: center;" v-if='item.Status==2'>
<q-btn outline style="color: #2961FE;padding: 0 10px" label="启用" @click="updateTempStatus(item.Id,item.TemplateType,item.Status)"></q-btn>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import {
getTemplateList
getTemplateList,
setTemplate
} from '../../api/administration/administration';
import {
getSchoolDropdown //校区下拉
} from '../../api/school/index'
export default {
data() {
return {
loading:true,
......@@ -63,30 +63,33 @@
//返回数据
dataList: [],
companyList: [],
IsParentCompany:2
IsParentCompany:2,
drawer:false,
SpId:0
}
},
methods: {
workflow(Id){
this.$router.push({
path: '/administration/ApprovalProcess?Id='+Id+'&Bid='+this.QueryMsg.BranchId
});
},
getList() {
let describe = ['适用于请假申请，<br/>精确扣减出勤时间，并同步考勤报表', '适用于出差申请，<br/>精确汇总至考勤报表', '适用于外出申请，<br/>精确汇总至考勤报表', '当员工考勤出现缺卡时，可发起补卡审批，<br/>审批通过后考勤报表中的缺卡记录改为正常']
// this.apipost('WorkFlow_get_GetTemplateList', {BranchId:this.QueryMsg.BranchId}, res => {
// if(res.data.resultCode == 1) {
// this.loading=false;
// this.dataList = res.data.data[0].List;
// this.dataList.forEach((item, index) => {
// item.describe = describe[index]
// })
//
// }
// }, err => {})
let describe = ['适用于请假申请', '适用于出差申请', '适用于外出申请', '当员工考勤出现缺卡时，可发起补卡审批']
let describe2 = ['精确扣减出勤时间，并同步考勤报表', '精确汇总至考勤报表', '精确汇总至考勤报表', '审批通过后考勤报表中的缺卡记录改为正常']
getTemplateList({BranchId:this.QueryMsg.BranchId}).then(res => {
if(res.Code == 1) {
this.loading=false;
this.dataList = res.Data[0].List;
this.dataList.forEach((item, index) => {
item.describe = describe[index]
item.describe2 = describe2[index]
})
}
}).catch(() => {
})
},
getCompanyList() {
......@@ -114,19 +117,21 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('WorkFlow_post_SetTemplate', {
setTemplate({
Id: id,
TemplateType: type,
Status: 2,
BranchId:this.QueryMsg.BranchId
}, res => {
if(res.data.resultCode == 1) {
}).then(res => {
if(res.Code == 1) {
this.$message.success("已经停用")
this.getList()
} else {
}else {
this.$message.error("操作失败")
}
}, err => {})
}).catch(() => {
})
}).catch(() => {
this.$message.info('已取消停用')
});
......@@ -137,19 +142,21 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('WorkFlow_post_SetTemplate', {
setTemplate({
Id: id,
TemplateType: type,
Status: 1,
BranchId:this.QueryMsg.BranchId
}, res => {
if(res.data.resultCode == 1) {
}).then(res => {
if(res.Code == 1) {
this.$message.success("启用成功")
this.getList()
} else {
this.$message.error("操作失败")
}
}, err => {})
}).catch(() => {
})
}).catch(() => {
this.$message.info('已取消启用')
......@@ -183,7 +190,11 @@
border-left: 3px solid #E95252;
margin: 30px 0;
}
.appProval{
background: white;
height: 90%;
padding: 0 20px;
}
.appProval .el-input__inner{
height: 34px!important;
}
......@@ -197,58 +208,58 @@
}
.approval_item {
height: 160px;
padding: 20px;
background: #fff;
overflow: auto;
border-radius: 8px;
margin-bottom: 10px;
background: white;
/*border: 1px solid rgba(2, 44, 66, 0.15);*/
border-radius: 4px;
padding: 40px;
display: flex;
flex-direction: column;
align-items: center;
}
.approval_item p.tit {
font-size: 18px;
color: #333;
.approval_item .tit {
font-size: 32px;
color: #111111;
font-weight: bold;
margin-top: 30px;
}
.approval_item p.des {
.approval_item .des {
font-size: 14px;
color: #666;
color: #999999;
line-height: 22px;
}
.approval_item p.tim {
font-size: 14px;
color: #999;
.approval_item .tim {
font-size: 12px;
color: #A6A6A6;
line-height: 22px;
}
.approval_fwDiv {
float: left;
width: 520px;
height: 120px;
padding: 50px 0;
border-right: 1px dotted #DCDFE6;
}
.approval_fwDiv>p {
text-align: center;
font-size: 16px;
color: #333;
}
.approval_fwDiv>p.updateP {
.approval_item .updateP {
font-size: 14px;
color: #666;
color: #999999;
line-height: 24px;
}
.approval_doDiv {
float: left;
width: 500px;
.appProval .drawerTop {
width: 100%;
height: 50px;
display: flex;
flex-direction: row;
justify-content: space-between;
background-color: #F0F5FB;
padding: 5px 10px;
align-items: center;
}
.approval_doDiv>p {
text-align: center;
line-height: 120px;
.el-drawer__body {
overflow: auto;
}
/*2.隐藏滚动条，太丑了*/
.el-drawer__container ::-webkit-scrollbar{
display: none;
}
</style>
src/pages/administration/ApprovalProcess.vue 0 → 100644
View file @ 53a500b2
This diff is collapsed.
src/pages/administration/document.vue
View file @ 53a500b2
......@@ -131,7 +131,7 @@
<div class="text-caption q-mb-lg q-px-md text-grey-6">基本资料</div>
<q-card-section class="q-pt-none">
<div class="row wrap">
<q-input clearable class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" v-model="addMsg.From" label="公文来源（FR）" :rules="[val => !!val || '公文来源（FR）']"/>
<q-input clearable filled class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" v-model="addMsg.From" label="公文来源（FR）" :rules="[val => !!val || '公文来源（FR）']"/>
<selectTree class="col-6 q-pb-lg q-pr-lg" :treeData='DeptList' :defaultArray="returnString" nodeKey="DeptId" :multiple="true" :defaultExpandAll="true"
labelKey="DeptName" childrenKey="ChildList" tipText="To" @getChild="getChild"
classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
......@@ -148,7 +148,7 @@
</template>
</q-select>
<q-input clearable class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" disable v-model="nNumber" label="编号" v-if="nNumber!=null "/>
<q-input clearable class="col-12 q-pb-lg q-pr-lg" standout="bg-primary text-white" v-model="addMsg.Title" label="标题" :rules="[val => !!val || '标题']"/>
<q-input clearable filled class="col-12 q-pb-lg q-pr-lg" standout="bg-primary text-white" v-model="addMsg.Title" label="标题" :rules="[val => !!val || '标题']"/>
<div class="text-caption q-my-md q-px-xs text-grey-6">公告内容</div>
<ext-editor :defaultMsg="addMsg.Content" classStr="col-12" @getEditValue="getEditValue"></ext-editor>
<el-upload
......
src/pages/administration/processDesign.vue 0 → 100644
View file @ 53a500b2
This diff is collapsed.
src/pages/administration/updateProcessDesign.vue 0 → 100644
View file @ 53a500b2
This diff is collapsed.
src/pages/school/sysuser.vue
View file @ 53a500b2
......@@ -97,7 +97,7 @@
<img :src="props.value" />
</q-avatar>
<q-avatar size="md" color="teal-10" text-color="white" v-if="!props.value">
{{props.row.EmployeeName}}</q-avatar>
{{GetFirst(props.row.EmployeeName)}}</q-avatar>
</q-td>
</template>
<template v-slot:body-cell-EmployeeName="props">
......@@ -591,6 +591,11 @@
this.setObj.selected = [];
this.setObj.selected.push(obj);
this.isShowEmployeeSet = true;
},
GetFirst(val) {
if (val) {
return val.substr(0, 1);
}
}
},
}
......
src/pages/system/role.vue
View file @ 53a500b2
......@@ -20,10 +20,8 @@
separator="none" title="角色信息" :data="data" :columns="columns" row-key="name">
<template v-slot:body-cell-Status="props">
<q-td :props="props">
<q-td :props="props">
<q-toggle size="md" color="primary" :false-value="1" :true-value="0" v-model="props.row.Status"
title="注意：关闭后，分类将无法正常使用." @input="DeleteRole(props.row)" />
</q-td>
<q-toggle size="md" color="primary" :false-value="1" :true-value="0" v-model="props.row.Status"
title="注意：关闭后，分类将无法正常使用." @input="DeleteRole(props.row)" />
</q-td>
</template>
<template v-slot:bottom>
......
src/router/routes.js
View file @ 53a500b2
......@@ -316,6 +316,21 @@ const routes = [{
component: () =>
import("pages/administration/Approval.vue")
},
{
path: "/administration/ApprovalProcess", //审批流程详情
component: () =>
import("pages/administration/ApprovalProcess.vue")
},
{
path: "/administration/processDesign", //分条件审批
component: () =>
import("pages/administration/processDesign.vue")
},
{
path: "/administration/updateProcessDesign", //分条件审批
component: () =>
import("pages/administration/updateProcessDesign.vue")
},
{
path: "/test", //API测试
component: () =>
......
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