mkm/shop-mer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2023-12-29 17:59:37 +08:00
parent 399b158ad3
commit c47eb944c9
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/order.js
View File

@ -52,6 +52,12 @@ export function orderUpdateApi (id, data) {
export function orderDeliveryApi (id, data) { export function orderDeliveryApi (id, data) {
return request.post(`store/order/delivery/${id}`, data) return request.post(`store/order/delivery/${id}`, data)
} }
/**
* @description 订单 -- 发货
*/
export function orderOtherDeliveryApi (id, data) {
return request.post(`store/order/other/delivery/${id}`, data)
}
/** /**
* @description 订单 -- 详情 * @description 订单 -- 详情
*/ */
@ -298,6 +304,12 @@ export function exprTempsLst (data) {
export function batchDeliveryApi (data) { export function batchDeliveryApi (data) {
return request.post(`store/order/delivery_batch`, data) return request.post(`store/order/delivery_batch`, data)
} }
/**
* @description 发送货 -- 批量发送货
*/
export function batchOtherDeliveryApi (data) {
return request.post(`store/order_other/delivery_batch`, data)
}
/** /**
* @description 发送货 -- 电子面单默认数据 * @description 发送货 -- 电子面单默认数据
*/ */

16
src/views/order/index_credit.vue
View File

@ -459,7 +459,7 @@
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column prop="pay_price" label="订单金额" min-width="100" /> <el-table-column prop="pay_price" label="订单金额" min-width="100" />
<el-table-column label="收款公司" min-width="320"> <!-- <el-table-column label="收款公司" min-width="320">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.order_extend" <div v-if="scope.row.order_extend"
> >
@ -473,8 +473,8 @@
</div> </div>
<div v-else>-</div> <div v-else>-</div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="收款凭证" min-width="80" > <!-- <el-table-column label="收款凭证" min-width="80" >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.order_extend" <div v-if="scope.row.order_extend"
class="tabBox acea-row row-middle" class="tabBox acea-row row-middle"
@ -489,7 +489,7 @@
</div> </div>
<div v-else>-</div> <div v-else>-</div>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column prop="pay_price" label="手续扣除" min-width="100" > <el-table-column prop="pay_price" label="手续扣除" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.order_extend&&scope.row.order_extend.commission_rate" <div v-if="scope.row.order_extend&&scope.row.order_extend.commission_rate"
@ -1168,8 +1168,8 @@ import {
otherChartApi, otherChartApi,
orderUpdateApi, orderUpdateApi,
orderDetailApi, orderDetailApi,
orderDeliveryApi, orderOtherDeliveryApi,
batchDeliveryApi, batchOtherDeliveryApi,
orderLogApi, orderLogApi,
orderDeleteApi, orderDeleteApi,
orderRemarkApi, orderRemarkApi,
@ -1931,7 +1931,7 @@ export default {
delete this.shipment.to_phone delete this.shipment.to_phone
console.log(this.shipment); console.log(this.shipment);
// return // return
this.isBatch ? batchDeliveryApi(this.shipment).then(res => { this.isBatch ? batchOtherDeliveryApi(this.shipment).then(res => {
this.sendVisible = false this.sendVisible = false
this.$message.success(res.message) this.$message.success(res.message)
this.getList('') this.getList('')
@ -1940,7 +1940,7 @@ export default {
}).catch(({ message }) => { }).catch(({ message }) => {
this.$message.error(message) this.$message.error(message)
}) })
: orderDeliveryApi(this.orderId, this.shipment).then(res => { : orderOtherDeliveryApi(this.orderId, this.shipment).then(res => {
this.sendVisible = false this.sendVisible = false
this.$message.success(res.message) this.$message.success(res.message)
this.getList('') this.getList('')