|
@@ -311,11 +311,11 @@
|
|
|
<!-- 参照订单数据 -->
|
|
|
<referOrderData-modal ref="referOrderDataModal" @close="closeAdd" ></referOrderData-modal>
|
|
|
|
|
|
- <editShipDet-drawer ref="editShipDetDrawer" :fatherList="getShipmentList" @ok="modalFormOk" @close='closeAddEdit'></editShipDet-drawer>
|
|
|
+ <editShipDet-drawer ref="editShipDetDrawer" :fatherList="getShipmentList" @ok="modalFormOk" @close='closeAddEdit'></editShipDet-drawer>
|
|
|
|
|
|
<detailsShipDet-drawer ref="detailsShipDetDrawer" @ok="modalFormOk"></detailsShipDet-drawer>
|
|
|
<!-- 申报要素 弹框 -->
|
|
|
- <declareElements-modal ref="declareElementsModal" @table="getShipmentList" @close-declare="closeDeclare"></declareElements-modal>
|
|
|
+ <declareElements-modal ref="declareElementsModal" @table="getShipmentList" @close-declare="closeDeclare" @close-data="closeData"></declareElements-modal>
|
|
|
|
|
|
<!-- 维护款号成分 -->
|
|
|
<itemNumEle-modal ref="itemNumEleModal" @close="closeItemNumEle" @closeItem="changeList"></itemNumEle-modal>
|
|
@@ -750,6 +750,15 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ closeData(data,record){
|
|
|
+ this.shipmentListData.map(item=>{
|
|
|
+ if(item.orderNumber == record.orderNumber && item.itemNumber==record.itemNumber && item.account == record.account&& item.inventoryName == record.inventoryName){
|
|
|
+ item.declarationName = data.declarationName
|
|
|
+ item.hsCode = data.hsCode
|
|
|
+ item.englishProductName = data.englishProductName
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
// // 新增
|
|
|
// addShipDet() {
|
|
|
// this.$refs.addShipDetDrawer.syShippingDetailsItemList = [];
|
|
@@ -780,8 +789,12 @@ export default {
|
|
|
res.result['itemIds'] = record.itemIds;
|
|
|
|
|
|
this.$refs.declareElementsModal.declareElements = res.result
|
|
|
+ this.$refs.declareElementsModal.declareElements.declarationName = record.declarationName
|
|
|
+ this.$refs.declareElementsModal.declareElements.englishProductName = record.englishProductName
|
|
|
+ this.$refs.declareElementsModal.declareElements.hsCode = record.hsCode
|
|
|
this.$refs.declareElementsModal.flourOrGarment = this.queryParam.flourOrGarment
|
|
|
this.$refs.declareElementsModal.orderNumber = record.orderNumber
|
|
|
+ this.$refs.declareElementsModal.record = record
|
|
|
if(!res.result.hsCode || res.result.hsCode == ''){
|
|
|
this.$refs.declareElementsModal.query = '0'
|
|
|
}else{
|