Merge branch 'dev1.0' into dev1.0.1

src/router/moudules/creditManage.js

@@ -78,35 +78,35 @@ export default {
         name: 'DueReview',
         component: () => import('@/views/creditManage/projectCredit/dueReview/index'),
         hidden: true,
-        meta: { title: '尽调审核', icon: 'dashboard' }
+        meta: { title: '尽调审核', icon: 'dashboard', activeMenu: '/projectCredit/index' }
       },
       {
         path: '/projectCredit/projectAdmittance/:id',
         name: 'ProjectAdmittance',
         component: () => import('@/views/creditManage/projectCredit/projectAdmittance'),
         hidden: true,
-        meta: { title: '项目准入报告', icon: 'dashboard' }
+        meta: { title: '项目准入报告', icon: 'dashboard', activeMenu: '/projectCredit/index' }
       },
       {
         path: '/projectCredit/companyAdmittance/:id',
         name: 'CompanyAdmittance',
         component: () => import('@/views/creditManage/projectCredit/companyAdmittance'),
         hidden: true,
-        meta: { title: '核心企业准入报告', icon: 'dashboard' }
+        meta: { title: '核心企业准入报告', icon: 'dashboard', activeMenu: '/projectCredit/index' }
       },
       {
         path: '/projectCredit/projectView/:id',
         name: 'ProjectView',
         component: () => import('@/views/creditManage/projectCredit/projectView'),
         hidden: true,
-        meta: { title: '项目信息查看', icon: 'dashboard' }
+        meta: { title: '项目信息查看', icon: 'dashboard', activeMenu: '/projectCredit/index' }
       },
       {
         path: '/projectCredit/companyView/:id',
         name: 'CompanyView',
         component: () => import('@/views/creditManage/projectCredit/companyView'),
         hidden: true,
-        meta: { title: '核心企业信息查看', icon: 'dashboard' }
+        meta: { title: '核心企业信息查看', icon: 'dashboard', activeMenu: '/projectCredit/index' }
       }
     ]
   },

src/styles/index.scss

@@ -157,3 +157,8 @@ div:focus {
   width: calc(100% - 140px);
   line-height: 32px;
 }
+
+.option-label-tip {
+  font-size: 12px;
+  color: #838080;
+}

src/views/creditManage/projectCredit/dueReview/components/Company/Auditing.vue

@@ -28,11 +28,11 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="实际控制人" style="width: 100%">
+      <el-form-item label="股东信息" style="width: 100%">
         <cy-comm-table
           ref="commTable"
           :columns="columns"
-          :data="ruleForm.actualControllerList"
+          :data="ruleForm.regStocks"
         />
       </el-form-item>
       <el-form-item label="国有控股比例" prop="holdingRatio">
@@ -183,7 +183,7 @@ export default {
         equityHierarchy: '',
         equityHierarchyDetail: '',
         involvingLitigationAccess: '',
-        actualControllerList: [],
+        regStocks: [],
         privateLendings: [],
         equityFreezeDataList: [],
         majorAnomalies: [],
@@ -235,18 +235,22 @@ export default {
           index: true
         },
         {
-          label: '实控人名称',
-          prop: 'name',
+          label: '股东名称',
+          prop: 'stockName',
           showTooltip: true
         },
         {
-          label: '最终受益股份',
+          label: '股东类型',
           showTooltip: true,
-          prop: 'finalBenefitPercent'
+          prop: 'stockType'
         },
         {
-          label: '表决权',
-          prop: 'controlPercent'
+          label: '持股比例',
+          prop: 'stockPercent'
+        },
+        {
+          label: '认缴出资额(万元)',
+          prop: 'shouldCapi'
         }
       ]
     }

src/views/creditManage/projectCredit/dueReview/components/Project/ProjectInfo.vue

@@ -13,9 +13,11 @@
           <el-option
             v-for="item in projectTypes"
             :key="item.value"
-            :label="item.label"
+            :label="item.label.split(':')[0]"
             :value="item.value"
-          />
+          >
+            <span>{{ item.label.split(':')[0] }}</span><span class="option-label-tip">（{{ item.label.split(':')[1] }}）</span>
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="项目名称" prop="projectName" class="one-form-item">
@@ -114,9 +116,11 @@
           <el-option
             v-for="item in purposeList"
             :key="item.code"
-            :label="item.name"
+            :label="item.name.split('：')[0]"
             :value="item.code"
-          />
+          >
+            <span>{{ item.name.split('：')[0] }}</span><span class="option-label-tip">（{{ item.name.split('：')[1] }}）</span>
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="具体用途" class="one-form-item" prop="purposeDetail">
@@ -273,15 +277,15 @@ export default {
       },
       projectTypes: [
         {
-          label: '固定项目',
+          label: '固定项目:货物与项目一一对应，非集采公司采购',
           value: 'c_project_type_1'
         },
         {
-          label: '集采项目',
+          label: '集采项目:货物与项目非一一对应，集采公司采购',
           value: 'c_project_type_2'
         },
         {
-          label: '无项目',
+          label: '无项目:暂无具体项目',
           value: 'c_project_type_3'
         }
       ]

src/views/creditManage/projectCredit/dueReview/components/Project/ProjectOwner.vue

@@ -36,11 +36,11 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="实际控制人" style="width: 100%">
+      <el-form-item label="股东信息" style="width: 100%">
         <cy-comm-table
           ref="commTable"
           :columns="columns"
-          :data="ruleForm.actualControllerList"
+          :data="ruleForm.regStocks"
         />
       </el-form-item>
       <el-form-item label="国有控股比例" prop="holdingRatio">
@@ -203,7 +203,7 @@ export default {
         equityHierarchy: '',
         equityHierarchyDetail: '',
         involvingLitigationAccess: '',
-        actualControllerList: [],
+        regStocks: [],
         privateLendings: [],
         equityFreezeDataList: [],
         majorAnomalies: [],
@@ -261,18 +261,22 @@ export default {
           index: true
         },
         {
-          label: '实控人名称',
-          prop: 'name',
+          label: '股东名称',
+          prop: 'stockName',
           showTooltip: true
         },
         {
-          label: '最终受益股份',
+          label: '股东类型',
           showTooltip: true,
-          prop: 'finalBenefitPercent'
+          prop: 'stockType'
         },
         {
-          label: '表决权',
-          prop: 'controlPercent'
+          label: '持股比例',
+          prop: 'stockPercent'
+        },
+        {
+          label: '认缴出资额(万元)',
+          prop: 'shouldCapi'
         }
       ]
     }