Skip to content

F
factory_front
Commit 92946f6f by zhuzhequan
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 3fab8331 288b3a29
Showing with 232 additions and 23 deletions
src/types/api/order.ts
...@@ -113,6 +113,7 @@ export interface ProductList { ...@@ -113,6 +113,7 @@ export interface ProductList {
isProduction?: boolean isProduction?: boolean
imageAry?: string imageAry?: string
productionFileId?: string productionFileId?: string
sizeType?: number | null
} }
export interface MemoList { export interface MemoList {
......
src/types/api/podCnOrder.ts
...@@ -40,6 +40,7 @@ export interface SearchForm { ...@@ -40,6 +40,7 @@ export interface SearchForm {
thirdStockSku?: string thirdStockSku?: string
exceptionHandling?: number | undefined exceptionHandling?: number | undefined
interceptStatus?: number | string interceptStatus?: number | string
sizeType?: number | null
} }
export interface PodCnOrderListData { export interface PodCnOrderListData {
id: number id: number
...@@ -138,6 +139,7 @@ export interface ProductList { ...@@ -138,6 +139,7 @@ export interface ProductList {
replenishmentSumNum?: number | null replenishmentSumNum?: number | null
interceptStatus?: number | null interceptStatus?: number | null
batchArrangeNumber?: string | null batchArrangeNumber?: string | null
sizeType?: number | null
} }
export interface cardImages { export interface cardImages {
title: string title: string
......
src/types/api/podOrder.ts
...@@ -23,6 +23,7 @@ export interface SearchForm { ...@@ -23,6 +23,7 @@ export interface SearchForm {
productionFileId?: string productionFileId?: string
interceptedStatus?: boolean interceptedStatus?: boolean
platform?: string platform?: string
sizeType?: number | null
} }
export interface CardOrderData { export interface CardOrderData {
id: number id: number
...@@ -133,7 +134,7 @@ export interface SearchOrderRes extends PodProductList { ...@@ -133,7 +134,7 @@ export interface SearchOrderRes extends PodProductList {
size?: string | null size?: string | null
note?: Array<{ prop: string | number; value: string | number }> note?: Array<{ prop: string | number; value: string | number }>
imgList: { imgList: {
url:string url: string
title?: string title?: string
}[] }[]
} }
......
src/types/api/podUsOrder.ts
...@@ -37,6 +37,7 @@ export interface SearchForm { ...@@ -37,6 +37,7 @@ export interface SearchForm {
thirdStockSku?: string thirdStockSku?: string
interceptStatus?: number | string interceptStatus?: number | string
trackRegisterSelect?: string | number trackRegisterSelect?: string | number
sizeType?: number | null
} }
export interface PodUsOrderListData { export interface PodUsOrderListData {
id: number id: number
...@@ -132,6 +133,7 @@ export interface ProductList { ...@@ -132,6 +133,7 @@ export interface ProductList {
replenishmentSumNum?: number | null replenishmentSumNum?: number | null
batchArrangeNumber?: string | null batchArrangeNumber?: string | null
interceptStatus?: number | null interceptStatus?: number | null
sizeType?: number | null
} }
export interface cardImages { export interface cardImages {
title: string title: string
......
src/views/order/ProductInfo.vue
...@@ -203,6 +203,15 @@ ...@@ -203,6 +203,15 @@
item?.process || '--' item?.process || '--'
}}</span> }}</span>
</div> </div>
<div
v-if="isPod && item.sizeType"
class="order-list-expand_item_info_title"
>
<span class="order-list-expand_item_label">尺码类型:</span>
<span class="order-list-expand_item_value">{{
sizeList.find((i) => i.value === item.sizeType)?.name
}}</span>
</div>
<div v-if="!isPod" class="order-list-expand_item_info_title"> <div v-if="!isPod" class="order-list-expand_item_info_title">
<span class="order-list-expand_item_label">待质检:</span> <span class="order-list-expand_item_label">待质检:</span>
<span class="order-list-expand_item_value">{{ <span class="order-list-expand_item_value">{{
...@@ -252,6 +261,11 @@ defineProps({ ...@@ -252,6 +261,11 @@ defineProps({
default: false, default: false,
}, },
}) })
// 尺码类型表
const sizeList = ref<{ name: string; value: number }[]>([
{ name: '正常码', value: 1 },
{ name: '大码', value: 2 },
])
const emit = defineEmits(['openMaterial']) const emit = defineEmits(['openMaterial'])
const openMaterial = (item: PodProductList) => { const openMaterial = (item: PodProductList) => {
emit('openMaterial', item) emit('openMaterial', item)
......
src/views/order/pod/fastProduction.vue
...@@ -133,6 +133,16 @@ ...@@ -133,6 +133,16 @@
<span>尺寸</span> <span>尺寸</span>
<p>{{ detail?.size }}</p> <p>{{ detail?.size }}</p>
</div> </div>
<div
v-if="detail?.sizeType"
:title="String(detail?.sizeType)"
class="div-item"
>
<span>尺码类型</span>
<p>
{{ sizeList.find((i) => i.value === detail.sizeType)?.name }}
</p>
</div>
<!-- <div <!-- <div
v-if="isJmpod === 'JMPOD'" v-if="isJmpod === 'JMPOD'"
:title="detail?.supplyMerchantCode" :title="detail?.supplyMerchantCode"
...@@ -285,6 +295,11 @@ const detail = ref<PodOrderRes>({ ...@@ -285,6 +295,11 @@ const detail = ref<PodOrderRes>({
imgList: [] as ImageItemInter[][], imgList: [] as ImageItemInter[][],
}) })
const dialogVisible = ref(false) const dialogVisible = ref(false)
// 尺码类型表
const sizeList = ref<{ name: string; value: number }[]>([
{ name: '正常码', value: 1 },
{ name: '大码', value: 2 },
])
// 通过import动态导入音频文件 // 通过import动态导入音频文件
const audios = { const audios = {
weight_warning: new URL('@/assets/audio/weight_warning.mp3', import.meta.url) weight_warning: new URL('@/assets/audio/weight_warning.mp3', import.meta.url)
......
src/views/order/pod/index.vue
...@@ -150,6 +150,22 @@ ...@@ -150,6 +150,22 @@
<el-option value="multiple" label="多面"></el-option> <el-option value="multiple" label="多面"></el-option>
</el-select> </el-select>
</ElFormItem> </ElFormItem>
<ElFormItem label="尺码类型">
<ElSelect
v-model="searchForm.sizeType"
clearable
filterable
placeholder="尺码类型"
style="width: 100px"
>
<el-option
v-for="item in sizeList"
:key="item.value"
:label="item.name"
:value="item.value"
></el-option>
</ElSelect>
</ElFormItem>
<ElFormItem> <ElFormItem>
<ElButton type="primary" @click="loadDiffList">查询</ElButton> <ElButton type="primary" @click="loadDiffList">查询</ElButton>
</ElFormItem> </ElFormItem>
...@@ -514,11 +530,7 @@ ...@@ -514,11 +530,7 @@
<el-col <el-col
:span="12" :span="12"
:offset="0" :offset="0"
style=" style="white-space: nowrap"
white-space: nowrap;
display: flex;
align-items: center;
"
> >
<el-tooltip <el-tooltip
class="item" class="item"
...@@ -539,6 +551,7 @@ ...@@ -539,6 +551,7 @@
</el-tooltip> </el-tooltip>
</el-col> </el-col>
<el-col <el-col
v-if="cardItem?.sizeType"
:span="12" :span="12"
:offset="0" :offset="0"
style="white-space: nowrap; text-align: right" style="white-space: nowrap; text-align: right"
...@@ -546,7 +559,11 @@ ...@@ -546,7 +559,11 @@
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
:content="'店铺单号: ' + cardItem?.shopNumber" :content="
'尺码类型: ' +
(sizeList.find((i) => i.value === cardItem.sizeType)
?.name || '--')
"
placement="bottom" placement="bottom"
> >
<span <span
...@@ -557,7 +574,12 @@ ...@@ -557,7 +574,12 @@
text-overflow: ellipsis; text-overflow: ellipsis;
" "
> >
{{ cardItem?.shopNumber }} {{
'尺码类型：' +
(sizeList.find(
(i) => i.value === cardItem.sizeType,
)?.name || '--')
}}
</span> </span>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
...@@ -566,14 +588,12 @@ ...@@ -566,14 +588,12 @@
<el-col <el-col
:span="12" :span="12"
:offset="0" :offset="0"
style="white-space: nowrap" style="white-space: nowrap; text-align: left"
> >
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
:content=" :content="'店铺单号: ' + cardItem?.shopNumber"
'第三方生产单号: ' + cardItem?.thirdSubOrderNumber
"
placement="bottom" placement="bottom"
> >
<span <span
...@@ -583,11 +603,8 @@ ...@@ -583,11 +603,8 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
" "
@click.stop="
copy(String(cardItem?.thirdSubOrderNumber || ''))
"
> >
{{ cardItem?.thirdSubOrderNumber }} {{ cardItem?.shopNumber }}
</span> </span>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
...@@ -599,7 +616,9 @@ ...@@ -599,7 +616,9 @@
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
:content="'批次号: ' + cardItem?.factoryOrderNumber" :content="
'第三方生产单号: ' + cardItem?.thirdSubOrderNumber
"
placement="bottom" placement="bottom"
> >
<span <span
...@@ -610,13 +629,14 @@ ...@@ -610,13 +629,14 @@
text-overflow: ellipsis; text-overflow: ellipsis;
" "
@click.stop=" @click.stop="
copy(String(cardItem?.factoryOrderNumber || '')) copy(String(cardItem?.thirdSubOrderNumber || ''))
" "
> >
{{ cardItem?.factoryOrderNumber }} {{ cardItem?.thirdSubOrderNumber }}
</span> </span>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
<!-- <el-col :span="12" :offset="0" style="text-align: right"> <!-- <el-col :span="12" :offset="0" style="text-align: right">
<span v-if="!cardItem?.expectDeliveryTime" <span v-if="!cardItem?.expectDeliveryTime"
>期望交货时间：--</span >期望交货时间：--</span
...@@ -630,6 +650,32 @@ ...@@ -630,6 +650,32 @@
<el-col <el-col
:span="12" :span="12"
:offset="0" :offset="0"
style="white-space: nowrap; text-align: left"
>
<el-tooltip
class="item"
effect="dark"
:content="'批次号: ' + cardItem?.factoryOrderNumber"
placement="bottom"
>
<span
style="
display: inline-block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
"
@click.stop="
copy(String(cardItem?.factoryOrderNumber || ''))
"
>
{{ cardItem?.factoryOrderNumber }}
</span>
</el-tooltip>
</el-col>
<el-col
:span="12"
:offset="0"
style="white-space: nowrap" style="white-space: nowrap"
> >
<a <a
...@@ -645,10 +691,12 @@ ...@@ -645,10 +691,12 @@
</el-tooltip> </el-tooltip>
</a> </a>
</el-col> </el-col>
</el-row>
<el-row style="margin-top: 5px">
<el-col <el-col
:span="12" :span="12"
:offset="0" :offset="0"
style="white-space: nowrap; text-align: right" style="white-space: nowrap; text-align: left"
> >
<el-tooltip <el-tooltip
class="item" class="item"
...@@ -1388,6 +1436,11 @@ const rightChange = async (code: string) => { ...@@ -1388,6 +1436,11 @@ const rightChange = async (code: string) => {
count.value = (res?.data || 0) as number count.value = (res?.data || 0) as number
} }
} }
// 尺码类型表
const sizeList = ref<{ name: string; value: number }[]>([
{ name: '正常码', value: 1 },
{ name: '大码', value: 2 },
])
// 日期工具函数 // 日期工具函数
const getDateRange = (days = 0, type: 'past' | 'future' = 'past') => { const getDateRange = (days = 0, type: 'past' | 'future' = 'past') => {
const end = dayjs() const end = dayjs()
......
src/views/order/podCN/FastProduction.vue
...@@ -116,6 +116,16 @@ ...@@ -116,6 +116,16 @@
<span>尺寸</span> <span>尺寸</span>
<p>{{ detail?.size }}</p> <p>{{ detail?.size }}</p>
</div> </div>
<div
v-if="detail?.sizeType"
:title="String(detail?.sizeType)"
class="div-item"
>
<span>尺码类型</span>
<p>
{{ sizeList.find((i) => i.value === detail.sizeType)?.name }}
</p>
</div>
<div :title="detail?.shopNumber ?? ''" class="div-item"> <div :title="detail?.shopNumber ?? ''" class="div-item">
<span>店铺单号</span> <span>店铺单号</span>
...@@ -218,6 +228,11 @@ const detail = ref<PodOrderRes>({ ...@@ -218,6 +228,11 @@ const detail = ref<PodOrderRes>({
imgList: [] as cardImages[], imgList: [] as cardImages[],
}) })
const dialogVisible = ref(false) const dialogVisible = ref(false)
// 尺码类型表
const sizeList = ref<{ name: string; value: number }[]>([
{ name: '正常码', value: 1 },
{ name: '大码', value: 2 },
])
// 通过import动态导入音频文件 // 通过import动态导入音频文件
const audios = { const audios = {
weight_warning: new URL('@/assets/audio/weight_warning.mp3', import.meta.url) weight_warning: new URL('@/assets/audio/weight_warning.mp3', import.meta.url)
......
src/views/order/podCN/index.vue
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<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 :model="searchForm" size="default" inline> <ElForm :model="searchForm" size="default" inline>
<div>
<ElFormItem label="仓库"> <ElFormItem label="仓库">
<ElSelect <ElSelect
v-model="searchForm.warehouseId" v-model="searchForm.warehouseId"
...@@ -101,7 +100,22 @@ ...@@ -101,7 +100,22 @@
style="width: 150px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
</div> <ElFormItem label="尺码类型">
<ElSelect
v-model="searchForm.sizeType"
clearable
filterable
placeholder="请输入尺码类型"
style="width: 150px"
>
<el-option
v-for="item in sizeList"
:key="item.value"
:label="item.name"
:value="item.value"
></el-option>
</ElSelect>
</ElFormItem>
<ElFormItem label="类型"> <ElFormItem label="类型">
<el-radio-group v-model="searchForm.customizedQuantity"> <el-radio-group v-model="searchForm.customizedQuantity">
<el-radio-button label="single">单面</el-radio-button> <el-radio-button label="single">单面</el-radio-button>
...@@ -1022,6 +1036,14 @@ ...@@ -1022,6 +1036,14 @@
{{ item.supplierProductNo }} {{ item.supplierProductNo }}
</span> </span>
</div> </div>
<div v-if="item.sizeType" class="goods-item-info-item">
<span class="goods-item-info-item-label">尺码类型:</span>
<span class="goods-item-info-item-value">
{{
sizeList.find((i) => i.value === item.sizeType)?.name
}}
</span>
</div>
<div <div
v-if="item.isReplenishment" v-if="item.isReplenishment"
...@@ -1744,6 +1766,22 @@ ...@@ -1744,6 +1766,22 @@
{{ cardItem?.craftName }} {{ cardItem?.craftName }}
</span> </span>
</div> </div>
<div
v-if="cardItem?.sizeType"
class="grid-item"
:title="`尺码类型:${
sizeList.find((i) => i.value === cardItem.sizeType)
?.name || ''
}`"
>
<span class="grid-item-label">尺码类型：</span>
<span class="grid-item-value">
{{
sizeList.find((i) => i.value === cardItem.sizeType)
?.name
}}
</span>
</div>
<div class="grid-item"> <div class="grid-item">
<div <div
:title="`库存SKU:${cardItem?.thirdSkuCode || ''}`" :title="`库存SKU:${cardItem?.thirdSkuCode || ''}`"
...@@ -2583,6 +2621,13 @@ const getWeekRange = (weeks = 0, type: 'past' | 'future' = 'past') => { ...@@ -2583,6 +2621,13 @@ const getWeekRange = (weeks = 0, type: 'past' | 'future' = 'past') => {
type === 'past' ? now.subtract(weeks, 'week') : now.add(weeks, 'week') type === 'past' ? now.subtract(weeks, 'week') : now.add(weeks, 'week')
return [start.startOf('week').toDate(), start.endOf('week').toDate()] return [start.startOf('week').toDate(), start.endOf('week').toDate()]
} }
// 尺码类型表
const sizeList = ref<{ name: string; value: number }[]>([
{ name: '正常码', value: 1 },
{ name: '大码', value: 2 },
])
const handleRefreshAddress = async (row: PodCnOrderListData) => { const handleRefreshAddress = async (row: PodCnOrderListData) => {
try { try {
await showConfirm('确定刷新地址吗?', { await showConfirm('确定刷新地址吗?', {
......
src/views/order/podUs/FastProduction.vue
...@@ -135,6 +135,16 @@ ...@@ -135,6 +135,16 @@
<span>尺寸</span> <span>尺寸</span>
<p>{{ detail?.size }}</p> <p>{{ detail?.size }}</p>
</div> </div>
<div
v-if="detail?.sizeType"
:title="String(detail?.sizeType)"
class="div-item"
>
<span>尺码类型</span>
<p>
{{ sizeList.find((i) => i.value === detail.sizeType)?.name }}
</p>
</div>
<div :title="detail?.shopNumber ?? ''" class="div-item"> <div :title="detail?.shopNumber ?? ''" class="div-item">
<span>店铺单号</span> <span>店铺单号</span>
...@@ -263,6 +273,11 @@ const audios = { ...@@ -263,6 +273,11 @@ const audios = {
import.meta.url, import.meta.url,
).href, ).href,
} }
// 尺码类型表
const sizeList = ref<{ name: string; value: number }[]>([
{ name: '正常码', value: 1 },
{ name: '大码', value: 2 },
])
const TrackingNumber = ref('') const TrackingNumber = ref('')
const props = defineProps({ const props = defineProps({
type: { type: {
......
src/views/order/podUs/index.vue
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
v-model="searchForm.factorySubOrderNumber" v-model="searchForm.factorySubOrderNumber"
placeholder="生产单号" placeholder="生产单号"
clearable clearable
style="width: 400px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="店铺单号"> <ElFormItem label="店铺单号">
...@@ -104,6 +104,22 @@ ...@@ -104,6 +104,22 @@
style="width: 150px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="尺码类型">
<ElSelect
v-model="searchForm.sizeType"
clearable
filterable
placeholder="请输入尺码类型"
style="width: 150px"
>
<el-option
v-for="item in sizeList"
:key="item.value"
:label="item.name"
:value="item.value"
></el-option>
</ElSelect>
</ElFormItem>
<!-- </div> --> <!-- </div> -->
<ElFormItem label="类型"> <ElFormItem label="类型">
<el-radio-group v-model="searchForm.customizedQuantity"> <el-radio-group v-model="searchForm.customizedQuantity">
...@@ -1135,6 +1151,14 @@ ...@@ -1135,6 +1151,14 @@
{{ item.weight }}g {{ item.weight }}g
</span> </span>
</div> </div>
<div v-if="item.sizeType" class="goods-item-info-item">
<span class="goods-item-info-item-label">尺码类型:</span>
<span class="goods-item-info-item-value">
{{
sizeList.find((i) => i.value === item.sizeType)?.name
}}
</span>
</div>
<div <div
v-if="item.isReplenishment" v-if="item.isReplenishment"
class="goods-item-info-item" class="goods-item-info-item"
...@@ -1945,6 +1969,22 @@ ...@@ -1945,6 +1969,22 @@
</span> </span>
</div> </div>
<div <div
v-if="cardItem?.sizeType"
class="grid-item"
:title="`尺码类型:${
sizeList.find((i) => i.value === cardItem.sizeType)
?.name || ''
}`"
>
<span class="grid-item-label">尺码类型：</span>
<span class="grid-item-value">
{{
sizeList.find((i) => i.value === cardItem.sizeType)
?.name
}}
</span>
</div>
<div
class="grid-item" class="grid-item"
:title="`店铺单号:${cardItem?.shopNumber || ''}`" :title="`店铺单号:${cardItem?.shopNumber || ''}`"
@click="copy(cardItem?.shopNumber || '')" @click="copy(cardItem?.shopNumber || '')"
...@@ -2871,6 +2911,12 @@ const replenishmentRules = { ...@@ -2871,6 +2911,12 @@ const replenishmentRules = {
], ],
} }
// 尺码类型表
const sizeList = ref<{ name: string; value: number }[]>([
{ name: '正常码', value: 1 },
{ name: '大码', value: 2 },
])
const detailData = ref({}) const detailData = ref({})
const [searchForm, resetSearchForm] = useValue<SearchForm>({ const [searchForm, resetSearchForm] = useValue<SearchForm>({
timeType: 1, timeType: 1,
......
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