Skip to content

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

页面修改

parent 7b17965a
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 31 deletions
src/pages/studyAbroad/employment.vue
View file @ f96b0406
......@@ -136,7 +136,12 @@
</div>
</q-td>
<q-td v-else-if="col.name=='SaleStateName'">
{{col.value}}
<template v-if="props.row.SaleState==1">
{{col.value}}
</template>
<template v-if="props.row.SaleState!=1">
<a style="cursor:pointer;color:blue;" @click="ShowInfo(props.row)" title="点击查看审核信息"> {{col.value}}</a>
</template>
</q-td>
<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="编辑"
......@@ -169,6 +174,7 @@
<studyAbroadprice-form v-if="isShowStudyPrice" :save-obj="studyObj" :Type="2" @close="closeStudyForm"
@success="refreshPage">
</studyAbroadprice-form>
<studyproauditinfo-form v-if="isShowInfo" :Id="studyObj.Id" @close="closeStudyForm"></studyproauditinfo-form>
</div>
</div>
</template>
......@@ -181,6 +187,7 @@
} from '../../api/studyabroad/index'
import studyAbroadForm from '../../components/studyAbroad/studyAbroad-form'
import studyAbroadpriceForm from '../../components/studyAbroad/studyAbroadprice-form'
import studyproauditinfoForm from '../../components/studyAbroad/studyproauditinfo-form'
import {
mapState
} from "vuex";
......@@ -190,7 +197,8 @@
},
components: {
studyAbroadForm,
studyAbroadpriceForm
studyAbroadpriceForm,
studyproauditinfoForm
},
data() {
return {
......@@ -271,23 +279,25 @@
field: 'Id'
}
],
//表格可见列
//表格可见列
visibleColumns: [
'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
"PreferentialListB2BCommission",
"EducationCommission", 'SaleStateName', 'Id','SupplierName',
"EducationCommission", 'SaleStateName', 'Id', 'SupplierName',
], //可见列
PageCount: 0,
isShowStudy: false, //是否显示留学弹窗
studyObj: {}, //留学对象
isShowStudyPrice: false, //是否显示价格设置
saleDownList: [], //销售状态下拉
isShowInfo: false, //是否显示审核信息
}
},
computed: mapState({
//是否有查看合同权限
isHaveViewContractAction(state) {
if (state.user.userInfo.ActionMenuList) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "View_Supplier_Contract") {
return x;
......@@ -297,9 +307,10 @@
}
return false;
},
//是否有查看供应商权限
//是否有查看供应商权限
isHaveViewSupplierAction(state) {
if (state.user.userInfo.ActionMenuList) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "View_Supplier") {
return x;
......@@ -315,12 +326,16 @@
},
created() {
this.getSaleStateList();
if(!this.isHaveViewSupplierAction)
{
this.visibleColumns.splice(this.visibleColumns.length-1,1);
if (!this.isHaveViewSupplierAction) {
this.visibleColumns.splice(this.visibleColumns.length - 1, 1);
}
},
methods: {
//显示详情
ShowInfo(item) {
this.studyObj = item;
this.isShowInfo = true;
},
//获取销售状态列表
getSaleStateList() {
querySaleStateList().then(res => {
......@@ -352,6 +367,7 @@
closeStudyForm() {
this.isShowStudy = false;
this.isShowStudyPrice = false;
this.isShowInfo = false;
this.refreshPage();
},
//刷新页面
......
src/pages/studyAbroad/studyProAudit.vue
View file @ f96b0406
......@@ -140,7 +140,7 @@
import {
mapState
} from "vuex";
export default {
meta: {
title: "留学产品审核"
......@@ -235,13 +235,12 @@
field: 'Id'
}
],
//表格可见列
//表格可见列
visibleColumns: [
'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
"PreferentialListB2BCommission",
"EducationCommission", 'SaleStateName', 'Id','SupplierName',
"EducationCommission", 'SaleStateName', 'Id', 'SupplierName',
], //可见列
PageCount: 0,
isShowStudy: false, //是否显示留学弹窗
Id: 0,
......@@ -252,7 +251,8 @@
computed: mapState({
//是否有查看合同权限
isHaveViewContractAction(state) {
if (state.user.userInfo&&state.user.userInfo.ActionMenuList&&state.user.userInfo.ActionMenuList.length>0) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "View_Supplier_Contract") {
return x;
......@@ -264,7 +264,8 @@
},
//是否有查看供应商权限
isHaveViewSupplierAction(state) {
if (state.user.userInfo&&state.user.userInfo.ActionMenuList&&state.user.userInfo.ActionMenuList.length>0) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "View_Supplier") {
return x;
......@@ -289,9 +290,8 @@
}
})
}
if(!this.isHaveViewSupplierAction)
{
this.visibleColumns.splice(this.visibleColumns.length-1,1);
if (!this.isHaveViewSupplierAction) {
this.visibleColumns.splice(this.visibleColumns.length - 1, 1);
}
},
methods: {
......@@ -338,7 +338,6 @@
}
}
}
</script>
<style scoped>
.border-bottom {
......
src/pages/studyAbroad/studyabroad.vue
View file @ f96b0406
......@@ -136,7 +136,12 @@
</div>
</q-td>
<q-td v-else-if="col.name=='SaleStateName'">
{{col.value}}
<template v-if="props.row.SaleState==1">
{{col.value}}
</template>
<template v-if="props.row.SaleState!=1">
<a style="cursor:pointer;color:blue;" @click="ShowInfo(props.row)" title="点击查看审核信息"> {{col.value}}</a>
</template>
</q-td>
<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="编辑"
......@@ -169,6 +174,7 @@
<studyAbroadprice-form v-if="isShowStudyPrice" :save-obj="studyObj" :Type="1" @close="closeStudyForm"
@success="refreshPage">
</studyAbroadprice-form>
<studyproauditinfo-form v-if="isShowInfo" :Id="studyObj.Id" @close="closeStudyForm"></studyproauditinfo-form>
</div>
</div>
</template>
......@@ -181,6 +187,7 @@
} from '../../api/studyabroad/index'
import studyAbroadForm from '../../components/studyAbroad/studyAbroad-form'
import studyAbroadpriceForm from '../../components/studyAbroad/studyAbroadprice-form'
import studyproauditinfoForm from '../../components/studyAbroad/studyproauditinfo-form'
import {
mapState
} from "vuex";
......@@ -191,7 +198,8 @@
},
components: {
studyAbroadForm,
studyAbroadpriceForm
studyAbroadpriceForm,
studyproauditinfoForm
},
data() {
return {
......@@ -274,21 +282,23 @@
],
//表格可见列
visibleColumns: [
'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
'Name', 'SuggestPrice', 'SellPrice', "PreferentialList", "PreferentialListSellCommission",
"PreferentialListB2BCommission",
"EducationCommission", 'SaleStateName', 'Id','SupplierName',
"EducationCommission", 'SaleStateName', 'Id', 'SupplierName',
], //可见列
PageCount: 0,
isShowStudy: false, //是否显示留学弹窗
studyObj: {}, //留学对象
isShowStudyPrice: false, //是否显示价格设置
saleDownList: [], //销售状态下拉
isShowInfo: false, //是否显示审核信息
}
},
computed: mapState({
//是否有查看合同权限
isHaveViewContractAction(state) {
if (state.user.userInfo&&state.user.userInfo.ActionMenuList&&state.user.userInfo.ActionMenuList.length>0) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "View_Supplier_Contract") {
return x;
......@@ -300,7 +310,8 @@
},
//是否有查看供应商权限
isHaveViewSupplierAction(state) {
if (state.user.userInfo&&state.user.userInfo.ActionMenuList&&state.user.userInfo.ActionMenuList.length>0) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "View_Supplier") {
return x;
......@@ -316,12 +327,16 @@
},
created() {
this.getSaleStateList();
if(!this.isHaveViewSupplierAction)
{
this.visibleColumns.splice(this.visibleColumns.length-1,1);
if (!this.isHaveViewSupplierAction) {
this.visibleColumns.splice(this.visibleColumns.length - 1, 1);
}
},
methods: {
//显示详情
ShowInfo(item) {
this.studyObj = item;
this.isShowInfo = true;
},
//获取销售状态列表
getSaleStateList() {
querySaleStateList().then(res => {
......@@ -353,6 +368,7 @@
closeStudyForm() {
this.isShowStudy = false;
this.isShowStudyPrice = false;
this.isShowInfo = false;
this.refreshPage();
},
//刷新页面
......
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