Merge remote-tracking branch 'origin/master'

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

@@ -185,7 +185,7 @@ export default {
         this.tableLoading = false
         if(res.code==200){
           this.dialogVisible=true
-          this.ifClaim = true
+          this.ifClaim = 1
         }
       }else{
         this.$message.warning('对不起，当前不能认领')
@@ -226,7 +226,7 @@ export default {
     },
     //获取认领状态
     getClaimStatus(){
-      this.ifClaim = this.companyInfo.regCapital
+      this.ifClaim = this.companyInfo.claimStatus
     },
     handleWidth(){
       if(this.companyInfo.introduction){

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

@@ -11,7 +11,12 @@
         <el-table-column label="序号" width="55" align="left" fixed>
           <template slot-scope="scope">{{ holderParams.pageNum * holderParams.pageSize - holderParams.pageSize + scope.$index + 1 }}</template>
         </el-table-column>
-        <el-table-column prop="stockName" min-width="140" label="股东名称"></el-table-column>
+        <el-table-column min-width="140" label="股东名称">
+          <template slot-scope="scope">
+            <router-link :to="`/enterprise/${encodeStr(scope.row.stockId)}`" tag="a" class="a-link" v-if="scope.row.stockId&&scope.row.stockName" v-html="scope.row.stockName"></router-link>
+            <div v-else v-html="scope.row.stockName  || '--'"></div>
+          </template>
+        </el-table-column>
         <el-table-column prop="shouldCapiConv" label="应缴金额"></el-table-column>
         <el-table-column prop="stockPercent" label="持股比例"></el-table-column>
         <el-table-column prop="" label="法定代表人">