Commit 7543f8a8 authored by 黄奎's avatar 黄奎

页面修改

parent b5d4b997
...@@ -47,6 +47,9 @@ ...@@ -47,6 +47,9 @@
</a> </a>
</div> </div>
</q-td> </q-td>
<q-td v-if="col.name=='StudyCountryName'">
{{col.value}}
</q-td>
<q-td v-if="col.name=='SchoolName'"> <q-td v-if="col.name=='SchoolName'">
{{col.value}} {{col.value}}
</q-td> </q-td>
...@@ -258,13 +261,13 @@ ...@@ -258,13 +261,13 @@
}, },
dataList: [], dataList: [],
loading: true, loading: true,
columns: [ { columns: [{
name: 'Remark', name: 'Remark',
label: '备注', label: '备注',
field: 'Remark', field: 'Remark',
align: 'left' align: 'left'
}, },
{ {
name: 'ProductTypeName', name: 'ProductTypeName',
label: '类型', label: '类型',
field: 'ProductTypeName', field: 'ProductTypeName',
...@@ -282,6 +285,12 @@ ...@@ -282,6 +285,12 @@
field: 'SupplierName', field: 'SupplierName',
align: 'left' align: 'left'
}, },
{
name: 'StudyCountryName',
label: '留学国家',
field: 'StudyCountryName',
align: 'left'
},
{ {
name: 'SchoolName', name: 'SchoolName',
label: '所属校区', label: '所属校区',
...@@ -344,10 +353,10 @@ ...@@ -344,10 +353,10 @@
], ],
//表格可见列 //表格可见列
visibleColumns: [ visibleColumns: [
'Remark', 'Name', 'SchoolName', 'SuggestPrice', 'SellPrice', "PreferentialList", 'Remark', 'Name', 'StudyCountryName', 'SchoolName', 'SuggestPrice', 'SellPrice', "PreferentialList",
"PreferentialListSellCommission", "PreferentialListSellCommission",
"PreferentialListB2BCommission", "PreferentialListB2BCommission",
"EducationCommission", 'SaleStateName', 'Id', 'SupplierName','ProductTypeName', "EducationCommission", 'SaleStateName', 'Id', 'SupplierName', 'ProductTypeName',
], //可见列 ], //可见列
PageCount: 0, PageCount: 0,
isShowStudy: false, //是否显示留学弹窗 isShowStudy: false, //是否显示留学弹窗
...@@ -546,7 +555,6 @@ ...@@ -546,7 +555,6 @@
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
.border-bottom { .border-bottom {
...@@ -554,9 +562,7 @@ ...@@ -554,9 +562,7 @@
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
</style> </style>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style>
</style> \ No newline at end of file
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