Merge remote-tracking branch '烟台/master' into 烟台master

src/views/modules/base/epidemic/natInfo/noNatList.vue

@@ -544,7 +544,7 @@ export default {
 
     //导出表格
     async handleExport () {
-      let title = '核酸检测信息'
+      let title = '人员名单核酸信息'
 
       const url = "/epmetuser/icNatCompareRecord/export"
 
@@ -588,7 +588,7 @@ export default {
     },
 
     handleExportModule () {
-      let title = '核酸检测信息导入模板'
+      let title = '核酸人员名单导入模板'
 
       const url = "/epmetuser/icNatCompareRecord/template-download"
       let params = {}

src/views/modules/workSys/dataOpenConfig.vue

@@ -76,6 +76,16 @@
                  :inline="true"
                  :model="formData">
 
+          <el-form-item label="部门"
+                        label-width="150px"
+                        style="display: block">
+           <span>{{selRow.deptName}}</span>
+          </el-form-item>
+          <el-form-item label="数据名称"
+                        label-width="150px"
+                        style="display: block">
+           <span>{{selRow.dataName}}</span>
+          </el-form-item>
           <el-form-item label="适用范围"
                         label-width="150px"
                         style="display: block">
@@ -147,6 +157,7 @@ export default {
 
       scopeList: [],
       dataSyncConfigId: '',
+      selRow:{}
     }
   },
 
@@ -188,7 +199,8 @@ export default {
 
     async getOrgList () {
 
-      const url = '/gov/org/customeragency/my-subagency-list'
+      // const url = '/gov/org/customeragency/my-subagency-list'
+      const url = '/gov/org/customeragency/agencylist'
 
       let params = {};
 
@@ -295,6 +307,7 @@ export default {
 
     // 编辑 customerId,parentCategoryId,dateform
     editShow (row) {
+      this.selRow=row
       this.dataSyncConfigId = row.id
 
       this.orgIdArray = []