Commit e4ed9d52 authored by 罗超's avatar 罗超

修改

parent 08b2be3a
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
}) })
return return
} }
if (this.msg.ExtraDeductMoney == '') { if (this.msg.ExtraDeductMoney === '') {
this.$q.notify({ this.$q.notify({
icon: 'negative', icon: 'negative',
color: 'accent', color: 'accent',
......
This diff is collapsed.
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<orderlist :dataList="dataList" :isShowClass="false" ref="orderL" :cancelList="CancelList" @success="refreshClassOrder"></orderlist> <orderlist :dataList="dataList" :isShowClass="false" ref="orderL" :Comtype="2" :cancelList="CancelList" @success="refreshClassOrder"></orderlist>
</div> </div>
</div> </div>
</template> </template>
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</div> </div>
<div class="page-content" > <div class="page-content" >
<orderlist :dataList="data.List" :isShowClass="true" @success="refreshClassOrder" ref="orderL"></orderlist> <orderlist :dataList="data.List" :isShowClass="true" :Comtype="1" @success="refreshClassOrder" ref="orderL"></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 <q-pagination
v-model="msg.pageIndex" v-model="msg.pageIndex"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount" <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" /> :input="true" @input="changePage" />
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props" v-if="isShowBtn">
<q-td :props="props"> <q-td :props="props">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="EditRole(props.row)" /> @click="EditRole(props.row)" />
...@@ -201,8 +201,10 @@ ...@@ -201,8 +201,10 @@
this.msg.OrderId =this.$route.query.OrderId; this.msg.OrderId =this.$route.query.OrderId;
this.addMsg.OrderId =this.$route.query.OrderId; this.addMsg.OrderId =this.$route.query.OrderId;
this.msg.ClassId =this.$route.query.ClassId this.msg.ClassId =this.$route.query.ClassId
if(this.$route.query.isFrom==1){ if(this.$route.query.isShow==1){
this.isShowBtn = false; this.isShowBtn = true;
}else{
this.isShowBtn=false
} }
} }
this.getRolelist(); this.getRolelist();
......
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