Skip to content

C
confucius
Commit 0cbb133c authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 8d55cc79
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 25 deletions
src/pages/course/course.vue
View file @ 0cbb133c
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,8 @@
@click="EditCourse(props.row, 1)" /> @click="EditCourse(props.row, 1)" />
<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="EditCourse(props.row, 2)" v-if="isHavePriceAction" /> @click="EditCourse(props.row, 2)" v-if="isHavePriceAction" />
<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="goMycourse(props.row)" /> @click="goMycourse(props.row)" /> -->
</q-td> </q-td>
</template> </template>
</q-table> </q-table>
......
src/pages/studyAbroad/employment.vue
View file @ 0cbb133c
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
</template> </template>
<template v-slot:body="props"> <template v-slot:body="props">
<q-tr :props="props"> <q-tr :props="props">
<q-td auto-width>
<q-btn size="sm" color="accent" round dense @click="props.row.expand = !props.row.expand"
:icon="props.row.expand ? 'remove' : 'add'" />
</q-td>
<template v-for="col in props.cols"> <template v-for="col in props.cols">
<q-td v-if="col.name == 'Name'" style="width:200px;"> <q-td v-if="col.name == 'Name'" style="width:200px;">
{{col.value}} {{col.value}}
...@@ -56,7 +60,7 @@ ...@@ -56,7 +60,7 @@
<template v-if="x.PriceType==0"> <template v-if="x.PriceType==0">
{{ 100 - x.PriceMoney }}折 {{ 100 - x.PriceMoney }}折
</template> </template>
<template> <template v-else>
{{x.PriceMoney}} 元 {{x.PriceMoney}} 元
</template> </template>
优惠 优惠
...@@ -65,7 +69,7 @@ ...@@ -65,7 +69,7 @@
双人报名享<template v-if="x.PriceType==0"> 双人报名享<template v-if="x.PriceType==0">
{{ 100 - x.PriceMoney }}折 {{ 100 - x.PriceMoney }}折
</template> </template>
<template> <template v-else>
{{x.PriceMoney}} 元 {{x.PriceMoney}} 元
</template> </template>
优惠 优惠
...@@ -74,7 +78,7 @@ ...@@ -74,7 +78,7 @@
续费享<template v-if="x.PriceType==0"> 续费享<template v-if="x.PriceType==0">
{{ 100 - x.PriceMoney }}折 {{ 100 - x.PriceMoney }}折
</template> </template>
<template> <template v-else>
{{x.PriceMoney}} 元 {{x.PriceMoney}} 元
</template> </template>
优惠 优惠
...@@ -146,14 +150,25 @@ ...@@ -146,14 +150,25 @@
<q-td v-else-if="col.name == 'Id'" style="width:200px;"> <q-td v-else-if="col.name == 'Id'" style="width:200px;">
<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="EditStudy(props.row)" /> @click="EditStudy(props.row)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置" <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
@click="EditStudyPrice(props.row)" /> <q-list>
<q-btn v-if="props.row.SaleState==1||props.row.SaleState==4" flat size="xs" icon="edit" color="accent" <q-item clickable v-close-popup @click="EditStudyPrice(props.row)">
style="font-weight:400" label="申请审核" @click="applyApply(props.row)" /> <q-item-section>
<q-item-label>价格设置</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="props.row.SaleState==1||props.row.SaleState==4"
@click="applyApply(props.row)">
<q-item-section>
<q-item-label>申请审核</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
</q-td> </q-td>
</template> </template>
</q-tr> </q-tr>
<q-tr :props="props"> <q-tr v-show="props.row.expand" :props="props">
<q-td colspan="100%" class="bg-grey-2"> <q-td colspan="100%" class="bg-grey-2">
<div style="display:flex;"> <div style="display:flex;">
<div style="flex-shrink:0">备注：</div> <div style="flex-shrink:0">备注：</div>
...@@ -214,6 +229,12 @@ ...@@ -214,6 +229,12 @@
dataList: [], dataList: [],
loading: true, loading: true,
columns: [{ columns: [{
name: 'Remark',
label: '备注',
field: 'Remark',
align: 'left'
},
{
name: 'Name', name: 'Name',
label: '项目名称', label: '项目名称',
field: 'Name', field: 'Name',
...@@ -281,7 +302,7 @@ ...@@ -281,7 +302,7 @@
], ],
//表格可见列 //表格可见列
visibleColumns: [ visibleColumns: [
'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission", 'Remark', 'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
"PreferentialListB2BCommission", "PreferentialListB2BCommission",
"EducationCommission", 'SaleStateName', 'Id', 'SupplierName', "EducationCommission", 'SaleStateName', 'Id', 'SupplierName',
], //可见列 ], //可见列
...@@ -352,7 +373,13 @@ ...@@ -352,7 +373,13 @@
this.loading = true; this.loading = true;
queryStudyAbroadPage(this.msg).then(res => { queryStudyAbroadPage(this.msg).then(res => {
this.loading = false; this.loading = false;
this.dataList = res.Data.PageData; var tempArray = res.Data.PageData;
if (tempArray && tempArray.length > 0) {
tempArray.forEach(item => {
item.expand = false;
})
}
this.dataList = tempArray;
this.PageCount = res.Data.PageCount; this.PageCount = res.Data.PageCount;
}) })
.catch(() => { .catch(() => {
......
src/pages/studyAbroad/studyProAudit.vue
View file @ 0cbb133c
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<template v-if="x.PriceType==0"> <template v-if="x.PriceType==0">
{{ 100 - x.PriceMoney }}折 {{ 100 - x.PriceMoney }}折
</template> </template>
<template> <template v-else>
{{x.PriceMoney}} 元 {{x.PriceMoney}} 元
</template> </template>
优惠 优惠
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
双人报名享<template v-if="x.PriceType==0"> 双人报名享<template v-if="x.PriceType==0">
{{ 100 - x.PriceMoney }}折 {{ 100 - x.PriceMoney }}折
</template> </template>
<template> <template v-else>
{{x.PriceMoney}} 元 {{x.PriceMoney}} 元
</template> </template>
优惠 优惠
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
续费享<template v-if="x.PriceType==0"> 续费享<template v-if="x.PriceType==0">
{{ 100 - x.PriceMoney }}折 {{ 100 - x.PriceMoney }}折
</template> </template>
<template> <template v-else>
{{x.PriceMoney}} 元 {{x.PriceMoney}} 元
</template> </template>
优惠 优惠
......
src/pages/studyAbroad/studyabroad.vue
View file @ 0cbb133c
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
</template> </template>
<template v-slot:body="props"> <template v-slot:body="props">
<q-tr :props="props"> <q-tr :props="props">
<q-td auto-width>
<q-btn size="sm" color="accent" round dense @click="props.row.expand = !props.row.expand"
:icon="props.row.expand ? 'remove' : 'add'" />
</q-td>
<template v-for="col in props.cols"> <template v-for="col in props.cols">
<q-td v-if="col.name == 'Name'" style="width:200px;"> <q-td v-if="col.name == 'Name'" style="width:200px;">
{{col.value}} {{col.value}}
...@@ -56,7 +60,7 @@ ...@@ -56,7 +60,7 @@
<template v-if="x.PriceType==0"> <template v-if="x.PriceType==0">
{{ 100 - x.PriceMoney }}折 {{ 100 - x.PriceMoney }}折
</template> </template>
<template> <template v-else>
{{x.PriceMoney}} 元 {{x.PriceMoney}} 元
</template> </template>
优惠 优惠
...@@ -65,7 +69,7 @@ ...@@ -65,7 +69,7 @@
双人报名享<template v-if="x.PriceType==0"> 双人报名享<template v-if="x.PriceType==0">
{{ 100 - x.PriceMoney }}折 {{ 100 - x.PriceMoney }}折
</template> </template>
<template> <template v-else>
{{x.PriceMoney}} 元 {{x.PriceMoney}} 元
</template> </template>
优惠 优惠
...@@ -74,7 +78,7 @@ ...@@ -74,7 +78,7 @@
续费享<template v-if="x.PriceType==0"> 续费享<template v-if="x.PriceType==0">
{{ 100 - x.PriceMoney }}折 {{ 100 - x.PriceMoney }}折
</template> </template>
<template> <template v-else>
{{x.PriceMoney}} 元 {{x.PriceMoney}} 元
</template> </template>
优惠 优惠
...@@ -146,14 +150,25 @@ ...@@ -146,14 +150,25 @@
<q-td v-else-if="col.name == 'Id'" style="width:200px;"> <q-td v-else-if="col.name == 'Id'" style="width:200px;">
<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="EditStudy(props.row)" /> @click="EditStudy(props.row)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置" <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
@click="EditStudyPrice(props.row)" /> <q-list>
<q-btn v-if="props.row.SaleState==1||props.row.SaleState==4" flat size="xs" icon="edit" color="accent" <q-item clickable v-close-popup @click="EditStudyPrice(props.row)">
style="font-weight:400" label="申请审核" @click="applyApply(props.row)" /> <q-item-section>
<q-item-label>价格设置</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-close-popup v-if="props.row.SaleState==1||props.row.SaleState==4"
@click="applyApply(props.row)">
<q-item-section>
<q-item-label>申请审核</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
</q-td> </q-td>
</template> </template>
</q-tr> </q-tr>
<q-tr :props="props"> <q-tr v-show="props.row.expand" :props="props">
<q-td colspan="100%" class="bg-grey-2"> <q-td colspan="100%" class="bg-grey-2">
<div style="display:flex;"> <div style="display:flex;">
<div style="flex-shrink:0">备注：</div> <div style="flex-shrink:0">备注：</div>
...@@ -215,6 +230,12 @@ ...@@ -215,6 +230,12 @@
dataList: [], dataList: [],
loading: true, loading: true,
columns: [{ columns: [{
name: 'Remark',
label: '备注',
field: 'Remark',
align: 'left'
},
{
name: 'Name', name: 'Name',
label: '项目名称', label: '项目名称',
field: 'Name', field: 'Name',
...@@ -282,7 +303,7 @@ ...@@ -282,7 +303,7 @@
], ],
//表格可见列 //表格可见列
visibleColumns: [ visibleColumns: [
'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission", 'Remark', 'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
"PreferentialListB2BCommission", "PreferentialListB2BCommission",
"EducationCommission", 'SaleStateName', 'Id', 'SupplierName', "EducationCommission", 'SaleStateName', 'Id', 'SupplierName',
], //可见列 ], //可见列
...@@ -353,7 +374,13 @@ ...@@ -353,7 +374,13 @@
this.loading = true; this.loading = true;
queryStudyAbroadPage(this.msg).then(res => { queryStudyAbroadPage(this.msg).then(res => {
this.loading = false; this.loading = false;
this.dataList = res.Data.PageData; var tempArray = res.Data.PageData;
if (tempArray && tempArray.length > 0) {
tempArray.forEach(item => {
item.expand = false;
})
}
this.dataList = tempArray;
this.PageCount = res.Data.PageCount; this.PageCount = res.Data.PageCount;
}) })
.catch(() => { .catch(() => {
......
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