|
@@ -60,7 +60,7 @@
|
|
|
<!-- 操作栏 -->
|
|
<!-- 操作栏 -->
|
|
|
<div class="actions clearfix mt-10">
|
|
<div class="actions clearfix mt-10">
|
|
|
<div
|
|
<div
|
|
|
- v-if="$module('order-updatePrice') &&$auth('/order/detail.updatePrice')"
|
|
|
|
|
|
|
+ v-if="$module('order-updatePrice') && $auth('/order/detail.updatePrice')"
|
|
|
class="action-item"
|
|
class="action-item"
|
|
|
>
|
|
>
|
|
|
<a-button
|
|
<a-button
|
|
@@ -90,6 +90,16 @@
|
|
|
<div class="action-item" v-if="$auth('/order/detail.merchantRemark')">
|
|
<div class="action-item" v-if="$auth('/order/detail.merchantRemark')">
|
|
|
<a-button @click="handleMerchantRemark">商家备注</a-button>
|
|
<a-button @click="handleMerchantRemark">商家备注</a-button>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+ <div class="action-item" v-if="$auth('/order/detail.updateAddress')">
|
|
|
|
|
+ <a-button
|
|
|
|
|
+ v-if="(
|
|
|
|
|
+ record.delivery_type == DeliveryTypeEnum.EXPRESS.value
|
|
|
|
|
+ && record.delivery_status != DeliveryStatusEnum.DELIVERED.value
|
|
|
|
|
+ && !inArray(record.order_status, [OrderStatusEnum.CANCELLED.value, OrderStatusEnum.APPLY_CANCEL.value])
|
|
|
|
|
+ )"
|
|
|
|
|
+ @click="handleUpdateAddress()"
|
|
|
|
|
+ >修改收货地址</a-button>
|
|
|
|
|
+ </div>
|
|
|
<div
|
|
<div
|
|
|
v-if="$module('order-printer') && $auth('/order/detail.printer')"
|
|
v-if="$module('order-printer') && $auth('/order/detail.printer')"
|
|
|
class="action-item"
|
|
class="action-item"
|
|
@@ -303,6 +313,7 @@
|
|
|
<PrinterForm ref="PrinterForm" @handleSubmit="handleRefresh" />
|
|
<PrinterForm ref="PrinterForm" @handleSubmit="handleRefresh" />
|
|
|
<PriceForm ref="PriceForm" @handleSubmit="handleRefresh" />
|
|
<PriceForm ref="PriceForm" @handleSubmit="handleRefresh" />
|
|
|
<RemarkForm ref="RemarkForm" @handleSubmit="handleRefresh" />
|
|
<RemarkForm ref="RemarkForm" @handleSubmit="handleRefresh" />
|
|
|
|
|
+ <AddressForm ref="AddressForm" @handleSubmit="handleRefresh" />
|
|
|
<ExpressForm ref="ExpressForm" />
|
|
<ExpressForm ref="ExpressForm" />
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
@@ -311,7 +322,7 @@
|
|
|
import { inArray } from '@/utils/util'
|
|
import { inArray } from '@/utils/util'
|
|
|
import * as Api from '@/api/order'
|
|
import * as Api from '@/api/order'
|
|
|
import { GoodsItem, UserItem } from '@/components/Table'
|
|
import { GoodsItem, UserItem } from '@/components/Table'
|
|
|
-import { DeliveryForm, CancelForm, PrinterForm, PriceForm, RemarkForm, ExpressForm } from './modules'
|
|
|
|
|
|
|
+import { DeliveryForm, CancelForm, PrinterForm, PriceForm, RemarkForm, ExpressForm, AddressForm } from './modules'
|
|
|
import {
|
|
import {
|
|
|
OrderTypeEnum,
|
|
OrderTypeEnum,
|
|
|
DeliveryStatusEnum,
|
|
DeliveryStatusEnum,
|
|
@@ -367,7 +378,8 @@ export default {
|
|
|
PrinterForm,
|
|
PrinterForm,
|
|
|
PriceForm,
|
|
PriceForm,
|
|
|
RemarkForm,
|
|
RemarkForm,
|
|
|
- ExpressForm
|
|
|
|
|
|
|
+ ExpressForm,
|
|
|
|
|
+ AddressForm
|
|
|
},
|
|
},
|
|
|
data () {
|
|
data () {
|
|
|
return {
|
|
return {
|
|
@@ -488,6 +500,12 @@ export default {
|
|
|
this.$refs.PriceForm.show(record)
|
|
this.$refs.PriceForm.show(record)
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
|
|
+ // 修改收货地址
|
|
|
|
|
+ handleUpdateAddress () {
|
|
|
|
|
+ const { record } = this
|
|
|
|
|
+ this.$refs.AddressForm.show(record)
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
// 商家备注
|
|
// 商家备注
|
|
|
handleMerchantRemark () {
|
|
handleMerchantRemark () {
|
|
|
const { record } = this
|
|
const { record } = this
|