Skip to content

F
factory_front
Commit ff174216 by linjinhong
Options

podus添加是否代发

parent 8a4496b4
Showing with 71 additions and 5 deletions
src/types/api/podUsOrder.ts
...@@ -12,7 +12,7 @@ export interface ExportParams extends SearchForm { ...@@ -12,7 +12,7 @@ export interface ExportParams extends SearchForm {
export interface SearchForm { export interface SearchForm {
timeType?: number | null timeType?: number | null
shopNumber?: string shopNumber?: string
shipmentType?: string shipmentType?: string | number | null
userMark?: string userMark?: string
processNumber?: string processNumber?: string
trackingNumber?: string trackingNumber?: string
...@@ -40,6 +40,7 @@ export interface SearchForm { ...@@ -40,6 +40,7 @@ export interface SearchForm {
sizeType?: number | null sizeType?: number | null
tagsId?: string tagsId?: string
tagsIdArr?: (number | null)[] tagsIdArr?: (number | null)[]
replaceShipment?: number | null
} }
export interface PodUsOrderListData { export interface PodUsOrderListData {
id: number id: number
......
src/views/order/podUs/index.vue
...@@ -247,9 +247,10 @@ ...@@ -247,9 +247,10 @@
clearable clearable
:teleported="false" :teleported="false"
style="width: 150px" style="width: 150px"
:disabled="searchForm.replaceShipment === 0"
> >
<ElOption <ElOption
v-for="(item, index) in ['自有物流', '工厂物流']" v-for="(item, index) in shipmentList"
:key="index" :key="index"
:value="index" :value="index"
:label="item" :label="item"
...@@ -276,6 +277,36 @@ ...@@ -276,6 +277,36 @@
></ElOption> ></ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="是否代发">
<ElSelect
v-model="searchForm.replaceShipment"
placeholder="请选择"
clearable
:teleported="false"
style="width: 150px"
@change="
(e:number) => {
if (e == 0) {
shipmentList=['自提','快递']
searchForm.shipmentType=0
}else{
shipmentList=['自有物流', '工厂物流']
searchForm.shipmentType=''
}
}
"
>
<ElOption
v-for="(item, index) in [
{ value: 1, label: '代发' },
{ value: 0, label: '不代发' },
]"
:key="index"
:value="item.value"
:label="item.label"
></ElOption>
</ElSelect>
</ElFormItem>
</ElForm> </ElForm>
<template #reference> <template #reference>
<el-button type="warning" @click="searchVisible = !searchVisible"> <el-button type="warning" @click="searchVisible = !searchVisible">
...@@ -1389,16 +1420,36 @@ ...@@ -1389,16 +1420,36 @@
</span> </span>
</div> </div>
<div class="order-detail-item"> <div class="order-detail-item">
<!-- 是否代发 0.否 1.是 -->
<span class="order-detail-item-label">是否代发:</span>
<span
style="color: red; font-weight: 500"
class="order-detail-item-value"
>
{{ ['否', '是'][row.replaceShipment] }}
</span>
</div>
<div class="order-detail-item">
<span class="order-detail-item-label">物流类型:</span> <span class="order-detail-item-label">物流类型:</span>
<span <span
style="color: red; font-weight: 500" style="color: red; font-weight: 500"
class="order-detail-item-value" class="order-detail-item-value"
> >
{{ ['自有物流', '工厂物流'][row.shipmentType] }} {{
row.shipmentType == 0 && row.replaceShipment == 0
? '自提'
: ['自有物流', '工厂物流'][row.shipmentType]
}}
</span> </span>
</div> </div>
<div class="order-detail-item"> <div class="order-detail-item">
<span class="order-detail-item-label">物流跟踪号:</span> <span class="order-detail-item-label">
{{
row.replaceShipment === 0 && row.shipmentType === 0
? '取货码:'
: '物流跟踪号:'
}}</span
>
<span class="order-detail-item-value"> <span class="order-detail-item-value">
<el-button <el-button
type="primary" type="primary"
...@@ -1737,7 +1788,14 @@ ...@@ -1737,7 +1788,14 @@
</ElButton> </ElButton>
</span> </span>
<span v-if="['WAIT_TRACK'].includes(status)" class="operate-item"> <span
v-if="
['WAIT_TRACK'].includes(status) &&
row.replaceShipment !== 0 &&
row.shipmentType !== 0
"
class="operate-item"
>
<ElButton link type="warning" @click="updateTrackingNumber(row)" <ElButton link type="warning" @click="updateTrackingNumber(row)"
>修改跟踪号</ElButton >修改跟踪号</ElButton
> >
...@@ -1753,6 +1811,7 @@ ...@@ -1753,6 +1811,7 @@
<span <span
v-if=" v-if="
row.shipmentType === 0 && row.shipmentType === 0 &&
row.replaceShipment !== 0 &&
['CREATE_LOGISTICS', 'WAIT_SHIPMENT'].includes(status) ['CREATE_LOGISTICS', 'WAIT_SHIPMENT'].includes(status)
" "
class="operate-item" class="operate-item"
...@@ -1791,6 +1850,7 @@ ...@@ -1791,6 +1850,7 @@
<span <span
v-if=" v-if="
row.shipmentType === 0 && row.shipmentType === 0 &&
row.replaceShipment !== 0 &&
['CREATE_LOGISTICS', 'WAIT_SHIPMENT'].includes(status) ['CREATE_LOGISTICS', 'WAIT_SHIPMENT'].includes(status)
" "
class="operate-item" class="operate-item"
...@@ -1805,6 +1865,8 @@ ...@@ -1805,6 +1865,8 @@
</span> </span>
<span <span
v-if=" v-if="
row.shipmentType !== 0 &&
row.replaceShipment !== 0 &&
(status === 'IN_TRANSIT' || status === 'COMPLETE') && (status === 'IN_TRANSIT' || status === 'COMPLETE') &&
isPermissionBtn('TRACK') isPermissionBtn('TRACK')
" "
...@@ -3264,6 +3326,9 @@ const handleBatchDelete = async (type: string, id?: string) => { ...@@ -3264,6 +3326,9 @@ const handleBatchDelete = async (type: string, id?: string) => {
loading.close() loading.close()
} }
} }
const shipmentList = ref(['自有物流', '工厂物流'])
// 批量下载 重新排版 // 批量下载 重新排版
const handleReComposingDesign = async () => { const handleReComposingDesign = async () => {
const row = { ...(typesettingRow.value as PodUsOrderListData) } const row = { ...(typesettingRow.value as PodUsOrderListData) }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment