|
@@ -16,17 +16,55 @@
|
|
|
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
|
|
<a-row :gutter="24">
|
|
|
<a-col :md="6" :sm="8">
|
|
|
- <a-form-item label="订单号">
|
|
|
- <a-input placeholder="请输入订单号" v-model="queryParam.orderNumber"></a-input>
|
|
|
+ <a-form-item label="发运明细单号">
|
|
|
+ <a-input placeholder="请输入发运明细单号" v-model="queryParam.documentNo"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
|
<a-col :md="6" :sm="8">
|
|
|
- <a-form-item label="品名">
|
|
|
- <a-input placeholder="请输入品名" v-model="queryParam.chineseName"></a-input>
|
|
|
+ <a-form-item label="发货情况">
|
|
|
+ <a-select v-model="queryParam.status" style="width: 200px" placeholder="请选择发货情况" >
|
|
|
+ <a-select-option value="n">超量发货</a-select-option>
|
|
|
+ <a-select-option value="y">正常</a-select-option>
|
|
|
+ </a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
|
+
|
|
|
+ <template v-if="toggleSearchStatus">
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-item label="Po">
|
|
|
+ <a-input placeholder="请输入Po" v-model="queryParam.smallPo"></a-input>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-item label="客户">
|
|
|
+ <j-search-select-tag
|
|
|
+ placeholder="请选择客户"
|
|
|
+ v-model="queryParam.customer"
|
|
|
+ dict="view_customer,customername,customername">
|
|
|
+ </j-search-select-tag>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-item label="分销点">
|
|
|
+ <a-input placeholder="请输入分销点" v-model="queryParam.distributionPoint"></a-input>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-item label="预发货日期">
|
|
|
+ <a-range-picker
|
|
|
+ :placeholder="['开始时间', '结束时间']"
|
|
|
+ format="YYYY-MM-DD"
|
|
|
+ style="width: 100%"
|
|
|
+ v-model="preDeliveryDate"
|
|
|
+ @change="onDateChange"
|
|
|
+ />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+
|
|
|
+ </template>
|
|
|
+
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
|
|
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
|
|
@@ -47,7 +85,6 @@
|
|
|
:data-source="referShipDetailsData"
|
|
|
:loading="loading"
|
|
|
:pagination="pagination"
|
|
|
- :row-key="record => record.id"
|
|
|
:rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
|
|
@change="handleTableChange"
|
|
|
bordered
|
|
@@ -73,6 +110,7 @@ export default {
|
|
|
return {
|
|
|
selectedRowKeys: [], // 勾选航
|
|
|
loading: false, // 表格加载
|
|
|
+ preDeliveryDate:[],
|
|
|
// 表头
|
|
|
referShipDetailsColumns: [
|
|
|
{
|
|
@@ -251,8 +289,13 @@ export default {
|
|
|
|
|
|
// 查询条件
|
|
|
queryParam: {
|
|
|
- orderNumber: '',
|
|
|
+ documentNo: '',
|
|
|
chineseName: '',
|
|
|
+ status:'',
|
|
|
+ smallPo:'',
|
|
|
+ distributionPoint:'',
|
|
|
+ startDate:'',
|
|
|
+ endDate:'',
|
|
|
pageNo: '' // 初始页
|
|
|
},
|
|
|
pagination: {}
|
|
@@ -291,6 +334,7 @@ export default {
|
|
|
// 重置
|
|
|
searchReset() {
|
|
|
this.queryParam = {}
|
|
|
+ this.preDeliveryDate = []
|
|
|
this.getReferenceList()
|
|
|
// this.getShipmentList()
|
|
|
},
|
|
@@ -308,6 +352,8 @@ export default {
|
|
|
},
|
|
|
close() {
|
|
|
this.$emit('close')
|
|
|
+ this.queryParam = {}
|
|
|
+ this.preDeliveryDate = []
|
|
|
this.referShipDetailsModVis = false
|
|
|
},
|
|
|
handleCancel() {
|
|
@@ -321,7 +367,11 @@ export default {
|
|
|
handleTableChange(pagination, filters, sorter) {
|
|
|
this.queryParam.pageNo = pagination.current
|
|
|
this.getReferenceList()
|
|
|
- }
|
|
|
+ },
|
|
|
+ onDateChange(value, dateString) {
|
|
|
+ this.queryParam.startDate = dateString[0]
|
|
|
+ this.queryParam.endDate = dateString[1]
|
|
|
+ },
|
|
|
},
|
|
|
computed: {
|
|
|
// 选中项
|