From d4c8d19101329806995244d139d5ce58de25f1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A4=A9=E9=9C=B8?= <15565133664@163.com> Date: Wed, 28 Jul 2021 20:49:47 +0800 Subject: [PATCH] 111 --- .../system/order/components/orderDetail.vue | 2 +- src/views/system/order/index.vue | 35 +++++++++++++++---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/views/system/order/components/orderDetail.vue b/src/views/system/order/components/orderDetail.vue index 79bd3d7..c2544e0 100644 --- a/src/views/system/order/components/orderDetail.vue +++ b/src/views/system/order/components/orderDetail.vue @@ -73,7 +73,7 @@ </div> <el-table :data="orderDetail ? orderDetail.item : []" style="border: 1px solid #eee;" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" /> - <el-table-column label="订å•å·" prop="order_sn"/> + <el-table-column label="订å•å·" prop="order_sn" /> <el-table-column label="商å“åç§°"> <template slot-scope="scope"> {{scope.row.goods_list[0].title}} diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 38d499a..f9da971 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -4,10 +4,10 @@ <div style="position: relative;"> <el-tabs v-model="activeName" @tab-click="handleClick"> <el-tab-pane name="first"> - <div slot="label">å¾…å‘è´§{{activeName == 'first' ? '(' + total + ')' : ''}}</div> + <div slot="label">å¾…å‘è´§{{activeName == 'first' ? '(' + total1 + ')' : ''}}</div> </el-tab-pane> <el-tab-pane name="second"> - <div slot="label">å·²å‘è´§{{activeName == 'second' ? '(' + total + ')' : ''}}</div> + <div slot="label">å·²å‘è´§{{activeName == 'second' ? '(' + total2 + ')' : ''}}</div> </el-tab-pane> <el-tab-pane label="已完æˆ" name="third"></el-tab-pane> <el-tab-pane label="全部订å•" name="fourth"></el-tab-pane> @@ -17,6 +17,7 @@ <el-button size="mini" icon="el-icon-position" @click="isDeliveryOpen = true">批é‡å‘è´§</el-button> </div> </div> + <div class="scollbox"> <div class="form-box"> <el-form ref="form" :model="form" label-width="85px"> <el-row type="flex" class="row-bg" justify="space-around"> @@ -64,16 +65,20 @@ </el-row> </el-form> </div> - <el-table :data="tableData" height="520"> + <el-table :data="tableData" max-height="1080"> <el-table-column type="selection" width="55" /> - <el-table-column label="订å•å·" align="center" prop="order_sn"/> - <el-table-column label="䏋啿—¶é—´" align="center" prop="Updatetime"> + <el-table-column label="订å•å·" align="center" prop="order_sn" width="255"/> + <el-table-column label="䏋啿—¶é—´" align="center" prop="Updatetime" width="155"> <template slot-scope="scope"> {{formatter(scope.row.Updatetime)}} </template> </el-table-column> <el-table-column label="æ•°é‡" align="center" prop="goods_total"/> - <el-table-column label="订å•金é¢" align="center" prop="goods_price"/> + <el-table-column label="订å•金é¢" align="center" prop="goods_price"> + <template slot-scope="scope"> + {{scope.row.goods_price/100}} + </template> + </el-table-column> <el-table-column label="收货人" align="center" prop="real_name"/> <el-table-column label="è”系电è¯" align="center" prop="mobile"/> <el-table-column label="æ“作" align="center" class-name="small-padding fixed-width"> @@ -88,6 +93,8 @@ </template> </el-table-column> </el-table> + + </div> <div class="footer_pagination"> <el-pagination background @@ -170,6 +177,8 @@ currentPage: 1, pageSize: 20, total: 0, + total1:'',//å¾…å‘è´§ + total2:'',//å·²å‘è´§ activeName: 'first', form: { order_sn: '', @@ -256,6 +265,12 @@ listOrder(params).then(res => { if (res.code == 1) { this.total = res.data.count || 0 + if( this.goodsStatus == 1){ + this.total1 = res.data.count || 0 + } + if( this.goodsStatus == 2){ + this.total2 = res.data.count || 0 + } this.tableData = res.data.data } }) @@ -381,7 +396,13 @@ /deep/.el-range-editor.el-input__inner { width: 100%; } - +/deep/ .el-card__body{ + height:calc(100% - 50px); +} +.scollbox{ + height: calc(100% - 50px); + overflow-y: scroll; +} .form-box { background-color: #F7F8FA; margin-bottom: 20px; -- 2.18.1