Merge remote-tracking branch 'origin/master'

jero-web/src/components/ReferenceParameter/index.vue

@@ -169,7 +169,7 @@ export default {
       this.loadData()
     },
     handleCancel() {
-      this.$emit('areaVisible', false)
+      this.$emit('areaVisibleAssignedbyflag', false)
     },
     onSelectChange(selectedRowKeys, selectedRowKeysDate) {
       this.selectedRowKeysDate = selectedRowKeysDate

jero-web/src/components/SynchronousSubmissionLibrary/index.vue

@@ -109,9 +109,11 @@ export default {
         }
       })
         .then( (res) =>{
+          console.log(res,'res')
           if (res.data.success) {
             _this.$message.success(res.data.message)
             this.$emit('areaVisibsynchronous', false)
+            this.$emit('GetgetTableList')
           }else{
             _this.$message.warning(res.data.message)
           }

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -186,13 +186,13 @@
     <!--  引用参数--->
     <a-modal v-model="areaVisiblereferenceparameter" :title="$t('referenceparameter')" width='650px' :footer="null">
       <reference-parameter v-if='areaVisiblereferenceparameter' :paramsManifest='paramsManifest' @GetgetTableList='GetgetTableList'
-                           @areaVisible='areaVisiblereferenceparameter = false'
+                           @areaVisibleAssignedbyflag='areaVisiblereferenceparameter = false'
                            :selectedRowKeysArray='selectedRowKeysArray'/>
     </a-modal>
     <!--  同步上报库--->
     <a-modal v-model="areaVisibsynchronous" :title="$t('SynchronousReportLibrary')" width='650px' :footer="null">
       <synchronous-submission-library v-if='areaVisibsynchronous' :paramsManifest='paramsManifest' @GetgetTableList='GetgetTableList'
-                           :selectedRowKeysArray='selectedRowKeysArray' @areaVisible='areaVisibsynchronous = false'/>
+                           :selectedRowKeysArray='selectedRowKeysArray' @areaVisibsynchronous='areaVisibsynchronous = false'/>
     </a-modal>
   </a-card>
 </template>