zm/nuttyreading-master-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单页面部分修改

Browse Source
This commit is contained in:
@fawn-nine
2023-11-22 13:35:16 +08:00
parent 074c4f0934
commit 93cdab6162
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/views/modules/order/buyorder.vue
View File

@@ -24,7 +24,7 @@
<!-- <el-button style="margin-left: 10px;" size="mini" v-if="isAuth('book:buyorder:delete')" type="primary" @click="printHandle(dataListSelections)"
:disabled="dataListSelections.length <= 0" >批量打印</el-button> -->
</div>
<div style="margin-bottom: 10px; float:left; margin-right: 15px" v-if="tabChange.isPrint == '1'">
<div style="margin-bottom: 10px; float:left; margin-right: 15px" v-if="tabChange.isPrint == '1' && tabChange.tabActiveName == 2">
<el-radio v-model="tabChange.sheetCode" :label="0" border size="mini">全部</el-radio>
<el-radio v-model="tabChange.sheetCode" :label="2" border size="mini">未打印</el-radio>
<el-radio v-model="tabChange.sheetCode" :label="1" border size="mini">已打印</el-radio>
@@ -152,6 +152,7 @@
<router-link :to="{ path: 'order-buyorderdetail', query: { orderSn: fitem.orderSn , ordertype: fitem.orderStatus} }" style="margin-left:20px">
<el-button type="warning" style="" size="mini" plain>订单详情</el-button>
</router-link>
<!-- <el-button type="danger" style="" size="mini" plain @click="deleteHandle(fitem.orderId)">删除订单</el-button> -->
</el-col>
<el-col :span="6">
<div class="tip">
@@ -208,7 +209,9 @@
<!-- <img v-if="fitem.orderType == 'vip'" src="../../../../static/img/oder_vip.png" width="60px" height="60px"> -->
</div>
<div class="total td2 xcenter">
<div class="tabName">合计：<em>￥{{ fitem.orderPrice }}</em></div>
<div class="tabName">商品合计：<em>￥{{ fitem.orderPrice }}</em></div>
<div class="tabName">运费：<em>￥{{ fitem.shippingPrice }}</em></div>
<div class="tabName">实收：<em>￥{{ fitem.realPrice }}</em></div>
<div class="tabContent">
<div></div>
<!-- <div>含快递费：10.00，优惠券：{{ fitem.couponName }}，积分抵扣：-10.00</div> -->
@@ -322,12 +325,12 @@
align="center"
label="地址">
</el-table-column> -->
<el-table-column prop="paymentMethod" header-align="center" align="center" label="支付方式" width="100">
<el-table-column prop="paymentMethod" header-align="center" align="center" label="支付方式" width="130">
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentMethod == 1" type="success">微信</el-tag>
<el-tag v-if="scope.row.paymentMethod == 2" type="primary">支付宝</el-tag>
<el-tag v-if="scope.row.paymentMethod == 3" type="warning">ios内购</el-tag>
<el-tag v-if="scope.row.paymentMethod == 4" type="warnning">天医币支付</el-tag>
<el-tag size="mini" v-if="scope.row.paymentMethod == 1" type="success">微信</el-tag>
<el-tag size="mini" v-if="scope.row.paymentMethod == 2" type="primary">支付宝</el-tag>
<el-tag size="mini" v-if="scope.row.paymentMethod == 3" type="warning">ios内购</el-tag>
<el-tag size="mini" v-if="scope.row.paymentMethod == 4" type="info" >天医币支付</el-tag>
</template>
</el-table-column>
<!-- 1 支付宝 2 微信 3 ios内购-->
@@ -341,10 +344,11 @@
<el-table-column prop="realMoney" header-align="center" align="center" label="实收金额">
<template slot-scope="scope">
<div class="detailsFonts">
<span>实收：<b style="font-size: 16px; color: #fda328;">￥{{scope.row.orderPrice}}</b></span>
<span v-if="scope.row.couponId">优惠券：-</span>
<span v-if="scope.row.shippingMoney">运费：+{{scope.row.shippingMoney}}</span>
<span v-if="scope.row.shippingPrice">商品合计：￥{{scope.row.orderPrice}}</span>
<!-- <span v-if="scope.row.couponId">优惠券：-</span> -->
<span v-if="scope.row.shippingPrice">运费：￥{{scope.row.shippingPrice}}</span>
<!-- <span >积分抵扣：-</span> -->
<span>实收：<b style="font-size: 16px; color: #fda328;">￥{{scope.row.realPrice}}</b></span>
</div>
</template>
</el-table-column>
@@ -365,7 +369,7 @@
<img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.productImage" width="40px" height="40px">
</div>
<div>
<span>{{item.productName}} [ ×{{item.quantity}} ]
<span>{{item.productName}} [ ￥{{item.productPrice}} × {{item.quantity}} ]
<i v-if="item.books && item.books.length > 0" @click.stop="seeBooks(item.books)" class="el-icon-view" style="color:#409eff; cursor: pointer;"></i></span>
</div>
</div>
@@ -576,7 +580,7 @@ export default {
tabActiveName: '1', // tab筛选默认all全部 0：待付款 1：待发货 2：已发货 3：已完成
isPrint: 0, // 已发货列表筛选 0：显示订单 1：显示可打印列表,
orderName: '0', //订单名称筛选 all:全部 0:健康超市 1:电子书 2:充值订单
sheetCode: 0, // 面单状态2 未打印，1 已打印 0全部
sheetCode: 2, // 面单状态2 未打印，1 已打印 0全部
},
editBeizhudialogVisible: false, // 修改备注按钮
editBeizhuform: {
@@ -1237,7 +1241,7 @@ export default {
handler(val, oldVal) {
//console.log(val)
this.getDataList()
if (this.tabChange.tabActiveName === '0' || this.tabChange.tabActiveName === '1' || this.tabChange.tabActiveName === '3') {
if (this.tabChange.tabActiveName === '' || this.tabChange.tabActiveName === '0' || this.tabChange.tabActiveName === '1' || this.tabChange.tabActiveName === '3') {
this.tabChange.isPrint = '0'
}
if (this.tabChange.isPrint === '1') { this.getPrintSheetList() }