发运明细-报关要素-子表

src/views/shipment-details/declareElementsModal.vue

@@ -352,7 +352,7 @@ export default {
         if (res.success) {
           this.$message.success('新增成功')
           this.$emit('close-data',newObj,this.record)
-          this.$emit('save-information',newObj.syDeclarationElementsItemList)
+          this.$emit('save-information',newObj)
           // this.$emit('table')
           this.close()
         }else {

src/views/shipment-details/shipmentList.vue

@@ -635,6 +635,7 @@ export default {
       shipmentListData: [], // 发运明细数据
       allMoney:'',
       copyTableData:[],//保存还未更新时的申报要素列表信息
+      copyFromData:{},////保存修改报关要素所点击得那行数据
       // 查询条件
       queryParam: {
         flourOrGarment:'1'
@@ -688,6 +689,7 @@ export default {
     async getShipmentList() {
       this.loading = true
       this.copyTableData = []
+      this.copyFromData = {} //保存修改报关要素所点击得那行数据
       await  shipmentList(this.queryParam).then(res => {
           if (res.success) {
            this.loading = false
@@ -740,7 +742,7 @@ export default {
       cc.map(item => this.selectedRowKeys.push(item.itemIds))
     },
     saveInformation(data){
-      this.copyTableData = data
+      this.copyTableData = data.syDeclarationElementsItemList
     },
 
     //关闭维护款号成分弹窗
@@ -756,6 +758,7 @@ export default {
       })
     },
     closeData(data,record){
+      this.copyFromData = 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
@@ -805,8 +808,9 @@ export default {
             }else{
              this.$refs.declareElementsModal.query = '1'
             }
-          if(this,this.copyTableData.length==0){
-            // 子表赋值
+          //判断报关要素保存时子表是否有数据以及再次点击时所点击行和报关要素修改行满不满足带出子表得条件
+          if(this.copyTableData.length==0||!(this.copyFromData.orderNumber == record.orderNumber && this.copyFromData.itemNumber==record.itemNumber && this.copyFromData.account == record.account&& this.copyFromData.inventoryName == record.inventoryName)){
+           // 子表赋值
             this.$refs.declareElementsModal.declareElementsData = res.result.syDeclarationElementsItemList
           }else{
             this.$refs.declareElementsModal.declareElementsData = this.copyTableData