Commit 5a03c55e authored by 余金瑶's avatar 余金瑶

订单列表收货人、发货人编号支持穿越

parent 93820aca
......@@ -8,7 +8,6 @@
:inline="true"
label-width="100px"
>
<el-row>
<el-form-item>
<el-select
v-model="queryParams.dateType"
......@@ -37,7 +36,7 @@
/>
</el-form-item>
<div>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
<el-form-item :label="$t('始发仓')">
<el-select
v-model="queryParams.startWarehouseIds"
multiple
......@@ -105,8 +104,6 @@
</el-select>
</el-form-item>
</div>
</el-row>
<el-row>
<el-form-item :label="$t('运输方式') + ':'" v-show="showSearch">
<dict-selector
:type="DICT_TYPE.ECW_TRANSPORT_TYPE"
......@@ -148,8 +145,6 @@
:label-field="$l(null, 'name')"
></selector>
</el-form-item>
</el-row>
<el-row>
<el-form-item :label="$t('控货') + ':'" v-show="showSearch">
<dict-selector
:type="DICT_TYPE.ECW_YESNO"
......@@ -191,8 +186,7 @@
</template>
</el-input>
</el-form-item>
</el-row>
<el-row>
<!-- <el-form-item :label="$t('发货人')+':'">
<customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" />
</el-form-item>
......@@ -246,8 +240,7 @@
/>
</div>
</el-form-item>
</el-row>
<el-row>
<el-form-item :label="$t('备案') + ':'" v-show="showSearch">
<dict-selector
:type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
......@@ -317,9 +310,7 @@
<el-option :label="$t('海外仓')" :value="2"></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="">
<el-form-item>
<el-checkbox
style="margin-left: 60px"
v-model="queryParams.isHaveCustomer"
......@@ -338,7 +329,6 @@
$t("重置")
}}</el-button>
</el-form-item>
</el-row>
</el-form>
<!-- 操作工具栏 -->
......
......@@ -523,8 +523,20 @@
</div>
</template>
</el-table-column>
<el-table-column :label="$t('发货人编号')" align="center" prop="consignorCustomerNumber" />
<el-table-column :label="$t('收货人编号')" align="center" prop="consigneeCustomerNumber" />
<el-table-column :label="$t('发货人编号')" align="center">
<template slot-scope="{ row }">
<router-link :to="`/customer/query/${row.consignorCustomerId}`" class="link-type">
{{row.consignorCustomerNumber}}
</router-link>
</template>
</el-table-column>
<el-table-column :label="$t('收货人编号')" align="center" prop="consigneeCustomerNumber">
<template slot-scope="{ row }">
<router-link :to="`/customer/query/${row.consigneeCustomerId}`" class="link-type">
{{row.consigneeCustomerNumber}}
</router-link>
</template>
</el-table-column>
<el-table-column
:label="$t('总箱数/入仓箱数')"
align="center"
......
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