Merge remote-tracking branch 'origin/dev' into dev

config/index.js

@@ -1,8 +1,8 @@
 // see http://vuejs-templates.github.io/webpack for documentation.
 var path = require("path");
 
-// const TEST_HOST = "http://101.36.160.140:10310";
-const TEST_HOST = "http://172.16.0.46:9025";
+const TEST_HOST = "http://101.36.160.140:10310";
+// const TEST_HOST = "http://172.16.0.46:9025";
 // const TEST_HOST = "http://172.16.0.46:9527";
 
 module.exports = {

src/page/CostStandard/index.vue

@@ -68,7 +68,6 @@
         prop="standardName"
         label="标准名称"
       ></el-table-column>
-      </el-table-column>
       <el-table-column
         align="center"
         prop="standardType"

src/router/index.js

@@ -166,7 +166,7 @@ export default new Router({
         transferManagementModule,
         // settlementManagementModule,
         // statisticsManagementModule,
-        // financialManagementModule,
+        financialManagementModule,
         progressManagementModule,
         consumerManagementModule,
         alertingModule,

src/utils/menuMock.js

@@ -100,7 +100,7 @@ const modules1 = [
   transferManagementModule,
   // settlementManagementModule,
   // statisticsManagementModule,
-  // financialManagementModule,
+  financialManagementModule,
   progressManagementModule,
   consumerManagementModule,
   alertingModule,