yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code review：门店自提

pull/283/MERGE
YunaiV 2023-10-20 09:46:15 +08:00
parent 83501f9b09
commit 2457665b55
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/mall/trade/delivery/pickUpOrder/index.vue
View File

@ -70,9 +70,14 @@
<Icon class="mr-5px" icon="ep:refresh" /> <Icon class="mr-5px" icon="ep:refresh" />
重置 重置
</el-button> </el-button>
<el-button @click="handlePickup" type="success" plain v-hasPermi="['trade:order:pick-up']">
<Icon class="mr-5px" icon="ep:check" />
核销
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</ContentWrap> </ContentWrap>
<!-- 统计卡片 --> <!-- 统计卡片 -->
<el-row :gutter="16" class="summary"> <el-row :gutter="16" class="summary">
<el-col :sm="6" :xs="12" v-loading="loading"> <el-col :sm="6" :xs="12" v-loading="loading">
@ -190,6 +195,9 @@
@pagination="getList" @pagination="getList"
/> />
</ContentWrap> </ContentWrap>
<!-- 各种操作的弹窗 -->
<OrderPickUpForm ref="pickUpForm" @success="getList" />
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
@ -204,6 +212,7 @@ import { dateFormatter } from '@/utils/formatTime'
import { DeliveryTypeEnum } from '@/utils/constants' import { DeliveryTypeEnum } from '@/utils/constants'
import { TradeOrderSummaryRespVO } from '@/api/mall/trade/order' import { TradeOrderSummaryRespVO } from '@/api/mall/trade/order'
import { DeliveryPickUpStoreVO } from '@/api/mall/trade/delivery/pickUpStore' import { DeliveryPickUpStoreVO } from '@/api/mall/trade/delivery/pickUpStore'
import OrderPickUpForm from '@/views/mall/trade/order/form/OrderPickUpForm.vue'
defineOptions({ name: 'PickUpOrder' }) defineOptions({ name: 'PickUpOrder' })
@ -291,6 +300,12 @@ const getPickUpStoreList = async () => {
pickUpStoreList.value = await PickUpStoreApi.getListAllSimple() pickUpStoreList.value = await PickUpStoreApi.getListAllSimple()
} }
/** 显示核销表单 */
const pickUpForm = ref()
const handlePickup = () => {
pickUpForm.value.open()
}
/** 初始化 **/ /** 初始化 **/
onMounted(() => { onMounted(() => {
getList() getList()

12
src/views/mall/trade/order/index.vue
View File

@ -157,10 +157,6 @@
<Icon class="mr-5px" icon="ep:refresh" /> <Icon class="mr-5px" icon="ep:refresh" />
重置 重置
</el-button> </el-button>
<el-button @click="handlePickup" type="success" plain>
<Icon class="mr-5px" icon="ep:check" />
核销
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</ContentWrap> </ContentWrap>
@ -352,7 +348,6 @@
<!-- 各种操作的弹窗 --> <!-- 各种操作的弹窗 -->
<OrderDeliveryForm ref="deliveryFormRef" @success="getList" /> <OrderDeliveryForm ref="deliveryFormRef" @success="getList" />
<OrderUpdateRemarkForm ref="updateRemarkForm" @success="getList" /> <OrderUpdateRemarkForm ref="updateRemarkForm" @success="getList" />
<OrderPickUpForm ref="pickUpForm" @success="getList" />
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
@ -367,7 +362,6 @@ import { floatToFixed2 } from '@/utils'
import { createImageViewer } from '@/components/ImageViewer' import { createImageViewer } from '@/components/ImageViewer'
import * as DeliveryExpressApi from '@/api/mall/trade/delivery/express' import * as DeliveryExpressApi from '@/api/mall/trade/delivery/express'
import { DeliveryTypeEnum, TradeOrderStatusEnum } from '@/utils/constants' import { DeliveryTypeEnum, TradeOrderStatusEnum } from '@/utils/constants'
import OrderPickUpForm from './form/OrderPickUpForm.vue'
defineOptions({ name: 'TradeOrder' }) defineOptions({ name: 'TradeOrder' })
@ -528,12 +522,6 @@ watch(
} }
) )
/** 显示核销表单 */
const pickUpForm = ref()
const handlePickup = () => {
pickUpForm.value.open()
}
const pickUpStoreList = ref([]) // 自提门店精简列表 const pickUpStoreList = ref([]) // 自提门店精简列表
const deliveryExpressList = ref([]) // 物流公司 const deliveryExpressList = ref([]) // 物流公司
/** 初始化 **/ /** 初始化 **/