Commit fb3b2796 by linjinhong

podus订单跟踪

parent 6a561044
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
:data="paginatedData" :data="paginatedData"
border border
:stripe="stripe" :stripe="stripe"
v-bind="attrs"
header-align="center" header-align="center"
height="100%" height="100%"
v-bind="attrs"
> >
<ElTableColumn <ElTableColumn
v-if="selectionable" v-if="selectionable"
......
...@@ -10,7 +10,7 @@ const props = defineProps({ ...@@ -10,7 +10,7 @@ const props = defineProps({
type: String || Number, type: String || Number,
}, },
otherSize: { otherSize: {
default: 20, default: '20',
type: String || Number, type: String || Number,
}, },
}) })
...@@ -19,7 +19,7 @@ const domSize = ref<string>('0') ...@@ -19,7 +19,7 @@ const domSize = ref<string>('0')
function domResize() { function domResize() {
const father = document.getElementsByClassName('splitpanes')[0] const father = document.getElementsByClassName('splitpanes')[0]
const top = document.getElementById('top') const top = document.getElementById('top')
if(top && father){ if (top && father) {
const v = ((top.clientHeight / father?.clientHeight) * 100).toFixed(2) const v = ((top.clientHeight / father?.clientHeight) * 100).toFixed(2)
if (props.size === '') { if (props.size === '') {
...@@ -28,9 +28,8 @@ function domResize() { ...@@ -28,9 +28,8 @@ function domResize() {
domSize.value = props.size domSize.value = props.size
} }
} }
} }
onUnmounted(()=>{ onUnmounted(() => {
window.removeEventListener('resize', domResize) window.removeEventListener('resize', domResize)
}) })
onMounted(() => { onMounted(() => {
...@@ -38,7 +37,7 @@ onMounted(() => { ...@@ -38,7 +37,7 @@ onMounted(() => {
domResize() domResize()
}) })
defineExpose({ defineExpose({
domResize domResize,
}) })
</script> </script>
...@@ -48,7 +47,6 @@ defineExpose({ ...@@ -48,7 +47,6 @@ defineExpose({
<div id="top"> <div id="top">
<slot name="top"></slot> <slot name="top"></slot>
</div> </div>
</pane> </pane>
<pane style="flex: 1; flex-shrink: 0"> <pane style="flex: 1; flex-shrink: 0">
<div id="bottom"> <div id="bottom">
...@@ -67,15 +65,15 @@ defineExpose({ ...@@ -67,15 +65,15 @@ defineExpose({
#top { #top {
height: fit-content; height: fit-content;
} }
#other-pane{ #other-pane {
height: 100%; height: 100%;
} }
#bottom { #bottom {
height: 100%; height: 100%;
} }
#top, #bottom { #top,
#bottom {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
...@@ -99,11 +97,11 @@ defineExpose({ ...@@ -99,11 +97,11 @@ defineExpose({
transform: translate(-50%); transform: translate(-50%);
width: 30px; width: 30px;
height: 1px; height: 1px;
content: ""; content: '';
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
transition: background-color .3s; transition: background-color 0.3s;
} }
&::after { &::after {
...@@ -112,11 +110,11 @@ defineExpose({ ...@@ -112,11 +110,11 @@ defineExpose({
transform: translate(-50%); transform: translate(-50%);
width: 30px; width: 30px;
height: 1px; height: 1px;
content: ""; content: '';
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
transition: background-color .3s; transition: background-color 0.3s;
} }
} }
......
...@@ -117,11 +117,11 @@ const menu: MenuItem[] = [ ...@@ -117,11 +117,11 @@ const menu: MenuItem[] = [
id: 8, id: 8,
label: 'POD订单(US)', label: 'POD订单(US)',
}, },
// { {
// index: '/pod-us-order/orderTracking', index: '/pod-us-order/orderTracking',
// id: 8, id: 8,
// label: 'POD(US)订单跟踪', label: 'POD(US)订单跟踪',
// }, },
], ],
}, },
......
...@@ -8,7 +8,7 @@ export interface SearchForm { ...@@ -8,7 +8,7 @@ export interface SearchForm {
shopNumber: string shopNumber: string
shipmentType: string shipmentType: string
userMark: string userMark: string
logisticsTracking: string processNumber: string
baseSku: string baseSku: string
factoryOrderNumber: string factoryOrderNumber: string
sku: string sku: string
......
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
</ElFormItem> --> </ElFormItem> -->
<ElFormItem label="物流跟踪号"> <ElFormItem label="物流跟踪号">
<ElInput <ElInput
v-model.trim="searchForm.logisticsTracking" v-model.trim="searchForm.processNumber"
placeholder="物流跟踪号" placeholder="物流跟踪号"
clearable clearable
style="width: 150px" style="width: 150px"
...@@ -1946,7 +1946,7 @@ const [searchForm, resetSearchForm] = useValue<SearchForm>({ ...@@ -1946,7 +1946,7 @@ const [searchForm, resetSearchForm] = useValue<SearchForm>({
shopNumber: '', shopNumber: '',
shipmentType: '', shipmentType: '',
userMark: '', userMark: '',
logisticsTracking: '', processNumber: '',
baseSku: '', baseSku: '',
factoryOrderNumber: '', factoryOrderNumber: '',
sku: '', sku: '',
......
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