*

dsk-operate-ui/src/api/common.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // id解密
 export const idRemark = (data) => {
   return request({
-    url: '/user/jsk/change/remark',
+    url: '/enterprise/remark',
     method: 'post',
     data: data
   })

dsk-operate-ui/src/api/detail/party-a/index.js

 import request from "@/utils/request";
 
-// 企业头部信息
+// 甲方详情-公司概要
 export function infoHeader(data) {
   return request({
-    url: '/api-module-data/enterprise/infoHeader',
+    url: '/enterprise/infoHeader',
     method: 'post',
     data: data
   })

dsk-operate-ui/src/api/detail/party-a/overview.js

 import request from "@/utils/request";
 
-// 甲方详情-公司概要
-export function infoHeader(data) {
-  return request({
-    url: '/enterprise/infoHeader',
-    method: 'post',
-    data: data
-  })
-}
-
 // 企业数据统计
 export function statistic(data) {
   return request({

dsk-operate-ui/src/views/detail/party-a/index.vue

@@ -61,6 +61,7 @@
 
 <script>
 import { idRemark } from '@/api/common'
+import { infoHeader } from '@/api/detail/party-a/index'
 import elementResizeDetectorMaker from "element-resize-detector"
 import Header from "./component/Header"
 import SideBar from "./component/Sidebar"
@@ -140,6 +141,7 @@ export default {
   },
   data() {
     return {
+      companyInfo: {},
       companyId: 10361319,  //企业Id（测试默认3068）
       customerId: '',  //企业Id（测试默认'a00d582a6041f32c16aac804e4924736'）
       currentPath: {
@@ -177,6 +179,13 @@ export default {
       let { data } = await idRemark({companyId})
       if( data.code == 200){
         this.companyId = data.data
+        this.handleQuery()
+      }
+    },
+    async handleQuery() {
+      let res = await infoHeader({companyId:this.companyId})
+      if(res.code==200){
+        this.companyInfo = res.data
       }
     }
   }

dsk-operate-ui/src/views/detail/party-a/overview/businfo.vue

@@ -7,14 +7,15 @@
 
 
     <info-table class="info-tab" :list="defaultList" :obj="forInfo" :labelWidth="labelWidth" v-if="activeName=='first'">
-
+      <template slot="provinceCode" slot-scope="scope">
+        <span>{{showRegion(scope.data.provinceCode)}}</span>
+      </template>
     </info-table>
     <tables
       :tableLoading="tableLoading"
       :tableData="tableData"
       :forData="forData"
       :queryParams="queryParams"
-      :paging="false"
       v-if="activeName=='second'"
     />
   </div>
@@ -22,8 +23,9 @@
 
 <script>
 import mixin from '../mixins/mixin'
+import dataRegion from '@/assets/json/dataRegion'
 import InfoTable from '../component/infoTable'
-import {getList} from "@/api/detail/party-a/overview";
+import {icInfo, changeInfo} from "@/api/detail/party-a/overview"
 export default {
   name: 'Businfo',
   props: ['companyId'],
@@ -34,39 +36,42 @@ export default {
   data() {
     return {
       activeName: 'first',
+      baseParams: {
+        cid: this.companyId
+      },
       queryParams: {
         cid: this.companyId,
         pageNum: 1,
         pageSize: 20
       },
       labelWidth: 250,
-      forInfo: {projectType: 'aaa', projectPurposes: '222', projectInvestmentAmounts: '222'},
+      forInfo: {},
       defaultList: [
-        { name: '企业名称', prop: 'projectTypes' },
-        { name: '社会信用代码', prop: 'projectPurposes' },
-        { name: '法定代表人', prop: 'projectInvestmentAmounts' },
-        { name: '登记状态', prop: 'projectInvestmentAmounts' },
-        { name: '成立日期', prop: 'projectInvestmentAmounts' },
-        { name: '注册资本', prop: 'projectInvestmentAmounts' },
-        { name: '实缴资本', prop: 'projectInvestmentAmounts' },
-        { name: '核准日期', prop: 'projectInvestmentAmounts' },
-        { name: '组织机构代码', prop: 'projectInvestmentAmounts' },
-        { name: '工商注册号', prop: 'projectInvestmentAmounts' },
-        { name: '纳税人识别号', prop: 'projectInvestmentAmounts' },
-        { name: '企业类型', prop: 'projectInvestmentAmounts' },
-        { name: '营业期限', prop: 'projectInvestmentAmounts' },
-        { name: '纳税人资质', prop: 'projectInvestmentAmounts' },
-        { name: '所属地区', prop: 'projectInvestmentAmounts' },
-        { name: '登记机关', prop: 'projectInvestmentAmounts' },
-        { name: '人员规模', prop: 'projectInvestmentAmounts' },
-        { name: '参保人数', prop: 'projectInvestmentAmounts' },
-        { name: '经营范围', prop: 'projectInvestmentAmounts', style: true }
+        { name: '企业名称', prop: 'name' },
+        { name: '社会信用代码', prop: 'creditNo' },
+        { name: '法定代表人', prop: 'operName' },
+        { name: '登记状态', prop: 'status' },
+        { name: '成立日期', prop: 'startDate' },
+        { name: '注册资本', prop: 'registCapi' },
+        { name: '实缴资本', prop: 'actualCapi' },
+        { name: '核准日期', prop: 'checkDate' },
+        { name: '组织机构代码', prop: 'orgNo' },
+        { name: '工商注册号', prop: 'regNo' },
+        { name: '纳税人识别号', prop: 'creditNo' },
+        { name: '企业类型', prop: 'econKind' },
+        { name: '营业期限', prop: 'termEnd' },
+        { name: '纳税人资质', prop: 'qualification' },
+        { name: '所属地区', prop: 'provinceCode', slot: true },
+        { name: '登记机关', prop: 'belongOrg' },
+        { name: '人员规模', prop: 'colleguesNum' },
+        { name: '参保人数', prop: 'colleguesNum' },
+        { name: '经营范围', prop: 'scope', style: true }
       ],
       forData: [
-        {label: '变更日期', prop: 'inReason', width: '90', slot: true},
-        {label: '变更事项', prop: 'inDate'},
-        {label: '变更前', prop: 'department'},
-        {label: '变更后', prop: 'department'}
+        {label: '变更日期', prop: 'changeDate', width: '90'},
+        {label: '变更事项', prop: 'type'},
+        {label: '变更前', prop: 'beforeContent'},
+        {label: '变更后', prop: 'afterContent'}
       ],
       //列表
       tableLoading:false,
@@ -80,28 +85,29 @@ export default {
     handleClick(){
       this.handleQuery()
     },
-    handleQuery() {
-      console.log('索引：',this.activeName)
+    async handleQuery() {
       this.tableLoading = true
-      getList(this.queryParams).then((res) => {
-        this.tableLoading = false
-        this.tableData = [
-          {
-            projectId: '1',
-            tag: '在业',
-            projectName:'滨州医学院口腔医学大楼铝合金门窗供货及安装',
-            use:'城镇住宅用地',
-            type:'房地产业',
-            way:'挂牌出让',
-            state:'重庆',
-            money:'11234万元',
-            scale:'222平米',
-            unit:'江苏省住房和城乡建设厅',
-            date:'2015-08-06',
+      let param = this.activeName == 'first' ? this.baseParams : this.queryParams
+      let res = this.activeName == 'first' ? await icInfo(param) : await changeInfo(param)
+      this.tableLoading = false
+      if(res.code==200){
+        this.activeName == 'first' ? this.forInfo = res.data : this.tableData = res.rows
+      }
+      this.activeName == 'first' ? '' : this.tableDataTotal = res.total
+    },
+    showRegion(region){
+      if(region) {
+        let list = dataRegion
+        let areaText = ''
+        list.forEach(item => {
+          if(item.id == region) {
+            areaText = item.regionName
           }
-        ]
-        this.tableDataTotal = 100
-      })
+        })
+        return areaText
+      }else {
+        return '--'
+      }
     }
   }
 }

dsk-operate-ui/src/views/detail/party-a/overview/overview.vue

@@ -49,7 +49,7 @@ export default {
     margin: 0;
     padding: 0;
     .view-content{
-      margin-top: 12px;
+      //margin-top: 12px;
     }
   }
 </style>

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/regionalEconomies.vue

@@ -32,7 +32,7 @@ import {
 } from '@/api/detail/party-a/urbanLnvestment'
 import {
   infoHeader
-} from '@/api/detail/party-a/overview'
+} from '@/api/detail/party-a/index'
 export default {
   name: 'regionalEconomies',
   components: {

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue

@@ -114,7 +114,7 @@ import {
 } from '@/api/detail/party-a/urbanLnvestment'
 import {
   infoHeader
-} from '@/api/detail/party-a/overview'
+} from '@/api/detail/party-a/index'
 export default {
   name: 'SameRegion',
   mixins: [mixin],