Skip to content

F
factory_front
Commit b67e1eb9 by linjinhong
Options

Merge branch 'release'

parents 03007d8e 9f4bc132
Showing with 400 additions and 94 deletions
src/api/logistics.ts
...@@ -148,7 +148,7 @@ export function getUniuniList() { ...@@ -148,7 +148,7 @@ export function getUniuniList() {
} }
// 获取tictok物流承运商 // 获取tictok物流承运商
export function getTiktokCarrier() { export function getTiktokCarrier() {
return axios.get<never, BaseRespData<{ name: string; id: number }[]>>( return axios.get<never, BaseRespData<{ name: string; id: string,typeCode:string,label:string }[]>>(
'logisticsWay/getTiktokShippingProvider', 'logisticsWay/getTiktokShippingProvider',
) )
} }
......
src/views/logistics/components/LogisticsWaySelect.tsx
...@@ -4,6 +4,8 @@ import { ...@@ -4,6 +4,8 @@ import {
ElScrollbar, ElScrollbar,
ElCheckbox, ElCheckbox,
ElCheckboxGroup, ElCheckboxGroup,
ElRadioGroup,
ElRadio,
ElInput, ElInput,
} from 'element-plus' } from 'element-plus'
...@@ -24,6 +26,11 @@ const styles = { ...@@ -24,6 +26,11 @@ const styles = {
flexWrap: 'wrap', flexWrap: 'wrap',
backgroundColor: '#efefef', backgroundColor: '#efefef',
}, },
checkbox: {
width: '33.3333%',
'margin-right': '0px !important',
},
} as const } as const
interface ICompanyList { interface ICompanyList {
...@@ -35,41 +42,64 @@ interface IwayList { ...@@ -35,41 +42,64 @@ interface IwayList {
id: string id: string
} }
interface IAllList { interface IAllList {
factoryId: number factoryId?: number
id: number id: number
name: string name: string
serviceCode: string serviceCode?: string
siteUrl: string siteUrl?: string
status: number status?: number
uinuinWarehouseId: number | null uinuinWarehouseId?: number | null
updateTime: string updateTime?: string
warehouseId: number warehouseId?: number
warehouseName: string warehouseName?: string
wayList?: IwayList[]
} }
export default defineComponent({ export default defineComponent({
name: 'CustomizeForm', name: 'CustomizeForm',
props: { props: {
modelValue: { modelValue: {
type: Array as PropType<(string | number)[]>, type: [Array, String, Number] as PropType<
(string | number)[] | string | number
>,
default: () => [], default: () => [],
// 可选：添加自定义验证器确保类型安全
validator: (value: unknown) => {
return (
Array.isArray(value) ||
typeof value === 'string' ||
typeof value === 'number'
)
},
}, },
companyList: { companyList: {
type: Array as PropType<IAllList[]>, type: Array as PropType<IAllList[] | ICompanyList[]>,
default: () => [], default: () => [],
}, },
isRadio: {
type: Boolean,
default: false,
},
}, },
emits: ['update:modelValue'], emits: ['update:modelValue'],
setup(props, { emit }) { setup(props, { emit }) {
const companyList = ref<ICompanyList[]>([]) const companyList = ref<ICompanyList[]>([])
const templeCompanyList = ref<ICompanyList[] | IwayList[] | IAllList[]>([])
const allList = ref<IAllList[]>([]) const allList = ref<IAllList[]>([])
const allWayLists = ref<IwayList[]>([])
const selectedList = ref<(string | number)[]>([]) const selectedList = ref<(string | number)[]>([])
const selectedRadioList = ref<string | number>()
const waysName = ref('') const waysName = ref('')
const searchName = ref('')
watch( watch(
() => props.modelValue, () => props.modelValue,
(newVal) => { (newVal) => {
selectedList.value = newVal if (props.isRadio) {
selectedRadioList.value = newVal as string | number
console.log('waysName', waysName.value)
} else {
selectedList.value = newVal as (string | number)[]
}
}, },
{ {
immediate: true, immediate: true,
...@@ -78,14 +108,30 @@ export default defineComponent({ ...@@ -78,14 +108,30 @@ export default defineComponent({
) )
watch( watch(
[() => selectedList.value, () => props.companyList], [
() => selectedList.value,
() => props.companyList,
() => selectedRadioList.value,
],
(newVal) => { (newVal) => {
// console.log(90, newVal)
if (props.isRadio) {
emit('update:modelValue', newVal[2])
companyList.value = newVal[1] as ICompanyList[]
allWayLists.value = props.companyList.flatMap(
(company) => company.wayList,
) as IwayList[]
waysName.value =
allWayLists.value.find((el: IwayList) => newVal[2] === el.id)
?.name || ''
} else {
emit('update:modelValue', newVal[0]) emit('update:modelValue', newVal[0])
allList.value = newVal[1] allList.value = newVal[1] as IAllList[]
companyList.value = transformData(newVal[1]) companyList.value = transformData(newVal[1] as IAllList[])
if (newVal[1]?.length) { if (newVal[1]?.length) {
waysName.value = newVal[1] waysName.value = (newVal[1] as IAllList[])
.filter((item) => { .filter((item) => {
if (newVal[0].includes(item.id)) { if (newVal[0].includes(item.id)) {
return item.name return item.name
...@@ -94,7 +140,8 @@ export default defineComponent({ ...@@ -94,7 +140,8 @@ export default defineComponent({
.map((item) => item.name) .map((item) => item.name)
.join(',') .join(',')
// emit('waysName', res) // emit('waysName', res)
console.log(87, waysName.value) // console.log(87, waysName.value)
}
} }
}, },
{ deep: true, immediate: true }, { deep: true, immediate: true },
...@@ -127,6 +174,31 @@ export default defineComponent({ ...@@ -127,6 +174,31 @@ export default defineComponent({
return (company: ICompanyList) => statusMap.get(company.warehouseName) return (company: ICompanyList) => statusMap.get(company.warehouseName)
}) })
function fuzzySearch<T>(
items: T[],
searchTerm: string,
key: keyof T = 'name' as keyof T,
): T[] {
// 空搜索返回所有元素
if (!searchTerm.trim()) {
return [...items]
}
// 将搜索词转为小写（不区分大小写）
const searchLower = searchTerm.toLowerCase()
return items.filter((item) => {
// 获取属性值
const value = item[key]
// 确保属性值存在且为字符串
if (typeof value !== 'string') return false
// 将属性值转为小写并检查是否包含搜索词
return value.toLowerCase().includes(searchLower)
})
}
function transformData(data: IAllList[]) { function transformData(data: IAllList[]) {
const warehouseMap = new Map() const warehouseMap = new Map()
for (const item of data) { for (const item of data) {
...@@ -154,10 +226,13 @@ export default defineComponent({ ...@@ -154,10 +226,13 @@ export default defineComponent({
return () => ( return () => (
<ElPopover <ElPopover
width="650px" width="750px"
placement="bottom-start" placement="bottom-start"
trigger="click" trigger="click"
popper-style={{ padding: 0 }} popper-style={{ padding: 0 }}
onUpdate:visible={(value) => {
if (value) searchName.value = ''
}}
v-slots={{ v-slots={{
reference: () => ( reference: () => (
<ElInput <ElInput
...@@ -168,36 +243,128 @@ export default defineComponent({ ...@@ -168,36 +243,128 @@ export default defineComponent({
), ),
}} }}
> >
<ElScrollbar class="scroll-container" maxHeight="450px"> <ElInput
{companyList.value.map((company, index) => ( modelValue={searchName.value}
onUpdate:modelValue={(value) => {
if (props.isRadio) {
templeCompanyList.value = fuzzySearch(allWayLists.value, value)
} else {
templeCompanyList.value = fuzzySearch(allList.value, value)
}
console.log('templeCompanyList', templeCompanyList.value)
searchName.value = value
}}
clearable
style={{ width: '200px', padding: '10px' }}
placeholder="请搜索承运商"
/>
<ElScrollbar
class="scroll-container"
maxHeight="450px"
style={{ 'border-top': '1px solid #eee' }}
>
{!searchName.value ? (
companyList.value.map((company, index) => (
<div class="companyBox" key={index}> <div class="companyBox" key={index}>
<div style={styles.titleBox}> <div style={styles.titleBox}>
<div class="title">{company.warehouseName}</div> <div class="title">{company.warehouseName}</div>
{!props.isRadio && (
<ElCheckbox <ElCheckbox
modelValue={getCompanySelectedStatus.value(company)} modelValue={getCompanySelectedStatus.value(
onChange={(v) => setCheckAll(company, v as boolean)} company as ICompanyList,
)}
onChange={(v) =>
setCheckAll(company as ICompanyList, v as boolean)
}
class="selectAll" class="selectAll"
> >
全选 全选
</ElCheckbox> </ElCheckbox>
)}
</div> </div>
{props.isRadio ? (
<ElRadioGroup
modelValue={selectedRadioList.value}
onUpdate:modelValue={(value) => {
console.log('company', value)
selectedRadioList.value = value as string | number
}}
style={styles.checkboxGroup}
>
{company.wayList?.map((item) => (
<div title={item.name} style={styles.checkbox}>
<ElRadio
label={item.name}
value={item.id}
key={`item-${item.id}`}
>
{item.name}
</ElRadio>
</div>
))}
</ElRadioGroup>
) : (
<ElCheckboxGroup <ElCheckboxGroup
modelValue={selectedList.value} modelValue={selectedList.value}
onUpdate:modelValue={(value) => (selectedList.value = value)} onUpdate:modelValue={(value) =>
(selectedList.value = value)
}
style={styles.checkboxGroup} style={styles.checkboxGroup}
> >
{company.wayList.map((item) => ( {(company as ICompanyList).wayList.map((item) => (
<div title={item.name} style={styles.checkbox}>
<ElCheckbox <ElCheckbox
label={item.name} label={item.name}
value={item.id} value={item.id}
key={`item-${item.id}`} key={`item-${item.id}`}
class="checkboxItem" class="checkboxItem"
/> />
</div>
))} ))}
</ElCheckboxGroup> </ElCheckboxGroup>
)}
</div>
))
) : props.isRadio ? (
<ElRadioGroup
modelValue={selectedRadioList.value}
onUpdate:modelValue={(value) => {
console.log('company', value)
selectedRadioList.value = value as string | number
}}
style={styles.checkboxGroup}
>
{(templeCompanyList.value as IwayList[]).map((item) => (
<div title={item.name} style={styles.checkbox}>
<ElRadio
label={item.name}
value={item.id}
key={`item-${item.id}`}
>
{item.name}
</ElRadio>
</div>
))}
</ElRadioGroup>
) : (
<ElCheckboxGroup
modelValue={selectedList.value}
onUpdate:modelValue={(value) => (selectedList.value = value)}
style={styles.checkboxGroup}
>
{(templeCompanyList.value as IwayList[]).map((item) => (
<div title={item.name} style={styles.checkbox}>
<ElCheckbox
label={item.name}
value={item.id}
key={`item-${item.id}`}
class="checkboxItem"
/>
</div> </div>
))} ))}
</ElCheckboxGroup>
)}
</ElScrollbar> </ElScrollbar>
</ElPopover> </ElPopover>
) )
......
src/views/logistics/logisticsMethod.vue
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
v-model="editForm" v-model="editForm"
:config="formConfig" :config="formConfig"
form-item-width="100%" form-item-width="100%"
labelWidth="110" label-width="110"
> >
</CustomizeForm> </CustomizeForm>
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
defineOptions({ defineOptions({
name: 'LogisticsMethod', name: 'LogisticsMethod',
}) })
import LogisticsWaySelect from './components/LogisticsWaySelect.tsx'
import { import {
getLogisticsWayList, getLogisticsWayList,
addLogisticsWay, addLogisticsWay,
...@@ -83,7 +84,7 @@ import { ...@@ -83,7 +84,7 @@ import {
getUniuniList, getUniuniList,
getTiktokCarrier, getTiktokCarrier,
} from '@/api/logistics' } from '@/api/logistics'
import type { FormItemRule } from 'element-plus'
import { WarehouseListData } from '@/types/api/podUsOrder' 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'
...@@ -103,6 +104,7 @@ import { showConfirm } from '@/utils/ui' ...@@ -103,6 +104,7 @@ import { showConfirm } from '@/utils/ui'
import { Edit, Delete, List, WarningFilled } from '@element-plus/icons-vue' import { Edit, Delete, List, WarningFilled } from '@element-plus/icons-vue'
import { debounce } from 'lodash-es' 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: [ platformList: [
...@@ -140,6 +142,7 @@ const warehouseList = ref<WarehouseListData[]>([]) ...@@ -140,6 +142,7 @@ const warehouseList = ref<WarehouseListData[]>([])
interface ImageList { interface ImageList {
[key: string]: string [key: string]: string
} }
const imgeList = ref<ImageList>({ const imgeList = ref<ImageList>({
UPARCEL: UPARCELImage, UPARCEL: UPARCELImage,
}) })
...@@ -182,6 +185,45 @@ const platformList = ref([]) ...@@ -182,6 +185,45 @@ const platformList = ref([])
const ruleNameList = ref([]) const ruleNameList = ref([])
const uniuniList = ref([]) const uniuniList = ref([])
const logisticsCompanyList = ref([]) const logisticsCompanyList = ref([])
watch(
() => JSON.parse(JSON.stringify(editForm.value.platformList)),
(newValue, oldValue) => {
if (oldValue.length && newValue.length) {
// 遍历旧值数组
oldValue.forEach(
(
oldItem: { logisticsName: string; showPlatform: string[] },
index: number,
) => {
// 检查旧值项是否符合条件
if (
Array.isArray(oldItem.showPlatform) &&
oldItem.showPlatform.length === 1 &&
oldItem.showPlatform[0] === 'TIKTOK' &&
oldItem.logisticsName
) {
// 获取对应的新值项
const newItem = newValue[index]
// 检查新值项是否不再满足条件
if (
newItem &&
(!Array.isArray(newItem.showPlatform) ||
newItem.showPlatform.length === 0 ||
!newItem.showPlatform.includes('TIKTOK') ||
newItem.showPlatform.length > 1)
) {
// 清除 logisticsName
editForm.value.platformList[index].logisticsName = ''
}
}
},
)
}
},
{ deep: true },
)
const formConfig = computed<IFormConfig[]>(() => [ const formConfig = computed<IFormConfig[]>(() => [
{ title: '物流基础信息' }, { title: '物流基础信息' },
{ {
...@@ -370,9 +412,7 @@ const formConfig = computed<IFormConfig[]>(() => [ ...@@ -370,9 +412,7 @@ const formConfig = computed<IFormConfig[]>(() => [
{ {
title: '平台物流名称', title: '平台物流名称',
fixed: 'last', fixed: 'last',
render: (item, formData) => { render: (_, formData) => {
console.log(283, item, formData)
return (formData?.platformList as platformObj[])?.map( return (formData?.platformList as platformObj[])?.map(
(item: platformObj, index: number) => ( (item: platformObj, index: number) => (
<div style="display: flex; width:100%"> <div style="display: flex; width:100%">
...@@ -415,21 +455,21 @@ const formConfig = computed<IFormConfig[]>(() => [ ...@@ -415,21 +455,21 @@ const formConfig = computed<IFormConfig[]>(() => [
required: true, required: true,
message: '请输入物流名称', message: '请输入物流名称',
trigger: 'blur', trigger: 'blur',
validator: (
_: FormItemRule,
value: string,
callback: (error?: string) => void,
) => {
if (value) callback()
},
}, },
]} ]}
> >
<el-select <LogisticsWaySelect
v-model={item.logisticsName} v-model={item.logisticsName as string | number}
placeholder="请选择物流名称" isRadio={true}
> companyList={tiktokCarriers.value as ICompanyList[]}
{tiktokCarriers.value?.map((el) => ( ></LogisticsWaySelect>
<el-option
label={el.name}
value={el.name}
key={el.id}
></el-option>
))}{' '}
</el-select>
</el-form-item> </el-form-item>
) : ( ) : (
<el-form-item <el-form-item
...@@ -466,7 +506,7 @@ const formConfig = computed<IFormConfig[]>(() => [ ...@@ -466,7 +506,7 @@ const formConfig = computed<IFormConfig[]>(() => [
{index >= 1 && ( {index >= 1 && (
<el-button <el-button
style="margin-left: 10px" style="margin-left: 10px"
type="primary" type="danger"
onClick={() => deleteCol(index)} onClick={() => deleteCol(index)}
> >
删除 删除
...@@ -534,7 +574,16 @@ const tableConfig = ref<TableColumn[]>([ ...@@ -534,7 +574,16 @@ const tableConfig = ref<TableColumn[]>([
</span> </span>
<span> <span>
<span>{'物流名称:'}</span> <span>{'物流名称:'}</span>
{el.platform === 'TIKTOK' ? (
<span class="logistics-name">
{tiktokCarriers.value
?.flatMap((company) => company.wayList)
?.find((item) => el.logisticsName === item.id)?.name ||
el.logisticsName}
</span>
) : (
<span class="logistics-name">{el.logisticsName}</span> <span class="logistics-name">{el.logisticsName}</span>
)}
</span> </span>
</div> </div>
)), )),
...@@ -868,13 +917,33 @@ async function getAllList() { ...@@ -868,13 +917,33 @@ async function getAllList() {
} }
} }
const tiktokCarriers = ref<{ name: string; id: number }[]>([]) interface ICompanyList {
warehouseName: string
wayList: IwayList[]
}
interface IwayList {
name: string
id: string
}
const tiktokCarriers = ref<ICompanyList[]>([])
/** /**
* @description: 获取tictok物流承运商 * @description: 获取tictok物流承运商
*/ */
async function getTiktokCarriers() { async function getTiktokCarriers() {
const { data } = await getTiktokCarrier() const { data } = await getTiktokCarrier()
tiktokCarriers.value = data const labelTypeList = Array.from(new Set(data.map((e) => e.label)))
const result: ICompanyList[] = []
labelTypeList.forEach((label) => {
result.push({
warehouseName: label,
wayList: data.filter((e) => e.label === label),
})
})
tiktokCarriers.value = result
console.log(893, tiktokCarriers.value)
} }
/** /**
...@@ -885,7 +954,9 @@ interface LogList { ...@@ -885,7 +954,9 @@ interface LogList {
createTime?: string createTime?: string
description?: string description?: string
} }
const logList = ref<LogList[]>([]) const logList = ref<LogList[]>([])
async function showLog(row: LogisticsMethod) { async function showLog(row: LogisticsMethod) {
logDialogVisible.value = true logDialogVisible.value = true
try { try {
...@@ -909,9 +980,11 @@ async function showLog(row: LogisticsMethod) { ...@@ -909,9 +980,11 @@ async function showLog(row: LogisticsMethod) {
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
.user-operate-btn { .user-operate-btn {
margin-bottom: 10px; margin-bottom: 10px;
} }
.dialog-footer { .dialog-footer {
text-align: center; text-align: center;
} }
......
src/views/order/index.vue
...@@ -4,7 +4,13 @@ ...@@ -4,7 +4,13 @@
<template #top> <template #top>
<div class="header-filter"> <div class="header-filter">
<div class="header-filter-form"> <div class="header-filter-form">
<ElForm :model="searchForm" size="default" inline> <ElForm
:model="searchForm"
size="default"
inline
label-position="right"
label-width="70px"
>
<ElFormItem> <ElFormItem>
<el-select <el-select
v-model="searchForm.timeType" v-model="searchForm.timeType"
...@@ -139,7 +145,7 @@ ...@@ -139,7 +145,7 @@
<el-select <el-select
v-model="searchForm.order" v-model="searchForm.order"
clearable clearable
style="width: 100px; margin-right: 5px" style="width: 125px"
placeholder="排序类型" placeholder="排序类型"
> >
<el-option value="asc" label="正序"></el-option> <el-option value="asc" label="正序"></el-option>
......
src/views/order/orderTracking/index.vue
...@@ -701,7 +701,14 @@ onMounted(() => { ...@@ -701,7 +701,14 @@ onMounted(() => {
<split-div otherSize="35"> <split-div otherSize="35">
<template #top> <template #top>
<el-card> <el-card>
<ElForm :model="searchForm" size="default" inline class="search-form"> <ElForm
:model="searchForm"
size="default"
inline
class="search-form"
label-position="right"
label-width="90px"
>
<ElFormItem label="仓库"> <ElFormItem label="仓库">
<ElSelect <ElSelect
v-model="searchForm.warehouseId" v-model="searchForm.warehouseId"
...@@ -1203,4 +1210,12 @@ onMounted(() => { ...@@ -1203,4 +1210,12 @@ onMounted(() => {
} }
} }
} }
.search-form {
::v-deep .el-radio-button {
width: 75px;
.el-radio-button__inner {
width: 100%;
}
}
}
</style> </style>
src/views/order/orderTracking/indexcn.vue
...@@ -686,7 +686,14 @@ onMounted(() => { ...@@ -686,7 +686,14 @@ onMounted(() => {
<split-div otherSize="35"> <split-div otherSize="35">
<template #top> <template #top>
<el-card> <el-card>
<ElForm :model="searchForm" size="default" inline class="search-form"> <ElForm
:model="searchForm"
size="default"
inline
class="search-form"
label-position="right"
label-width="90px"
>
<ElFormItem label="仓库"> <ElFormItem label="仓库">
<ElSelect <ElSelect
v-model="searchForm.warehouseId" v-model="searchForm.warehouseId"
...@@ -1172,4 +1179,12 @@ onMounted(() => { ...@@ -1172,4 +1179,12 @@ onMounted(() => {
} }
} }
} }
.search-form {
::v-deep .el-radio-button {
width: 75px;
.el-radio-button__inner {
width: 100%;
}
}
}
</style> </style>
src/views/order/pod/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 :model="searchForm" size="default" inline> <ElForm
<ElFormItem> :model="searchForm"
<el-select size="default"
v-model="searchForm.timeType" inline
style="width: 100px; margin-right: 5px" label-position="right"
clearable label-width="70px"
placeholder="时间类型"
>
<el-option :value="1" label="创建时间"></el-option>
<el-option :value="2" label="确认时间"></el-option>
<el-option :value="3" label="完成时间"></el-option>
<!-- <el-option :value="4" label="发货时间"></el-option> -->
</el-select>
<el-date-picker
v-model="timeRange"
:default-time="[
new Date(0, 0, 0, 0, 0, 0),
new Date(0, 0, 0, 23, 59, 59),
]"
placeholder="收货人"
value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange"
style="width: 280px"
:shortcuts="pickerOptions.shortcuts"
start-placeholder="开始时间"
end-placeholder="结束时间"
clearable
> >
</el-date-picker>
</ElFormItem>
<ElFormItem label="客户"> <ElFormItem label="客户">
<el-select <el-select
v-model="searchForm.userMark" v-model="searchForm.userMark"
clearable clearable
filterable filterable
style="width: 100px" style="width: 150px"
placeholder="客户" placeholder="客户"
> >
<el-option <el-option
...@@ -77,7 +54,7 @@ ...@@ -77,7 +54,7 @@
v-model.trim="searchForm.sku" v-model.trim="searchForm.sku"
placeholder=" SKU" placeholder=" SKU"
clearable clearable
style="width: 130px" style="width: 150px"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<!-- <ElFormItem label="发货单号"> <!-- <ElFormItem label="发货单号">
...@@ -85,7 +62,7 @@ ...@@ -85,7 +62,7 @@
v-model="searchForm.shipmentNumber" v-model="searchForm.shipmentNumber"
placeholder="发货单号" placeholder="发货单号"
clearable clearable
style="width: 130px" style="width: 150px"
/> />
</ElFormItem> --> </ElFormItem> -->
<ElFormItem label="生产单号"> <ElFormItem label="生产单号">
...@@ -93,7 +70,7 @@ ...@@ -93,7 +70,7 @@
v-model="searchForm.factorySubOrderNumber" v-model="searchForm.factorySubOrderNumber"
placeholder="定制生产单号" placeholder="定制生产单号"
clearable clearable
style="width: 130px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="订单号"> <ElFormItem label="订单号">
...@@ -101,7 +78,7 @@ ...@@ -101,7 +78,7 @@
v-model="searchForm.factoryOrderNumber" v-model="searchForm.factoryOrderNumber"
placeholder="定制订单号" placeholder="定制订单号"
clearable clearable
style="width: 130px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="店铺单号"> <ElFormItem label="店铺单号">
...@@ -109,7 +86,7 @@ ...@@ -109,7 +86,7 @@
v-model="searchForm.shopNumber" v-model="searchForm.shopNumber"
placeholder="店铺单号" placeholder="店铺单号"
clearable clearable
style="width: 130px" style="width: 150px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="素材ID"> <ElFormItem label="素材ID">
...@@ -117,7 +94,7 @@ ...@@ -117,7 +94,7 @@
v-model.trim="searchForm.productionFileId" v-model.trim="searchForm.productionFileId"
placeholder="素材ID" placeholder="素材ID"
clearable clearable
style="width: 130px" style="width: 150px"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem label="内部标签"> <ElFormItem label="内部标签">
...@@ -125,14 +102,14 @@ ...@@ -125,14 +102,14 @@
v-model.trim="searchForm.internalMemo" v-model.trim="searchForm.internalMemo"
placeholder="内部标签" placeholder="内部标签"
clearable clearable
style="width: 100px" style="width: 150px"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem label="排序"> <ElFormItem label="排序">
<el-select <el-select
v-model="searchForm.order" v-model="searchForm.order"
clearable clearable
style="width: 80px" style="width: 150px"
placeholder="排序类型" placeholder="排序类型"
> >
<el-option value="asc" label="正序"></el-option> <el-option value="asc" label="正序"></el-option>
...@@ -143,7 +120,7 @@ ...@@ -143,7 +120,7 @@
<el-select <el-select
v-model="searchForm.customizedQuantity" v-model="searchForm.customizedQuantity"
clearable clearable
style="width: 100px" style="width: 150px"
placeholder="定制类型" placeholder="定制类型"
> >
<el-option value="single" label="单面"></el-option> <el-option value="single" label="单面"></el-option>
...@@ -156,7 +133,7 @@ ...@@ -156,7 +133,7 @@
clearable clearable
filterable filterable
placeholder="尺码类型" placeholder="尺码类型"
style="width: 100px" style="width: 150px"
> >
<el-option <el-option
v-for="item in sizeList" v-for="item in sizeList"
...@@ -167,6 +144,35 @@ ...@@ -167,6 +144,35 @@
</ElSelect> </ElSelect>
</ElFormItem> </ElFormItem>
<ElFormItem> <ElFormItem>
<el-select
v-model="searchForm.timeType"
style="width: 100px; margin-right: 5px"
clearable
placeholder="时间类型"
>
<el-option :value="1" label="创建时间"></el-option>
<el-option :value="2" label="确认时间"></el-option>
<el-option :value="3" label="完成时间"></el-option>
<!-- <el-option :value="4" label="发货时间"></el-option> -->
</el-select>
<el-date-picker
v-model="timeRange"
:default-time="[
new Date(0, 0, 0, 0, 0, 0),
new Date(0, 0, 0, 23, 59, 59),
]"
placeholder="收货人"
value-format="YYYY-MM-DD HH:mm:ss"
type="datetimerange"
style="width: 280px"
:shortcuts="pickerOptions.shortcuts"
start-placeholder="开始时间"
end-placeholder="结束时间"
clearable
>
</el-date-picker>
</ElFormItem>
<ElFormItem>
<ElButton type="primary" @click="loadDiffList">查询</ElButton> <ElButton type="primary" @click="loadDiffList">查询</ElButton>
</ElFormItem> </ElFormItem>
<ElFormItem v-if="status === 'TO_BE_CONFIRMED'"> <ElFormItem v-if="status === 'TO_BE_CONFIRMED'">
......
src/views/order/podCN/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 :model="searchForm" size="default" inline> <ElForm
class="search-form"
:model="searchForm"
size="default"
inline
label-position="right"
label-width="70px"
>
<ElFormItem label="仓库"> <ElFormItem label="仓库">
<ElSelect <ElSelect
v-model="searchForm.warehouseId" v-model="searchForm.warehouseId"
...@@ -120,7 +127,7 @@ ...@@ -120,7 +127,7 @@
<el-select <el-select
v-model="searchForm.order" v-model="searchForm.order"
clearable clearable
style="width: 100px" style="width: 150px"
placeholder="排序类型" placeholder="排序类型"
> >
<el-option value="asc" label="正序"></el-option> <el-option value="asc" label="正序"></el-option>
...@@ -5587,6 +5594,14 @@ useRouter().beforeEach((to, from, next) => { ...@@ -5587,6 +5594,14 @@ useRouter().beforeEach((to, from, next) => {
color: white; color: white;
font-weight: bold; font-weight: bold;
} }
.search-form {
::v-deep .el-radio-button {
width: 75px;
.el-radio-button__inner {
width: 100%;
}
}
}
</style> </style>
<style lang="scss"> <style lang="scss">
.customize-select-style { .customize-select-style {
......
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 label-position="left" 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
...@@ -6525,6 +6525,15 @@ useRouter().beforeEach((to, from, next) => { ...@@ -6525,6 +6525,15 @@ useRouter().beforeEach((to, from, next) => {
color: white; color: white;
font-weight: bold; font-weight: bold;
} }
.search-form{
::v-deep .el-radio-button{
width: 75px;
.el-radio-button__inner{
width: 100%;
}
}
}
</style> </style>
<style lang="scss"> <style lang="scss">
.customize-select-style { .customize-select-style {
......
tsconfig.json
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"module": "ESNext", "module": "ESNext",
"lib": ["ES2020", "DOM", "DOM.Iterable"], "lib": ["ES2020", "DOM", "DOM.Iterable"],
"skipLibCheck": true, "skipLibCheck": true,
"types":[],
/* Bundler mode */ /* Bundler mode */
"moduleResolution": "bundler", "moduleResolution": "bundler",
"allowImportingTsExtensions": true, "allowImportingTsExtensions": true,
......
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