3:21

src/api/emport/ExcelData.js

@@ -55,3 +55,17 @@ export async function blobValidate(data) {
         return true;
     }
 }
+
+/**
+ * 获取机构数据
+ * @param orgName
+ * @param year
+ * @returns {*}
+ */
+export function queryArea(orgName,year) {
+    return request({
+        url: `${prefix}/queryArea`,
+        method: 'get',
+        params:{orgName,year}
+    })
+}

src/views/emport/emport/index.vue

@@ -413,13 +413,13 @@
                       border height="500px" max-height="500px" stripe
             >
                 <el-table-column align="center" type="index" width="50"/>
-                <el-table-column align="center" label="标识" prop="value" show-overflow-tooltip/>
-                <el-table-column align="center" label="机构类型" prop="orgType" show-overflow-tooltip/>
-                <el-table-column align="center" label="机构名称" prop="label" show-overflow-tooltip/>
-                <el-table-column align="center" label="机构地址" prop="address" show-overflow-tooltip/>
-                <el-table-column align="center" label="行政区划代码" prop="unifiedCode" show-overflow-tooltip/>
-                <el-table-column align="center" label="所属市" prop="city" show-overflow-tooltip/>
-                <el-table-column align="center" label="所属区" prop="region" show-overflow-tooltip/>
+                <el-table-column align="center" label="标识" prop="ROWCODE" show-overflow-tooltip/>
+                <el-table-column align="center" label="机构类型" prop="ORG_TYPE" show-overflow-tooltip/>
+                <el-table-column align="center" label="机构名称" prop="ORG_NAME" show-overflow-tooltip/>
+                <el-table-column align="center" label="机构地址" prop="MAILING_ADDRESS" show-overflow-tooltip/>
+                <el-table-column align="center" label="行政区划代码" prop="AREA_NUMBER_CODE" show-overflow-tooltip/>
+                <el-table-column v-if="false" align="center" label="所属市" prop="CITY" show-overflow-tooltip/>
+                <el-table-column  align="center" label="所属区" prop="AREA" show-overflow-tooltip/>
                 <el-table-column align="center" label="操作" width="120">
                     <template slot-scope="scope">
                         <el-button circle icon="el-icon-edit" plain
@@ -1367,8 +1367,14 @@ export default {
         },
         // 打开机构字典列表
         openOrgDictDialog() {
-            this.initOrgList()
+            //this.initOrgList()
             this.orgDictDialog.show = true
+            this.orgDictDialog.loading = true
+            ExcelData.queryArea(this.queryForm.orgName,this.queryForm.year).then(res => {
+                if (res.code === 200) {
+                    this.orgDictDialog.orgList = res.data
+                }
+            }).finally(_ => this.orgDictDialog.loading = false)
         },
         openAddOrgListDialog() {
             this.orgListDialog.title = '新增机构'