Skip to content

C
confucius
Commit 18cc6f4b authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent d429e48b
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 75 deletions
src/components/sale/orderlist.vue
View file @ 18cc6f4b
...@@ -163,7 +163,6 @@ ...@@ -163,7 +163,6 @@
<template v-else> <template v-else>
<span class="redstyle">{{item.PreferPrice.toFixed(2)}}</span> <span class="redstyle">{{item.PreferPrice.toFixed(2)}}</span>
</template> </template>
</td> </td>
<td style="border:none;width:7%"> <td style="border:none;width:7%">
<template v-if="item.Income>=0"> <template v-if="item.Income>=0">
...@@ -224,24 +223,25 @@ ...@@ -224,24 +223,25 @@
@click="editOrder(item)" /> @click="editOrder(item)" />
</template> </template>
<template v-if="comefrom==1"> <template v-if="comefrom==1">
<q-btn flat size="xs" color="accent" style="font-weight:400" label="关联老师" <q-btn flat size="xs" color="accent" style="font-weight:400" label="关联老师"
@click="gettanchuteacher(item)" > @click="gettanchuteacher(item)">
<q-popup-proxy > <q-popup-proxy>
<q-banner v-if="isShowteacher"> <q-banner v-if="isShowteacher">
<div class="calenderDialog"> <div class="calenderDialog">
<div style="margin:10px 0 15px 0;">请选择关联教师</div> <div style="margin:10px 0 15px 0;">请选择关联教师</div>
<q-select standout="bg-primary text-white" option-value="Id" option-label="EmployeeName" <q-select standout="bg-primary text-white" option-value="Id" option-label="EmployeeName"
v-model="teacherMsg.HelpEnterId" :options="TeacherList" emit-value map-options label="请选择关联教师" /> v-model="teacherMsg.HelpEnterId" :options="TeacherList" emit-value map-options
<q-card-actions align="right" class="bg-white" style="margin-top:20px;"> label="请选择关联教师" />
<q-btn label="取消" flat color="grey-10" size="sm" @click="isShowteacher=false" <q-card-actions align="right" class="bg-white" style="margin-top:20px;">
style="font-weight:400 !important" /> <q-btn label="取消" flat color="grey-10" size="sm" @click="isShowteacher=false"
<q-btn label="确认" color="accent q-px-md" size="sm" style="font-weight:400 !important" style="font-weight:400 !important" />
@click="setCheckStatus()" /> <q-btn label="确认" color="accent q-px-md" size="sm" style="font-weight:400 !important"
</q-card-actions> @click="setCheckStatus()" />
</div> </q-card-actions>
</q-banner> </div>
</q-popup-proxy> </q-banner>
</q-btn> </q-popup-proxy>
</q-btn>
</template> </template>
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;"> <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list> <q-list>
...@@ -329,11 +329,17 @@ ...@@ -329,11 +329,17 @@
<q-item-label @click="transferClass(item,1)">转班</q-item-label> <q-item-label @click="transferClass(item,1)">转班</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-close-popup v-if="AuthorityObj.isShowSeparater" style="display:none"> <q-item clickable v-close-popup v-if="AuthorityObj.isShowSeparater">
<q-item-section> <q-item-section>
<q-item-label @click="transferClass(item,2)">分拆</q-item-label> <q-item-label @click="transferClass(item,2)">分拆</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-close-popup
v-if="AuthorityObj.isShowSeparater&&item.JoinType==5&&item.IsBackClass==0">
<q-item-section>
<q-item-label @click="backSourceClass(item)">回归原班</q-item-label>
</q-item-section>
</q-item>
</q-list> </q-list>
</q-btn-dropdown> </q-btn-dropdown>
</td> </td>
...@@ -844,8 +850,8 @@ ...@@ -844,8 +850,8 @@
@success="refreshOrder"></continueclass-form> @success="refreshOrder"></continueclass-form>
<!-- 转班申请 --> <!-- 转班申请 -->
<transferclass-form v-if="isShowTransferClass" :save-obj="orderObj" :ChangeType="ChangeType" @close="closeTransferClassForm" <transferclass-form v-if="isShowTransferClass" :save-obj="orderObj" :ChangeType="ChangeType"
@success="refreshOrder"></transferclass-form> @close="closeTransferClassForm" @success="refreshOrder"></transferclass-form>
<!-- 查看报价单 --> <!-- 查看报价单 -->
<viewquotation-form v-if="isShowviewQuo" :rId="offerId" :isShowCancle="1" @close="closeQuota" <viewquotation-form v-if="isShowviewQuo" :rId="offerId" :isShowCancle="1" @close="closeQuota"
...@@ -874,8 +880,9 @@ ...@@ -874,8 +880,9 @@
import eduinfoForm from '../sale/eduinfo-form' import eduinfoForm from '../sale/eduinfo-form'
import { import {
setOrderHelpEnterId,//老师关联 setOrderHelpEnterId, //老师关联
cancelClassOrder, //取消订单 cancelClassOrder, //取消订单
regressSourceClass, //拆分订单回到原班
} from '../../api/sale/sale' } from '../../api/sale/sale'
import { import {
...@@ -886,8 +893,8 @@ ...@@ -886,8 +893,8 @@
SetEducationContractAudit SetEducationContractAudit
} from '../../api/sale/contract' } from '../../api/sale/contract'
import { import {
getTeacherDropDownList getTeacherDropDownList
} from '../../api/school/index' } from '../../api/school/index'
export default { export default {
components: { components: {
editorderForm, editorderForm,
...@@ -932,7 +939,7 @@ ...@@ -932,7 +939,7 @@
default: 0 default: 0
}, },
//因为今天订单 取消了一些操作 //因为今天订单 取消了一些操作
comefrom:{//来自 1是来自 学管今日订单 comefrom: { //来自 1是来自 学管今日订单
type: Number, type: Number,
default: 0 default: 0
} }
...@@ -976,7 +983,7 @@ ...@@ -976,7 +983,7 @@
isShowContract: true, //是否显示合同 isShowContract: true, //是否显示合同
isShowEdit: true, //是否显示修改订单按钮 isShowEdit: true, //是否显示修改订单按钮
isShowTransClassOrder: false, //是否显示转班按钮 isShowTransClassOrder: false, //是否显示转班按钮
isShowSeparater:false //是否显示分拆 isShowSeparater: false //是否显示分拆
}, },
isShowEduForm: false, //是否显示新增修改合同弹窗 isShowEduForm: false, //是否显示新增修改合同弹窗
...@@ -989,16 +996,19 @@ ...@@ -989,16 +996,19 @@
newModityOrderType: 0, newModityOrderType: 0,
isChaBan: 0, //是否插班(0-正常报入，1-插班报入) isChaBan: 0, //是否插班(0-正常报入，1-插班报入)
isShowTransferClass: false, //是否显示转班 isShowTransferClass: false, //是否显示转班
ChangeType:1, //1-转班 2-分拆 ChangeType: 1, //1-转班 2-分拆
isShowteacher:false,//关联教师显示 isShowteacher: false, //关联教师显示
teacherMsg:{OrderId:0,HelpEnterId:'',},//关联老师参数 teacherMsg: {
TeacherList:[],//下拉老师 OrderId: 0,
HelpEnterId: '',
}, //关联老师参数
TeacherList: [], //下拉老师
} }
}, },
created() { created() {
this.initAuth(); this.initAuth();
this.Employee(); this.Employee();
this.GetTeacherList()//获取老师数据 this.GetTeacherList() //获取老师数据
var localStorageData = window.localStorage["loginUserInfo"]; var localStorageData = window.localStorage["loginUserInfo"];
let ActionMenuList = JSON.parse(localStorageData).data.ActionMenuList let ActionMenuList = JSON.parse(localStorageData).data.ActionMenuList
if (ActionMenuList && ActionMenuList.length > 0) { if (ActionMenuList && ActionMenuList.length > 0) {
...@@ -1084,11 +1094,45 @@ ...@@ -1084,11 +1094,45 @@
if (this.authObj.isShowTransClassOrder != null && this.authObj.isShowTransClassOrder) { if (this.authObj.isShowTransClassOrder != null && this.authObj.isShowTransClassOrder) {
this.AuthorityObj.isShowTransClassOrder = this.authObj.isShowTransClassOrder; this.AuthorityObj.isShowTransClassOrder = this.authObj.isShowTransClassOrder;
} }
if (this.authObj.isShowSeparater !=null && this.authObj.isShowSeparater){ if (this.authObj.isShowSeparater != null && this.authObj.isShowSeparater) {
this.AuthorityObj.isShowSeparater = this.authObj.isShowSeparater; this.AuthorityObj.isShowSeparater = this.authObj.isShowSeparater;
} }
} }
}, },
//回归原班
backSourceClass(item) {
var backMsg = {
OrderId: item.OrderId
};
var that = this;
this.$q.dialog({
title: "回归原班",
message: "你正在进行订单回归原班级操作，是否确认执行",
persistent: true,
cancel: {
label: "取消",
flat: true
},
ok: {
label: "确认执行",
flat: true,
focus: true
}
}).onOk(() => {
regressSourceClass(backMsg).then(res => {
if (res.Code == 1) {
that.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '操作成功',
position: 'top'
})
that.refreshOrder();
}
})
});
},
//关闭报价单 //关闭报价单
closeQuota() { closeQuota() {
this.isShowviewQuo = false; this.isShowviewQuo = false;
...@@ -1137,20 +1181,17 @@ ...@@ -1137,20 +1181,17 @@
this.orderObj = {}; this.orderObj = {};
this.isShowContinueClass = false; this.isShowContinueClass = false;
}, },
//转班 //转班
transferClass(item,type) { transferClass(item, type) {
this.orderObj = item; this.orderObj = item;
this.ChangeType = type; this.ChangeType = type;
this.isShowTransferClass = true; this.isShowTransferClass = true;
}, },
//关闭转班 //关闭转班
closeTransferClassForm() { closeTransferClassForm() {
this.orderObj = {}; this.orderObj = {};
this.isShowTransferClass = false; this.isShowTransferClass = false;
}, },
//获取员工列表 //获取员工列表
Employee() { Employee() {
var qMsg = { var qMsg = {
...@@ -1404,7 +1445,6 @@ ...@@ -1404,7 +1445,6 @@
refreshPage() { refreshPage() {
this.refreshOrder(); this.refreshOrder();
}, },
//领取合同 //领取合同
takeContract(item) { takeContract(item) {
let msg = { let msg = {
...@@ -1468,55 +1508,49 @@ ...@@ -1468,55 +1508,49 @@
//获取教师下拉 //获取教师下拉
GetTeacherList() { GetTeacherList() {
var qMsg = { var qMsg = {
AccountTypeStr:2 AccountTypeStr: 2
} }
queryEmployee(qMsg).then(res => { queryEmployee(qMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.TeacherList = res.Data; this.TeacherList = res.Data;
} }
})
},
gettanchuteacher(item) {
this.isShowteacher = true
this.teacherMsg.OrderId = item.OrderId;
this.teacherMsg.HelpEnterId = item.HelpEnterId > 0 ? item.HelpEnterId : '';
},
setCheckStatus() {
if (this.teacherMsg.HelpEnterId == 0 || this.teacherMsg.HelpEnterId == '') {
this.$q.notify({
icon: 'close',
color: 'accent',
timeout: 2000,
message: '请选择关联老师',
position: 'top'
}) })
}, return
gettanchuteacher(item){ }
this.isShowteacher = true setOrderHelpEnterId(this.teacherMsg).then(res => {
this.teacherMsg.OrderId = item.OrderId; if (res.Code == 1) {
this.teacherMsg.HelpEnterId = item.HelpEnterId>0?item.HelpEnterId:'';
},
setCheckStatus(){
if( this.teacherMsg.HelpEnterId==0 || this.teacherMsg.HelpEnterId==''){
this.$q.notify({ this.$q.notify({
icon: 'close', icon: 'iconfont icon-chenggong',
color: 'accent', color: 'accent',
timeout: 2000, timeout: 2000,
message: '请选择关联老师', message: '操作成功',
position: 'top' position: 'top'
}) })
return //调用父页面成功方法
this.isShowteacher = false
this.$emit('success');
} }
setOrderHelpEnterId(this.teacherMsg).then(res => { })
if (res.Code == 1) { }
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
timeout: 2000,
message: '操作成功',
position: 'top'
})
//调用父页面成功方法
this.isShowteacher = false
this.$emit('success');
}
})
}
} }
} }
</script> </script>
<style> <style>
li { li {
list-style-type: none; list-style-type: none;
......
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