Skip to content

C
confucius
Commit 57abdd04 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent b2d07b8e
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 212 deletions
quasar.conf.js
View file @ 57abdd04
......@@ -49,8 +49,8 @@ module.exports = function (ctx) {
env: ctx.dev ? {
//API: 'http://192.168.1.36:8300/api'
// API: 'https://localhost:5001/api'
API: 'http://192.168.20.9:8085/api',
API: 'https://localhost:5001/api',
//API: 'http://192.168.20.9:8085/api',
// API: 'http://eduapi.oytour.com/api'
API_ZC:'http://192.168.20.9:8087/api'
} : {
......
src/components/sale/studyorder-form.vue deleted 100644 → 0
View file @ b2d07b8e
<style>
.StudyOrder_drawerTop {
width: 100%;
height: 50px;
display: flex;
justify-content: space-between;
background-color: #F0F5FB;
padding: 5px 10px;
align-items: center;
}
</style>
<template>
<q-dialog v-model="persistent" maximized full-height seamless position="right">
<q-card style="margin-top:61px;width:500px" class="no-border-radius classinfo_Dialog">
<div class="StudyOrder_drawerTop">
<div style="display:flex;align-items:center;margin-left:10px;">
<span class="drawer_Span">学员报名</span>
</div>
</div>
<div style="padding:20px 15px;">
<q-input filled stack-label maxlength="4" :dense="false" v-model="enrollMsg.GuestNum" type="number"
@input="countPrice" class="col-12" label="人数" :rules="[val => !!val || '请填写人数']" />
<q-input filled stack-label :dense="false" maxlength="8" v-model="enrollMsg.Unit_Price"
:disable="UPrice==true?false:true" @blur="countPrice" class="col-12" label="成交单价"
:rules="[val => !!val || '请填成交单价']" />
<q-select standout="bg-primary text-white" option-value="Id" class="q-pb-lg" option-label="Name" v-model="enrollMsg.OrderSource"
:options="SourceEnumList" emit-value map-options label="客人来源" />
<q-select standout="bg-primary text-white" option-value="Id" class="q-pb-lg" option-label="Name" v-model="enrollMsg.OrderNature"
:options="OrderStatus" emit-value map-options label="订单性质" />
<q-input filled stack-label :dense="false" maxlength="10"
@keyup.native="checkPrice(enrollMsg,'PreferPrice')" :disable="enrollMsg.OrderNature==1&&isHaveModify" v-model="enrollMsg.PreferPrice" class="col-12 q-pb-lg" label="应收" />
<q-input filled stack-label type="textarea" maxlength="500" :dense="false" v-model="enrollMsg.SaleRemark"
class="col-12" label="备注" />
<div style="margin:30px 10px 0 0;">
<q-btn class="q-mr-md" label="取消" @click="closeStudyForm" />
<q-btn color="accent" class="q-mr-md" label="保存" @click="saveSatMsg()" />
</div>
</div>
</q-card>
<div class="dialog-out-close" @click="closeStudyForm"
style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
<q-icon name="iconfont icon-jujue1" size="26px" />
</div>
</q-dialog>
</template>
<script>
import {
getOrderSourceEnumList, //获取订单来源 枚举
setClassOrder, //新增 修改订单
} from '../../api/sale/sale';
import {
mapState
} from "vuex";
export default {
name: "studyOrder-form",
props: {
saveObj: {
type: Object,
default: null,
},
},
data() {
return {
persistent: true,
//学员报名
enrollMsg: {
ClassId: 0,
GuestNum: 1,
Unit_Price: 0, //成交单价
PreferPrice: 0, //应收总额
OrderSource: 0, //客人来源 枚举
SaleRemark: '', //备注
OrderType: 2, //订单类型(1-班级课程订单，2-留学就业订单)
SourceId: 0, //来源变化
OrderNature:1, //订单性质(1-直通车,2-代收代付,3-返佣)
OldPreferPrice:0 //原来应收
},
UPrice: 0, //单价
SourceEnumList: [], //来源
OrderStatus:[
{
Id:1,
Name:'直通车'
},
{
Id:2,
Name:'代收代付'
},
{
Id:3,
Name:'返佣'
}
]
}
},
computed: mapState({
//是否有查看合同权限
isHaveModify(state) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "E_ModifyStudyOrderPrice") {
return x;
}
});
return action && action.FunctionCode;
}
return false;
}
}),
created() {
this.getOrderSEList();
},
mounted() {
this.enrollMsg.Unit_Price = this.saveObj.SellPrice;
this.enrollMsg.SourceId = this.saveObj.Id;
this.countPrice();
console.log(this.saveObj,'saveObj');
},
methods: {
closeStudyForm() {
this.persistent = false;
this.$emit('close');
},
//获取客人来源列表
getOrderSEList() {
getOrderSourceEnumList({}).then(res => {
if (res.Code == 1) {
var tempArray = res.Data;
this.SourceEnumList = tempArray;
this.enrollMsg.OrderSource = tempArray[0].Id;
}
})
},
//计算价格
countPrice() {
var guestNum = 0;
var unit_price = 0;
if (this.enrollMsg.GuestNum && this.enrollMsg.GuestNum > 0) {
guestNum = Number(this.enrollMsg.GuestNum);
}
if (this.enrollMsg.Unit_Price && this.enrollMsg.Unit_Price > 0) {
unit_price = Number(this.enrollMsg.Unit_Price);
}
this.enrollMsg.PreferPrice = Number(guestNum * unit_price).toFixed(2);
this.enrollMsg.OldPreferPrice = Number(guestNum * unit_price).toFixed(2);
},
//保存订单
saveSatMsg() {
setClassOrder(this.enrollMsg).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '报名成功！',
position: 'top'
})
this.$emit("save");
}
}).catch(() => {})
},
}
}
</script>
src/components/schedul/schedul-fanke.vue
View file @ 57abdd04
......@@ -127,7 +127,7 @@
},
mounted() {
console.log(this.saveObj, 'saveObj');
},
methods: {
closeFangkeForm() {
......
src/pages/sale/japaneseTrain.vue
View file @ 57abdd04
......@@ -16,7 +16,8 @@
</div>
<div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" option-value="CourseId"
option-label="CourseName" v-model="msg.CouseId" :options="ClassList" emit-value map-options label="学习课程" clearable />
option-label="CourseName" v-model="msg.CouseId" :options="ClassList" emit-value map-options label="学习课程"
clearable />
</div>
<div class="col-3">
<div class="col-3 Sysuser_Date">
......@@ -275,7 +276,8 @@
ClassList: [], //关联课程下拉数据
TeacherList: [], //关联教师下拉数据
elvalue: new Date(),
isShowEditOrderForm: false,//是否显示订单弹窗
isShowEditOrderForm: false, //是否显示订单弹窗
//订单对象
orderObj: {
ClassId: 0,
Unit_Price: 0,
......@@ -295,9 +297,7 @@
this.msg.StartTime = currentDay
},
mounted() {
this.getList();
},
methods: {
//关闭订单修改
......@@ -588,4 +588,4 @@
background: transparent !important;
}
</style>
</style>
\ No newline at end of file
src/pages/sale/studyjob.vue
View file @ 57abdd04
......@@ -120,10 +120,8 @@
<q-dialog v-model="showForm" persistent>
<quotationstudy-form :obj="null" @save="showForm=false"></quotationstudy-form>
</q-dialog>
<!-- <studyorder-form v-if="isShowOrderForm" :saveObj="studyObj" @close="cloStudyform" @save="refreshPage()">
</studyorder-form> -->
<editorderForm v-if="isShowOrderForm" :save-obj="studyObj" :orderType="2" @close="cloStudyform" @save="refreshPage()"></editorderForm>
<editorderForm v-if="isShowOrderForm" :save-obj="studyObj" :orderType="2" @close="cloStudyform"
@save="refreshPage()"></editorderForm>
</div>
</div>
</template>
......@@ -133,9 +131,7 @@
queryStudyAbroadPage
} from '../../api/studyabroad/index'
import quotationstudyForm from '../../components/sale/quotationstudy-form'
import studyorderForm from '../../components/sale/studyorder-form'
import editorderForm from '../../components/sale/editorder-form'
import {
mapState
} from "vuex";
......@@ -146,7 +142,6 @@
},
components: {
quotationstudyForm,
studyorderForm,
editorderForm
},
data() {
......@@ -227,16 +222,6 @@
field: 'Id'
}
],
//审核类型
AuditStateList: [{
Id: 1,
Name: "待审核"
},
{
Id: 2,
Name: "已审核"
},
],
//项目类型列表
studyAbroadList: [{
Id: 1,
......@@ -256,7 +241,11 @@
PageCount: 0,
showForm: false, //是否显示报价单弹窗
isShowOrderForm: false, //是否显示订单弹窗
studyObj: {}, //留学就业对象
//留学就业对象
studyObj: {
SourceId: 0, //留学就业产品编号
Unit_Price: 0, //留学就业价格
},
}
},
mounted() {
......@@ -274,7 +263,6 @@
this.isShowOrderForm = true;
this.studyObj.Unit_Price = item.SellPrice;
this.studyObj.SourceId = item.Id;
// this.studyObj = item;
},
//显示报价单弹窗
createQuotation() {
......@@ -301,30 +289,13 @@
this.msg.pageIndex = val;
this.getList();
},
//关闭弹窗
closeStudyForm() {
this.isShowStudyAudit = false;
},
closeStudyInfo() {
this.isShowInfo = false;
},
//留学就业审核
AuditStudy(obj) {
this.studyObj = obj;
this.isShowStudyAudit = true;
},
//刷新页面
refreshPage() {
this.showForm = false;
this.isShowOrderForm = false;
this.studyObj = {};
this.studyObj.SourceId = 0;
this.studyObj.Unit_Price = 0;
this.getList();
},
//审核详情
getviewInfo(obj) {
this.studyObj = obj;
this.isShowInfo = true;
}
}
}
......
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