Skip to content

F
factory_front
Commit 67dd9310 by wusiyi
Options

Merge branch 'dev'

parents 5803a004 b340eb76
Showing with 19 additions and 21 deletions
src/views/logistics/logisticsTracking.vue
...@@ -27,23 +27,22 @@ ...@@ -27,23 +27,22 @@
<template #top> <template #top>
<el-card> <el-card>
<el-form inline :model="searchForm"> <el-form inline :model="searchForm">
<el-form-item label="店铺单号"> <el-form-item label="物流跟踪号">
<el-input <el-input
v-model="searchForm.shopNumber" v-model="searchForm.trackNumber"
style="width: 180px" style="width: 180px"
placeholder="请输入店铺单号" placeholder="请输入物流跟踪号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="物流跟踪号"> <el-form-item label="店铺单号">
<el-input <el-input
v-model="searchForm.trackNumber" v-model="searchForm.shopNumber"
style="width: 180px" style="width: 180px"
placeholder="请输入物流跟踪号" placeholder="请输入店铺单号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="getData">查询</el-button> <el-button type="primary" @click="getData">查询</el-button>
<el-button <el-button
...@@ -156,6 +155,19 @@ const pagination = ref<ILogisticsCompanyData>({ ...@@ -156,6 +155,19 @@ const pagination = ref<ILogisticsCompanyData>({
const tableColumns = computed(() => { const tableColumns = computed(() => {
return [ return [
{ {
label: '物流跟踪号',
prop: 'trackingNumber',
width: 200,
align: 'center',
showOverflowTooltip: true,
},
{
label: '店铺单号',
prop: 'shopNumber',
width: 160,
align: 'center',
},
{
label: '订单号', label: '订单号',
prop: 'factoryOrderNumber', prop: 'factoryOrderNumber',
width: 160, width: 160,
...@@ -168,12 +180,6 @@ const tableColumns = computed(() => { ...@@ -168,12 +180,6 @@ const tableColumns = computed(() => {
align: 'center', align: 'center',
}, },
{ {
label: '店铺单号',
prop: 'shopNumber',
width: 160,
align: 'center',
},
{
label: '订单状态', label: '订单状态',
prop: 'orderStatus', prop: 'orderStatus',
slot: 'orderStatus', slot: 'orderStatus',
...@@ -188,14 +194,6 @@ const tableColumns = computed(() => { ...@@ -188,14 +194,6 @@ const tableColumns = computed(() => {
align: 'center', align: 'center',
}, },
{ {
label: '物流跟踪号',
prop: 'trackingNumber',
width: 200,
align: 'center',
showOverflowTooltip: true,
},
{
label: '总克重(g)', label: '总克重(g)',
prop: 'weight', prop: 'weight',
width: 100, width: 100,
......
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