Skip to content

F
factory_front
Commit 3ea071f0 by qinjianhui
Options

Merge branch 'dev'

parents b7f24f11 f7da650f
Showing with 73 additions and 25 deletions
src/types/api/podCnOrder.ts
...@@ -44,6 +44,7 @@ export interface SearchForm { ...@@ -44,6 +44,7 @@ export interface SearchForm {
interceptStatus?: number | string interceptStatus?: number | string
sizeType?: number | null sizeType?: number | null
tagsId?: string tagsId?: string
source?: string
tagsIdArr?: (number | null)[] tagsIdArr?: (number | null)[]
} }
export interface PodCnOrderListData { export interface PodCnOrderListData {
...@@ -222,9 +223,9 @@ export interface CraftListData { ...@@ -222,9 +223,9 @@ export interface CraftListData {
craftCode: string craftCode: string
} }
export interface PackingData { export interface PackingData {
podProductionNo?: string; // 生产单号（PSCD 开头） podProductionNo?: string // 生产单号（PSCD 开头）
jomallCustomNo?: string; // 一件定制号（16 位数字 或 S- 开头） jomallCustomNo?: string // 一件定制号（16 位数字 或 S- 开头）
jomallPsdCustomNo?: string; // 满印定制号（JMSC/GCSC 开头） jomallPsdCustomNo?: string // 满印定制号（JMSC/GCSC 开头）
podJomallNo?: string; // POD 平台号（JMPSC/GCPS 经过正则提取） podJomallNo?: string // POD 平台号（JMPSC/GCPS 经过正则提取）
sku?: string; // 普通 SKU（兜底） sku?: string // 普通 SKU（兜底）
} }
\ No newline at end of file
src/views/order/podCN/index.vue
...@@ -353,6 +353,22 @@ ...@@ -353,6 +353,22 @@
></ElOption> ></ElOption>
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem label="订单来源">
<ElSelect
v-model="searchForm.source"
placeholder="请选择"
clearable
:teleported="false"
style="width: 150px"
>
<ElOption
v-for="(item, index) in sourceList"
:key="index"
:value="item.id"
:label="item.name"
></ElOption>
</ElSelect>
</ElFormItem>
</ElForm> </ElForm>
<template #reference> <template #reference>
<el-button type="warning" @click="searchVisible = !searchVisible"> <el-button type="warning" @click="searchVisible = !searchVisible">
...@@ -1327,6 +1343,19 @@ ...@@ -1327,6 +1343,19 @@
</el-icon> </el-icon>
</div> </div>
<div class="order-detail-item"> <div class="order-detail-item">
<span class="order-detail-item-label">订单来源:</span>
<span class="order-detail-item-value">
{{
row.source
? {
'jomall-erp': 'erp推送',
'third-party': '第三方推送',
}[row.source as 'jomall-erp' | 'third-party']
: ''
}}
</span>
</div>
<div class="order-detail-item">
<span class="order-detail-item-label">总克重:</span> <span class="order-detail-item-label">总克重:</span>
<span v-if="row.weight" class="order-detail-item-value"> <span v-if="row.weight" class="order-detail-item-value">
{{ row.weight }}g {{ row.weight }}g
...@@ -2620,6 +2649,17 @@ const exportForm = ref({ ...@@ -2620,6 +2649,17 @@ const exportForm = ref({
resource: '', resource: '',
}) })
const sourceList = [
{
name: 'erp推送',
id: 'jomall-erp',
},
{
name: '第三方推送',
id: 'third-party',
},
]
const exportData = () => { const exportData = () => {
exportVisible.value = true exportVisible.value = true
} }
......
src/views/order/podUs/index.vue
<template> <template>
<div class="card flex-column h-100 overflow-hidden"> <div class="card flex-column h-100 overflow-hidden">
<div class="header-filter-form"> <div class="header-filter-form">
<ElForm class="search-form" label-position="right" label-width="70px" :model="searchForm" size="default" inline> <ElForm
class="search-form"
label-position="right"
label-width="70px"
:model="searchForm"
size="default"
inline
>
<!-- <div> --> <!-- <div> -->
<ElFormItem label="仓库"> <ElFormItem label="仓库">
<ElSelect <ElSelect
...@@ -338,7 +345,7 @@ ...@@ -338,7 +345,7 @@
style="width: 150px" style="width: 150px"
> >
<ElOption <ElOption
v-for="(item, index) in sourceList " v-for="(item, index) in sourceList"
:key="index" :key="index"
:value="item.id" :value="item.id"
:label="item.name" :label="item.name"
...@@ -1508,9 +1515,10 @@ ...@@ -1508,9 +1515,10 @@
<span class="order-detail-item-value"> <span class="order-detail-item-value">
{{ {{
row.source row.source
? { 'jomall-erp': 'erp', 'third-party': '第三方推送' }[ ? {
row.source as 'jomall-erp' | 'third-party' 'jomall-erp': 'erp推送',
] 'third-party': '第三方推送',
}[row.source as 'jomall-erp' | 'third-party']
: '' : ''
}} }}
</span> </span>
...@@ -2899,7 +2907,8 @@ import { ...@@ -2899,7 +2907,8 @@ import {
changeToFinished, changeToFinished,
updateTrackingNumberAndRegister, updateTrackingNumberAndRegister,
countTrackRegisterApi, countTrackRegisterApi,
getCustomTagListApi, getLogisticsWayApi, getCustomTagListApi,
getLogisticsWayApi,
} from '@/api/podUsOrder' } from '@/api/podUsOrder'
import { BaseRespData } from '@/types/api' import { BaseRespData } from '@/types/api'
...@@ -2971,18 +2980,18 @@ declare global { ...@@ -2971,18 +2980,18 @@ declare global {
} }
const sourceList = [ const sourceList = [
{ {
name:'erp推送', name: 'erp推送',
id:'jomall-erp' id: 'jomall-erp',
}, },
{ {
name:'第三方推送', name: '第三方推送',
id:'third-party' id: 'third-party',
} },
] ]
const tabsNav = ref<Tab[]>() const tabsNav = ref<Tab[]>()
const isAuto = ref(true) const isAuto = ref(true)
const countryList = ref([]) const countryList = ref([])
const logisticsWayList = ref<{name:string,id:number}[]>([]) const logisticsWayList = ref<{ name: string; id: number }[]>([])
const currentRow = ref<AddressInfo>({ const currentRow = ref<AddressInfo>({
receiverName: '', receiverName: '',
receiverPhone: '', receiverPhone: '',
...@@ -6169,8 +6178,8 @@ const getTagName = (row: ProductList) => { ...@@ -6169,8 +6178,8 @@ const getTagName = (row: ProductList) => {
: '' : ''
} }
const getLogisticsWay = async ()=>{ const getLogisticsWay = async () => {
const {data} = await getLogisticsWayApi() const { data } = await getLogisticsWayApi()
logisticsWayList.value = data logisticsWayList.value = data
} }
...@@ -6525,15 +6534,14 @@ useRouter().beforeEach((to, from, next) => { ...@@ -6525,15 +6534,14 @@ useRouter().beforeEach((to, from, next) => {
color: white; color: white;
font-weight: bold; font-weight: bold;
} }
.search-form{ .search-form {
::v-deep .el-radio-button{ ::v-deep .el-radio-button {
width: 75px; width: 75px;
.el-radio-button__inner{ .el-radio-button__inner {
width: 100%; width: 100%;
} }
} }
} }
</style> </style>
<style lang="scss"> <style lang="scss">
.customize-select-style { .customize-select-style {
......
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