Skip to content

C
confucius
Commit 83b16c6a authored by 罗超's avatar 罗超
Browse files
Options

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

# Conflicts:
#	src/components/sale/ordertrans-form.vue
parents 27d05824 bda3e2a9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 601 additions and 40 deletions
src/components/sale/createbackbill-form.vue
View file @ 83b16c6a
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
} }
}, },
created() { created() {
this.FinanceMsg.BackClassId = this.setingObj.BackId; this.FinanceMsg.BackClassId = this.setingObj.DataObj.BackId;
this.addMsg.ObjID = this.setingObj.GuestId; this.addMsg.ObjID = this.setingObj.GuestId;
this.financeinfo_post_GetList(); this.financeinfo_post_GetList();
this.getGuestBankAccount() this.getGuestBankAccount()
......
src/pages/financial/reportform/activityCommissionUserList.vue
View file @ 83b16c6a
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="CommissionMoney" label="提成金额" sortable :sort-method="CommissionMoney"> <el-table-column prop="CommissionMoney" label="提成金额" sortable :sort-method="CommissionMoney">
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
this.msg.School_Id = this.$route.query.School_Id this.msg.School_Id = this.$route.query.School_Id
} }
this.getList() this.getList()
this.setClass() // this.setClass()
}, },
methods: { methods: {
getList() { getList() {
......
src/pages/stuMan/stuClassManage.vue 0 → 100644
View file @ 83b16c6a
This diff is collapsed.
src/pages/teacher/changeClassManager.vue
View file @ 83b16c6a
...@@ -50,8 +50,9 @@ ...@@ -50,8 +50,9 @@
<q-tab :ripple="false" name="2" label="已审批" /> <q-tab :ripple="false" name="2" label="已审批" />
<q-tab :ripple="false" name="4" label="抄送给我的" /> <q-tab :ripple="false" name="4" label="抄送给我的" />
</q-tabs> </q-tabs>
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table sticky-right-column-table" <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
separator="none" :data="data" :columns="columns" row-key="name"> class="sticky-tow-column-table sticky-right-column-table" separator="none" :data="data" :columns="columns"
row-key="name">
<template v-slot:body-cell-ReceiptTypeName="props"> <template v-slot:body-cell-ReceiptTypeName="props">
<q-td :props="props"> <q-td :props="props">
<span class="ReceipTypeName">{{props.row.ReceiptTypeName}}</span> <span class="ReceipTypeName">{{props.row.ReceiptTypeName}}</span>
...@@ -60,7 +61,8 @@ ...@@ -60,7 +61,8 @@
<template v-slot:body-cell-ApplyReason="props"> <template v-slot:body-cell-ApplyReason="props">
<q-td :props="props"> <q-td :props="props">
<div class="bill_Rearsons"> <div class="bill_Rearsons">
<template v-if="props.row.ReceiptType==1||props.row.ReceiptType==5||props.row.ReceiptType==3||props.row.ReceiptType==4"> <template
v-if="props.row.ReceiptType==1||props.row.ReceiptType==5||props.row.ReceiptType==3||props.row.ReceiptType==4">
<span v-if="props.row.DataObj&&props.row.DataObj.Remarks"> <span v-if="props.row.DataObj&&props.row.DataObj.Remarks">
{{props.row.DataObj.Remarks}} {{props.row.DataObj.Remarks}}
<q-tooltip :offset="[0, 10]"> <q-tooltip :offset="[0, 10]">
...@@ -90,16 +92,17 @@ ...@@ -90,16 +92,17 @@
@click="showBillForm(props.row,2)" /> @click="showBillForm(props.row,2)" />
</template> </template>
<template v-else> <template v-else>
<template v-if="props.row.FinanceId&& props.row.FinanceId>0"> <template
<a style="cursor:pointer;color:blue;" title="退课财务单据号" v-if="props.row.VerifyStatus==2&&props.row.ReceiptType==2&&props.row.DataObj.FinanceId<=0&& tabCheck=='1'">
@click="goFinaceUrl('FinancialDocumentsDetail',props.row)">{{props.row.FinanceId}}</a> <q-btn flat size="xs" icon="directions" color="secondary" style="font-weight:400" label="制单"
@click="createBillForm(props.row)" />
</template> </template>
<template v-else> <template v-if="props.row.VerifyStatus==2&&props.row.ReceiptType==2&&props.row.DataObj.FinanceId>0">
<q-btn v-if="tabCheck=='1' && props.row.AuditStatus==2" flat size="xs" icon="edit" color="accent" <span @click="goFinaceUrl('FinancialDocumentsDetail',props.row.DataObj)" title="退课财务单据号"
style="font-weight:400" label="生成单据" @click="createBillForm(props.row)" /> style="color: #2961FE;font-weight: bold;cursor: pointer;">{{props.row.DataObj.FinanceId}}</span>
</template> </template>
<q-btn v-if="props.row.VerifyStatus==0 && tabCheck=='1'" flat size="xs" icon="delete" color="negative" style="font-weight:400" label="作废" <q-btn v-if="props.row.VerifyStatus==0 && tabCheck=='1'" flat size="xs" icon="delete" color="negative"
@click="invalidBillForm(props.row)" /> style="font-weight:400" label="作废" @click="invalidBillForm(props.row)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="查看" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="查看"
@click="showBillForm(props.row,1)" /> @click="showBillForm(props.row,1)" />
</template> </template>
...@@ -119,11 +122,11 @@ ...@@ -119,11 +122,11 @@
@success="refreshPage"> @success="refreshPage">
</stopbill-form> </stopbill-form>
<!-- 订单转班-查看 --> <!-- 订单转班-查看 -->
<ordertrans-form v-if="isShowClassTrans" :seting-obj="billObj" :showType="showType" @close="closeBillForm" <ordertrans-form v-if="isShowClassTrans" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
@success="refreshPage"> @success="refreshPage">
</ordertrans-form> </ordertrans-form>
<!-- 订单临时上课邀请-查看 --> <!-- 订单临时上课邀请-查看 -->
<temporaryClass-form v-if="isShowTemporaryClass" :seting-obj="billObj" :showType="showType" @close="closeBillForm" <temporaryClass-form v-if="isShowTemporaryClass" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
@success="refreshPage"> @success="refreshPage">
</temporaryClass-form> </temporaryClass-form>
</div> </div>
...@@ -162,7 +165,7 @@ ...@@ -162,7 +165,7 @@
label: '单号', label: '单号',
field: 'Id', field: 'Id',
align: 'left' align: 'left'
}, },
{ {
name: 'ReceiptTypeName', name: 'ReceiptTypeName',
label: '单据类型', label: '单据类型',
...@@ -223,7 +226,7 @@ ...@@ -223,7 +226,7 @@
pageIndex: 1, pageIndex: 1,
pageSize: 12, pageSize: 12,
rowsPerPage: 12, rowsPerPage: 12,
Id:"", Id: "",
VerifyStatus: "", //审核状态 VerifyStatus: "", //审核状态
StartTime: "", //开始时间 StartTime: "", //开始时间
EndTime: "", //结束时间 EndTime: "", //结束时间
...@@ -238,9 +241,9 @@ ...@@ -238,9 +241,9 @@
billObj: {}, //单据信息 billObj: {}, //单据信息
showType: 1, //1-查看，2-审核 showType: 1, //1-查看，2-审核
OrderTypeList: [], OrderTypeList: [],
isShowStopBillForm:false,//是否显示停课订单详情 isShowStopBillForm: false, //是否显示停课订单详情
isShowClassTrans:false, //是否显示订单转班详情 isShowClassTrans: false, //是否显示订单转班详情
isShowTemporaryClass:false,//是否显示临时上课邀请订单详情 isShowTemporaryClass: false, //是否显示临时上课邀请订单详情
} }
}, },
created() { created() {
...@@ -254,13 +257,8 @@ ...@@ -254,13 +257,8 @@
methods: { methods: {
//跳转到财务单据 //跳转到财务单据
goFinaceUrl(path, rowData) { goFinaceUrl(path, rowData) {
this.$router.push({ this.OpenNewUrl('/financial/financalDocument/' + path, {
path: '/financial/financalDocument/' + path, 'id': rowData.FinanceId
query: {
"id": rowData.FinanceId,
blank: 'y',
tab: '单据详情'
}
}) })
}, },
//生成财务单据 //生成财务单据
...@@ -273,7 +271,7 @@ ...@@ -273,7 +271,7 @@
this.isShowBillForm = false; this.isShowBillForm = false;
this.isShowChangeBillForm = false; this.isShowChangeBillForm = false;
this.isShowCreateBillForm = false; this.isShowCreateBillForm = false;
this.isShowStopBillForm=false; this.isShowStopBillForm = false;
this.isShowClassTrans = false; this.isShowClassTrans = false;
this.isShowTemporaryClass = false; this.isShowTemporaryClass = false;
this.billObj = {}; this.billObj = {};
...@@ -288,17 +286,17 @@ ...@@ -288,17 +286,17 @@
else if (item.ReceiptType == 2) { else if (item.ReceiptType == 2) {
this.isShowBillForm = true; this.isShowBillForm = true;
} }
//停课 //停课
else if (item.ReceiptType == 3) { else if (item.ReceiptType == 3) {
this.isShowStopBillForm = true; this.isShowStopBillForm = true;
} }
//临时上课邀请 //临时上课邀请
else if (item.ReceiptType == 4){ else if (item.ReceiptType == 4) {
this.isShowTemporaryClass =true; this.isShowTemporaryClass = true;
} }
//转班 //转班
else if (item.ReceiptType == 5 || item.ReceiptType==6){ else if (item.ReceiptType == 5 || item.ReceiptType == 6) {
this.isShowClassTrans =true; this.isShowClassTrans = true;
} }
this.showType = type; this.showType = type;
this.billObj = item; this.billObj = item;
...@@ -339,7 +337,7 @@ ...@@ -339,7 +337,7 @@
this.isShowBillForm = false; this.isShowBillForm = false;
this.isShowChangeBillForm = false; this.isShowChangeBillForm = false;
this.isShowCreateBillForm = false; this.isShowCreateBillForm = false;
this.isShowStopBillForm=false; this.isShowStopBillForm = false;
this.isShowClassTrans = false; this.isShowClassTrans = false;
this.billObj = {}; this.billObj = {};
this.getStuBackBill(); this.getStuBackBill();
...@@ -353,12 +351,12 @@ ...@@ -353,12 +351,12 @@
}).catch(() => {}) }).catch(() => {})
}, },
//作废 //作废
invalidBillForm(item){ invalidBillForm(item) {
let delMsg = { let delMsg = {
Id: item.Id, Id: item.Id,
}; };
var message = "是否要作废此单据？"; var message = "是否要作废此单据？";
this.$q.dialog({ this.$q.dialog({
title: '提示信息', title: '提示信息',
message: message, message: message,
......
src/router/routes.js
View file @ 83b16c6a
...@@ -1090,6 +1090,11 @@ const routes = [{ ...@@ -1090,6 +1090,11 @@ const routes = [{
component: () => component: () =>
import("pages/stuMan/todaysOrder") import("pages/stuMan/todaysOrder")
}, },
{
path: "/stuMan/stuClassManage", //学管 班级管理
component: () =>
import("pages/stuMan/stuClassManage")
}
], ],
}, },
......
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