*

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

@@ -53,7 +53,7 @@
         </template>
       </el-table>
     </div>
-    <div class="pagination-box">
+    <div class="pagination-box" v-if="paging">
       <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
     </div>
   </div>
@@ -91,6 +91,10 @@ export default {
       type: Object,
       default: {}
     },
+    paging: {
+      type: Boolean,
+      default: true
+    },
   },
   data() {
     return {

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

@@ -5,16 +5,72 @@
       <el-tab-pane label="工商变更" name="second"></el-tab-pane>
     </el-tabs>
 
-    <div v-if="activeName=='first'">
-      111
+    <div class="businfo-box" v-if="activeName=='first'">
+      <p>
+        <label class="label">企业名称</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+        <label class="label">社会信用代码</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+      </p>
+      <p>
+        <label class="label">法定代表人</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+        <label class="label">登记状态</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+      </p>
+      <p>
+        <label class="label">成立日期</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+        <label class="label">注册资本</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+      </p>
+      <p>
+        <label class="label">实缴资本</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+        <label class="label">核准日期</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+      </p>
+      <p>
+        <label class="label">组织机构代码</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+        <label class="label">工商注册号</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+      </p>
+      <p>
+        <label class="label">纳税人识别号</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+        <label class="label">企业类型</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+      </p>
+      <p>
+        <label class="label">营业期限</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+        <label class="label">纳税人资质</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+      </p>
+      <p>
+        <label class="label">所属地区</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+        <label class="label">登记机关</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+      </p>
+      <p>
+        <label class="label">人员规模</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+        <label class="label">参保人数</label>
+        <span>{{forInfo.companyName || '--'}}</span>
+      </p>
+      <p>
+        <label class="label">经营范围</label>
+        <span class="span-one">{{forInfo.companyName || '--'}}</span>
+      </p>
     </div>
     <tables
       :tableLoading="tableLoading"
       :tableData="tableData"
       :forData="forData"
-      :tableDataTotal="tableDataTotal"
       :queryParams="queryParams"
-      @handle-current-change="handleCurrentChange"
+      :paging="false"
       v-if="activeName=='second'"
     />
   </div>
@@ -24,6 +80,7 @@
 import mixin from '../mixins/mixin'
 export default {
   name: 'Businfo',
+  props: ['companyId'],
   mixins: [mixin],
   data() {
     return {
@@ -33,29 +90,26 @@ export default {
         pageNum: 1,
         pageSize: 10
       },
+      forInfo: {},
       forData: [
-        {label: '变更日期', prop: 'inReason', slot: true},
+        {label: '变更日期', prop: 'inReason', width: '90', slot: true},
         {label: '变更事项', prop: 'inDate'},
         {label: '变更前', prop: 'department'},
         {label: '变更后', prop: 'department'}
       ],
-      formData: [],
       //列表
       tableLoading:false,
-      tableData:[],
-      pageIndex:1,
-      pageSize:10,
-      tableDataTotal:0,
+      tableData:[]
     }
   },
   created() {
-    this.dataRegion()
+    this.handleData()
   },
   methods: {
     handleClick(){
-      this.dataRegion()
+      this.handleData()
     },
-    async dataRegion() {
+    async handleData() {
       this.tableData = [
         {id:1, inReason:'达萨法达萨法', inDate:'000',tag:'aaa'},
         {id:2, inReason:'达萨法达萨法', inDate:'111'},
@@ -90,5 +144,35 @@ export default {
       }
     }
   }
+  .businfo-box {
+    border-top: 1px solid #E6E9F0;
+    p {
+      display: flex;
+      align-items: center;
+      margin: 0;
+      border-left: 1px solid #E6E9F0;
+      border-bottom: 1px solid #E6E9F0;
+      .label {
+        width: 10%;
+        font-weight: 400;
+        line-height: 40px;
+        font-size: 12px;
+        height: 40px;
+        background: #F0F3FA;
+        padding-left: 12px;
+      }
+      span {
+        width: 40%;
+        color: #000;
+        height: 40px;
+        line-height: 40px;
+        padding-left: 12px;
+        font-size: 12px;
+      }
+      .span-one {
+        width: 90%;
+      }
+    }
+  }
 }
 </style>

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

@@ -5,16 +5,14 @@
       :form-data="formData"
       :query-params="queryParams"
       :total="tableDataTotal"
-      @handle-search="handleSearch"
     />
 
     <tables
       :tableLoading="tableLoading"
       :tableData="tableData"
       :forData="forData"
-      :tableDataTotal="tableDataTotal"
       :queryParams="queryParams"
-      @handle-current-change="handleCurrentChange"
+      :paging="false"
     />
   </div>
 </template>
@@ -23,6 +21,7 @@
 import mixin from '../mixins/mixin'
 export default {
   name: 'Execuinfo',
+  props: ['companyId'],
   mixins: [mixin],
   data() {
     return {
@@ -39,16 +38,14 @@ export default {
       //列表
       tableLoading:false,
       tableData:[],
-      pageIndex:1,
-      pageSize:10,
       tableDataTotal:0,
     }
   },
   created() {
-    this.dataRegion()
+    this.handleData()
   },
   methods: {
-    async dataRegion() {
+    async handleData() {
       this.tableData = [
         {id:1, inReason:'达萨法达萨法', inDate:'000',tag:'aaa'},
         {id:2, inReason:'达萨法达萨法', inDate:'111'},

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

@@ -5,7 +5,6 @@
       :form-data="formData"
       :query-params="queryParams"
       :total="tableDataTotal"
-      @handle-search="handleSearch"
     />
     <el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
       <el-tab-pane label="股东信息" name="first"></el-tab-pane>
@@ -35,6 +34,7 @@
 import mixin from '../mixins/mixin'
 export default {
   name: 'Holderinfo',
+  props: ['companyId'],
   mixins: [mixin],
   data() {
     return {
@@ -50,7 +50,7 @@ export default {
         {label: '认缴出资（万）', prop: 'department'},
         {label: '实缴出资额', prop: 'department'},
         {label: '认缴出资额', prop: 'department'},
-        {label: '参股日期', prop: 'department'}
+        {label: '参股日期', prop: 'department', width: '150'}
       ],
       formData: [],
       //列表
@@ -62,13 +62,13 @@ export default {
     }
   },
   created() {
-    this.dataRegion()
+    this.handleData()
   },
   methods: {
     handleClick(){
-      this.dataRegion()
+      this.handleData()
     },
-    async dataRegion() {
+    async handleData() {
       this.tableData = [
         {id:1, inReason:'达萨法达萨法', inDate:'000',tag:'aaa'},
         {id:2, inReason:'达萨法达萨法', inDate:'111'},

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

@@ -17,6 +17,18 @@
       :queryParams="queryParams"
       @handle-current-change="handleCurrentChange"
     >
+      <template slot="gqzb">
+        <div class="tab-header">股权占比 <el-popover
+            placement="top-start"
+            width="280"
+            trigger="hover">
+          <div>
+            控股67%：绝对控制权67%，相当于100%的权力，修改公司章程/分立、合并、变更主营项目、重大决策<br />
+            控股51%：相对控制权51%，控制线，绝对控制公司<br />
+            控股34%：安全控制权，一票否决权</div>
+            <img src="@/assets/images/detail/overview/zbph_question.png" slot="reference">
+          </el-popover></div>
+      </template>
       <template slot="inReason" slot-scope="scope">
         <div>{{scope.row.inReason}}</div>
         <div class="tags" v-if="scope.row.tag">
@@ -32,6 +44,7 @@
 import mixin from '../mixins/mixin'
 export default {
   name: 'Overseas',
+  props: ['companyId'],
   mixins: [mixin],
   data() {
     return {
@@ -45,7 +58,7 @@ export default {
         {label: '法定代表人', prop: 'inDate'},
         {label: '注册资本（万元）', prop: 'department'},
         {label: '成立日期', prop: 'department'},
-        {label: '股权占比', prop: 'department'},
+        {label: '股权占比', prop: 'department', slotHeader: true, slotName: 'gqzb'},
         {label: '认缴出资额（万元）', prop: 'department'}
       ],
       formData: [
@@ -75,10 +88,10 @@ export default {
     }
   },
   created() {
-    this.dataRegion()
+    this.handleData()
   },
   methods: {
-    async dataRegion() {
+    async handleData() {
       this.tableData = [
         {id:1, inReason:'达萨法达萨法', inDate:'000',tag:'aaa'},
         {id:2, inReason:'达萨法达萨法', inDate:'111'},
@@ -98,6 +111,14 @@ export default {
   margin: 0;
   padding: 16px;
   background: #FFFFFF;
+  .tab-header{
+    img{
+      margin-bottom: -3px;
+      width: 14px;
+      height: 14px;
+      cursor: pointer;
+    }
+  }
   .tags{
     .tag{
       display: inline-block;