|
|
@@ -1,7 +1,11 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
|
|
|
-
|
|
|
+ <el-form
|
|
|
+ ref="queryForm"
|
|
|
+ :model="queryParams"
|
|
|
+ :inline="true"
|
|
|
+ label-width="68px"
|
|
|
+ >
|
|
|
<el-form-item label="当当订单" prop="orderId">
|
|
|
<el-input
|
|
|
v-model="queryParams.orderId"
|
|
|
@@ -11,10 +15,10 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="夫子订单" prop="dangOrder">
|
|
|
+ <el-form-item label="孔网订单" prop="dangOrder">
|
|
|
<el-input
|
|
|
v-model="queryParams.dangOrder"
|
|
|
- placeholder="请输入夫子订单"
|
|
|
+ placeholder="请输入孔网订单"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
@@ -30,8 +34,19 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ 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>
|
|
|
|
|
|
@@ -43,7 +58,8 @@
|
|
|
icon="el-icon-plus"
|
|
|
size="mini"
|
|
|
@click="handleAdd"
|
|
|
- >新增</el-button>
|
|
|
+ >新增</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
@@ -53,7 +69,8 @@
|
|
|
icon="el-icon-edit"
|
|
|
size="mini"
|
|
|
@click="handleUpdate"
|
|
|
- >修改</el-button>
|
|
|
+ >修改</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
@@ -63,7 +80,8 @@
|
|
|
icon="el-icon-delete"
|
|
|
size="mini"
|
|
|
@click="handleDelete"
|
|
|
- >删除</el-button>
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
@@ -72,11 +90,16 @@
|
|
|
icon="el-icon-download"
|
|
|
size="mini"
|
|
|
@click="handleExport"
|
|
|
- >导出</el-button>
|
|
|
+ >导出</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
|
|
|
+ <el-table
|
|
|
+ v-loading="loading"
|
|
|
+ :data="orderList"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
+ >
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column type="index" label="序号">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -84,28 +107,48 @@
|
|
|
<span v-else>{{ scope.$index + 1 }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="夫子订单" align="center" prop="orderId" />
|
|
|
+ <el-table-column label="孔网订单" align="center" prop="orderId" />
|
|
|
<el-table-column label="当当订单" align="center" prop="dangOrder" />
|
|
|
- <el-table-column label="收件人详细信息" align="center" prop="receiver" width="380" />
|
|
|
+ <el-table-column
|
|
|
+ label="收件人详细信息"
|
|
|
+ align="center"
|
|
|
+ prop="receiver"
|
|
|
+ width="380"
|
|
|
+ />
|
|
|
<!-- <el-table-column label="省" align="center" prop="provName" />
|
|
|
<el-table-column label="市" align="center" prop="cityName" />
|
|
|
<el-table-column label="区" align="center" prop="areaName" />
|
|
|
<el-table-column label="详细地址" align="center" prop="address" /> -->
|
|
|
<!-- <el-table-column label="订单状态" align="center" prop="orderStatus" /> -->
|
|
|
- <el-table-column label="订单状态" align="center" prop="orderStatusName" />
|
|
|
- <el-table-column label="当当发货状态" align="center" prop="dangOrderStatus" width="120" />
|
|
|
+ <el-table-column label="孔网状态" align="center" prop="orderStatusName" />
|
|
|
+ <el-table-column
|
|
|
+ label="当当发货状态"
|
|
|
+ align="center"
|
|
|
+ prop="dangOrderStatus"
|
|
|
+ width="120"
|
|
|
+ />
|
|
|
<!-- <el-table-column label="付款状态" align="center" prop="payStatus" /> -->
|
|
|
- <el-table-column label="付款状态" align="center" prop="payName" />
|
|
|
+ <el-table-column label="孔网付款时间" align="center" prop="createdTime" />
|
|
|
<el-table-column label="快递公司" align="center" prop="shippingCom" />
|
|
|
<el-table-column label="快递单号" align="center" prop="shipmentNum" />
|
|
|
- <el-table-column label="运费" align="center" prop="shippingFee" />
|
|
|
+ <!-- <el-table-column label="运费" align="center" prop="shippingFee" /> -->
|
|
|
<el-table-column label="发货时间" align="center" prop="shippingTime" />
|
|
|
- <el-table-column label="更新时间" align="center" prop="gmtUpdate" width="180">
|
|
|
+ <el-table-column
|
|
|
+ label="更新时间"
|
|
|
+ align="center"
|
|
|
+ prop="gmtUpdate"
|
|
|
+ width="180"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.gmtUpdate) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
|
|
|
+ <el-table-column
|
|
|
+ label="操作"
|
|
|
+ align="center"
|
|
|
+ width="180"
|
|
|
+ class-name="small-padding fixed-width"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
v-permission="['shop:order:edit']"
|
|
|
@@ -113,20 +156,22 @@
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
- >修改</el-button>
|
|
|
+ >修改</el-button
|
|
|
+ >
|
|
|
<el-button
|
|
|
v-permission="['shop:order:remove']"
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
- >删除</el-button>
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
<pagination
|
|
|
- v-show="total>0"
|
|
|
+ v-show="total > 0"
|
|
|
:total="total"
|
|
|
:page.sync="queryParams.pageNum"
|
|
|
:limit.sync="queryParams.pageSize"
|
|
|
@@ -142,8 +187,8 @@
|
|
|
<el-form-item label="当当订单号" prop="orderId">
|
|
|
<el-input v-model="form.orderId" placeholder="请输入当当订单号" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="夫子订单号" prop="dangOrder">
|
|
|
- <el-input v-model="form.dangOrder" placeholder="请输入夫子订单号" />
|
|
|
+ <el-form-item label="孔网订单号" prop="dangOrder">
|
|
|
+ <el-input v-model="form.dangOrder" placeholder="请输入孔网订单号" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="详细地址" prop="address">
|
|
|
<el-input v-model="form.address" placeholder="请输入详细地址" />
|
|
|
@@ -163,7 +208,10 @@
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="订单状态" prop="orderStatusName">
|
|
|
- <el-input v-model="form.orderStatusName" placeholder="请输入订单状态" />
|
|
|
+ <el-input
|
|
|
+ v-model="form.orderStatusName"
|
|
|
+ placeholder="请输入订单状态"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="付款状态">
|
|
|
<el-radio-group v-model="form.payStatus">
|
|
|
@@ -180,10 +228,18 @@
|
|
|
<el-input v-model="form.mobile" placeholder="请输入收件人电话" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="收件人详细信息" prop="receiver">
|
|
|
- <el-input v-model="form.receiver" type="textarea" placeholder="请输入内容" />
|
|
|
+ <el-input
|
|
|
+ v-model="form.receiver"
|
|
|
+ type="textarea"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
- <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
|
|
+ <el-input
|
|
|
+ v-model="form.remark"
|
|
|
+ type="textarea"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="删除标识" prop="deleteFlag">
|
|
|
<el-input v-model="form.deleteFlag" placeholder="请输入删除标识" />
|
|
|
@@ -196,7 +252,8 @@
|
|
|
style="width: 200px"
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择"/>
|
|
|
+ placeholder="选择"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="" prop="gmtUpdate">
|
|
|
<el-date-picker
|
|
|
@@ -206,7 +263,8 @@
|
|
|
style="width: 200px"
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择"/>
|
|
|
+ placeholder="选择"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="" prop="userId">
|
|
|
<el-input v-model="form.userId" placeholder="请输入" />
|
|
|
@@ -224,7 +282,14 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listOrder, getOrder, delOrder, addOrder, updateOrder, exportOrder } from '@/api/shop/order'
|
|
|
+import {
|
|
|
+ listOrder,
|
|
|
+ getOrder,
|
|
|
+ delOrder,
|
|
|
+ addOrder,
|
|
|
+ updateOrder,
|
|
|
+ exportOrder
|
|
|
+} from '@/api/shop/order'
|
|
|
|
|
|
export default {
|
|
|
data() {
|
|
|
@@ -272,8 +337,7 @@ export default {
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
// 表单校验
|
|
|
- rules: {
|
|
|
- }
|
|
|
+ rules: {}
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -283,7 +347,7 @@ export default {
|
|
|
/** 查询电商订单表列表 */
|
|
|
getList() {
|
|
|
this.loading = true
|
|
|
- listOrder(this.queryParams).then(response => {
|
|
|
+ listOrder(this.queryParams).then((response) => {
|
|
|
this.orderList = response.data.data.items
|
|
|
this.total = response.data.data.count
|
|
|
this.loading = false
|
|
|
@@ -333,8 +397,8 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map(item => item.id)
|
|
|
- this.single = selection.length!=1
|
|
|
+ this.ids = selection.map((item) => item.id)
|
|
|
+ this.single = selection.length != 1
|
|
|
this.multiple = !selection.length
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
@@ -347,7 +411,7 @@ export default {
|
|
|
handleUpdate(row) {
|
|
|
this.reset()
|
|
|
const id = row.id || this.ids.join(',')
|
|
|
- getOrder(id).then(response => {
|
|
|
+ getOrder(id).then((response) => {
|
|
|
this.form = response.data.data
|
|
|
this.open = true
|
|
|
this.title = '修改电商订单表'
|
|
|
@@ -355,10 +419,10 @@ export default {
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm: function() {
|
|
|
- this.$refs['form'].validate(valid => {
|
|
|
+ this.$refs['form'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (this.form.id != undefined) {
|
|
|
- updateOrder(this.form).then(response => {
|
|
|
+ updateOrder(this.form).then((response) => {
|
|
|
if (response.data) {
|
|
|
this.msgSuccess('修改成功')
|
|
|
this.open = false
|
|
|
@@ -368,7 +432,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
} else {
|
|
|
- addOrder(this.form).then(response => {
|
|
|
+ addOrder(this.form).then((response) => {
|
|
|
if (response.data) {
|
|
|
this.msgSuccess('新增成功')
|
|
|
this.open = false
|
|
|
@@ -384,16 +448,23 @@ export default {
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
const ids = row.id || this.ids.join(',')
|
|
|
- this.$confirm('是否确认删除电商订单表编号为"' + ids + '"的数据项?', '警告', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- cancelButtonText: '取消',
|
|
|
- type: 'warning'
|
|
|
- }).then(function() {
|
|
|
- return delOrder(ids)
|
|
|
- }).then(() => {
|
|
|
- this.getList()
|
|
|
- this.msgSuccess('删除成功')
|
|
|
- }).catch(function() {})
|
|
|
+ this.$confirm(
|
|
|
+ '是否确认删除电商订单表编号为"' + ids + '"的数据项?',
|
|
|
+ '警告',
|
|
|
+ {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }
|
|
|
+ )
|
|
|
+ .then(function() {
|
|
|
+ return delOrder(ids)
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.getList()
|
|
|
+ this.msgSuccess('删除成功')
|
|
|
+ })
|
|
|
+ .catch(function() {})
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
@@ -402,11 +473,14 @@ export default {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
|
- }).then(function() {
|
|
|
- return exportOrder(queryParams)
|
|
|
- }).then(response => {
|
|
|
- this.download(response.data.data)
|
|
|
- }).catch(function() {})
|
|
|
+ })
|
|
|
+ .then(function() {
|
|
|
+ return exportOrder(queryParams)
|
|
|
+ })
|
|
|
+ .then((response) => {
|
|
|
+ this.download(response.data.data)
|
|
|
+ })
|
|
|
+ .catch(function() {})
|
|
|
}
|
|
|
}
|
|
|
}
|
