Skip to content

C
confucius
Commit 798a7380 authored by 罗超's avatar 罗超
Browse files
Options

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

# Conflicts:
#	src/router/routes.js
parents 9819dec8 3a7252b2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 396 additions and 352 deletions
src/api/stuMan/index.js
View file @ 798a7380
import request from '../../utils/request'
/**
* 获取部门分页列表
* 获取学员出勤情况
*/
export function getDeptPage(data) {
export function getStudentAttendanceDayStatistics(data) {
return request({
url: '/User/GetDeptPageList',
url: '/stu/GetStudentAttendanceDayStatistics',
method: 'post',
data
});
}
//学管 获取访客列表
export function getVisitorAllPageList(data) {
return request({
url: '/DutyPlan/GetVisitorAllPageList',
method: 'post',
data
})
}
\ No newline at end of file
src/components/course/class-form.vue
View file @ 798a7380
......@@ -305,8 +305,6 @@
</q-icon>
</template>
</q-input>
<!-- <q-input filled stack-label maxlength="20" v-model="sItem.StartTime" placeholder="08:30"
:dense="false" class="col-6 q-pr-lg" label="开始时间" /> -->
</td>
<td>
<q-input filled v-model="sItem.EndTime" class="col-6 q-pr-lg" placeholder="结束时间" mask="time">
......@@ -322,8 +320,6 @@
</q-icon>
</template>
</q-input>
<!-- <q-input filled stack-label maxlength="20" v-model="sItem.EndTime" placeholder="09:30" :dense="false"
class="col-6 q-pr-lg" label="结束时间" /> -->
</td>
<td>
<q-input filled stack-label maxlength="20" v-model="sItem.TimeHour"
......@@ -602,10 +598,8 @@
saveCourse() {
this.$refs.ClassName.validate();
this.$refs.ClassPersion.validate();
this.$refs.OriginalPrice.validate();
this.$refs.SellPrice.validate();
if (!this.$refs.ClassName.hasError && !this.$refs.ClassPersion.hasError && !this.$refs.OriginalPrice.hasError &&
!this.$refs.SellPrice.hasError) {
if (!this.$refs.ClassName.hasError && !this.$refs.ClassPersion.hasError) {
if (this.objOption.IsOpenCommission == 1) {
if (this.objOption.CommissionValue == '') {
this.$q.notify({
......
src/components/sale/backbill-form.vue
View file @ 798a7380
......@@ -167,7 +167,7 @@
<div class="row backInfo_One">
<div class="col-6">
<span class="backInfo_Title">合同信息：</span>
<span class="backOtherInfo" style="cursor: pointer;text-decoration: underline;" @click="getlookContractNo(setingObj.DataObj.ContractNo)" v-if="setingObj.DataObj.ContractNo && setingObj.DataObj.ContractNo!=''">
<span class="backOtherInfo" style="cursor: pointer;text-decoration: underline;" @click="getlookContractNo(setingObj.DataObj.ContractId)" v-if="setingObj.DataObj.ContractNo && setingObj.DataObj.ContractNo!=''">
{{setingObj.DataObj.ContractNo}}
</span>
<span v-else>无</span>
......@@ -454,10 +454,15 @@
'OrderId': OrderId
})
},
getlookContractNo(ContractNo){//跳转合同管理
this.OpenNewUrl('/sale/contractManage', {
'Name': ContractNo
})
getlookContractNo(ContractId){//跳转合同管理
let routeUrl = this.$router.resolve({
path: "/contractView",
query: {
ContractId: ContractId
}
});
window.open(routeUrl.href, '_blank');
},
getlookFinishHours(){//跳转学员消耗课时明细
let StartMonth = ''
......
src/components/sale/ordertrans-form.vue
View file @ 798a7380
......@@ -124,7 +124,9 @@
</div>
<div class="row backInfo_One">
<div class="col-6">
<span class="backInfo_Title">调课编号:</span>
<span class="backInfo_Title">
<span v-if="setingObj.ReceiptType==6">分拆</span>
<span v-if="setingObj.ReceiptType==5">转班</span>编号:</span>
<span class="backOtherInfo">{{setingObj.DataObj.Id}}</span>
</div>
<div class="col-6">
......
src/components/school/manager/employee-set.vue
View file @ 798a7380
......@@ -118,17 +118,17 @@
</div>
</div>
<div class="row" style="margin-top:20px;" v-if="deptObj.schoolType==1">
<div class="col-6">
<div class="col-12">
<q-select filled stack-label @input="getDepartList()" option-value="SId" option-label="SName"
class="col-6 q-pr-lg q-pb-lg" v-model="deptObj.School_Id" ref="School_Id" :options="schoolList"
class="q-pb-lg" v-model="deptObj.School_Id" ref="School_Id" :options="schoolList"
label="所属校区" :dense="false" emit-value map-options />
</div>
</div>
<div class="row" style="margin-top:20px;">
<div class="col-6">
<div class="row" style="margin-top:15px;">
<div class="col-12">
<selectTree :treeData='DeptList' :defaultArray="returnString" nodeKey="DeptId" :multiple="false"
labelKey="DeptName" childrenKey="ChildList" tipText="选择部门" @getChild="getChild"
classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
classStr="col-12 q-pb-lg"></selectTree>
</div>
</div>
</div>
......@@ -139,9 +139,9 @@
<div>修改岗位</div>
</div>
<div class="row" style="margin-top:20px;">
<div class="col-6">
<div class="col-12">
<q-select filled stack-label option-value="PostId" option-label="PostName" v-model="Post_Id" ref="Post_Id"
:options="PostList" label="岗位" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
:options="PostList" label="岗位" :dense="false" class="q-pb-lg" emit-value map-options />
</div>
</div>
</div>
......@@ -167,20 +167,20 @@
</div>
</div>
<div class="row" style="margin-top:20px;">
<div class="col-6">
<div class="col-12">
<q-select filled stack-label option-value="Id" option-label="Name" v-model="changeTypeMsg.TargetAccountType"
ref="AccountType" :options="accountTypeList" label="目标职能" :dense="false" class="col-6 q-pr-lg q-pb-lg"
ref="AccountType" :options="accountTypeList" label="目标职能" :dense="false" class="col-6 q-pb-lg"
emit-value map-options />
</div>
</div>
<div class="row" style="margin-top:20px;">
<div class="col-6">
<q-input v-model="changeTypeMsg.Remark" label="调整原因" filled type="textarea" class="col-6 q-pr-lg q-pb-lg"
<div class="row">
<div class="col-12">
<q-input v-model="changeTypeMsg.Remark" label="调整原因" filled type="textarea" class="col-6 q-pb-lg"
maxlength="100" />
</div>
</div>
</div>
<div style="text-align:left;margin-left:20px;">
<div style="text-align:right;margin-right:20px;">
<q-btn color="primary" label="确定" @click="saveReuslt()" style="width:300px;" />
</div>
</q-card>
......@@ -294,11 +294,6 @@
getSchool() {
getSchoolDropdown({}).then(res => {
this.schoolList = res.Data;
var obj = {
SName: '总部',
SId: 0
}
this.schoolList.unshift(obj);
})
},
closeShenheForm() {
......@@ -369,7 +364,14 @@
UpdateEmployeeLeave(Msg).then(res => {
if (res.Code == 1) {
this.$emit('success');
this.$emit('close')
this.$emit('close');
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '保存成功！',
position: 'top'
})
}
})
}
......@@ -394,7 +396,14 @@
UpdateEmployeeDept(obj).then(res => {
if (res.Code == 1) {
this.$emit('success');
this.$emit('close')
this.$emit('close');
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '保存成功！',
position: 'top'
})
}
})
}
......@@ -417,7 +426,14 @@
UpdateEmployeePost(obj).then(res => {
if (res.Code == 1) {
this.$emit('success');
this.$emit('close')
this.$emit('close');
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '保存成功！',
position: 'top'
})
}
})
}
......@@ -425,6 +441,13 @@
if (this.setingObj.type == 5) {
UpdateEmployeeType(this.changeTypeMsg).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '保存成功！',
position: 'top'
})
this.$emit('success');
this.$emit('close')
}
......
src/components/system/role-form.vue
View file @ 798a7380
......@@ -9,16 +9,13 @@
.role-form .role_MenuList {
width: 100%;
height: 40px;
height: auto;
border-radius: 3px;
border: 1px solid #2961FE;
color: #2961FE;
align-items: center;
font-size: 12px;
white-space: nowrap;
}
.role-form .role_TreeList {
height: 250px;
overflow: auto;
......@@ -52,8 +49,9 @@
}
.role-form .role_MenuList span {
width: 80px;
.role-form .role_MenuList>span {
width: auto;
padding:0 14px;
display: inline-block;
text-align: center;
height: 100%;
......@@ -71,7 +69,7 @@
}
.role-form .role_ItemList {
width: 200px;
min-width: 200px;
height: 300px;
background-color: #F1F1F1;
margin-right: 10px;
......
src/pages/course/makeup.vue
View file @ 798a7380
......@@ -23,7 +23,7 @@
</div>
<div class="col-3">
<q-select @input="refreshPage" standout="bg-primary text-white" v-model="msg.MakeUpStatus" clearable
option-value="Id" option-label="Name" :options="statusList" emit-value map-options label="状态" />
option-value="Id" option-label="Name" :options="statusList" emit-value map-options label="处理结果" />
</div>
<div class="col-3">
<div class="col-3 Sysuser_Date">
......@@ -77,14 +77,14 @@
</template>
<template v-slot:body-cell-optioned="props">
<q-td :props="props">
<q-btn v-if="props.row.MakeUpStatus==3" flat size="xs" icon="edit" color="accent" style="font-weight:400"
label="处理" @click="isShowEdit=true,getClickItem(props.row)">
<q-popup-proxy>
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400"
:label="props.row.MakeUpStatus == 1?'处理':'修改'" @click="isShowEdit=true,getClickItem(props.row)">
<q-popup-proxy >
<q-banner v-if="isShowEdit">
<div class="calenderDialog">
<div style="margin:10px 0 15px 0;">设置处理状态</div>
<q-select standout="bg-primary text-white" option-value="Id" option-label="Name"
v-model="statusMsg.MakeUpStatus" :options="statusList" emit-value map-options label="班级状态" />
v-model="statusMsg.MakeUpStatus" :options="statusList2" emit-value map-options label="是否可补课" />
<q-card-actions align="right" class="bg-white" style="margin-top:20px;">
<q-btn label="取消" flat color="grey-10" size="sm" @click="isShowEdit=false"
style="font-weight:400 !important" />
......@@ -160,10 +160,16 @@
},
{
name: 'MakeUpStatusStr',
label: '状态',
label: '处理结果',
align: 'left',
field: 'MakeUpStatusStr'
},
{
name: 'TimeHour',
label: '课时长度',
align: 'left',
field: 'TimeHour'
},
{
name: 'optioned',
label: '操作',
......@@ -176,7 +182,7 @@
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
MakeUpStatus: 3, //(2-已处理，3-未处理)
MakeUpStatus: 1, //(2-已处理，3-未处理)
GuestName: "", //学员名称
ClassName: "", //班级名称
CourseName: "", //课程名称
......@@ -187,18 +193,8 @@
},
pageCount: 0,
isShowEdit: false, //是否显示修改
statusList: [{
Id: -1,
Name: '全部'
}, {
Id: 2,
Name: '已处理'
},
{
Id: 3,
Name: "未处理"
}
],
statusList: [{Id: 1,Name: '未处理'}, { Id: 2,Name: '可补课'},{Id: 3,Name: "不可补课"}],
statusList2: [ { Id: 2,Name: '可补课'},{Id: 3,Name: "不可补课"}],
statusMsg: {
Id: 0,
MakeUpStatus: 2,
......@@ -246,6 +242,7 @@
this.statusMsg.ClassCheckId = item.ClassCheckId;
this.statusMsg.GuestId = item.OrderGuestId;
this.statusMsg.Id = item.Id;
this.statusMsg.MakeUpStatus = item.MakeUpStatus
},
clearMsg() {
this.statusMsg.Id = 0;
......
src/pages/sale/myOrder.vue
View file @ 798a7380
......@@ -25,7 +25,7 @@
option-label="CourseName" v-model="msg.CouseId" :options="CourseList" emit-value map-options label="学习课程" />
</div>
<div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" option-value="Id" option-label="Name"
<q-select @input="msg.OrderState==0?(msg.Q_OrderState = 1):msg.Q_OrderState=0,resetSearch()" standout="bg-primary text-white" option-value="Id" option-label="Name"
v-model="msg.OrderState" :options="OrderStateList" emit-value map-options label="订单状态" />
</div>
<div class="col-3">
......
src/pages/sale/studyOrder.vue
View file @ 798a7380
......@@ -17,7 +17,7 @@
@clear="resetSearch" maxlength="20" />
</div>
<div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" option-value="Id" option-label="Name"
<q-select @input="msg.OrderState==0?(msg.Q_OrderState = 1):msg.Q_OrderState=0,resetSearch()" standout="bg-primary text-white" option-value="Id" option-label="Name"
v-model="msg.OrderState" :options="OrderStateList" emit-value map-options label="订单状态" />
</div>
<div class="col-3">
......
src/pages/sale/studyOrderStatistics.vue
View file @ 798a7380
......@@ -23,7 +23,7 @@
@clear="resetSearch" maxlength="20" />
</div>
<div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" option-value="Id" option-label="Name"
<q-select @input="msg.OrderState==0?(msg.Q_OrderState = 1):msg.Q_OrderState=0,resetSearch()" standout="bg-primary text-white" option-value="Id" option-label="Name"
v-model="msg.OrderState" :options="OrderStateList" emit-value map-options label="订单状态" />
</div>
<div class="col-3">
......
src/pages/stuMan/studentManage.vue
View file @ 798a7380
This diff is collapsed.
src/pages/system/processSet.vue
View file @ 798a7380
......@@ -75,10 +75,10 @@
name: "5",
label: "临时上课邀请流程"
},
{
name: "6",
label: "分拆"
}
// {
// name: "6",
// label: "分拆"
// }
],
tabCheck: '1',
}
......
src/pages/teacher/changeClassManager.vue
View file @ 798a7380
......@@ -144,7 +144,7 @@
import temporaryClassForm from '../../components/sale/temporaryClassbill-form';
export default {
meta: {
title: "退课单据"
title: "业务单据"
},
components: {
backbillForm,
......
src/router/routes.js
View file @ 798a7380
......@@ -1051,7 +1051,12 @@ const routes = [{
path: "/stuMan/stuList",//学管 学员名单
component: () =>
import("pages/stuMan/stuList")
}, {
path: "/stuMan/visitorRecord",//学管 访问管理
component: () =>
import("pages/stuMan/visitorRecord")
},
],
},
......
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