|
@@ -18,7 +18,7 @@
|
|
|
<a-input placeholder="请输入款号" v-model="queryParam.itemNumber"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="5" :sm="8">
|
|
|
+ <a-col :md="5" :sm="8">
|
|
|
<a-form-model-item label="类型">
|
|
|
<a-select v-model="queryParam.flourOrGarment">
|
|
|
<a-select-option value="">请选择</a-select-option>
|
|
@@ -78,6 +78,16 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
|
+ <a-col :md="5" :sm="8">
|
|
|
+ <a-form-model-item label="申报要素是否维护">
|
|
|
+ <a-select v-model="queryParam.isElement">
|
|
|
+ <a-select-option value="">请选择</a-select-option>
|
|
|
+ <a-select-option value="1">已维护</a-select-option>
|
|
|
+ <a-select-option value="0">未维护</a-select-option>
|
|
|
+ </a-select>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+
|
|
|
</template>
|
|
|
|
|
|
<a-col :md="4" :sm="8">
|
|
@@ -113,7 +123,7 @@
|
|
|
:columns="shipmentListColumns"
|
|
|
:data-source="shipmentListData"
|
|
|
:loading="loading"
|
|
|
- :pagination="pagination"
|
|
|
+ :pagination="false"
|
|
|
:scroll="{ x: 1500 , y: 500}"
|
|
|
:rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
|
|
@change="handleTableChange"
|
|
@@ -544,12 +554,13 @@ export default {
|
|
|
preDeliveryDateE:'',//预发货日期结束时间
|
|
|
// timeRange: [], // 查询条件 时间范围
|
|
|
// preDeliveryDate: '',
|
|
|
+ isElement:'',//申报要素是否维护
|
|
|
salesman: '',
|
|
|
itemNumber: '', // 款号
|
|
|
refer: '',
|
|
|
flourOrGarment: '', //类型
|
|
|
- pageSize:20,//每页条数
|
|
|
- pageNo: '' // 点击的页数
|
|
|
+ // pageSize:20,//每页条数
|
|
|
+ // pageNo: '' // 点击的页数
|
|
|
},
|
|
|
selectedRowKeys:[],
|
|
|
selectedRows:[],
|
|
@@ -862,14 +873,15 @@ export default {
|
|
|
if(timeInterval > 31){
|
|
|
this.$message.error('预发货时间区间超过31天,请重新选择!');
|
|
|
}else {
|
|
|
- this.queryParam.pageNo = ''
|
|
|
- this.queryParam.pageSize = 20
|
|
|
+ // this.queryParam.pageNo = ''
|
|
|
+ // this.queryParam.pageSize = 20
|
|
|
this.getShipmentList()
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
|
|
|
searchReset() {
|
|
|
+ this.queryParam.isElement = ''
|
|
|
this.queryParam.orderNumber = ''
|
|
|
this.queryParam.supplier = ''
|
|
|
this.timeRange = []
|
|
@@ -882,7 +894,7 @@ export default {
|
|
|
this.queryParam.itemNumber = ''
|
|
|
this.queryParam.refer = ''
|
|
|
this.queryParam.isTc = ''
|
|
|
- this.queryParam.pageSize = 20
|
|
|
+ // this.queryParam.pageSize = 20
|
|
|
this.selectedRows = []
|
|
|
this.selectedRowKeys = []
|
|
|
this.queryParam.flourOrGarment = '', //类型
|