fix: 预售订单列表简单处理
This commit is contained in:
parent
1314bdb200
commit
746c671538
|
|
@ -1,102 +1,40 @@
|
|||
<template>
|
||||
<div>
|
||||
<div v-if="isMerchant" style="height: calc(100vh - 200px)">
|
||||
<obj-table-plus
|
||||
ref="oTable"
|
||||
style="height: 100%"
|
||||
:tableCols="tableCols"
|
||||
:tableProp="tableProp"
|
||||
@query="queryList"
|
||||
v-model="dataList"
|
||||
:tableEvent="tableEvent"
|
||||
:enableAutoQuery="false"
|
||||
<div style="height: calc(100vh - 200px)">
|
||||
<el-form
|
||||
v-if="storeList.length > 1"
|
||||
:inline="true"
|
||||
:model="formInline"
|
||||
class="demo-form-inline"
|
||||
>
|
||||
<template slot="tableTop">
|
||||
<el-form :inline="true" :model="formInline" class="demo-form-inline">
|
||||
<el-row v-if="storeList.length > 1">
|
||||
<el-col :span="24">
|
||||
<!-- <el-form-item label="菜市场">
|
||||
<el-select
|
||||
@change="getData"
|
||||
v-model="formInline.marketId"
|
||||
placeholder="请选择菜市场"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in marketList"
|
||||
:key="item.marketId"
|
||||
:label="item.marketName"
|
||||
:value="item.marketId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="店铺">
|
||||
<el-form-item label="摊铺">
|
||||
<el-select
|
||||
class="filter-item"
|
||||
style="width: 200px"
|
||||
v-model="formInline.shopId"
|
||||
placeholder="请选择店铺"
|
||||
placeholder="请选择摊铺"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in storeList"
|
||||
:key="item.shopId"
|
||||
:label="item.shopName"
|
||||
:value="item.shopId"
|
||||
></el-option>
|
||||
</el-select> </el-form-item
|
||||
></el-col>
|
||||
</el-row>
|
||||
<el-form-item label="订单号">
|
||||
<el-input
|
||||
v-model="formInline.name"
|
||||
placeholder="订单号搜索"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="订单商品">
|
||||
<el-input
|
||||
v-model="formInline.name"
|
||||
placeholder="订单名称搜索"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="定金付款时间">
|
||||
<el-date-picker
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
v-model="value1"
|
||||
type="datetimerange"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="尾款付款时间">
|
||||
<el-date-picker
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
v-model="value1"
|
||||
type="datetimerange"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="配送方式">
|
||||
<el-select v-model="formInline.name" placeholder="请选择菜市场">
|
||||
<el-option
|
||||
v-for="item in [
|
||||
{ label: '全部', value: '0' },
|
||||
{ label: '快递', value: '1' },
|
||||
{ label: '自提', value: '2' }
|
||||
]"
|
||||
:key="item.marketId"
|
||||
:label="item.marketName"
|
||||
:value="item.marketId"
|
||||
></el-option>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="$refs.oTable.reload()"
|
||||
>查询</el-button
|
||||
>
|
||||
<el-button type="primary" @click="getList">查询</el-button>
|
||||
<el-button type="primary" @click="Reset">重置</el-button>
|
||||
<el-button
|
||||
type="success"
|
||||
@click="
|
||||
$router.push({ name: 'operation-management-total-order/index' })
|
||||
"
|
||||
>菜市场总订单</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-tabs v-model="activeName" @tab-click="handleClick">
|
||||
<el-tabs v-model="formInline.group" @tab-click="handleClick">
|
||||
<el-tab-pane
|
||||
v-for="item in statusList"
|
||||
:key="item.value"
|
||||
|
|
@ -104,267 +42,168 @@
|
|||
:name="item.value"
|
||||
></el-tab-pane>
|
||||
</el-tabs>
|
||||
<div class="mb-2">
|
||||
<el-button type="primary" size="small" @click="addProduct"
|
||||
>批量导出</el-button
|
||||
<el-table :data="tableData" height="70vh" border style="width: 100%">
|
||||
<el-table-column type="expand">
|
||||
<template slot-scope="props">
|
||||
<div style="padding-left: 20px" m="4">
|
||||
<el-table :data="props.row.productOrders" :border="true">
|
||||
<el-table-column type="index" width="50" label="序号">
|
||||
</el-table-column>
|
||||
<el-table-column label="商品订单号" prop="productOrderNo" />
|
||||
<el-table-column label="商品名称" prop="productName" />
|
||||
<el-table-column label="商品原价" prop="originPrice" />
|
||||
<el-table-column label="商品终价" prop="finalPrice" />
|
||||
<el-table-column label="商品订单金额" prop="productOrderMoney" />
|
||||
<el-table-column label="商品数量" prop="productCount" />
|
||||
<el-table-column label="商品单价" prop="productFinalPrice" />
|
||||
<el-table-column label="商品图片" prop="productImg">
|
||||
<template slot-scope="scope">
|
||||
<el-image
|
||||
style="width: 60px; height: 60px"
|
||||
:src="scope.row.productImg"
|
||||
:preview-src-list="[scope.row.productImg]"
|
||||
>
|
||||
</el-image>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
</obj-table-plus>
|
||||
<!-- 详情 -->
|
||||
</el-table-column>
|
||||
<el-table-column label="总订单号" prop="orderNo" />
|
||||
<el-table-column label="结算单位订单号" prop="unitOrderNo" />
|
||||
<el-table-column label="总商品数量" prop="productCount" />
|
||||
<el-table-column label="订单状态" prop="preSaleStage">
|
||||
<template slot-scope="scope">
|
||||
{{
|
||||
scope.row.preSaleStage === 1
|
||||
? '已付定金'
|
||||
: scope.row.preSaleStage === 2
|
||||
? '已付尾款'
|
||||
: '待付定金'
|
||||
}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="顾客实际支付" prop="totalMoney" />
|
||||
<el-table-column label="商品总价" prop="productMoney" />
|
||||
<el-table-column label="配送费" prop="deliveryMoney" />
|
||||
<el-table-column label="优惠券减免" prop="couponMoney" />
|
||||
<el-table-column label="支付时间" prop="payTime" />
|
||||
<el-table-column label="预计送达时间" prop="predictDeliveryTime" />
|
||||
<el-table-column label="预计收入" prop="predictIncome" />
|
||||
<el-table-column label="距离" prop="distance" />
|
||||
<el-table-column label="备注" prop="remark" />
|
||||
<el-table-column fixed="right" width="100px" label="操作" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="primary" size="mini" @click="view(scope.row)">
|
||||
查看
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!-- 分页 -->
|
||||
<div class="pagination-container">
|
||||
<el-pagination
|
||||
:current-page="formInline.pageNumber"
|
||||
:page-sizes="[10, 20, 30, 50]"
|
||||
:page-size="formInline.pageSize"
|
||||
:total="total"
|
||||
background
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"
|
||||
/>
|
||||
</div>
|
||||
<!-- 订单详情 -->
|
||||
<viewDetails ref="viewDetails"></viewDetails>
|
||||
</div>
|
||||
<div style="height: calc(100vh - 200px)" v-else>
|
||||
<el-empty :image-size="200" description="您不是摊主哦"></el-empty>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { mapState } from 'vuex'
|
||||
import viewDetails from './popup/view-details.vue'
|
||||
import { mapState } from 'vuex'
|
||||
export default {
|
||||
components: { viewDetails },
|
||||
data() {
|
||||
return {
|
||||
value1: '',
|
||||
activeName: '5',
|
||||
advanceSellStatus: '',
|
||||
dataList: [],
|
||||
formInline: {
|
||||
name: '',
|
||||
marketId: '',
|
||||
shopId: ''
|
||||
},
|
||||
tableProp: {
|
||||
'auto-resize': true,
|
||||
border: true,
|
||||
height: 'auto',
|
||||
'row-id': 'advanceSellId',
|
||||
'show-overflow': false
|
||||
group: '',
|
||||
shopId: '',
|
||||
pageNumber: 1,
|
||||
pageSize: 10
|
||||
},
|
||||
statusList: [
|
||||
{
|
||||
label: '全部',
|
||||
value: '5'
|
||||
},
|
||||
{
|
||||
label: '代付定金',
|
||||
label: '全部订单',
|
||||
value: '0'
|
||||
},
|
||||
{
|
||||
label: '代付尾款',
|
||||
label: '待备货',
|
||||
value: '1'
|
||||
},
|
||||
{
|
||||
label: '待发货',
|
||||
label: '待取货',
|
||||
value: '2'
|
||||
},
|
||||
{
|
||||
label: '待收货',
|
||||
value: '3'
|
||||
},
|
||||
{
|
||||
label: '待评价',
|
||||
value: '4'
|
||||
},
|
||||
{
|
||||
label: '已完成',
|
||||
value: '6'
|
||||
},
|
||||
{
|
||||
label: '已取消',
|
||||
value: '7'
|
||||
},
|
||||
{
|
||||
label: '交易关闭',
|
||||
value: '8'
|
||||
value: '4'
|
||||
}
|
||||
],
|
||||
productFilterType: 'SALE',
|
||||
selectList: []
|
||||
tableData: [],
|
||||
total: 0
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.formInline = {
|
||||
marketId: this.marketId,
|
||||
group: '0',
|
||||
// marketId: this.marketId,
|
||||
shopId: this.shopId
|
||||
}
|
||||
this.$nextTick(() => {
|
||||
this.$refs.oTable.reload()
|
||||
})
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
addProduct() {
|
||||
this.$refs.addOrUpdate.toggle().add()
|
||||
},
|
||||
queryList(pageNo, pageSize) {
|
||||
// let res = {
|
||||
// data: [],
|
||||
// total: 0
|
||||
// }
|
||||
// setTimeout(() => {
|
||||
// this.$refs.oTable.complete(res.data, Number(res.total))
|
||||
// }, 1000)
|
||||
this.$api.preSale
|
||||
.preSaleProducts({
|
||||
pageNumber: pageNo,
|
||||
pageSize: pageSize,
|
||||
getList() {
|
||||
//根据店铺查询
|
||||
this.$api.mer_admin
|
||||
.shopOrderPage({
|
||||
...this.formInline,
|
||||
advanceSellStatus: this.advanceSellStatus,
|
||||
merchantId: JSON.parse(sessionStorage.getItem('userInfo')).merchantId,
|
||||
productQuerySortParam: []
|
||||
orderCategory: 3
|
||||
})
|
||||
.then(res => {
|
||||
console.log(res)
|
||||
this.$refs.oTable.complete(
|
||||
res.data.data.data,
|
||||
Number(res.data.data.total)
|
||||
)
|
||||
})
|
||||
.catch(err => {
|
||||
this.$refs.oTable.complete(false)
|
||||
this.tableData = res.data.data.data
|
||||
this.total = Number(res.data.data.total)
|
||||
})
|
||||
},
|
||||
Reset() {
|
||||
this.formInline = {
|
||||
name: '',
|
||||
marketId: this.marketId,
|
||||
group: '0',
|
||||
shopId: this.shopId
|
||||
}
|
||||
this.$refs.oTable.reload()
|
||||
this.getList()
|
||||
},
|
||||
handleClick(e) {
|
||||
console.log(e.name)
|
||||
if (e.name == '5') {
|
||||
this.advanceSellStatus = ''
|
||||
} else {
|
||||
this.advanceSellStatus = e.name
|
||||
}
|
||||
this.$refs.oTable.reload()
|
||||
this.getList()
|
||||
},
|
||||
view(row) {
|
||||
this.$refs.viewDetails.toggle(row).update()
|
||||
},
|
||||
handleSizeChange(val) {
|
||||
this.formInline.pageSize = val
|
||||
this.getList()
|
||||
},
|
||||
handleCurrentChange(val) {
|
||||
this.formInline.pageNumber = val
|
||||
this.getList()
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
tableCols() {
|
||||
return [
|
||||
// { type: "checkbox", width: "60px", fixed: "left" },
|
||||
{
|
||||
type: 'seq',
|
||||
fixed: 'left',
|
||||
width: '60px',
|
||||
align: 'center',
|
||||
title: '序号'
|
||||
},
|
||||
{
|
||||
title: '订单号',
|
||||
align: 'center',
|
||||
field: 'id'
|
||||
},
|
||||
{
|
||||
title: '订单商品',
|
||||
field: 'productPhotoList',
|
||||
align: 'center',
|
||||
width: '80px',
|
||||
type: 'jsx',
|
||||
render: ({ row }) => {
|
||||
if (row.productPhotoList.length > 0) {
|
||||
return (
|
||||
<el-image
|
||||
preview-src-list={row.productPhotoList.map(item => {
|
||||
return item.url
|
||||
})}
|
||||
src={row.productPhotoList[0].url}
|
||||
></el-image>
|
||||
)
|
||||
} else {
|
||||
return <span>暂无商品图</span>
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '商品名称',
|
||||
align: 'center',
|
||||
field: 'name'
|
||||
},
|
||||
{
|
||||
title: '规格/数量',
|
||||
align: 'center',
|
||||
field: 'name'
|
||||
},
|
||||
{
|
||||
title: '定金支付时间',
|
||||
align: 'center',
|
||||
field: 'startTime',
|
||||
type: 'jsx',
|
||||
render: ({ row }) => {
|
||||
return (
|
||||
<span>
|
||||
{row.startTime}至{row.endTime}
|
||||
</span>
|
||||
)
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '尾款支付时间',
|
||||
align: 'center',
|
||||
field: 'minSalePrice',
|
||||
type: 'jsx',
|
||||
render: ({ row }) => {
|
||||
return (
|
||||
<span>
|
||||
{row.balancePaymentStartTime}至{row.balancePaymentEndTime}
|
||||
</span>
|
||||
)
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '状态',
|
||||
align: 'center',
|
||||
field: 'status',
|
||||
type: 'jsx',
|
||||
render: ({ row }) => {
|
||||
if (row.advanceSellStatus == '0') {
|
||||
return <span>未开始</span>
|
||||
} else if (row.advanceSellStatus == '1') {
|
||||
return <span>进行中</span>
|
||||
} else if (row.advanceSellStatus == '2') {
|
||||
return <span>已结束</span>
|
||||
} else if (row.advanceSellStatus == '3') {
|
||||
return <span>已关闭</span>
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
type: 'jsx',
|
||||
align: 'center',
|
||||
width: '100px',
|
||||
render: ({ row }) => {
|
||||
let details = () => {
|
||||
this.$refs.viewDetails.toggle(row).update()
|
||||
}
|
||||
return (
|
||||
<div>
|
||||
<el-button size="mini" type="primary" onClick={details}>
|
||||
查看
|
||||
</el-button>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
tableEvent() {
|
||||
return {
|
||||
'checkbox-all': ({ records, reserves }) => {
|
||||
this.selectList = [...records, ...reserves]
|
||||
},
|
||||
'checkbox-change': ({ records, reserves }) => {
|
||||
this.selectList = [...records, ...reserves]
|
||||
}
|
||||
}
|
||||
},
|
||||
...mapState('userData', [
|
||||
'isMerchant',
|
||||
'marketList',
|
||||
|
|
@ -377,4 +216,3 @@ export default {
|
|||
</script>
|
||||
|
||||
<style lang="scss" scoped></style>
|
||||
|
||||
|
|
|
|||
|
|
@ -15,183 +15,203 @@
|
|||
class="demo-ruleForm"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="订金支付时间：" prop="startTime">
|
||||
<el-date-picker
|
||||
@change="getOrderTime"
|
||||
format="yyyy-MM-dd HH:mm"
|
||||
data-format="yyyy-MM-dd HH:mm"
|
||||
:disabled="true"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
v-model="orderTime"
|
||||
type="datetimerange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:editable="false"
|
||||
>
|
||||
</el-date-picker> </el-form-item
|
||||
></el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item
|
||||
label="尾款支付时间："
|
||||
prop="balancePaymentStartTime"
|
||||
>
|
||||
<el-date-picker
|
||||
@change="getArrearsTime"
|
||||
format="yyyy-MM-dd HH:mm"
|
||||
data-format="yyyy-MM-dd HH:mm"
|
||||
:disabled="true"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
v-model="arrears"
|
||||
type="datetimerange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:picker-options="pickerOptions"
|
||||
>
|
||||
</el-date-picker> </el-form-item
|
||||
></el-col>
|
||||
</el-row>
|
||||
<el-form-item
|
||||
label="预计发货时间："
|
||||
prop="estimatedStartDeliveryTime"
|
||||
>
|
||||
<el-date-picker
|
||||
format="yyyy-MM-dd HH:mm"
|
||||
data-format="yyyy-MM-dd HH:mm"
|
||||
:disabled="true"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
@change="deliveryTime"
|
||||
v-model="delivery"
|
||||
type="datetimerange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
:picker-options="pickerOptions"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="定金可退：" prop="isRefundEarnestMoney">
|
||||
<el-radio
|
||||
v-model="ruleForm.isRefundEarnestMoney"
|
||||
:label="1"
|
||||
:disabled="true"
|
||||
>是</el-radio
|
||||
>
|
||||
<el-radio
|
||||
v-model="ruleForm.isRefundEarnestMoney"
|
||||
:label="0"
|
||||
:disabled="true"
|
||||
>否</el-radio
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="订单状态：">
|
||||
<span>
|
||||
选择是，用户可在付尾款前申请退定金（申请后自动退，无需审核），或付尾款时间结束后系统自动退定金
|
||||
{{
|
||||
ruleForm.preSaleStage === 1
|
||||
? '已付定金'
|
||||
: ruleForm.preSaleStage === 2
|
||||
? '已付尾款'
|
||||
: '待付定金'
|
||||
}}
|
||||
</span>
|
||||
</el-form-item>
|
||||
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="总订单号：">
|
||||
<span>{{ ruleForm.orderNo }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label=" 结算单位订单号：">
|
||||
<span>{{ ruleForm.unitOrderNo }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="总商品数量：">
|
||||
<span>{{ ruleForm.productCount }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="顾客支付：">
|
||||
<span>{{ ruleForm.totalMoney }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="配送费：">
|
||||
<span>{{ ruleForm.deliveryMoney }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="优惠券减免：">
|
||||
<span>{{ ruleForm.couponMoney }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="下单时间：">
|
||||
<span>{{ ruleForm.payTime }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="预计送达时间：">
|
||||
<span>{{ ruleForm.predictDeliveryTime }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="预计收入：">
|
||||
<span>{{ ruleForm.predictIncome }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="距离：">
|
||||
<span>{{ ruleForm.distance }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="预计自动取消时间：">
|
||||
<span>{{ ruleForm.predictAutoCancelTime }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="备注：">
|
||||
<span>{{ ruleForm.remark }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="包装费：">
|
||||
<span>{{ ruleForm.packageMoney }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="平台服务费：">
|
||||
<span>{{ ruleForm.platformMoney }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="备餐完成时间：">
|
||||
<span>{{ ruleForm.completePrepareTime }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="开始配送时间：">
|
||||
<span>{{ ruleForm.startDeliveryTime }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="配送完成时间：">
|
||||
<span>{{ ruleForm.completeDeliveryTime }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="下单时间：">
|
||||
<span>{{ ruleForm.createTime }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="完成取货时间：">
|
||||
<span>{{ ruleForm.pickTime }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="订单完成时间：">
|
||||
<span>{{ ruleForm.completeTime }}</span>
|
||||
</el-form-item></el-col
|
||||
>
|
||||
<el-col :span="8">
|
||||
<!-- <el-form-item label="配送方式：">
|
||||
<span>{{ ruleForm.deliveryType }}</span>
|
||||
</el-form-item> -->
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div style="padding: 0 0 0 20px; font-size: 16px; font-weight: 600">
|
||||
已选择商品
|
||||
订单商品
|
||||
</div>
|
||||
<div style="padding: 20px">
|
||||
<div style="border-top: 1px solid #ccc; padding: 10px 0 0 0">
|
||||
<div style="font-size: 16px; margin-bottom: 20px">
|
||||
<span>商品ID:{{ ruleForm.productId }}</span>
|
||||
<span style="margin-left: 20px"
|
||||
>商品名称:{{ ruleForm.name }}</span
|
||||
>
|
||||
</div>
|
||||
<el-table
|
||||
border
|
||||
ref="multipleTable"
|
||||
:data="ruleForm.productSpecificationList"
|
||||
:data="ruleForm.productOrders"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column align="center" label="是否预售" width="80">
|
||||
<el-table-column
|
||||
prop="shopName"
|
||||
align="center"
|
||||
label="店铺名称"
|
||||
width="80"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="商品名称"
|
||||
prop="productName"
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="商品图片"
|
||||
prop="productImg"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
scope.row.isAdvanceSell == 1 ? '是' : '否'
|
||||
}}</span>
|
||||
<!-- <el-checkbox
|
||||
:true-label="1"
|
||||
:false-label="0"
|
||||
v-model="scope.row.isAdvanceSell"
|
||||
></el-checkbox> -->
|
||||
<el-image
|
||||
style="width: 60px; height: 60px"
|
||||
:src="scope.row.productImg"
|
||||
:preview-src-list="[scope.row.productImg]"
|
||||
>
|
||||
</el-image>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="SKU-ID" prop="id" />
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="规格"
|
||||
prop="attributeList"
|
||||
prop="productSpecName"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.attributeValue }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="属性" prop="address">
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
scope.row.attributeList
|
||||
? scope.row.attributeList[0].attributeName
|
||||
: '无'
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="销售价"
|
||||
prop="marketPrice"
|
||||
label="商品原价"
|
||||
prop="originPrice"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="商品终价"
|
||||
prop="finalPrice"
|
||||
width="120"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="presalePrice"
|
||||
prop="productOrderMoney"
|
||||
align="center"
|
||||
label="*预售价"
|
||||
label="商品订单金额"
|
||||
width="200"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.isAdvanceSell">{{
|
||||
scope.row.presalePrice
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="earnestMoney"
|
||||
align="center"
|
||||
label="*定金"
|
||||
width="200"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.isAdvanceSell">{{
|
||||
scope.row.earnestMoney
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="尾款" width="200">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.isAdvanceSell">{{
|
||||
scope.row.presalePrice
|
||||
? scope.row.presalePrice - scope.row.earnestMoney
|
||||
: ''
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="*预售库存" width="200">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.isAdvanceSell">{{
|
||||
scope.row.advanceSellStockNum
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<el-empty
|
||||
v-show="ruleForm.productList?.length == 0"
|
||||
description="请选择商品"
|
||||
></el-empty>
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
|
|
@ -203,51 +223,31 @@
|
|||
import { debounce, cloneDeep } from 'lodash'
|
||||
export default {
|
||||
components: {},
|
||||
props: {
|
||||
marketId: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
shopId: {
|
||||
type: String,
|
||||
default: ''
|
||||
}
|
||||
},
|
||||
props: {},
|
||||
data() {
|
||||
return {
|
||||
isAdd: true,
|
||||
//表格属性
|
||||
modalConfig: {
|
||||
title: '查看预售',
|
||||
title: '订单详情',
|
||||
show: false,
|
||||
width: '1200px',
|
||||
fullscreen: true
|
||||
},
|
||||
modalData: {},
|
||||
ruleForm: {
|
||||
productList: [],
|
||||
isRefundEarnestMoney: 1 //定金可退 1是 0
|
||||
},
|
||||
pickerOptions: {
|
||||
disabledDate(time) {
|
||||
return time.getTime() < Date.now()
|
||||
}
|
||||
},
|
||||
orderTime: [], //订单支付时间
|
||||
arrears: [], //尾款时间
|
||||
delivery: [], //发货时间
|
||||
ruleForm: {},
|
||||
tableData: []
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
'modalConfig.show'(newVal) {
|
||||
if (newVal) {
|
||||
//关闭弹窗清空校验
|
||||
setTimeout(() => {
|
||||
this.$refs.ruleForm.resetFields()
|
||||
})
|
||||
}
|
||||
}
|
||||
// "modalConfig.show"(newVal) {
|
||||
// if (newVal) {
|
||||
// //关闭弹窗清空校验
|
||||
// setTimeout(() => {
|
||||
// this.$refs.ruleForm.resetFields();
|
||||
// });
|
||||
// }
|
||||
// },
|
||||
},
|
||||
methods: {
|
||||
queryTableData(pageNo, pageSize) {},
|
||||
|
|
@ -262,109 +262,38 @@ export default {
|
|||
}
|
||||
return {
|
||||
add: () => {
|
||||
this.orderTime = []
|
||||
this.arrears = []
|
||||
this.delivery = []
|
||||
this.ruleForm = {
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
balancePaymentStartTime: '',
|
||||
balancePaymentEndTime: '',
|
||||
estimatedStartDeliveryTime: '',
|
||||
estimatedEndDeliveryTime: '',
|
||||
productList: [],
|
||||
isRefundEarnestMoney: 1 //定金可退 1是 0
|
||||
}
|
||||
this.modalConfig.title = '新增预售'
|
||||
this.modalConfig.title = '订单详情'
|
||||
this.isAdd = true
|
||||
},
|
||||
update: () => {
|
||||
this.modalConfig.title = '查看预售'
|
||||
this.modalConfig.title = '订单详情'
|
||||
this.isAdd = false
|
||||
}
|
||||
}
|
||||
},
|
||||
init(row) {
|
||||
console.log(row.startTime, row.endTime)
|
||||
this.orderTime = [row.startTime, row.endTime]
|
||||
this.arrears = [row.balancePaymentStartTime, row.balancePaymentEndTime]
|
||||
this.delivery = [
|
||||
row.estimatedStartDeliveryTime,
|
||||
row.estimatedEndDeliveryTime
|
||||
]
|
||||
;(this.ruleForm = {
|
||||
productId: row.id,
|
||||
advanceSellId: row.advanceSellId,
|
||||
startTime: row.startTime,
|
||||
name: row.name,
|
||||
endTime: row.endTime,
|
||||
balancePaymentStartTime: row.balancePaymentStartTime,
|
||||
balancePaymentEndTime: row.balancePaymentEndTime,
|
||||
estimatedStartDeliveryTime: row.estimatedStartDeliveryTime,
|
||||
estimatedEndDeliveryTime: row.estimatedEndDeliveryTime,
|
||||
isRefundEarnestMoney: Number(row.isRefundEarnestMoney),
|
||||
productSpecificationList: row.productSpecificationList
|
||||
}),
|
||||
console.log(this.orderTime, this.arrears, this.delivery)
|
||||
|
||||
// this.ruleForm = row;
|
||||
},
|
||||
//订单支付时间
|
||||
getOrderTime(e) {
|
||||
if (e) {
|
||||
console.log(e)
|
||||
this.ruleForm.startTime = e[0]
|
||||
this.ruleForm.endTime = e[1]
|
||||
} else {
|
||||
this.ruleForm.startTime = ''
|
||||
this.ruleForm.endTime = ''
|
||||
}
|
||||
},
|
||||
//尾款支付时间
|
||||
getArrearsTime(e) {
|
||||
if (e) {
|
||||
console.log(e)
|
||||
this.ruleForm.balancePaymentStartTime = e[0]
|
||||
this.ruleForm.balancePaymentEndTime = e[1]
|
||||
} else {
|
||||
this.ruleForm.balancePaymentStartTime = ''
|
||||
this.ruleForm.balancePaymentEndTime = ''
|
||||
}
|
||||
},
|
||||
//发货时间
|
||||
deliveryTime(e) {
|
||||
if (e) {
|
||||
console.log(e)
|
||||
this.ruleForm.estimatedStartDeliveryTime = e[0]
|
||||
this.ruleForm.estimatedEndDeliveryTime = e[1]
|
||||
} else {
|
||||
this.ruleForm.estimatedStartDeliveryTime = ''
|
||||
this.ruleForm.estimatedEndDeliveryTime = ''
|
||||
}
|
||||
},
|
||||
selectProduct() {
|
||||
console.log('选择商品', this.marketId, this.shopId)
|
||||
this.$nextTick(() => {
|
||||
this.$refs.commodity.toggle().add({
|
||||
marketId: this.marketId,
|
||||
shopId: this.shopId
|
||||
})
|
||||
})
|
||||
console.log(row)
|
||||
this.ruleForm = row
|
||||
},
|
||||
handleSelectionChange(e) {
|
||||
console.log(e)
|
||||
},
|
||||
getProduct(row) {
|
||||
this.ruleForm.productList = row.map(item => {
|
||||
return {
|
||||
productId: item.id,
|
||||
name: item.name,
|
||||
productSpecificationList: item.productSpecificationList
|
||||
getRefundStatus(val) {
|
||||
if (val == 0) {
|
||||
return '正常'
|
||||
} else if (val == 1) {
|
||||
return '退款中'
|
||||
} else if (val == 2) {
|
||||
return '完全退款'
|
||||
} else if (val == 3) {
|
||||
return '部分退款'
|
||||
} else if (val == 4) {
|
||||
return '拒绝用户退款'
|
||||
} else if (val == -1) {
|
||||
return '退款失败'
|
||||
} else if (val == -2) {
|
||||
return '用户申请退款中'
|
||||
}
|
||||
})
|
||||
console.log(this.ruleForm.productList, this.ruleForm.productList.length)
|
||||
|
||||
console.log('获取商品')
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue