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

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

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