Skip to content

S
shop-new
提交 db571502 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

资产，bug修复、优化

上级 0a5a1e67
隐藏空白字符变更
内嵌 并排
正在显示 包含 71 行增加 和 156 行删除
src/views/system/asset/balance/index.vue
浏览文件 @ db571502
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>结算流水</span> <p style="font-size: 18px">结算流水</p>
</div> </div>
<el-table v-loading="loading" :height="tableHeight" :data="assetList"> <el-table v-loading="loading" :height="tableHeight" :data="assetList">
<el-table-column label="ID" align="center" prop="Id"/> <el-table-column label="ID" align="center" prop="Id"/>
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
name: "asset", name: "asset",
data() { data() {
return { return {
fullHeight: '', fullHeight: 0,
tableHeight: null, tableHeight: 0,
loading: true, // 遮罩层 loading: true, // 遮罩层
ids: [], // 选中数组 ids: [], // 选中数组
total: 0, // 总条数 total: 0, // 总条数
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
}) })
}, },
watch: { watch: {
fullHeight(val, oldval) { fullHeight(val) {
console.log(val) let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - 130 this.tableHeight = val - formHeight - 120;
} }
}, },
methods: { methods: {
...@@ -110,20 +110,5 @@ ...@@ -110,20 +110,5 @@
}; };
</script> </script>
<style scoped> <style scoped>
.app-container {
height: 100%;
}
.box-card {
height: 100%;
}
.box-card /deep/ .el-card__body {
height: 100%;
overflow: hidden;
}
.el-table {
height: calc(100% - 120px);
}
</style> </style>
src/views/system/asset/bankcard/index.vue
浏览文件 @ db571502
...@@ -2,16 +2,22 @@ ...@@ -2,16 +2,22 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>账户管理</span> <el-row :span="24" type="flex" align="middle" justify="space-between">
<el-button <el-col :span="20">
style='float:right' <p style="font-size: 18px;">账户管理</p>
:disabled="isAddbank" </el-col>
type="primary" <el-col :span="4">
icon="el-icon-plus" <el-button
size="mini" style='float:right'
@click="handleAdd" :disabled="isAddbank"
>新增 type="primary"
</el-button> icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增
</el-button>
</el-col>
</el-row>
</div> </div>
<el-table v-loading="loading" :height="tableHeight" :data="bankcardList" <el-table v-loading="loading" :height="tableHeight" :data="bankcardList"
...@@ -138,8 +144,8 @@ ...@@ -138,8 +144,8 @@
name: "bankcard", name: "bankcard",
data() { data() {
return { return {
fullHeight: '', fullHeight: 0,
tableHeight: null, tableHeight: 0,
state: [ state: [
// {label: "支付宝", value: 2}, // {label: "支付宝", value: 2},
{label: "银行卡", value: 1}, {label: "银行卡", value: 1},
...@@ -204,7 +210,7 @@ ...@@ -204,7 +210,7 @@
}, },
watch: { watch: {
fullHeight(val, oldval) { fullHeight(val) {
this.tableHeight = val this.tableHeight = val
} }
}, },
...@@ -335,20 +341,5 @@ ...@@ -335,20 +341,5 @@
}; };
</script> </script>
<style scoped> <style scoped>
.app-container {
height: 100%;
}
.box-card {
height: 100%;
}
.box-card /deep/ .el-card__body {
height: 100%;
overflow: hidden;
}
.el-table {
height: calc(100% - 120px);
}
</style> </style>
src/views/system/asset/verifyrecord/index.vue
浏览文件 @ db571502
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>结算对账</span> <p style="font-size: 18px; float:left;">结算对账</p>
</div> </div>
<!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
...@@ -312,21 +311,6 @@ ...@@ -312,21 +311,6 @@
} //methods结束 } //methods结束
}; };
</script> </script>
<style scoped> <style scoped lang="scss" type="text/stylus">
.app-container {
height: 100%;
}
.box-card {
height: 100%;
}
.box-card /deep/ .el-card__body {
height: 100%;
overflow: hidden;
}
.el-table {
height: calc(100% - 120px);
}
</style> </style>
src/views/system/asset/withdraw/index.vue
浏览文件 @ db571502
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>商户提现</span> <p style="font-size: 18px; float:left;">提现申请</p>
</div> </div>
<el-row> <el-row>
<el-col :span="24" class="card-box"> <el-col :span="24" class="card-box">
...@@ -276,26 +276,9 @@ ...@@ -276,26 +276,9 @@
} //methods结束 } //methods结束
}; };
</script> </script>
<style scoped> <style scoped lang="scss" type="text/stylus">
.app-container {
height: 100%;
}
.box-card {
height: 100%;
}
.box-card /deep/ .el-card__body {
height: 100%;
overflow: hidden;
}
.el-table {
height: calc(100% - 120px);
}
.ruleFormshop { .ruleFormshop {
width: 500px; width: 500px;
margin: 0 0 0 180px; margin: 20px 0 0 120px;
} }
</style> </style>
src/views/system/asset/withdrawlog/index.vue
浏览文件 @ db571502
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>提现记录</span> <p style="font-size: 18px; float:left;">提现记录</p>
</div> </div>
<el-table v-loading="loading" :data="withdrawlogList" :height="tableHeight"> <el-table v-loading="loading" :data="withdrawlogList" :height="tableHeight">
<el-table-column label="提现流水单号" align="center" prop="ReflectSn"/> <el-table-column label="提现流水单号" align="center" prop="ReflectSn"/>
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
data() { data() {
return { return {
sellerId: 0, sellerId: 0,
fullHeight: '', fullHeight: 0,
tableHeight: null, tableHeight: 0,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
...@@ -89,8 +89,9 @@ ...@@ -89,8 +89,9 @@
}) })
}, },
watch: { watch: {
fullHeight(val, oldval) { fullHeight(val) {
this.tableHeight = val - 130; let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 120;
} }
}, },
methods: { methods: {
...@@ -166,21 +167,6 @@ ...@@ -166,21 +167,6 @@
} //methods结束 } //methods结束
}; };
</script> </script>
<style scoped> <style scoped lang="scss" type="text/stylus">
.app-container {
height: 100%;
}
.box-card {
height: 100%;
}
.box-card /deep/ .el-card__body {
height: 100%;
overflow: hidden;
}
.el-table {
height: calc(100% - 120px);
}
</style> </style>
src/views/system/freight/freight_list/index.vue
浏览文件 @ db571502
...@@ -2,34 +2,34 @@ ...@@ -2,34 +2,34 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>运费模板</span> <el-form :inline="true" class="queryFormInline">
<el-row :span="24" type="flex" align="middle" justify="space-between">
<el-button <el-col :span="20">
style="float:right;margin-left: 10px;" <p style="font-size: 18px; float:left;">运费模板</p>
type="danger" </el-col>
icon="el-icon-delete" <el-col :span="4">
size="mini" <div style="float: right">
:disabled="multiple" <el-button
@click="handleDelete" style="float:right;margin-left: 10px;"
>删除 type="danger"
</el-button> icon="el-icon-delete"
<!-- <el-button--> size="mini"
<!-- style="float:right;"--> :disabled="multiple"
<!-- type="success"--> @click="handleDelete"
<!-- icon="el-icon-edit"--> >删除
<!-- size="mini"--> </el-button>
<!-- :disabled="single"--> <el-button
<!-- @click="handleUpdate"--> style="float:right;margin-left: 20px;"
<!-- >修改--> type="primary"
<!-- </el-button>--> icon="el-icon-plus"
<el-button size="mini"
style="float:right;margin-left: 20px;" @click="handleAdd"
type="primary" >新增
icon="el-icon-plus" </el-button>
size="mini" </div>
@click="handleAdd" </el-col>
>新增 </el-row>
</el-button> </el-form>
</div> </div>
<el-table v-loading="loading" :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
name: "freight", name: "freight",
data() { data() {
return { return {
fullHeight: '', fullHeight: 0,
tableHeight: null, tableHeight: 0,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
...@@ -139,8 +139,9 @@ ...@@ -139,8 +139,9 @@
}, },
watch: { watch: {
fullHeight(val, oldval) { fullHeight(val) {
this.tableHeight = val - 130 let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 120;
} }
}, },
methods: { methods: {
...@@ -322,21 +323,6 @@ ...@@ -322,21 +323,6 @@
} //methods结束 } //methods结束
}; };
</script> </script>
<style scoped> <style scoped lang="scss" type="text/stylus">
.app-container {
height: 100%;
}
.box-card {
height: 100%;
}
.box-card /deep/ .el-card__body {
height: 100%;
overflow: hidden;
}
.el-table {
height: calc(100% - 120px);
}
</style> </style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论