Skip to content

F
factory_front
Commit d9d84ad2 by linjinhong
Options

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

parents a918d605 6a561044
Showing with 136 additions and 124 deletions
src/router/index.ts
...@@ -74,6 +74,13 @@ const router = createRouter({ ...@@ -74,6 +74,13 @@ const router = createRouter({
component: PodUsOrderList, component: PodUsOrderList,
}, },
{ {
path: '/pod-us-order/orderTracking',
meta: {
title: 'POD(US)订单跟踪',
},
component: () => import('@/views/order/orderTracking/index.vue'),
},
{
path: '/pod-delivery-note/list', path: '/pod-delivery-note/list',
meta: { meta: {
title: 'POD发货单', title: 'POD发货单',
...@@ -227,84 +234,6 @@ const router = createRouter({ ...@@ -227,84 +234,6 @@ const router = createRouter({
}, },
component: WarehousePosition, component: WarehousePosition,
}, },
{
path: '/logistics/logisticsMethod',
meta: {
title: '物流方式',
},
component: () => import('@/views/logistics/logisticsMethod.vue'),
},
{
path: '/logistics/shippingAddress',
meta: {
title: '发货地址',
},
component: () => import('@/views/logistics/shippingAddress.vue'),
},
{
path: '/logistics/logisticsQuotation',
meta: {
title: '物流报价',
},
component: () => import('@/views/logistics/logisticsQuotation.vue'),
},
{
path: '/logistics/declarationRule',
meta: {
title: '申报规则',
},
component: () => import('@/views/logistics/declarationRule.vue'),
},
{
path: '/logistics/logisticsPartition',
meta: {
title: '物流分区',
},
component: () => import('@/views/logistics/logisticsPartition.vue'),
},
{
path: '/logistics/logisticsCalculate',
meta: {
title: '运费试算',
},
component: () => import('@/views/logistics/logisticsCalculate.vue'),
},
{
path: '/warehouse/manage',
meta: {
title: '仓库管理',
},
component: WarehouseManage,
},
{
path: '/warehouse/receipt-doc',
meta: {
title: '入库单',
},
component: receiptDoc,
},
// {
// path: '/warehouse/issue-doc',
// meta: {
// title: '出库单',
// },
// component: issueDoc,
// },
{
path: '/warehouse/warning',
meta: {
title: '仓库预警',
},
component: WarehouseWarning,
},
{
path: '/warehouse/position',
meta: {
title: '库位管理',
},
component: WarehousePosition,
},
], ],
}, },
// 登录 // 登录
......
src/router/menu.ts
...@@ -117,6 +117,11 @@ const menu: MenuItem[] = [ ...@@ -117,6 +117,11 @@ const menu: MenuItem[] = [
id: 8, id: 8,
label: 'POD订单(US)', label: 'POD订单(US)',
}, },
// {
// index: '/pod-us-order/orderTracking',
// id: 8,
// label: 'POD(US)订单跟踪',
// },
], ],
}, },
......
src/views/logistics/logisticsMethod.vue
...@@ -76,16 +76,17 @@ import { ...@@ -76,16 +76,17 @@ import {
updateLogisticsWay, updateLogisticsWay,
updateStatusLogisticsWay, updateStatusLogisticsWay,
deleteLogisticsWay, deleteLogisticsWay,
getWarehouseList,
getRuleList, getRuleList,
getPlatformList, getPlatformList,
getLogisticsLog, getLogisticsLog,
getLogisticsCompanyList, getLogisticsCompanyList,
getUniuniList, getUniuniList,
} from '@/api/logistics' } from '@/api/logistics'
import { WarehouseListData } from '@/types/api/podUsOrder'
import { ISeachFormConfig } from '@/types/searchType' import { ISeachFormConfig } from '@/types/searchType'
import { TableColumn } from '@/components/VxeTable' import { TableColumn } from '@/components/VxeTable'
// import type { PromiseSettledResult } from 'types' import { loadWarehouseListApi } from '@/api/podUsOrder'
import type { import type {
LogisticsMethod, LogisticsMethod,
platformObj, platformObj,
...@@ -103,7 +104,9 @@ import { debounce } from 'lodash-es' ...@@ -103,7 +104,9 @@ import { debounce } from 'lodash-es'
import UPARCELImage from '@/assets/images/UPARCEL物流编码.png' import UPARCELImage from '@/assets/images/UPARCEL物流编码.png'
const [searchForm] = useValue({}) const [searchForm] = useValue({})
const [editForm, resetEditForm] = useValue<LogisticsMethod>({ const [editForm, resetEditForm] = useValue<LogisticsMethod>({
platformList: [{ platform: '', logisticsName: '', showPlatform: [] }], platformList: [
{ platform: '', logisticsName: '', showPlatform: ['default'] },
],
ruleRef: { ruleId: '', ruleName: '' }, ruleRef: { ruleId: '', ruleName: '' },
status: 1, status: 1,
}) })
...@@ -131,6 +134,7 @@ const dialogVisible = ref(false) ...@@ -131,6 +134,7 @@ const dialogVisible = ref(false)
const logDialogVisible = ref(false) const logDialogVisible = ref(false)
const editFormRef = ref<InstanceType<typeof CustomizeForm> | null>(null) const editFormRef = ref<InstanceType<typeof CustomizeForm> | null>(null)
const selection = ref([]) const selection = ref([])
const warehouseList = ref<WarehouseListData[]>([])
interface ImageList { interface ImageList {
[key: string]: string [key: string]: string
...@@ -173,7 +177,7 @@ const searchConfig = ref<ISeachFormConfig[]>([ ...@@ -173,7 +177,7 @@ const searchConfig = ref<ISeachFormConfig[]>([
}, },
]) ])
const platformList = ref([]) const platformList = ref([])
const warehouseList = ref([])
const ruleNameList = ref([]) const ruleNameList = ref([])
const uniuniList = ref([]) const uniuniList = ref([])
const logisticsCompanyList = ref([]) const logisticsCompanyList = ref([])
...@@ -323,11 +327,17 @@ const formConfig = computed<IFormConfig[]>(() => [ ...@@ -323,11 +327,17 @@ const formConfig = computed<IFormConfig[]>(() => [
}, },
{ {
prop: 'warehouseId', prop: 'warehouseId',
type: 'input', type: 'select',
label: '仓库名称', label: '仓库名称',
fixed: 'last', fixed: 'last',
attrs: { attrs: {
placeholder: '请输入仓库名称', placeholder: '请选择仓库名称',
label: 'name',
value: 'id',
options: [...(warehouseList.value || [])],
onChange: (item: WarehouseListData) => {
editForm.value.warehouseName = item.name
},
}, },
}, },
...@@ -384,6 +394,7 @@ const formConfig = computed<IFormConfig[]>(() => [ ...@@ -384,6 +394,7 @@ const formConfig = computed<IFormConfig[]>(() => [
collapse-tags collapse-tags
collapse-tags-tooltip collapse-tags-tooltip
v-model={item['showPlatform']} v-model={item['showPlatform']}
disabled={index === 0}
> >
{platformList.value?.map((el, idx) => ( {platformList.value?.map((el, idx) => (
<el-option label={el} value={el} key={idx}></el-option> <el-option label={el} value={el} key={idx}></el-option>
...@@ -707,7 +718,7 @@ const save = debounce(async () => { ...@@ -707,7 +718,7 @@ const save = debounce(async () => {
return return
} }
} }
}, 400) }, 200)
/** /**
* @description: 新增按钮打开弹窗 * @description: 新增按钮打开弹窗
...@@ -784,14 +795,20 @@ function deleteCol(index: number) { ...@@ -784,14 +795,20 @@ function deleteCol(index: number) {
async function getAllList() { async function getAllList() {
try { try {
const res = await Promise.allSettled([ const res = await Promise.allSettled([
getWarehouseList(), loadWarehouseListApi(),
getRuleList(), getRuleList(),
getPlatformList(), getPlatformList(),
getLogisticsCompanyList(), getLogisticsCompanyList(),
getUniuniList(), getUniuniList(),
]) ])
res.forEach( res.forEach(
(item: PromiseSettledResult<{ code: number; data: never[] }>, index) => { (
item: PromiseSettledResult<{
code: number
data: WarehouseListData[] | never[]
}>,
index,
) => {
if (item.status === 'fulfilled') { if (item.status === 'fulfilled') {
if (item.value.code === 200) { if (item.value.code === 200) {
if (index == 0) { if (index == 0) {
...@@ -799,13 +816,13 @@ async function getAllList() { ...@@ -799,13 +816,13 @@ async function getAllList() {
} else if (index == 1) { } else if (index == 1) {
console.log(758, item.value.data) console.log(758, item.value.data)
ruleNameList.value = item.value.data || [] ruleNameList.value = (item.value.data as never[]) || []
} else if (index == 2) { } else if (index == 2) {
platformList.value = item.value.data || [] platformList.value = (item.value.data as never[]) || []
} else if (index == 3) { } else if (index == 3) {
logisticsCompanyList.value = item.value.data || [] logisticsCompanyList.value = (item.value.data as never[]) || []
} else if (index == 4) { } else if (index == 4) {
uniuniList.value = item.value.data || [] uniuniList.value = (item.value.data as never[]) || []
} }
} }
} }
......
src/views/order/podUs/index.vue
...@@ -93,6 +93,14 @@ ...@@ -93,6 +93,14 @@
style="width: 150px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="店铺单号">
<ElInput
v-model="searchForm.shopNumber"
placeholder="店铺单号"
clearable
style="width: 150px"
/>
</ElFormItem>
</div> </div>
<ElFormItem label="类型"> <ElFormItem label="类型">
<el-radio-group v-model="searchForm.customizedQuantity"> <el-radio-group v-model="searchForm.customizedQuantity">
...@@ -155,14 +163,6 @@ ...@@ -155,14 +163,6 @@
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="店铺单号">
<ElInput
v-model="searchForm.shopNumber"
placeholder="店铺单号"
clearable
style="width: 150px"
/>
</ElFormItem>
<ElFormItem label="客户"> <ElFormItem label="客户">
<el-select <el-select
v-model="searchForm.userMark" v-model="searchForm.userMark"
...@@ -1202,7 +1202,7 @@ ...@@ -1202,7 +1202,7 @@
<template #bottom_left> <template #bottom_left>
<span <span
v-if="cardItem?.factorySubOrderNumber" v-if="cardItem?.factorySubOrderNumber"
title="生产单号" :title="`生产单号:${cardItem?.factorySubOrderNumber || ''}`"
class="factory-sub-order-number" class="factory-sub-order-number"
@click.stop=" @click.stop="
copy(String(cardItem?.factorySubOrderNumber || '')) copy(String(cardItem?.factorySubOrderNumber || ''))
...@@ -1210,6 +1210,14 @@ ...@@ -1210,6 +1210,14 @@
> >
{{ cardItem?.factorySubOrderNumber }} {{ cardItem?.factorySubOrderNumber }}
</span> </span>
<el-icon
class="icon"
style="margin-left: 3px"
size="14"
@click="copy(cardItem?.factorySubOrderNumber || '')"
>
<DocumentCopy />
</el-icon>
</template> </template>
<template #operations> <template #operations>
<div <div
...@@ -1255,7 +1263,10 @@ ...@@ -1255,7 +1263,10 @@
</template> </template>
<template #info> <template #info>
<div class="grid-container"> <div class="grid-container">
<div class="grid-item" title="商品名称"> <div
class="grid-item"
:title="`商品名称:${cardItem?.productName || ''}`"
>
<span class="grid-item-value" <span class="grid-item-value"
>{{ cardItem?.productName }} >{{ cardItem?.productName }}
</span> </span>
...@@ -1282,9 +1293,20 @@ ...@@ -1282,9 +1293,20 @@
</span> </span>
</div> </div>
<div class="grid-item"> <div class="grid-item">
<span title="Base SKU" class="grid-item-value"> <div
:title="`Base SKU:${cardItem?.baseSku || ''}`"
class="grid-item-value orderNumber"
>
{{ cardItem?.baseSku }} {{ cardItem?.baseSku }}
</span> <el-icon
class="icon"
style="margin-left: 3px"
size="14"
@click="copy(cardItem?.baseSku || '')"
>
<DocumentCopy />
</el-icon>
</div>
</div> </div>
<div v-if="status !== 'TO_BE_ARRANGE'" class="grid-item"> <div v-if="status !== 'TO_BE_ARRANGE'" class="grid-item">
<span class="grid-item-label">补胚数量：</span> <span class="grid-item-label">补胚数量：</span>
...@@ -1298,16 +1320,30 @@ ...@@ -1298,16 +1320,30 @@
{{ cardItem?.variantSku }} {{ cardItem?.variantSku }}
</span> </span>
</div> --> </div> -->
<div class="grid-item" title="工艺"> <div
class="grid-item"
:title="`工艺:${cardItem?.craftName || ''}`"
>
<span class="grid-item-label">工艺：</span> <span class="grid-item-label">工艺：</span>
<span class="grid-item-value"> <span class="grid-item-value">
{{ cardItem?.craftName }} {{ cardItem?.craftName }}
</span> </span>
</div> </div>
<div class="grid-item"> <div class="grid-item">
<span title="库存SKU" class="grid-item-value"> <div
:title="`库存SKU:${cardItem?.thirdSkuCode || ''}`"
class="grid-item-value orderNumber"
>
{{ cardItem?.thirdSkuCode }} {{ cardItem?.thirdSkuCode }}
</span> <el-icon
class="icon"
style="margin-left: 3px"
size="14"
@click="copy(cardItem?.thirdSkuCode || '')"
>
<DocumentCopy />
</el-icon>
</div>
</div> </div>
<div class="grid-item"> <div class="grid-item">
<span class="grid-item-label">款号：</span> <span class="grid-item-label">款号：</span>
...@@ -1319,13 +1355,21 @@ ...@@ -1319,13 +1355,21 @@
</span> </span>
</div> </div>
<div class="grid-item" title="店铺单号"> <div
<span class="grid-item"
class="grid-item-value" :title="`店铺单号:${cardItem?.shopNumber || ''}`"
@click="copy(cardItem?.shopNumber || '')" >
> <div class="grid-item-value orderNumber">
{{ cardItem?.shopNumber }} {{ cardItem?.shopNumber }}
</span> <el-icon
class="icon"
style="margin-left: 3px"
size="14"
@click="copy(cardItem?.shopNumber || '')"
>
<DocumentCopy />
</el-icon>
</div>
</div> </div>
<!-- <div class="grid-item" title="订单号"> <!-- <div class="grid-item" title="订单号">
<span <span
...@@ -1337,27 +1381,39 @@ ...@@ -1337,27 +1381,39 @@
</div> --> </div> -->
<div class="grid-item"> <div class="grid-item">
<span <div
:title="`第三方生产单号:${cardItem?.thirdSubOrderNumber}`" :title="`第三方生产单号:${cardItem?.thirdSubOrderNumber}`"
class="grid-item-value" class="grid-item-value orderNumber"
@click.stop="
copy(String(cardItem?.thirdSubOrderNumber || ''))
"
> >
{{ cardItem?.thirdSubOrderNumber }} {{ cardItem?.thirdSubOrderNumber }}
</span> <el-icon
class="icon"
style="margin-left: 3px"
size="14"
@click.stop="
copy(String(cardItem?.thirdSubOrderNumber || ''))
"
>
<DocumentCopy />
</el-icon>
</div>
</div> </div>
<div <div
v-if="cardItem.batchArrangeNumber" v-if="cardItem.batchArrangeNumber"
class="grid-item" class="grid-item"
title="批次号" :title="`批次号:${cardItem?.batchArrangeNumber || ''}`"
> >
<span <div class="grid-item-value orderNumber">
class="grid-item-value"
@click="copy(cardItem?.batchArrangeNumber || '')"
>
{{ cardItem?.batchArrangeNumber }} {{ cardItem?.batchArrangeNumber }}
</span> <el-icon
class="icon"
style="margin-left: 3px"
size="14"
@click="copy(cardItem?.batchArrangeNumber || '')"
>
<DocumentCopy />
</el-icon>
</div>
</div> </div>
<div v-if="cardItem.isReplenishment" class="grid-item"> <div v-if="cardItem.isReplenishment" class="grid-item">
<el-tag size="small" type="danger" effect="dark" <el-tag size="small" type="danger" effect="dark"
...@@ -4203,6 +4259,11 @@ function getPlatformImg(code: string) { ...@@ -4203,6 +4259,11 @@ function getPlatformImg(code: string) {
font-size: 15px; font-size: 15px;
} }
} }
.orderNumber {
display: flex;
align-items: center;
justify-content: flex-start;
}
</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