Skip to content

C
confucius
Commit 81b5d04b authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 74002a22
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 68 deletions
src/components/sale/editOrder-form.vue
View file @ 81b5d04b
......@@ -11,7 +11,13 @@
<q-input filled stack-label maxlength="100" :dense="false" v-model="OrderMsg.GuestNum" type="number"
@input="countPrice" class="col-12" label="人数" :rules="[val => !!val || '请填写人数']"
:disable="modityOrderType==2" />
<template v-if="isChaBan==1">
<q-select standout="bg-primary text-white" option-value="CourseId" option-label="CourseName"
v-model="OrderMsg.CourseId" :options="CourseList" emit-value map-options class="q-pb-lg" label="选择课程"
@input="changePrice" />
<q-input filled stack-label :dense="false" v-model="OrderMsg.StartClassHours" @blur="countPrice"
class="col-12" label="起始课时" :rules="[val => !!val || '请填起始课时']" />
</template>
<template v-if="modityOrderType==1">
<q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price"
:disable="IsShowUpPrice==true?false:true" @blur="countPrice" class="col-12" label="成交单价"
......@@ -32,7 +38,6 @@
<q-select :disable="modityOrderType==2" standout="bg-primary text-white" option-value="Id" option-label="Name"
v-model="OrderMsg.OrderSource" :options="SourceEnumList" emit-value map-options class="q-pb-lg"
label="客人来源" />
<q-select :disable="(modityOrderType==2)" v-model="OrderMsg.HelpEnterId" :options="EmployeeList" filled
use-input label="协助人员" option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-pb-lg"
emit-value map-options @filter="filterFn">
......@@ -48,9 +53,7 @@
maxlength="50" v-model="OrderMsg.GeneralOccupation" class="col-12 q-pb-lg" label="一般同行" />
<q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==7" filled stack-label :dense="false"
maxlength="50" v-model="OrderMsg.EduOccupation" class="col-12 q-pb-lg" label="教育同行" />
<q-select v-model="OrderMsg.ClassHour" :options="CourseList" filled use-input label="已上课时"
option-label="Name" option-value="Id" class="col-6 q-pb-lg" emit-value map-options>
</q-select>
<q-toggle :disable="(modityOrderType==2)" v-model="OrderMsg.IsLessPrice" :false-value="0" :true-value="1"
label="是否少价" class="q-mb-md" />
<q-input :disable="(modityOrderType==2)" v-if="OrderMsg.IsLessPrice==1"
......@@ -75,6 +78,7 @@
getClassOrderInfo, //获取订单操作日志列表
getOrderSourceEnumList, //获取订单来源 枚举
setClassOrder, //修改订单
queryChaClassInfo,
} from '../../api/sale/sale'
import {
queryEmployee
......@@ -100,6 +104,10 @@
type: Number,
default: 0, //1-销售修改，2-OP修改，3-总经理修改
},
isChaBan: {
type: Number,
default: 0, //1-是插班报入
}
},
data() {
return {
......@@ -122,39 +130,21 @@
LessPrice: 0, //少价金额
OrderNature: 1, //订单性质
OldPreferPrice: 0, //原实际应收
ClassHour: 1 //已上课时
IsChaBan: 0, //是否插班报入(1-是)
CourseId: 0, //课程编号
StartClassHours: 0, //已上课时
},
IsShowUpPrice: false, //是否显示高于定价
StepPriceList: [],
UnitPrice: 0,
SourceEnumList: [], //订单来源
EmployeeList: [], //员工列表
AllemployeeList: [], //所有员工列表
OrderStatus: [{
Id: 1,
Name: '直通车'
},
{
Id: 2,
Name: '代收代付'
},
{
Id: 3,
Name: '返佣'
}
],
isHaveModify: false,
//已上课时
CourseList: [{
Id: 1,
Name: '第一课'
}, {
Id: 2,
Name: '第二课'
}]
CourseList: [], //课程列表
}
},
created() {
this.OrderMsg.IsChaBan = this.isChaBan;
this.initConfig();
this.getOrderSEList();
this.getEmployee();
var localStorageData = window.localStorage["loginUserInfo"];
......@@ -162,25 +152,44 @@
if (ActionMenuList && ActionMenuList.length > 0) {
ActionMenuList.forEach(x => {
if (x.FunctionCode == 'E_ModifyStudyOrderPrice') {
this.isHaveModify = true
}
})
}
},
mounted() {
console.log(this.modityOrderType, 'modityOrderType');
this.initData()
},
methods: {
//判断是否禁用
checkIsDisable() {
//获取插班报入配置信息
initConfig() {
var qMsg = {
ClassId: 0
};
if (this.saveObj.ClassId) {
qMsg.ClassId = this.saveObj.ClassId;
}
queryChaClassInfo(qMsg).then(res => {
if (res.Code == 1) {
this.CourseList = res.Data.otherCourse;
if (this.saveObj && this.saveObj.OrderId > 0) {} else {
this.OrderMsg.StartClassHours = res.Data.finishHours;
}
}
});
},
//订单性质切换
OrderNatureChange() {
if (this.OrderMsg.OrderNature == 1) {
this.countPrice();
//选择课程切换价格
changePrice() {
let temp = this.CourseList.find(x => x.CourseId == this.OrderMsg.CourseId);
console.log("temp", temp);
if (temp) {
this.OrderMsg.Unit_Price = temp.SellPrice;
this.UnitPrice = temp.SellPrice;
} else {
this.OrderMsg.Unit_Price = 0;
this.UnitPrice = 0;
}
this.countPrice();
},
initData() {
if (this.saveObj && this.saveObj.OrderId > 0) {
......@@ -188,25 +197,28 @@
OrderId: this.saveObj.OrderId
}).then(res => {
if (res.Code == 1) {
this.OrderMsg.ClassId = res.Data.OrderInfo.ClassId;
this.OrderMsg.GuestNum = res.Data.OrderInfo.GuestNum;
this.OrderMsg.Unit_Price = res.Data.OrderInfo.Unit_Price;
this.OrderMsg.PreferPrice = res.Data.OrderInfo.PreferPrice;
this.OrderMsg.OrderSource = res.Data.OrderInfo.OrderSource;
this.OrderMsg.SaleRemark = res.Data.OrderInfo.SaleRemark;
this.OrderMsg.Class_Price = res.Data.OrderInfo.Class_Price;
this.OrderMsg.OrderId = res.Data.OrderInfo.OrderId;
this.OrderMsg.OrderType = res.Data.OrderInfo.OrderType;
this.OrderMsg.SourceId = res.Data.OrderInfo.SourceId;
this.OrderMsg.HelpEnterId = res.Data.OrderInfo.HelpEnterId;
this.OrderMsg.GeneralOccupation = res.Data.OrderInfo.GeneralOccupation;
this.OrderMsg.EduOccupation = res.Data.OrderInfo.EduOccupation;
this.OrderMsg.IsLessPrice = res.Data.OrderInfo.IsLessPrice;
this.OrderMsg.LessPrice = res.Data.OrderInfo.LessPrice;
this.OrderMsg.OrderNature = res.Data.OrderInfo.OrderNature;
this.OrderMsg.OldPreferPrice = res.Data.OrderInfo.OldPreferPrice;
var tempData = res.Data.OrderInfo;
this.OrderMsg.ClassId = tempData.ClassId;
this.OrderMsg.GuestNum = tempData.GuestNum;
this.OrderMsg.Unit_Price = tempData.Unit_Price;
this.OrderMsg.PreferPrice = tempData.PreferPrice;
this.OrderMsg.OrderSource = tempData.OrderSource;
this.OrderMsg.SaleRemark = tempData.SaleRemark;
this.OrderMsg.Class_Price = tempData.Class_Price;
this.OrderMsg.OrderId = tempData.OrderId;
this.OrderMsg.OrderType = tempData.OrderType;
this.OrderMsg.SourceId = tempData.SourceId;
this.OrderMsg.HelpEnterId = tempData.HelpEnterId;
this.OrderMsg.GeneralOccupation = tempData.GeneralOccupation;
this.OrderMsg.EduOccupation = tempData.EduOccupation;
this.OrderMsg.IsLessPrice = tempData.IsLessPrice;
this.OrderMsg.LessPrice = tempData.LessPrice;
this.OrderMsg.OrderNature = tempData.OrderNature;
this.OrderMsg.OldPreferPrice = tempData.OldPreferPrice;
this.OrderMsg.CourseId = tempData.CourseId;
this.OrderMsg.StartClassHours = tempData.StartClassHours;
this.OrderMsg.IsChaBan = tempData.IsChaBan;
this.UnitPrice = this.OrderMsg.Unit_Price;
this.StepPriceList = res.Data.StepPriceList;
this.IsShowEditOrder = true;
}
})
......@@ -220,6 +232,9 @@
this.OrderMsg.OrderNature = 0;
this.OrderMsg.OldPreferPrice = 0;
this.OrderMsg.GuestNum = 1;
this.OrderMsg.CourseId = 0;
this.OrderMsg.StartClassHours = 0;
this.OrderMsg.IsChaBan = this.isChaBan;
this.OrderMsg.OrderType = this.orderType;
if (this.OrderMsg.OrderType == 2) {
this.OrderMsg.OrderNature = 1;
......
src/components/sale/studyOrder-form.vue
View file @ 81b5d04b
......@@ -10,10 +10,10 @@
<div style="padding:20px 15px;">
<q-input filled stack-label maxlength="100" :dense="false" v-model="OrderMsg.GuestNum" type="number"
@input="countPrice" class="col-12" label="人数" :rules="[val => !!val || '请填写人数']"
:disable="modityOrderType==2" />
:disable="modityOrderType!=1" />
<q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" :disable="true" @blur="countPrice"
class="col-12" label="成交单价" :rules="[val => !!val || '请填成交单价']" />
<q-select :disable="modityOrderType==2" standout="bg-primary text-white" option-value="Id" option-label="Name"
<q-select :disable="modityOrderType!=1" standout="bg-primary text-white" option-value="Id" option-label="Name"
v-model="OrderMsg.OrderSource" :options="SourceEnumList" emit-value map-options class="q-pb-lg"
label="客人来源" />
<q-select standout="bg-primary text-white" option-value="Id" class="q-pb-lg" option-label="Name"
......@@ -71,11 +71,6 @@
type: Number,
default: 0, //1-销售修改，2-OP修改，3-总经理修改
},
//已上课时
classHour: {
type: Number,
default: 0,
}
},
data() {
return {
......
src/pages/sale/japaneseTrain.vue
View file @ 81b5d04b
......@@ -239,7 +239,7 @@
<div class="d7">
<div>
<q-btn style="margin-top:20px;" color="primary" size="sm" label="立即下单" v-if="item.IsCanApply==1"
@click="placeAnorder(item,1)" />
@click="placeAnorder(item,0)" />
</div>
<div v-if="item.IsCanApply==0">
<img src="../../assets/images/administration/bmym.png" alt=""
......@@ -253,7 +253,7 @@
<!--插班报入-->
<div v-if="item.IsChaBan==1">
<q-btn style="margin-top:10px;" size="sm" color="primary" label="插班报名"
@click="placeAnorder(item,3)" />
@click="placeAnorder(item,1)" />
</div>
</div>
</div>
......@@ -274,7 +274,7 @@
</ul>
<div v-else style="width: 100%;color: #999999;text-align: center;font-size: 15px">暂无数据</div>
</div>
<editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="orderType" :modityOrderType="1"
<editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="1" :modityOrderType="1" :isChaBan="isChaBan"
@close="closeOrderSaveForm" @success="refreshOrder">
</editorder-form>
</div>
......@@ -333,7 +333,7 @@
ClassId: 0,
Unit_Price: 0,
},
orderType: 1, //订单类型(1-正常报入，3-插班报入)
isChaBan: 0, //是否插班(0-正常报入，1-插班报入)
}
},
created() {
......@@ -496,7 +496,7 @@
},
//立即报名和插班报名
placeAnorder(item, type) {
this.orderType = type;
this.isChaBan = type;
this.orderObj.ClassId = item.ClassId;
this.orderObj.Unit_Price = item.SellPrice;
this.isShowEditOrderForm = 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