Commit bdbf6e4b authored by 黄奎's avatar 黄奎

页面修改

parent ede19f6a
...@@ -9,17 +9,29 @@ ...@@ -9,17 +9,29 @@
</div> </div>
<div style="padding:20px 15px;"> <div style="padding:20px 15px;">
<q-input filled stack-label maxlength="100" :dense="false" v-model="OrderMsg.GuestNum" type="number" <q-input filled stack-label maxlength="100" :dense="false" v-model="OrderMsg.GuestNum" type="number"
@input="countPrice" class="col-12" label="人数" :rules="[val => !!val || '请填写人数']" /> @input="countPrice" class="col-12" label="人数" :rules="[val => !!val || '请填写人数']"
<q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" :disable="modityOrderType!=1 " />
:disable="IsShowUpPrice==true?false:true" @blur="countPrice" class="col-12" label="成交单价"
:rules="[val => !!val || '请填成交单价']" />
<q-toggle v-model="IsShowUpPrice" label="高于定价收生" class="q-mb-md" />
<q-select standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="OrderMsg.OrderSource" <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="成交单价"
:rules="[val => !!val || '请填成交单价']" />
<q-toggle v-model="IsShowUpPrice" label="高于定价收生" class="q-mb-md" />
</template>
<template v-if="modityOrderType==2">
<q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" :disable="true" @blur="countPrice"
class="col-12" label="成交单价" :rules="[val => !!val || '请填成交单价']" />
</template>
<template v-if="modityOrderType==3">
<q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" @blur="countPrice" class="col-12"
label="成交单价" :rules="[val => !!val || '请填成交单价']" />
</template>
<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="客人来源" /> :options="SourceEnumList" emit-value map-options class="q-pb-lg" label="客人来源" />
<!--课程订单订单--> <!--课程订单订单-->
<template v-if="orderType==1||OrderMsg.OrderType==1"> <template v-if="orderType==1||OrderMsg.OrderType==1">
<q-select v-model="OrderMsg.HelpEnterId" :options="EmployeeList" filled use-input 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 option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-pb-lg" emit-value
map-options @filter="filterFn"> map-options @filter="filterFn">
<template v-slot:no-option> <template v-slot:no-option>
...@@ -30,17 +42,17 @@ ...@@ -30,17 +42,17 @@
</q-item> </q-item>
</template> </template>
</q-select> </q-select>
<q-input v-if="OrderMsg.OrderSource==3" filled stack-label :dense="false" maxlength="50" <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==3" filled stack-label :dense="false" maxlength="50"
v-model="OrderMsg.GeneralOccupation" class="col-12 q-pb-lg" label="一般同行" /> v-model="OrderMsg.GeneralOccupation" class="col-12 q-pb-lg" label="一般同行" />
<q-input v-if="OrderMsg.OrderSource==7" filled stack-label :dense="false" maxlength="50" <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="教育同行" /> v-model="OrderMsg.EduOccupation" class="col-12 q-pb-lg" label="教育同行" />
<q-toggle v-model="OrderMsg.IsLessPrice" :false-value="0" :true-value="1" label="是否少价" class="q-mb-md" /> <q-toggle :disable="(modityOrderType==2)" v-model="OrderMsg.IsLessPrice" :false-value="0" :true-value="1" label="是否少价" class="q-mb-md" />
<q-input v-if="OrderMsg.IsLessPrice==1" @keyup.native="checkPrice(OrderMsg,'LessPrice')" maxlength="10" filled <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.IsLessPrice==1" @keyup.native="checkPrice(OrderMsg,'LessPrice')" maxlength="10" filled
stack-label :dense="false" v-model="OrderMsg.LessPrice" class="col-12" label="少价金额" /> stack-label :dense="false" v-model="OrderMsg.LessPrice" class="col-12" label="少价金额" />
</template> </template>
<!--留学就业订单--> <!--留学就业订单-->
<template v-if="orderType==2||OrderMsg.OrderType==2"> <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" <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" /> @input="OrderNatureChange" />
<template v-if="OrderMsg.OrderNature==1"> <template v-if="OrderMsg.OrderNature==1">
...@@ -92,9 +104,9 @@ ...@@ -92,9 +104,9 @@
default: 1, default: 1,
}, },
//修改订单类型 //修改订单类型
modityOrderType:{ modityOrderType: {
type: Number, type: Number,
default: 0,//1-销售修改,2-OP修改,3-总经理修改 default: 0, //1-销售修改,2-OP修改,3-总经理修改
} }
}, },
data() { data() {
...@@ -158,6 +170,10 @@ ...@@ -158,6 +170,10 @@
this.initData() this.initData()
}, },
methods: { methods: {
//判断是否禁用
checkIsDisable() {
},
//订单性质切换 //订单性质切换
OrderNatureChange() { OrderNatureChange() {
if (this.OrderMsg.OrderNature == 1) { if (this.OrderMsg.OrderNature == 1) {
......
...@@ -153,8 +153,10 @@ ...@@ -153,8 +153,10 @@
</td> </td>
<td style="border:none"> <td style="border:none">
<template> <template>
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" <template v-if="!isEditOrder">
@click="editOrder(item)" v-if="AuthorityObj.isShowEdit" /> <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="editOrder(item)" v-if="AuthorityObj.isShowEdit" />
</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>
<q-item clickable v-close-popup> <q-item clickable v-close-popup>
...@@ -699,7 +701,7 @@ ...@@ -699,7 +701,7 @@
</div> </div>
<!--修改订单--> <!--修改订单-->
<editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="orderObj.OrderType" <editorder-form v-if="isShowEditOrderForm" :save-obj="orderObj" :orderType="orderObj.OrderType"
@close="closeOrderSaveForm" @success="refreshOrder"> @close="closeOrderSaveForm" @success="refreshOrder" :modityOrderType="newModityOrderType">
</editorder-form> </editorder-form>
<!--修改订单备注--> <!--修改订单备注-->
...@@ -791,6 +793,11 @@ ...@@ -791,6 +793,11 @@
authObj: { authObj: {
type: Object, type: Object,
}, },
//修改订单类型
modityOrderType: {
type: Number,
default: 0, //1-销售修改,2-OP修改,3-总经理修改
}
}, },
data() { data() {
return { return {
...@@ -838,6 +845,7 @@ ...@@ -838,6 +845,7 @@
chooseStudent: "", //收款单据,单选学生 chooseStudent: "", //收款单据,单选学生
isShowReward: false, // 是否可以修改额外金额 isShowReward: false, // 是否可以修改额外金额
isEditOrder: false, //是否有【总经理】修改订单但权限 isEditOrder: false, //是否有【总经理】修改订单但权限
newModityOrderType:0,
} }
}, },
created() { created() {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="dataList" ref="orderL" :authObj="authObj" :cancelList="CancelList" <orderlist :dataList="dataList" ref="orderL" :authObj="authObj" :modityOrderType="2" :cancelList="CancelList"
@success="refreshClassOrder"></orderlist> @success="refreshClassOrder"></orderlist>
</div> </div>
</div> </div>
......
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" ref="orderL"> <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="1" ref="orderL">
</orderlist> </orderlist>
<div class="row" style="justify-content: flex-end;padding: 5px 20px"> <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" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" ref="orderL" > <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" :modityOrderType="3" ref="orderL" >
</orderlist> </orderlist>
<div class="row" style="justify-content: flex-end;padding: 5px 20px"> <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" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" ref="orderL"> <orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="1" @success="refreshClassOrder" ref="orderL">
</orderlist> </orderlist>
<div class="row" style="justify-content: flex-end;padding: 5px 20px"> <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" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" ref="orderL"> <orderlist :dataList="data.List" :authObj="authObj" :modityOrderType="3" @success="refreshClassOrder" ref="orderL">
</orderlist> </orderlist>
<div class="row" style="justify-content: flex-end;padding: 5px 20px"> <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" <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="dataList" ref="orderL" :authObj="authObj" :cancelList="CancelList" <orderlist :dataList="dataList" ref="orderL" :authObj="authObj" :cancelList="CancelList"
@success="refreshClassOrder"></orderlist> @success="refreshClassOrder" :modityOrderType="2"></orderlist>
</div> </div>
</div> </div>
</template> </template>
......
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