Skip to content

C
confucius
Commit e75bc48e authored by Mac's avatar Mac
Browse files
Options

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

parents 549edfed d065249a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 368 additions and 184 deletions
src/api/common/common.js
View file @ e75bc48e
import request from '../../utils/request'
import ds from '../../utils/erpindex'
import {
Loading
} from 'quasar'
......@@ -388,4 +389,4 @@ export function EduDownLoad(cmd, msg, fileName, callBack) {
callBack(result);
}
})
}
}
\ No newline at end of file
src/api/school/index.js
View file @ e75bc48e
......@@ -579,3 +579,16 @@ export function SetOrderChange(data) {
});
}
/**
* 保存分拆申请
*/
export function SetOrderSplit(data) {
return request({
url: '/OrderChange/SetOrderSplit',
method: 'post',
data
});
}
src/components/sale/transferclass-form.vue
View file @ e75bc48e
......@@ -299,7 +299,8 @@
<script>
import {
getSchoolDropdown,
SetOrderChange
SetOrderChange,
SetOrderSplit
} from '../../api/school/index'
import {
GetClassTypeList
......@@ -515,20 +516,37 @@
})
return;
}
SetOrderChange(this.transMsg).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '保存成功！',
position: 'top'
})
//调用父页面成功方法
this.$emit('success');
this.IsShowContinueClassDialog = false
}
})
if(this.transMsg.ChangeType==1){
SetOrderChange(this.transMsg).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '保存成功！',
position: 'top'
})
//调用父页面成功方法
this.$emit('success');
this.IsShowContinueClassDialog = false
}
})
}else{
SetOrderSplit(this.transMsg).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '保存成功！',
position: 'top'
})
//调用父页面成功方法
this.$emit('success');
this.IsShowContinueClassDialog = false
}
})
}
},
//获取校区列表
getSchool() {
......
src/components/school/manager/employee-set.vue
View file @ e75bc48e
......@@ -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/pages/activity/activeSignUpList.vue
View file @ e75bc48e
<template>
<div class="page-body myActiveOrder">
<div class="row col" style="height: 40px">
<div class="row col " style="align-items: center;margin-bottom: 10px">
<q-btn color="accent" size="sm" class="q-mr-md " label="返回" @click="goBack" />
<div v-if="activeName">
活动名称：{{activeName}}
</div>
<div class="row col" style="margin-bottom: 10px">
<div class="row col ">
<q-btn color="accent" size="sm" class="q-mr-md " label="返回" @click="goBack" />
<div v-if="activeName" style="line-height:25px">
活动名称：{{activeName}}
</div>
</div>
<q-btn color="accent" style="float:right" v-if="from==1" size="sm" label="参与者名单" @click="gourl" />
</div>
<div class="page-content">
<OrderItem :dataList="data.List" ref="orderL" :authObj="authObj" :modityOrderType="2" :cancelList="CancelList" :formActiveMan="true" @agree="agreeApply" @refuse="jujueMsg"
@success="refreshClassOrder"></OrderItem>
<div class="row" style="justify-content: flex-end;padding: 5px 20px">
<OrderItem :dataList="data.List" ref="orderL" :authObj="authObj" :modityOrderType="2" :cancelList="CancelList"
:formActiveMan="true" @agree="agreeApply" @refuse="jujueMsg" @success="refreshClassOrder"></OrderItem>
<div class="row" style="justify-content: flex-end;padding: 5px 20px">
<q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
color="primary" :input="true">
</q-pagination>
</div>
</div>
<!-- 拒绝报名 -->
<!-- 拒绝报名 -->
<el-dialog title="拒绝报名" :visible.sync="showJujue" width="600px">
<div class="activityFlex">
<el-input type="textarea" rows="4" v-model="bdMsg.RejectRemark"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="sureJujue">确定</el-button> -->
<q-btn text-color="accent" size="sm" class="q-mr-md" label="取消" @click="showJujue=false" />
<q-btn color="accent" size="sm" class="q-mr-md" label="确定" @click="sureJujue" />
<q-btn text-color="accent" size="sm" class="q-mr-md" label="取消" @click="showJujue=false" />
<q-btn color="accent" size="sm" class="q-mr-md" label="确定" @click="sureJujue" />
</span>
</el-dialog>
</div>
</template>
<script>
......@@ -37,8 +39,8 @@
import OrderItem from '../../components/sale/activeOrder-item.vue'
export default {
meta:{
title:"活动报名列表"
meta: {
title: "活动报名列表"
},
components: {
OrderItem
......@@ -46,13 +48,13 @@
data() {
return {
data: {},
activeName:"",
activeName: "",
msg: {
pageIndex:1,
pageSize:10,
pageIndex: 1,
pageSize: 10,
ActivityId: 0
},
pageCount:0,
pageCount: 0,
//正常订单
dataList: [],
//取消订单
......@@ -72,7 +74,8 @@
ApplyForCancelStatus: 1, //申请取消审核状态 1同意 2拒绝
RejectRemark: ''
},
showJujue:false,
showJujue: false,
from: 0, //来源页面,1===活动=>活动管理=>活动列表
}
},
created() {
......@@ -82,20 +85,20 @@
if (this.$route.query.name) {
this.activeName = this.$route.query.name
}
if (this.$route.query.from) {
this.from = this.$route.query.from
}
this.getList();
},
mounted() {
},
methods: {
//获取订单列表
//获取订单列表
getList() {
this.loading = true;
this.apipostDS("/api/Education/GetConsultOrderStatisticsPage",this.msg, (res) => {
this.apipostDS("/api/Education/GetConsultOrderStatisticsPage", this.msg, (res) => {
this.loading = false
if (res.data.resultCode === 1) {
this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
this.data = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
}
})
},
......@@ -103,15 +106,15 @@
refreshClassOrder() {
this.getList();
},
goBack(){
this.$router.go(-1)
goBack() {
this.$router.go(-1)
},
//翻页
//翻页
changePage(val) {
this.msg.pageIndex = val;
this.getList()
this.msg.pageIndex = val;
this.getList()
},
//同意
//同意
agreeApply(item) {
this.bdMsg.Id = item.Id;
this.bdMsg.ApplyForCancelStatus = 1;
......@@ -124,20 +127,20 @@
}
})
},
jujueMsg(item){
jujueMsg(item) {
this.bdMsg.Id = item.Id;
this.showJujue=true;
this.showJujue = true;
},
// 拒绝
sureJujue(){
if(!this.bdMsg.RejectRemark){
sureJujue() {
if (!this.bdMsg.RejectRemark) {
this.Error("请输入拒绝原因")
return
}
this.bdMsg.ApplyForCancelStatus = 2;
this.apipostDS("/api/Education/SetCommerceConsultApplyCancel", this.bdMsg, res => {
if (res.data.resultCode == 1) {
this.showJujue=false;
this.showJujue = false;
this.Success("操作成功")
this.getList()
} else {
......@@ -145,35 +148,44 @@
}
})
},
gourl() {
this.$router.push({
path: "/activity/activeSignUpList2",
query: {
Id: this.msg.ActivityId,
name: this.activeName,
from: this.from
}
})
},
}
}
</script>
<style >
.myActiveOrder .table-body{
height: calc(100vh - 220px);
}
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
.myActiveOrder .table-body::-webkit-scrollbar
{
<style>
.myActiveOrder .table-body {
height: calc(100vh - 220px);
}
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
.myActiveOrder .table-body::-webkit-scrollbar {
width: 5px;
height: 5px;
background-color: #F5F5F5;
}
/*定义滚动条轨道 内阴影+圆角*/
.myActiveOrder .table-body::-webkit-scrollbar-track
{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
}
/*定义滚动条轨道 内阴影+圆角*/
.myActiveOrder .table-body::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
border-radius: 10px;
background-color: #F5F5F5;
}
/*定义滑块 内阴影+圆角*/
.myActiveOrder .table-body::-webkit-scrollbar-thumb
{
}
/*定义滑块 内阴影+圆角*/
.myActiveOrder .table-body::-webkit-scrollbar-thumb {
border-radius: 5px;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
background-color: #555;
}
}
</style>
src/pages/activity/activityList.vue
View file @ e75bc48e
......@@ -509,7 +509,8 @@
path: url,
query: {
Id: item.Id,
name:item.ActivityName
name:item.ActivityName,
from:1
}
})
}
......
src/pages/teacher/changeClassManager.vue
View file @ e75bc48e
......@@ -297,7 +297,7 @@
this.isShowTemporaryClass =true;
}
//转班
else if (item.ReceiptType == 5){
else if (item.ReceiptType == 5 || item.ReceiptType==6){
this.isShowClassTrans =true;
}
this.showType = type;
......
src/pages/user/billquery.vue
View file @ e75bc48e
......@@ -341,7 +341,7 @@
this.isShowBackBillForm = true;
}
//转班
else if(item.ReceiptType == 5){
else if(item.ReceiptType == 5||item.ReceiptType == 6){
this.isShowTransForm = true;
}
//停课
......
src/router/routes.js
View file @ e75bc48e
......@@ -746,6 +746,11 @@ const routes = [{
component: () =>
import("pages/activity/activeSignUpList.vue")
},
{
path: "/activity/activeSignUpList2", //活动 活动报名列表type2
component: () =>
import("pages/activity/activeSignUpList2.vue")
},
{
path: "/activity/activeSummary", //活动 活动总结
component: () =>
......
src/utils/erpindex.js
View file @ e75bc48e
......@@ -277,20 +277,38 @@ export default {
}
}, faildCall)
}
//价钱格式化，三位数逗号分隔，保留两位小数 duanjun
Vue.prototype.moneyFormat = function (value) {
let nStr = Number(value).toFixed(2)
nStr += '';
let x = nStr.split('.');
let x1 = x[0];
let x2 = x.length > 1 ? '.' + x[1] : '';
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, '$1' + ',' + '$2');
}
return x1 + x2;
//电商文件下载
Vue.prototype.GetLocalFileDS = function (cmd, msg, fileName, newCmd, successCall) {
var apiurl = this.domainManager().mallUrl + cmd;
var postData = this.GetPostDataDS(cmd, msg, newCmd);
this.$http.post(apiurl, postData, {
responseType: 'arraybuffer'
}).then((res) => {
let blob = new Blob([res.data], {
type: "application/vnd.ms-excel"
})
let url = URL.createObjectURL(blob);
let link = document.createElement('a');
link.href = url;
link.setAttribute("download", fileName);
document.body.appendChild(link);
link.click();
successCall(res);
}).catch(function (res) { });
},
//价钱格式化，三位数逗号分隔，保留两位小数 duanjun
Vue.prototype.moneyFormat = function (value) {
let nStr = Number(value).toFixed(2)
nStr += '';
let x = nStr.split('.');
let x1 = x[0];
let x2 = x.length > 1 ? '.' + x[1] : '';
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, '$1' + ',' + '$2');
}
return x1 + x2;
},
//验证只能输入整数【负数：isMinus传true】
Vue.prototype.checkInteger = function (item, filed, isMinus) {
var value = "" + item[filed]; //转字符串
......
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