Skip to content

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

修改问题

parent f0a2acb2
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 39 deletions
src/api/sale/sale.js
View file @ ec23b796
......@@ -158,6 +158,17 @@ export function setClassOrderCareOf(data) {
data
})
}
/**
* 修改订单销售
*
*/
export function updateOrderSale(data) {
return request({
url: '/order/UpdateOrderSale',
method: 'post',
data
})
}
/**
* 订单取消
*
......@@ -250,4 +261,4 @@ export function UpdateOrderCommission(data) {
method: 'post',
data
})
}
\ No newline at end of file
}
src/components/sale/orderlist.vue
View file @ ec23b796
......@@ -61,10 +61,15 @@
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="isShowClass">
<q-item-section @click="transferOrder(item)">
<q-item-section @click="transferOrder(item,1)">
<q-item-label>转交订单</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="!isShowClass">
<q-item-section @click="transferOrder(item,2)">
<q-item-label>修改销售</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="isShowClass">
<q-item-section @click="editOrderRemark(item,1)">
<q-item-label>销售备注</q-item-label>
......@@ -457,7 +462,7 @@
@close="closeRemarkForm" @success="refreshClassOrder"></orderremark-form>
<!--转交订单-->
<transOrder-form v-if="isShowTransOrderForm" :save-obj="orderObj" @close="closeTransOrderForm"
<transOrder-form v-if="isShowTransOrderForm" :save-obj="orderObj" :employeeList="EmployeeList" @close="closeTransOrderForm"
@success="refreshClassOrder"></transOrder-form>
<myOrder-form v-if="isShowmyorderForm" :save-obj="myorderObjOption" @close="closeMOSaveForm"></myOrder-form>
<!--班级详情-->
......@@ -484,7 +489,9 @@
} from '../../api/sale/sale'
import myOrderForm from '../../components/sale/myOrder-form'
import classinfoForm from '../../components/course/classinfo-form';
import {
queryEmployee //员工列表
} from '../../api/users/user'
export default {
components: {
editorderForm,
......@@ -525,10 +532,12 @@
isShowClassInfo: false, //是否显示课程信息
isShowMoney:false, //是否显示修改提成和额外奖励
moneyObj:{},
CommonType:-1 //用于判断是修改提成还是额外奖励
CommonType:-1, //用于判断是修改提成还是额外奖励
EmployeeList:[],//员工列表
}
},
created() {
this.Employee()
},
mounted() {
},
......@@ -543,6 +552,18 @@
this.orderObj = {};
this.isShowBackClassForm = false;
},
Employee(){
var qMsg = {
EmployeeName: ''
}
queryEmployee(qMsg).then(res => {
if (res.Code == 1) {
this.EmployeeList = res.Data;
}
}).catch(() => {
})
},
//获取财务单据
getOrderFinanceList(msg, type) {
this.apipost('sellorder_post_GetOrderFinanceListForEdu', {
......@@ -588,7 +609,8 @@
this.isShowmyorderForm = false;
},
//订单转交
transferOrder(item) {
transferOrder(item,type) {
item.type=type
this.orderObj = item;
this.isShowTransOrderForm = true;
},
......
src/components/sale/orderremark-form.vue
View file @ ec23b796
......@@ -96,7 +96,8 @@
})
//调用父页面成功方法
this.$emit('success');
this.IsShowOrderRemarkDialog = false
// this.IsShowOrderRemarkDialog = false
this.$emit('close');
}
})
}
......
src/components/sale/transOrder-form.vue
View file @ ec23b796
......@@ -4,12 +4,12 @@
transition-hide="scale">
<q-card style="width: 400px;max-width:500px;">
<q-card-section>
<div class="text-h6">转交订单</div>
<div class="text-h6">{{saveObj.type==1?'转交订单':'修改销售'}}</div>
</q-card-section>
<q-card-section>
<div class="col row" style="justify-content: center;width: 100%">
<q-select class="" filled label="转交人" v-model="TransOrderMsg.model" use-input hide-selected fill-input
option-value="Id" option-label="EmployeeName" :options="EmployeeList" @filter="filterFn"
<q-select class="" filled :label="saveObj.type==1?'转交人':'修改销售'" v-model="TransOrderMsg.model" use-input hide-selected fill-input
option-value="Id" option-label="EmployeeName" :options="emList" @filter="filterFn"
style="width: 250px; padding-bottom: 32px">
<template v-slot:no-option>
<q-item>
......@@ -31,6 +31,7 @@
<script>
import {
setClassOrderCareOf, //转交订单
updateOrderSale
} from '../../api/sale/sale'
import {
queryEmployee //员工列表
......@@ -42,6 +43,10 @@
type: Object,
default: null,
},
employeeList: {
type: Array,
default: null
},
},
data() {
return {
......@@ -50,26 +55,23 @@
model: '',
OrderId: 0,
},
EmployeeList: [], //员工列表
emList:[],
}
},
created() {
this.emList=this.employeeList;
this.initData();
},
methods: {
//筛选员工
filterFn(val, update) {
var qMsg = {
EmployeeName: val
}
update(() => {
queryEmployee(qMsg).then(res => {
if (res.Code == 1) {
this.EmployeeList = res.Data;
}
}).catch(() => {
})
if (val === '') {
this.emList = JSON.parse(JSON.stringify(this.employeeList))
} else {
const needle = val.toLowerCase()
this.emList = this.employeeList.filter(v => v.EmployeeName.toLowerCase().indexOf(needle) > -1)
}
})
},
//关闭弹窗
......@@ -84,24 +86,47 @@
},
//保存订单转交
saveTransOrder() {
let transMsg = {
OrderId: this.TransOrderMsg.OrderId,
CareOfPeople: this.TransOrderMsg.model.Id
}
setClassOrderCareOf(transMsg).then(res => {
if (res.Code == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '修改成功！',
position: 'top'
if(this.saveObj.type==1){
let transMsg = {
OrderId: this.TransOrderMsg.OrderId,
CareOfPeople: this.TransOrderMsg.model.Id
}
setClassOrderCareOf(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.$emit('close');
}
})
}else {
let transMsg = {
OrderId: this.TransOrderMsg.OrderId,
EnterID: this.TransOrderMsg.model.Id
}
updateOrderSale(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.$emit('close');
}
})
//调用父页面成功方法
this.$emit('success');
this.IsShowTransOrderDialog = false
}
})
}
}
}
......
src/pages/sale/japaneseTrain.vue
View file @ ec23b796
......@@ -145,7 +145,7 @@
<q-btn color="primary" label="立即下单" v-if="item.IsCanApply==1" @click="placeAnorder(item)"/>
<div v-if="item.IsCanApply==0">
<img src="../../assets/images/administration/bmym.png" alt="" style="width: 64px;height: 62px;margin-right: 15px" v-if="item.SurplusNum==0">
<img src="../../assets/images/administration/guoqi.png" alt="" style="width: 64px;height: 62px" v-if="getEXPDate(item.OpenTime)==true">
<img src="../../assets/images/administration/guoqi.png" alt="" style="width: 64px;height: 62px" v-if="getEXPDate(item.EndOrderTime)==true">
</div>
</div>
......@@ -261,6 +261,11 @@
}
},
created() {
// let nowDay = new Date().toLocaleDateString();
// for(let i=0;i<2;i++){
// this.dateList.push(nowDay)
// }
this.getSchool();
this.getOrderSEList()
this.CourseList();
......@@ -296,7 +301,7 @@
}
})
},
getEXPDate(time){
getEXPDate(time){//判断是否过期
var str = time.replace(/年/g,"/").replace(/月/g,"/").replace(/日/g,"");
var date = new Date(str ).getTime();
var now = new Date().getTime()+86400;
......
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