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

0309

Browse Source
This commit is contained in:
@fawn-nine
2023-03-09 17:14:30 +08:00
parent b001a5ca6d
commit d3581b3792
9 changed files with 1321 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,13 +29,13 @@
</div>
<el-form :inline="true" size="mini" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.key" placeholder="订单编号" clearable></el-input>
<el-input style="width:200px" v-model="dataForm.key" placeholder="订单编号/收件人姓名/手机号" clearable></el-input>
</el-form-item>
<!-- 按时间筛选 -->
<el-form-item>
<div class="block">
<el-date-picker size="mini" v-model="dataForm.time" type="datetimerange" :picker-options="timePickerOptions"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
<el-date-picker size="mini" value-format="timestamp" v-model="dataForm.time" type="datetimerange" :picker-options="timePickerOptions"
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right" @change="test">
</el-date-picker>
</div>
</el-form-item>
@@ -218,8 +218,8 @@
</el-table-column>
<el-table-column prop="orderSn" header-align="center" align="center" label="订单编号">
</el-table-column>
<el-table-column prop="userName" header-align="center" align="center" label="下单人姓名">
</el-table-column>
<!-- <el-table-column prop="userName" header-align="center" align="center" label="下单人姓名">
</el-table-column> -->
<!-- <el-table-column
prop="shippingUser"
header-align="center"
@@ -266,9 +266,9 @@
<template slot-scope="scope">
<div class="detailsFonts">
<span>实收：<b style="font-size: 16px; color: #fda328;">￥{{scope.row.realMoney}}</b></span>
<span>优惠券：-</span>
<span>运费：+{{scope.row.shippingMoney}}</span>
<span>积分抵扣：-</span>
<span v-if="scope.row.couponId">优惠券：-</span>
<span v-if="scope.row.shippingMoney">运费：+{{scope.row.shippingMoney}}</span>
<!-- <span >积分抵扣：-</span> -->
</div>
</template>
</el-table-column>
@@ -284,6 +284,7 @@
</el-table-column>
<el-table-column prop="orderStatus" header-align="center" align="center" label="订单状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.orderStatus == 0" type="success">待付款</el-tag>
<el-tag v-if="scope.row.orderStatus == 1" type="success">待发货</el-tag>
<el-tag v-if="scope.row.orderStatus == 2" type="danger">已发货</el-tag>
<el-tag v-if="scope.row.orderStatus == 3" type="warning">已完成</el-tag>
@@ -536,7 +537,8 @@ export default {
'page': this.pageIndex,
'limit': this.pageSize,
'key': this.dataForm.key,
'time': this.dataForm.time,
'startTime': this.dataForm.time[0],
'endTime': this.dataForm.time[1],
'orderStatus': this.tabChange.tabActiveName, // 订单状态参数
'isPrint': this.tabChange.isPrint,
'orderorderType': this.tabChange.orderName,
@@ -762,7 +764,9 @@ export default {
this.splitDeliverVisible = val
// this.oprateOrder = {}
this.getDataList()
},
test(e){
console.log(e)
},
// 关闭万能弹窗
closeanyDialogDialog() {

12
src/views/modules/order/paypaymentorder.vue
View File

@@ -22,17 +22,17 @@
align="center"
width="50">
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="id"
header-align="center"
align="center"
label="id">
</el-table-column>
</el-table-column> -->
<el-table-column
prop="userId"
prop="userName"
header-align="center"
align="center"
label="用户id">
label="用户">
</el-table-column>
<el-table-column
prop="rechargeAmount"
@@ -63,6 +63,10 @@
header-align="center"
align="center"
label="充值状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.rechargeStatus == 'success'" type="success">成功</el-tag>
<el-tag v-else type="error">失败</el-tag>
</template>
</el-table-column>
<el-table-column
prop="createTime"

18
src/views/modules/order/transactiondetails.vue
View File

@@ -23,16 +23,16 @@
width="50">
</el-table-column>
<el-table-column
prop="transactionId"
prop="createTime"
header-align="center"
align="center"
label="">
label="操作时间">
</el-table-column>
<el-table-column
prop="userId"
prop="userName"
header-align="center"
align="center"
label="用户id">
label="用户">
</el-table-column>
<el-table-column
prop="orderType"
@@ -45,13 +45,17 @@
header-align="center"
align="center"
label="变动金额">
<template slot-scope="scope">
<span v-if="scope.row.changeAmount > 0" style="color: red;">{{scope.row.changeAmount}}</span>
<span v-if="scope.row.changeAmount < 0" style="color: #54a966;">{{scope.row.changeAmount}}</span>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="relationId"
header-align="center"
align="center"
label="关联id">
</el-table-column>
</el-table-column> -->
<el-table-column
prop="remark"
header-align="center"
@@ -71,7 +75,7 @@
width="150"
label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.transactionId)">修改</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.transactionId)">明细</el-button>
<el-button type="text" size="small" @click="deleteHandle(scope.row.transactionId)">删除</el-button>
</template>
</el-table-column>