2.1地址修改后，管理后台端的修改

src/biz/admin/enterprise/enterprise.ts

@@ -129,8 +129,8 @@ export async function outPutEnterpriseData(createType:number, fuHuaQiUscc:string
     ];//表头顺序  如果这里修改了 下面的keyList也要修改
     const KeyList = [
         "name", "createTime", "fuhuaqiUscc", "isCreate",  "state", "virtualCause", "uscc", "industry", "mainBusiness", "logonTime",
-        "firstIncubationTime", "timeOfImmigration", "isNaturalPersonHolding", "oldLogonAdd",
-        "logonAdd", "operatingAdd", "leasedArea"
+        "firstIncubationTime", "timeOfImmigration", "isNaturalPersonHolding", "oldLogonAddress",
+        "logonAddress", "operatingAddress", "leasedArea"
     ];//表头对应的字段顺序
     let dataList = [TitleList];
     

src/biz/admin/enterprise/financing.ts

@@ -101,7 +101,7 @@ export async function outPutFinancingList(monthData:string, fuHuaQiName:string,
     
     /**拼接返回 需要注意的是 keyList要和titleList一一对应 */
     let keyList = [
-        "name", "uscc", "fuhuaqiUscc","logonAdd", "logonTime", "industry", "financingRounds", "operatingAdd", "financingAmount","investmentInstitutionsName",
+        "name", "uscc", "fuhuaqiUscc","logonAddress", "logonTime", "industry", "financingRounds", "operatingAddress", "financingAmount","investmentInstitutionsName",
         "timeToObtainInvestment", "fuHuaQiInvestment", "fuHuaQiInvestmentAmount", "fuHuaQiInvestmentStyle", "createTime"
     ];
     let titleList = [

src/config/splitResultConfig.ts

@@ -112,9 +112,9 @@ export const EnterpriseListConfig = {
     firstIncubationTime:{key:"首次入孵时间", changeDate:true},
     timeOfImmigration:{key:"迁入时间", changeDate:true},
     isNaturalPersonHolding:{key:"是否自然人控股"},
-    oldLogonAdd:{key:"迁入前注册地址"},
-    logonAdd:{key:"注册地址"},
-    operatingAdd:{key:"经营地址"},
+    oldLogonAddress:{key:"迁入前注册地址", isAdd:true},
+    logonAddress:{key:"注册地址", isAdd:true},
+    operatingAddress:{key:"经营地址", isAdd:true},
     leasedArea:{key:"租赁面积（平方米）"},
     isCreate:{key:"新注册/新迁入"},
     mainBusiness:{key:"主营业务"},//主营业务
@@ -157,8 +157,8 @@ export const EnterpriseMoveOutListConfig = {
 export const FinancingListConfig = {
     uscc:{key:"企业统一信用代码"},
     name:{key:"企业名称"},
-    logonAdd:{key:"注册地址"},
-    operatingAdd:{key:"经营地址"},
+    logonAddress:{key:"注册地址", isAdd:true},
+    operatingAddress:{key:"经营地址", isAdd:true},
     financingAmount:{key:"融资金额(万元)"},
     investmentInstitutionsName:{key:"投资机构名称"},
     timeToObtainInvestment:{key:"获得投资时间", changeDate:true},

src/routers/admin/enterprise.ts

@@ -14,10 +14,11 @@ import { eccReqParamater } from '../../util/verificationParam';
 
 export function setRouter(httpServer) {
     httpServer.post('/admin/enterprise/list',checkGuanWeiHuiToken, asyncHandler(getEnterpriseList));
-    httpServer.post('/admin/enterprise/financinglist',checkGuanWeiHuiToken, asyncHandler(getFinancingList));
-    httpServer.post('/admin/enterprise/affiliationfuhuaqi',checkGuanWeiHuiToken,asyncHandler(affiliationFuHuaQi));
     httpServer.post('/admin/data/output/enterprise',checkGuanWeiHuiToken, asyncHandler(outPutEnterpriseData));
+    httpServer.post('/admin/enterprise/financinglist',checkGuanWeiHuiToken, asyncHandler(getFinancingList));
     httpServer.post('/admin/data/output/financing',checkGuanWeiHuiToken, asyncHandler(outPutFinancingData));
+    /**所属孵化器下拉框 */
+    httpServer.post('/admin/enterprise/affiliationfuhuaqi',checkGuanWeiHuiToken,asyncHandler(affiliationFuHuaQi));
     /**迁出企业2.0新加 */
     httpServer.post('/admin/enterprise/moveoutlist',checkGuanWeiHuiToken, asyncHandler(moveOutList));
     httpServer.post('/admin/data/output/moveoutlist',checkGuanWeiHuiToken, asyncHandler(outPutMoveOutList));

src/util/piecemeal.ts

@@ -33,7 +33,14 @@ export function extractData(conf, data, isAdmin) {
         if (confInfo.changeDate) {
             if (isAdmin) result[key] = data[key] ? moment(data[key]).format("YYYY-MM-DD") : '-';
             else result[key] = data[key] || 0;
-        }else {
+        } else if (confInfo.isAdd && isAdmin) {
+            let addStr = "";
+            data[key].forEach(str => {
+                addStr += str;
+            });
+            result[key] = addStr;
+        }
+        else {
             result[key] = data[key];
             if (typeof result[key] == 'string' && !result[key]) result[key] = '';
         }