Skip to content

S
shop-new
提交 3380a1ed authored 作者: 王天霸's avatar 王天霸
浏览文件
操作

优化样式

上级 2de8066d
显示空白字符变更
内嵌 并排
正在显示 包含 582 行增加 和 273 行删除
src/layout/components/AppMain.vue
浏览文件 @ 3380a1ed
...@@ -25,7 +25,8 @@ export default { ...@@ -25,7 +25,8 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.app-main { .app-main {
/* 50= navbar 50 */ /* 50= navbar 50 */
min-height: calc(100vh - 50px); // min-height: calc(100vh - 50px);
height: calc(100vh - 50px);
width: 100%; width: 100%;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
...@@ -38,7 +39,8 @@ export default { ...@@ -38,7 +39,8 @@ export default {
.hasTagsView { .hasTagsView {
.app-main { .app-main {
/* 84 = navbar + tags-view = 50 + 34 */ /* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 84px); height: calc(100vh - 84px);
// min-height: calc(100vh - 84px);
} }
.fixed-header+.app-main { .fixed-header+.app-main {
......
src/views/system/asset/balance/index.vue
浏览文件 @ 3380a1ed
<template> <template>
<div class="app-container"> <div class="app-container">
<el-table v-loading="loading" :data="assetList"> <el-card class="box-card">
<div slot="header" class="clearfix">
<span>结算流水</span>
</div>
<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" />
<el-table-column label="流水订单号" align="center" prop="BalanceSn" /> <el-table-column label="流水订单号" align="center" prop="BalanceSn" />
<el-table-column label="变动金额" align="center" :formatter="formatMoney" prop="ChangeMoney" /> <el-table-column label="变动金额" align="center" :formatter="formatMoney" prop="ChangeMoney" />
...@@ -10,7 +15,7 @@ ...@@ -10,7 +15,7 @@
</el-table> </el-table>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> @pagination="getList" />
</el-card>
</div> </div>
</template> </template>
<script> <script>
...@@ -29,6 +34,8 @@ ...@@ -29,6 +34,8 @@
name: "asset", name: "asset",
data() { data() {
return { return {
fullHeight: '',
tableHeight:null,
loading: true, // 遮罩层 loading: true, // 遮罩层
ids: [], // 选中数组 ids: [], // 选中数组
total: 0, // 总条数 total: 0, // 总条数
...@@ -49,6 +56,16 @@ ...@@ -49,6 +56,16 @@
created() { created() {
this.queryParams.sellerId = this.$store.state.user.sellerid this.queryParams.sellerId = this.$store.state.user.sellerid
this.getList(); this.getList();
this.$nextTick(()=>{
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
})
},
watch:{
fullHeight(val,oldval){
console.log(val)
this.tableHeight = val - 130
}
}, },
methods: { methods: {
// //
...@@ -100,7 +117,18 @@ ...@@ -100,7 +117,18 @@
}; };
</script> </script>
<style scoped> <style scoped>
.el-table { .app-container{
height: calc(100% - 20px); 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
浏览文件 @ 3380a1ed
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row :gutter="10" class="mb8"> <el-card class="box-card">
<el-col :span="1.5" v-if="addbank"> <div slot="header" class="clearfix">
<span>绑定银行卡</span>
<el-button <el-button
style='float:right'
:disabled="!addbank"
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增</el-button> >新增</el-button>
</el-col>
</el-row> </div>
<el-table v-loading="loading" :data="bankcardList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :height="tableHeight" :data="bankcardList" @selection-change="handleSelectionChange">
<el-table-column label="商户ID" align="center" prop="Id" /> <el-table-column label="商户ID" align="center" prop="Id" />
<el-table-column label="开户名" align="center" prop="BankAccountName" /> <el-table-column label="开户名" align="center" prop="BankAccountName" />
<el-table-column label="城市名" align="center" prop="ProvinceCity" /> <el-table-column label="城市名" align="center" prop="ProvinceCity" />
...@@ -101,7 +105,7 @@ ...@@ -101,7 +105,7 @@
</el-dialog> </el-dialog>
</el-card>
</div> </div>
</template> </template>
<script> <script>
...@@ -110,6 +114,8 @@ export default { ...@@ -110,6 +114,8 @@ export default {
name: "bankcard", name: "bankcard",
data() { data() {
return { return {
fullHeight: '',
tableHeight:null,
state: [ state: [
{label:"支付宝",value:2}, {label:"支付宝",value:2},
{label:"银行卡",value:1}, {label:"银行卡",value:1},
...@@ -150,6 +156,7 @@ export default { ...@@ -150,6 +156,7 @@ export default {
form: { form: {
}, },
// 表单校验 // 表单校验
rules:{},
rules2: { rules2: {
ZfbAccountName: [ ZfbAccountName: [
{ required: true, message: "支付宝账户名称不能为空", trigger: "blur" } { required: true, message: "支付宝账户名称不能为空", trigger: "blur" }
...@@ -164,10 +171,19 @@ export default { ...@@ -164,10 +171,19 @@ export default {
}; };
}, },
created() { created() {
addbank:false;
this.getList(); this.getList();
this.getBankNameList(); this.getBankNameList();
this.getBankname(); // this.getBankname();
this.$nextTick(()=>{
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
})
},
watch:{
fullHeight(val,oldval){
console.log(val)
this.tableHeight = val
}
}, },
methods: { methods: {
...@@ -295,3 +311,19 @@ export default { ...@@ -295,3 +311,19 @@ export default {
} //methods结束 } //methods结束
}; };
</script> </script>
<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>
src/views/system/asset/verifyrecord/index.vue
浏览文件 @ 3380a1ed
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>结算对账</span>
</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">
<el-form-item label="账单状态" prop="status"> <el-form-item label="账单状态" prop="status">
...@@ -32,7 +37,7 @@ ...@@ -32,7 +37,7 @@
</el-form-item> </el-form-item>
</el-form> --> </el-form> -->
<el-table v-loading="loading" :data="verifyrecordList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="verifyrecordList" @selection-change="handleSelectionChange" :height="tableHeight">
<el-table-column label="ID" align="center" prop="Id" /> <el-table-column label="ID" align="center" prop="Id" />
<el-table-column label="账单生成时间" align="center" :formatter="formatTime" prop="Time" /> <el-table-column label="账单生成时间" align="center" :formatter="formatTime" prop="Time" />
<el-table-column label="商户id" align="center" prop="ShopId" /> <el-table-column label="商户id" align="center" prop="ShopId" />
...@@ -94,6 +99,7 @@ ...@@ -94,6 +99,7 @@
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</el-card>
</div> </div>
</template> </template>
<script> <script>
...@@ -103,6 +109,8 @@ export default { ...@@ -103,6 +109,8 @@ export default {
name: "verifyrecord", name: "verifyrecord",
data() { data() {
return { return {
fullHeight: '',
tableHeight:null,
//是否结算 //是否结算
isBlance:true, isBlance:true,
billId:0, billId:0,
...@@ -157,6 +165,16 @@ export default { ...@@ -157,6 +165,16 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.$nextTick(()=>{
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
})
},
watch:{
fullHeight(val,oldval){
console.log(val)
this.tableHeight = val - 130
}
}, },
methods: { methods: {
//状态 0待确认 1 已确认 2已结算 //状态 0待确认 1 已确认 2已结算
...@@ -284,3 +302,19 @@ export default { ...@@ -284,3 +302,19 @@ export default {
} //methods结束 } //methods结束
}; };
</script> </script>
<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>
src/views/system/asset/withdraw/index.vue
浏览文件 @ 3380a1ed
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>商户提现</span>
</div>
<el-row> <el-row>
<el-col :span="24" class="card-box"> <el-col :span="24" class="card-box">
<el-card> <!-- <span>商户信息</span> -->
<div slot="header"> <el-form ref="form" :model="form" :rules="rules" label-width="120px" class="ruleFormshop">
<span>商户信息</span> <el-form-item label="当前余额" >
</div> {{sellerinfo.Balance}}元
<div class="el-table el-table--enable-row-hover el-table--medium"> </el-form-item>
<table cellspacing="0" style="width: 100%;"> <el-form-item label="提现中的金额" >
<tbody> {{sellerinfo.FrozenMoney}}元
<tr> </el-form-item>
<td><div class="cell">当前余额</div></td> <el-form-item label="可提现金额" >
<td><div class="cell" >{{sellerinfo.Balance}}元</div></td> {{sellerinfo.Balance}}元
<td><div class="cell">提现中的金额</div></td> </el-form-item>
<td><div class="cell" v-if="1">{{sellerinfo.FrozenMoney}}元</div></td> <el-form-item label="手续费" >
</tr> 当前手续费为{{newFee}}元
<tr> </el-form-item>
<td><div class="cell">可提现金额</div></td>
<td><div class="cell" >{{sellerinfo.Balance}}元</div></td>
<td><div class="cell">手续费</div></td>
<td><div class="cell" v-if="1" >当前手续费为{{newFee}}元</div></td>
</tr>
</tbody>
</table>
</div>
</el-card>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button>
</el-col> -->
</el-row>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="银行卡" > <el-form-item label="银行卡" >
<el-select v-model="form.bankId" placeholder="选择到账银行卡"> <el-select v-model="form.bankId" placeholder="选择到账银行卡" style="width:260px;">
<el-option v-for="item in banklist" :key="item.Id" :label="item.BankAccountName?item.BankAccountName:item.ZfbAccountName" :value="item.Id?item.Id:item.Id"></el-option> <el-option v-for="item in banklist" :key="item.Id" :label="item.BankAccountName?item.BankAccountName:item.ZfbAccountName" :value="item.Id?item.Id:item.Id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="提现金额" prop="money"> <el-form-item label="提现金额" prop="money">
<el-input v-model="form.money" @blur="onInputBlur($event)" placeholder="提现金额大于等于100" /> <el-input v-model="form.money" @blur="onInputBlur($event)" placeholder="提现金额大于等于100" style="width:260px;"/>
</el-form-item> </el-form-item>
<el-form-item label="短信验证码" prop="verifycode"> <el-form-item label="短信验证码" prop="verifycode">
<el-input v-model="form.verifycode" placeholder="验证码" /> <el-input v-model="form.verifycode" placeholder="验证码" style="width:260px;">
<template slot="append">
<span v-show="show" @click="getCheckCode">获取验证码</span> <span v-show="show" @click="getCheckCode">获取验证码</span>
<span v-show="!show" class="count">{{count}} s</span> <span v-show="!show" class="count">{{count}} s</span>
</template>
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="支付密码" prop="pwd"> <el-form-item label="支付密码" prop="pwd">
<el-input v-model="form.pwd" type="password" placeholder="请输入提现密码" /> <el-input v-model="form.pwd" type="password" placeholder="请输入提现密码" style="width:260px;"/>
</el-form-item> </el-form-item>
<el-form-item label="" >
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </el-form-item>
</el-form>
</el-col>
</el-row>
</el-card>
</div> </div>
</template> </template>
<script> <script>
...@@ -218,3 +204,23 @@ export default { ...@@ -218,3 +204,23 @@ export default {
} //methods结束 } //methods结束
}; };
</script> </script>
<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);
}
.ruleFormshop{
width:500px;
margin:0 0 0 180px;
}
</style>
src/views/system/asset/withdrawlog/index.vue
浏览文件 @ 3380a1ed
<template> <template>
<div class="app-container"> <div class="app-container">
<el-table v-loading="loading" :data="withdrawlogList"> <el-card class="box-card">
<div slot="header" class="clearfix">
<span>提现记录</span>
</div>
<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" />
<el-table-column label="提现账号" align="center" prop="BankName" /> <el-table-column label="提现账号" align="center" prop="BankName" />
...@@ -20,7 +25,7 @@ ...@@ -20,7 +25,7 @@
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</el-card>
</div> </div>
</template> </template>
<script> <script>
...@@ -30,6 +35,8 @@ export default { ...@@ -30,6 +35,8 @@ export default {
name: "withdrawlog", name: "withdrawlog",
data() { data() {
return { return {
fullHeight: '',
tableHeight:null,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
...@@ -66,6 +73,16 @@ export default { ...@@ -66,6 +73,16 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.$nextTick(()=>{
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
})
},
watch:{
fullHeight(val,oldval){
console.log(val)
this.tableHeight = val - 130
}
}, },
methods: { methods: {
//格式化状态 //格式化状态
...@@ -133,3 +150,19 @@ export default { ...@@ -133,3 +150,19 @@ export default {
} //methods结束 } //methods结束
}; };
</script> </script>
<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>
src/views/system/freight/freight_list/index.vue
浏览文件 @ 3380a1ed
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>提现记录</span>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button <el-button
type="primary" style="float:right;margin-left: 10px;"
icon="el-icon-plus" type="danger"
icon="el-icon-delete"
size="mini" size="mini"
@click="handleAdd" :disabled="multiple"
>新增</el-button> @click="handleDelete"
</el-col> >删除</el-button>
<el-col :span="1.5">
<el-button <el-button
style="float:right;"
type="success" type="success"
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
>修改</el-button> >修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button <el-button
type="danger" style="float:right;margin-left: 20px;"
icon="el-icon-delete" type="primary"
icon="el-icon-plus"
size="mini" size="mini"
:disabled="multiple" @click="handleAdd"
@click="handleDelete" >新增</el-button>
>删除</el-button> </div>
</el-col>
</el-row> <el-table v-loading="loading" :data="freightList" :height="tableHeight" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="freightList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="Id" /> <el-table-column label="ID" align="center" prop="Id" />
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
<el-dialog :title="title" :visible.sync="open" v-if="open" width="90%" append-to-body> <el-dialog :title="title" :visible.sync="open" v-if="open" width="90%" append-to-body>
<IndexBtn :option="form" /> <IndexBtn :option="form" />
</el-dialog> </el-dialog>
</el-card>
</div> </div>
</template> </template>
<script> <script>
...@@ -79,6 +80,8 @@ export default { ...@@ -79,6 +80,8 @@ export default {
name: "freight", name: "freight",
data() { data() {
return { return {
fullHeight: '',
tableHeight:null,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
...@@ -100,7 +103,7 @@ export default { ...@@ -100,7 +103,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
seller_id: null, seller_id: null,
name: null, name: null,
sort: null, sort: null,
...@@ -127,6 +130,16 @@ export default { ...@@ -127,6 +130,16 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.$nextTick(()=>{
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
})
},
watch:{
fullHeight(val,oldval){
console.log(val)
this.tableHeight = val - 130
}
}, },
methods: { methods: {
formatType(row){ formatType(row){
...@@ -291,3 +304,19 @@ export default { ...@@ -291,3 +304,19 @@ export default {
} //methods结束 } //methods结束
}; };
</script> </script>
<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>
src/views/system/freight/freight_list/indexbtn.vue
浏览文件 @ 3380a1ed
...@@ -287,7 +287,9 @@ export default { ...@@ -287,7 +287,9 @@ export default {
}, },
handleinfomationclick() {//提交 handleinfomationclick() {//提交
console.log(this.goodsDate) console.log(this.goodsDate)
this.goodsDate.Disdispatching.forEach(item=>{
item.np = Number(item.np*100).toFixed()
})
addFreight(this.goodsDate).then(response => { addFreight(this.goodsDate).then(response => {
if(response.data.code == 1){ if(response.data.code == 1){
......
src/views/system/goods/add/index.vue
浏览文件 @ 3380a1ed
...@@ -205,10 +205,20 @@ ul,li{ ...@@ -205,10 +205,20 @@ ul,li{
.app-container{ .app-container{
height:100%; height:100%;
} }
.el-card{ .box-card{
height:100% ;
}
.box-card /deep/ .el-card__body{
height:100%; height:100%;
overflow: hidden;
}
.el-tabs{
height:calc(100% - 35px);
}
.el-tabs /deep/ .el-tabs__content{
height:calc(100% - 39px);
overflow-y: scroll;
} }
.eldelbtn{ .eldelbtn{
height:30px; height:30px;
padding:5px 20px !important; padding:5px 20px !important;
......
src/views/system/goods/offsale/index.vue
浏览文件 @ 3380a1ed
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-card class="box-card">
<el-form-item label="商品ID" prop="goods_id"> <div slot="header" class="clearfix">
<el-input <span></span>
v-model="queryParams.goods_id"
placeholder="请输入商品ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -45,7 +32,25 @@ ...@@ -45,7 +32,25 @@
>删除</el-button> >删除</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange"> </div>
<!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="商品ID" prop="goods_id">
<el-input
v-model="queryParams.goods_id"
placeholder="请输入商品ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> -->
<el-table v-loading="loading" :data="goodsList" :height="tableHeight" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="" align="center" width= "100" prop="defaultImage"> <el-table-column label="" align="center" width= "100" prop="defaultImage">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -90,6 +95,7 @@ ...@@ -90,6 +95,7 @@
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<IndexBtn :option="form" /> <IndexBtn :option="form" />
</el-dialog> </el-dialog>
</el-card>
</div> </div>
</template> </template>
<script> <script>
...@@ -99,7 +105,9 @@ export default { ...@@ -99,7 +105,9 @@ export default {
name: "goods", name: "goods",
data() { data() {
return { return {
fullHeight: '',
// 遮罩层 // 遮罩层
tableHeight:500,
loading: true, loading: true,
// 选中数组 // 选中数组
ids: [], ids: [],
...@@ -136,6 +144,16 @@ export default { ...@@ -136,6 +144,16 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.$nextTick(()=>{
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
})
},
watch:{
fullHeight(val,oldval){
// console.log(val)
this.tableHeight = val - 150
}
}, },
methods: { methods: {
//格式化价格 //格式化价格
...@@ -253,3 +271,19 @@ export default { ...@@ -253,3 +271,19 @@ export default {
} //methods结束 } //methods结束
}; };
</script> </script>
<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>
src/views/system/goods/onsale/index.vue
浏览文件 @ 3380a1ed
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-card class="box-card">
<el-form-item label="商品ID" prop="goods_id"> <div slot="header" class="clearfix">
<el-input <span></span>
v-model="queryParams.goods_id"
placeholder="请输入商品ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> -->
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -45,7 +32,25 @@ ...@@ -45,7 +32,25 @@
>删除</el-button> >删除</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange"> </div>
<!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="商品ID" prop="goods_id">
<el-input
v-model="queryParams.goods_id"
placeholder="请输入商品ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> -->
<el-table v-loading="loading" :data="goodsList" :height="tableHeight" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="" align="center" width= "100" prop="defaultImage"> <el-table-column label="" align="center" width= "100" prop="defaultImage">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -87,9 +92,10 @@ ...@@ -87,9 +92,10 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改goods对话框 --> <!-- 添加或修改goods对话框 -->
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body> <el-dialog :title="title" :visible.sync="open" :modal-append-to-body ="false" width="90%" style="height:90%;overflow:hidden;" append-to-body>
<IndexBtn :option="form" /> <IndexBtn :option="form" />
</el-dialog> </el-dialog>
</el-card>
</div> </div>
</template> </template>
<script> <script>
...@@ -99,6 +105,8 @@ export default { ...@@ -99,6 +105,8 @@ export default {
name: "goods", name: "goods",
data() { data() {
return { return {
fullHeight: '',
tableHeight:null,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
...@@ -136,6 +144,16 @@ export default { ...@@ -136,6 +144,16 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.$nextTick(()=>{
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
})
},
watch:{
fullHeight(val,oldval){
console.log(val)
this.tableHeight = val - 150
}
}, },
methods: { methods: {
//格式化价格 //格式化价格
...@@ -249,3 +267,19 @@ export default { ...@@ -249,3 +267,19 @@ export default {
} //methods结束 } //methods结束
}; };
</script> </script>
<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>
src/views/system/order/index.vue
浏览文件 @ 3380a1ed
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card class="box-card">
<div slot="header" class="clearfix">
<el-form :model="queryParams" ref="queryForm" :inline="true"> <el-form :model="queryParams" ref="queryForm" :inline="true">
<el-form-item label="付款状态"> <el-form-item label="付款状态">
<el-select v-model="queryParams.payStatus" placeholder="付款状态"> <el-select v-model="queryParams.payStatus" placeholder="付款状态">
...@@ -64,9 +66,11 @@ ...@@ -64,9 +66,11 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="orderList" :height="tableHeight" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="商品图片" align="center" width="100"> <el-table-column label="商品图片" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -305,7 +309,7 @@ ...@@ -305,7 +309,7 @@
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>
</el-dialog> </el-dialog>
</el-card>
</div> </div>
</template> </template>
<script> <script>
...@@ -315,6 +319,8 @@ export default { ...@@ -315,6 +319,8 @@ export default {
name: "order", name: "order",
data() { data() {
return { return {
fullHeight: '',
tableHeight:500,
fullscreenLoading:false, fullscreenLoading:false,
loading: true, loading: true,
// 时间线正序 // 时间线正序
...@@ -422,6 +428,17 @@ export default { ...@@ -422,6 +428,17 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.$nextTick(()=>{
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
})
},
watch:{
fullHeight(val,oldval){
// console.log(val)
let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 110
}
}, },
methods: { methods: {
//物流 //物流
...@@ -538,3 +555,19 @@ export default { ...@@ -538,3 +555,19 @@ export default {
} //methods结束 } //methods结束
}; };
</script> </script>
<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>
src/views/system/retreat/retreat/index.vue
浏览文件 @ 3380a1ed
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card class="box-card">
<div slot="header" class="clearfix">
<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">
<el-form-item label="商品id" prop="goods_id"> <el-form-item label="商品id" prop="goods_id">
<el-input <el-input
...@@ -26,8 +28,8 @@ ...@@ -26,8 +28,8 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div>
<el-table v-loading="loading" :data="retreatList"> <el-table v-loading="loading" :data="retreatList" :height="tableHeight">
<el-table-column label="序号" align="center" prop="Id" /> <el-table-column label="序号" align="center" prop="Id" />
<el-table-column label="商品名称" align="center" prop="GoodsName" /> <el-table-column label="商品名称" align="center" prop="GoodsName" />
<el-table-column label="订单号" align="center" prop="OrderSn" /> <el-table-column label="订单号" align="center" prop="OrderSn" />
...@@ -248,6 +250,7 @@ ...@@ -248,6 +250,7 @@
<el-button ></el-button> <el-button ></el-button>
</div> </div>
</el-dialog> </el-dialog>
</el-card>
</div> </div>
</template> </template>
<script> <script>
...@@ -256,6 +259,8 @@ export default { ...@@ -256,6 +259,8 @@ export default {
name: "retreat", name: "retreat",
data() { data() {
return { return {
fullHeight: '',
tableHeight:500,
//退货地址 //退货地址
address:[], address:[],
//提交信息 //提交信息
...@@ -334,6 +339,17 @@ export default { ...@@ -334,6 +339,17 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
this.$nextTick(()=>{
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
})
},
watch:{
fullHeight(val,oldval){
// console.log(val)
let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 110
}
}, },
methods: { methods: {
//原因 卖家拒绝（1:买家要求退款金额过高2:买家举证无效，商品没问题3:买家未举证，商品没问题4:商品已超售后服务时限5:退回商品后才能退款6:过期未操作,7:其他） //原因 卖家拒绝（1:买家要求退款金额过高2:买家举证无效，商品没问题3:买家未举证，商品没问题4:商品已超售后服务时限5:退回商品后才能退款6:过期未操作,7:其他）
...@@ -562,3 +578,19 @@ export default { ...@@ -562,3 +578,19 @@ export default {
} //methods结束 } //methods结束
}; };
</script> </script>
<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>
vue.config.js
浏览文件 @ 3380a1ed
...@@ -8,7 +8,7 @@ function resolve(dir) { ...@@ -8,7 +8,7 @@ function resolve(dir) {
const name = defaultSettings.title || '云仓' // 标题 const name = defaultSettings.title || '云仓' // 标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 8080 // 端口
// vue.config.js 配置说明 // vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论