Skip to content

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

也没修过

parent 6aa10b4e
Show whitespace changes
Inline Side-by-side
Showing with 245 additions and 302 deletions
src/components/sale/editOrder-form.vue
View file @ 577ec548
......@@ -41,7 +41,8 @@
<!--留学就业订单-->
<template v-if="orderType==2||OrderMsg.OrderType==2">
<q-select standout="bg-primary text-white" option-value="Id" class="q-pb-lg" option-label="Name"
v-model="OrderMsg.OrderNature" :options="OrderStatus" emit-value map-options label="订单性质" />
v-model="OrderMsg.OrderNature" :options="OrderStatus" emit-value map-options label="订单性质"
@input="OrderNatureChange" />
<q-input filled stack-label :dense="false" maxlength="10" @keyup.native="checkPrice(OrderMsg,'PreferPrice')"
:disable="OrderMsg.OrderNature==1&&isHaveModify" v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg"
label="应收" />
......@@ -127,7 +128,7 @@
Name: '返佣'
}
],
isHaveModify:false
isHaveModify: false
}
},
created() {
......@@ -135,21 +136,24 @@
this.getEmployee();
var localStorageData = window.localStorage["loginUserInfo"];
let ActionMenuList = JSON.parse(localStorageData).data.ActionMenuList
if(ActionMenuList && ActionMenuList.length>0){
ActionMenuList.forEach(x=>{
if(x.FunctionCode == 'E_ModifyStudyOrderPrice'){
if (ActionMenuList && ActionMenuList.length > 0) {
ActionMenuList.forEach(x => {
if (x.FunctionCode == 'E_ModifyStudyOrderPrice') {
this.isHaveModify = true
}
})
}
},
mounted() {
console.log("saveObj", this.saveObj);
console.log("orderType", this.orderType);
this.initData()
},
methods: {
//订单性质切换
OrderNatureChange() {
if (this.OrderMsg.OrderNature == 1) {
this.countPrice();
}
},
initData() {
if (this.saveObj && this.saveObj.OrderId > 0) {
getClassOrderInfo({
......@@ -269,7 +273,9 @@
},
//修改订单
saveOrderInfo() {
if (this.OrderMsg.OrderType == 1) {
this.OrderMsg.PreferPrice = (this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price) - this.OrderMsg.LessPrice;
}
setClassOrder(this.OrderMsg).then(res => {
if (res.Code == 1) {
this.$q.notify({
......
src/components/sale/orderlist.vue
View file @ 577ec548
......@@ -108,7 +108,7 @@
<td style="border:none">{{item.PreferPrice.toFixed(2)}}</td>
<td style="border:none">{{item.Income.toFixed(2)}}</td>
<td style="color:var(--q-color-negative);border:none">{{item.DiscountMoney.toFixed(2)}}</td>
<td style="border:none">{{item.LessPrice}}</td>
<td style="border:none">{{item.LessPrice.toFixed(2)}}</td>
<td style="border:none">{{item.Refund.toFixed(2)}}</td>
<td style="border:none">{{item.PlatformTax.toFixed(2)}}</td>
<td style="color:#2961FE;border:none">{{item.DueInMoney.toFixed(2)}}</td>
......@@ -118,6 +118,7 @@
</div>
</td>
<td style="border:none">
<template v-if="AuthorityObj.isShowOperate">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="editOrder(item)" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
......@@ -197,6 +198,7 @@
</q-item>
</q-list>
</q-btn-dropdown>
</template>
</td>
</tr>
<tr>
......@@ -216,19 +218,17 @@
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
<th width="170px;" v-if="isEdit">操作</th>
<th width="170px;" v-if="AuthorityObj.isShowOperate">操作</th>
</tr>
<tr v-for="subItem in item.GuestList">
<td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td>
<td v-if="isEdit">
<td v-if="AuthorityObj.isShowOperate">
<template v-if="subItem.ContractId==0">
<q-btn color="accent" size="sm" @click="takeContractTwo(item,subItem)" label="领取合同" />
</template>
<template v-else>
<!-- <q-btn color="accent" size="sm" style="margin-right:5px;"
@click="takeContractTwo(item,subItem)" label="修改" /> -->
<q-btn color="secondary" size="sm" @click="goContractMannage()" label="查看合同" />
</template>
</td>
......@@ -352,10 +352,12 @@
<div class="col">
<div class="row" style="justify-content: space-between">
<span>收款单据：</span>
<!-- <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit"
style="font-weight:400;color: #02C499" label="修改" /> -->
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit&&item.OrderType==1"
style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
<q-btn flat size="xs" icon="edit"
v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowOperate&&item.OrderType==2"
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" />
<template v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowOperate&&item.OrderType==1">
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
@click="showChooseStudent=true" />
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div style="width:500px;max-height:400px;overflow-y:auto;">
......@@ -379,6 +381,7 @@
style="min-width:70px;float:right;margin-top:10px" />
</q-banner>
</q-popup-proxy>
</template>
</div>
<div class="row wrap">
<div class="finance row" v-for="(x,j) in item.FinanceList" :index="j"
......@@ -390,8 +393,12 @@
</div>
<div class="row" style="justify-content: space-between">
<span>付款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit&&item.OrderType==1"
style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
<q-btn flat size="xs" icon="edit"
v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowOperate&&item.OrderType==2"
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" />
<template v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowOperate&&item.OrderType==1">
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
@click="showChooseStudent=true" />
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div style="width:500px;max-height:400px;overflow-y:auto;">
......@@ -415,6 +422,7 @@
style="min-width:70px;float:right;margin-top:10px" />
</q-banner>
</q-popup-proxy>
</template>
</div>
<div class="row wrap">
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j"
......@@ -432,7 +440,7 @@
<tbody v-if="cancelList&&cancelList.length>0">
<tr>
<td :colspan="12">
<td :colspan="13">
<span style="color:red;cursor:pointer;font-weight:bold;" @click='isShowCancel=!isShowCancel'>取消订单</span>
</td>
</tr>
......@@ -445,10 +453,8 @@
@click="goOrderdetails(item)">{{item.OrderId}}</div>
<div>{{item.EnterName}}</div>
<div style="margin-top: 10px">{{item.CreateTime}}</div>
<template v-if="isShowClass">
<div style="margin-top: 30px;margin-bottom: 10px">班级</div>
<div style="font-weight: bold;color:#2961FE;" @click="getClassInfo(item)">{{item.ClassName}}</div>
</template>
</td>
<td style="border:none">{{item.GuestNum}}人</td>
<td style="border:none">{{item.Class_Price.toFixed(2)}}</td>
......@@ -458,14 +464,16 @@
<td style="border:none">{{item.PreferPrice.toFixed(2)}}</td>
<td style="border:none">{{item.Income.toFixed(2)}}</td>
<td style="color:var(--q-color-negative);border:none">{{item.DiscountMoney.toFixed(2)}}</td>
<td style="border:none">{{item.LessPrice.toFixed(2)}}</td>
<td style="border:none">{{item.Refund.toFixed(2)}}</td>
<td style="border:none">{{item.PlatformTax.toFixed(2)}}</td>
<td style="color:#2961FE;border:none">{{item.DueInMoney.toFixed(2)}}</td>
<td style="border:none">
<div style="background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center">
<span style="color: #02C499">{{item.OrderStateName}}</span>
</div>
</td>
<td style="border:none;" v-if="isEdit">
<td style="border:none;" v-if="AuthorityObj.isShowOperate">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;display:none;" label="编辑"
@click="editOrder(item)" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;display:none;">
......@@ -480,7 +488,7 @@
</td>
</tr>
<tr>
<td :colspan="11" style="text-align: left">
<td :colspan="12" style="text-align: left">
<div class="row" v-if="item.GuestList&&item.GuestList.length>0">
学生名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1"
......@@ -495,7 +503,7 @@
</td>
</tr>
<tr>
<td :colspan="11" style="height: 168px;text-align: left">
<td :colspan="12" style="height: 168px;text-align: left">
<div class="col row remarks q-gutter-x-md">
<div class="col">
<div>销售备注：</div>
......@@ -560,7 +568,7 @@
<div style="width: 500px;">
<div>校长备注</div>
<div v-for="(xq,jq) in item.RectorRemarkList" :index="jq"
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
style="margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{xq.Content}}</div>
<div style="text-align: right">{{xq.CreateBy}} {{xq.CreateTime}}</div>
</div>
......@@ -600,75 +608,13 @@
<div class="col">
<div class="row" style="justify-content: space-between">
<span>收款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&item.OrderType==1"
style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div style="width:500px;max-height:220px;overflow-y:auto;">
<table class="Contract_Table">
<tr>
<th>选择</th>
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
</tr>
<tr v-for="subItem in item.GuestList">
<td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" />
<td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td>
</tr>
</table>
</div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner>
</q-popup-proxy>
</div>
<div class="row wrap">
<div class="finance row" v-for="(x,j) in item.FinanceList" :index="j"
:style="{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
</div>
</div>
<div class="row" style="justify-content: space-between">
<span>付款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&item.OrderType==1"
style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div style="width:500px;max-height:220px;overflow-y:auto;">
<table class="Contract_Table">
<tr>
<th>选择</th>
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
</tr>
<tr v-for="subItem in item.GuestList">
<td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" />
<td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td>
</tr>
</table>
</div>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner>
</q-popup-proxy>
</div>
<div class="row wrap">
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j"
:style="{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
</div>
</div>
</div>
</div>
......@@ -690,7 +636,9 @@
<!--转交订单-->
<transOrder-form v-if="isShowTransOrderForm" :save-obj="orderObj" :employeeList="EmployeeList"
@close="closeTransOrderForm" @success="refreshOrder"></transOrder-form>
<myOrder-form v-if="isShowmyorderForm" :save-obj="myorderObjOption" @close="closeMOSaveForm"></myOrder-form>
<!--班级详情-->
<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshOrder">
</classinfo-form>
......@@ -698,6 +646,7 @@
<!--退课申请-->
<backclass-form v-if="isShowBackClassForm" :save-obj="orderObj" @close="closeBackClassForm" @success="refreshOrder">
</backclass-form>
<!-- 修改提成和额外奖励 -->
<money-form v-if="isShowMoney" :data="moneyObj" :type="CommonType" @close="closeMoneyForm" @success="refreshOrder">
</money-form>
......@@ -705,14 +654,15 @@
<!--续课申请-->
<continueclass-form v-if="isShowContinueClass" :save-obj="orderObj" @close="closeContinueClassForm"
@success="refreshOrder"></continueclass-form>
<!-- 查看报价单 -->
<viewquotation-form v-if="isShowviewQuo" :rId="offerId" :isShowCancle="1" @close="closeQuota"
@success="refreshOrder">
</viewquotation-form>
<!--合同信息-->
<eduinfo-form v-if="isShowEduForm" :seting-obj="eduObj" @close="closeEdudia" @success="refreshPage">
</eduinfo-form>
</div>
</template>
......@@ -723,9 +673,9 @@
import backclassForm from '../sale/backclass-form' //退课申请
import moneyForm from '../sale/money-form' //修改提成和额外奖励
import myOrderForm from '../../components/sale/myOrder-form'
import classinfoForm from '../../components/course/classinfo-form';
import classinfoForm from '../../components/course/classinfo-form'; //班级信息
import continueclassForm from '../sale/continueclass-form' //续课申请
import viewquotationForm from '../sale/viewquotation-form'
import viewquotationForm from '../sale/viewquotation-form' //报价单信息
import eduinfoForm from '../sale/eduinfo-form'
......@@ -764,19 +714,10 @@
type: Array,
default: null
},
//是否显示班级
isShowClass: {
type: Boolean
},
//权限数据
authObj: {
type: Object,
},
//是否可以编辑
isEdit: {
type: Boolean,
default: true
}
},
data() {
return {
......@@ -793,7 +734,7 @@
classObjOption: null,
isShowClassInfo: false, //是否显示课程信息
isShowMoney: false, //是否显示修改提成和额外奖励
moneyObj: {},
moneyObj: {}, //额外提成
CommonType: -1, //用于判断是修改提成还是额外奖励
EmployeeList: [], //员工列表
isShowviewQuo: false, //是否显示报价单
......@@ -813,12 +754,13 @@
isShowRewardEdit: false, //是否显示修改额外提成按钮
isShowBackClass: false, //是否显示退课按钮
isShowRenewClass: false, //是否显示续课按钮
isShowContract: true, //是都显示合同
isShowContract: true, //是否显示合同
isShowOperate: true, //是否显示操作列
},
isShowEduForm: false,
eduObj: {},
isShowPop: false,
isShowEduForm: false, //是否显示新增修改合同弹窗
eduObj: {}, //合同信息
isShowPop: false, //是否显示查看合同
showChooseStudent: false, //收款单据，是否显示单选学生
chooseStudent: "", //收款单据，单选学生
isShowReward: false, // 是否可以修改额外金额
......@@ -883,6 +825,9 @@
if (this.authObj.isShowRenewClass != null && this.authObj.isShowRenewClass) {
this.AuthorityObj.isShowRenewClass = this.authObj.isShowRenewClass;
}
if (this.authObj.isShowOperate != null && !this.authObj.isShowOperate) {
this.AuthorityObj.isShowOperate = this.authObj.isShowOperate;
}
}
},
//关闭报价单
......@@ -891,8 +836,6 @@
},
//跳转到报价单
goQuotation(Id) {
// this.offerId = Id;
// this.isShowviewQuo = true;
this.OpenNewUrl("/sale/quotation", {
Id: Id
});
......@@ -1069,12 +1012,30 @@
})
})
},
//财务单据
chanceType(obj, type) {
if (obj.OrderType == 1) {
if (this.chooseStudent == "") {
let TCIDARR = []
if (obj && obj.OrderType == 2) {
//留学就业订单
TCIDARR.push(obj.SourceId);
} else {
//班级课程订单
TCIDARR.push(obj.ClassId);
}
var orderObj = {
OrderID: obj.OrderId,
OrderSource: 17,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR
}
if (obj.OfferId > 0) {
orderObj.OtherType = 29;
orderObj.ReFinanceId = obj.OfferId;
}
if (obj.OrderType == 1 && this.chooseStudent == "") {
this.$q.notify({
icon: 'close',
color: 'accent',
......@@ -1084,7 +1045,7 @@
})
return
}
if (this.chooseStudent == "") {
if (obj.OrderType == 1 && this.chooseStudent == "") {
this.$q.notify({
icon: 'close',
color: 'accent',
......@@ -1094,15 +1055,15 @@
})
return
}
let ContractNo =''
if(obj&&obj.GuestList.length>0){
obj.GuestList.forEach(x=>{
if(this.chooseStudent == x.Id){
ContractNo=x.ContractNo
let ContractNo = ''
if (obj && obj.GuestList.length > 0) {
obj.GuestList.forEach(x => {
if (this.chooseStudent == x.Id) {
ContractNo = x.ContractNo
}
})
}
if(ContractNo==''){
if (obj.OrderType == 1 && ContractNo == '') {
this.$q.notify({
icon: 'close',
color: 'accent',
......@@ -1112,39 +1073,15 @@
})
return
}
let TCIDARR = []
//留学就业订单
if (obj && obj.OrderType == 2) {
TCIDARR.push(obj.SourceId);
} else {
TCIDARR.push(obj.ClassId);
}
var orderObj = {}
if (obj.OfferId > 0) {
orderObj = {
OrderID: obj.OrderId,
OrderSource: 17,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR,
OtherType: 29,
ReFinanceId: obj.OfferId
}
} else {
orderObj = {
OrderID: obj.OrderId,
OrderSource: 17,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR
}
}
}
//留学就业订单
if (obj && obj.OrderType == 2) {
//财务单据类型【教育留学】
orderObj.OrderSource = 18;
}
var guestId = 0;
if (this.chooseStudent != "") {
guestId = this.chooseStudent;
}
this.$router.push({
path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
query: {
......@@ -1154,7 +1091,7 @@
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
'tradeWay': obj.tradeWay,
"GuestId": this.chooseStudent
"GuestId": guestId
}
});
},
......
src/pages/course/classorder.vue
View file @ 577ec548
......@@ -2,7 +2,6 @@
<div class="page-body myOrder">
<div class="row col" style="height: 40px">
<div class="row col" style="justify-content: space-between;align-items: center;margin-bottom: 10px">
<div>
<template v-if="data&& data.ClassInfo">
{{data.ClassInfo.ClassName}}
......
src/pages/sale/studyOrderStatistics.vue
View file @ 577ec548
......@@ -84,7 +84,7 @@
</div>
</div>
<div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" ref="orderL" :isEdit="false">
<orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" ref="orderL" >
</orderlist>
<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"
......@@ -156,6 +156,7 @@
isShowFinanceBtn: true, //显示财务单据按钮
isShowTransOrder: true, //显示转交订单按钮
isShowSaleRemark: true, //显示修改销售备注
isShowOperate:false,//不显示操作列
},
EmployeeList:[],//业务员
......
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