|
@@ -231,7 +231,7 @@
|
|
|
|
|
|
<detailsShipDet-drawer ref="detailsShipDetDrawer" @ok="modalFormOk"></detailsShipDet-drawer>
|
|
|
<!-- 申报要素 弹框 -->
|
|
|
- <declareElements-modal ref="declareElementsModal" @table="getShipmentList"></declareElements-modal>
|
|
|
+ <declareElements-modal ref="declareElementsModal" @table="getShipmentList" @close-declare="closeDeclare"></declareElements-modal>
|
|
|
|
|
|
<!-- 维护款号成分 -->
|
|
|
<itemNumEle-modal ref="itemNumEleModal" :fatherList="getShipmentList"></itemNumEle-modal>
|
|
@@ -544,11 +544,11 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
// 分页查询 发运明细
|
|
|
- getShipmentList() {
|
|
|
- this.$nextTick(() => {
|
|
|
- shipmentList(this.queryParam).then(res => {
|
|
|
+ async getShipmentList() {
|
|
|
+ await shipmentList(this.queryParam)
|
|
|
+ .then(res => {
|
|
|
if (res.success) {
|
|
|
- this.shipmentListData = res.result.records
|
|
|
+ this.shipmentListData = res.result.records
|
|
|
for (var i=0; i<this.shipmentListData.length; i++){
|
|
|
this.shipmentListData.randomId = randomUUID();
|
|
|
}
|
|
@@ -558,9 +558,24 @@ export default {
|
|
|
pageSize: res.result.size
|
|
|
}
|
|
|
}
|
|
|
+ return this.shipmentListData
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+ async closeDeclare(){
|
|
|
+ await this.getShipmentList()
|
|
|
+ // this.getShipmentList()
|
|
|
+ var cc = []
|
|
|
+ // for(var i= 0;i<this.shipmentListData)
|
|
|
+ this.shipmentListData.map(item =>{
|
|
|
+ this.selectedRows.map(item1 =>{
|
|
|
+ if(item.itemIds == item1.itemIds){
|
|
|
+ cc.push(item)
|
|
|
+ }
|
|
|
})
|
|
|
-
|
|
|
})
|
|
|
+ this.selectedRows = cc
|
|
|
+ cc.map(item => this.selectedRowKeys.push(item.itemIds))
|
|
|
},
|
|
|
|
|
|
// 新增
|