|
@@ -218,7 +218,7 @@
|
|
|
|
|
|
<!-- 抽屉 -->
|
|
|
<div>
|
|
|
- <addShipDet-drawer ref="addShipDetDrawer" :fatherList="getShipmentList" @ok="modalFormOk"></addShipDet-drawer>
|
|
|
+ <addShipDet-drawer ref="addShipDetDrawer" :fatherList="getShipmentList" @ok="modalFormOk" @close="closeAdd"></addShipDet-drawer>
|
|
|
|
|
|
<editShipDet-drawer ref="editShipDetDrawer" :fatherList="getShipmentList" @ok="modalFormOk"></editShipDet-drawer>
|
|
|
|
|
@@ -527,8 +527,13 @@ export default {
|
|
|
// 分页查询 发运明细
|
|
|
getShipmentList() {
|
|
|
this.$nextTick(() => {
|
|
|
- shipmentList(this.queryParam).then(res => {
|
|
|
+ if(this.queryParam.flourOrGarment === ''){
|
|
|
+ debugger
|
|
|
+ this.shipmentListData = []
|
|
|
+ }else {
|
|
|
+ shipmentList(this.queryParam).then(res => {
|
|
|
if (res.success) {
|
|
|
+ debugger
|
|
|
this.shipmentListData = res.result.records
|
|
|
for (var i=0; i<this.shipmentListData.length; i++){
|
|
|
this.shipmentListData.randomId = randomUUID();
|
|
@@ -540,6 +545,8 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
+ }
|
|
|
+
|
|
|
})
|
|
|
},
|
|
|
|
|
@@ -740,6 +747,7 @@ export default {
|
|
|
this.queryParam.itemNumber = ''
|
|
|
this.queryParam.refer = ''
|
|
|
this.queryParam.isTc = ''
|
|
|
+ this.queryParam.flourOrGarment = '', //类型
|
|
|
this.shipmentListData = [] // 渲染 发运明细列表
|
|
|
},
|
|
|
|
|
@@ -747,6 +755,21 @@ export default {
|
|
|
handleTableChange(pagination, filters, sorter) {
|
|
|
this.queryParam.pageNo = pagination.current
|
|
|
this.getShipmentList()
|
|
|
+ },
|
|
|
+
|
|
|
+ //关闭新增弹窗
|
|
|
+ closeAdd(){
|
|
|
+ this.queryParam.documentNo = ''
|
|
|
+ this.queryParam.timeRange = []
|
|
|
+ this.queryParam.startTime = ''
|
|
|
+ this.queryParam.endTime = ''
|
|
|
+ this.queryParam.preDeliveryDate = ''
|
|
|
+ this.queryParam.salesman = ''
|
|
|
+ this.queryParam.itemNumber = ''
|
|
|
+ this.queryParam.refer = ''
|
|
|
+ this.queryParam.isTc = ''
|
|
|
+ this.queryParam.flourOrGarment = '', //类型
|
|
|
+ this.shipmentListData = [] // 渲染 发运明细列表
|
|
|
}
|
|
|
}
|
|
|
}
|