update

jwtech-pc-page/src/views/enterpriseInformation/components/descriptionsEnterpriseTable.vue

@@ -23,8 +23,8 @@
     </div>
 
     <div class="table-wrap">
-      <div class="table-title">
-        <span
+      <div class="table-title-wrap">
+        <!-- <span
           :class="currentItem === '1' ? 'act' : ''"
           @click="currentItem = '1'"
         >
@@ -36,7 +36,17 @@
           @click="currentItem = '2'"
         >
           信用承若
-        </span>
+        </span> -->
+
+        <el-tabs
+          type="border-card"
+          v-model="currentItem"
+          @tab-click="handleClick"
+          class="table-title"
+        >
+          <el-tab-pane label="基本信息" name="1"></el-tab-pane>
+          <el-tab-pane label="信用承若" name="2"></el-tab-pane>
+        </el-tabs>
       </div>
       <template v-if="currentItem === '1'">
         <el-descriptions
@@ -355,35 +365,90 @@ export default {
   .table-wrap {
     margin-top: 20px;
 
-    .table-title {
-      height: 47px;
-      line-height: 47px;
-      background-color: #f6f6f6;
+    .table-title-wrap {
+      /deep/.table-title {
+        .el-tabs__header {
+          // border-bottom-color: #c8dff8;
+          border-color: transparent;
+        }
 
-      &::before {
-        content: "";
-        display: inline-block;
-        width: 3px;
-        height: 16px;
-        background: #005eb7;
-        margin-right: 10px;
-        vertical-align: middle;
-      }
+        .el-tabs__nav-wrap {
+          // height: 50px;
+          // padding-left: 5px;
 
-      span {
-        font-family: PingFangSC, PingFang SC;
-        font-weight: 600;
-        font-size: 16px;
-        color: #333333;
-        font-style: normal;
-        margin-right: 10px;
-        cursor: pointer;
+          .el-tabs__nav {
+            width: 100%;
+            // display: flex;
+          }
 
-        &.act {
+          .el-tabs__item {
+            // flex: 1;
+            height: 50px;
+            font-size: 14px;
+            font-weight: 600;
+            color: #333333;
+            padding-top: 5px;
+            text-align: center;
+            // margin-top: 5px;
+            // margin-left: 1px;
+            // padding-left: 20px;
+            // padding-right: 20px;
+            // margin-right: 18px;
+          }
+        }
+
+        .el-tabs__item.is-active {
+          // padding-left: 35px;
+          // padding-right: 35px;
           color: #005eb7;
+          border-right-color: #dadce3;
+          border-left-color: #dadce3;
+          border-top-color: #dadce3;
+          // border-bottom: 0px solid red;
+          // border-radius: 8px 8px 0px 0px;
+        }
+
+        .el-tabs__content {
+          padding: 0px;
+        }
+
+        .tab-label {
+          display: flex;
+          align-items: center;
+          justify-content: center;
         }
       }
     }
+
+    // .table-title {
+    //   height: 47px;
+    //   line-height: 47px;
+    //   background-color: #f6f6f6;
+
+    //   &::before {
+    //     content: "";
+    //     display: inline-block;
+    //     width: 3px;
+    //     height: 16px;
+    //     background: #005eb7;
+    //     margin-right: 10px;
+    //     vertical-align: middle;
+    //   }
+
+    //   span {
+    //     font-family: PingFangSC, PingFang SC;
+    //     font-weight: 600;
+    //     font-size: 16px;
+    //     color: #333333;
+    //     font-style: normal;
+    //     margin-right: 10px;
+    //     cursor: pointer;
+
+    //     &.act {
+    //       color: #005eb7;
+    //     }
+    //   }
+    // }
   }
 
   /deep/.el-descriptions {

jwtech-pc-page/src/views/enterpriseInformation/personDetail.vue

@@ -36,28 +36,23 @@
             <el-descriptions-item label="姓名">
               {{ personInfo.name }}
             </el-descriptions-item>
-           <el-descriptions-item label="性别">
-             {{ personInfo.name }}
-           </el-descriptions-item>
-            <el-descriptions-item label="聘用单位" :span="2">
+            <el-descriptions-item label="性别">
               {{ personInfo.name }}
-
+            </el-descriptions-item>
+            <el-descriptions-item label="聘用单位" :span="2">
+              {{ personInfo.enterpriseName }}
             </el-descriptions-item>
             <el-descriptions-item label="职称">
               {{ personInfo.professionalPost }}
-
             </el-descriptions-item>
             <el-descriptions-item label="职务">
               {{ personInfo.job }}
-
             </el-descriptions-item>
             <el-descriptions-item label="职称专业">
               {{ personInfo.jobSpecialty }}
-
             </el-descriptions-item>
             <el-descriptions-item label="从业开始年份">
               {{ personInfo.commencementYear }}
-
             </el-descriptions-item>
           </el-descriptions>
         </div>
@@ -119,7 +114,7 @@
             >
             </el-table-column>
             <el-table-column
-              prop="validityPeriod"
+              prop="remark"
               label="备注"
               width="120"
               align="center"
@@ -141,17 +136,9 @@
               align="center"
             >
             </el-table-column>
-            <el-table-column
-              prop="enterTime"
-              label="开始时间"
-              align="center"
-            >
+            <el-table-column prop="enterTime" label="开始时间" align="center">
             </el-table-column>
-            <el-table-column
-              prop="exitTime"
-              label="离职时间"
-              align="center"
-            >
+            <el-table-column prop="exitTime" label="离职时间" align="center">
             </el-table-column>
           </el-table>
         </div>
@@ -171,7 +158,7 @@ import actionList from "./components/actionList";
 import { enterpriseInfo } from "../../api/enterpriseInformation";
 import { personInfoList, personInfo } from "@/api/enterpriseInformation";
 
-import {getOnePersonInfo} from "../../api/home";
+import { getOnePersonInfo } from "../../api/home";
 
 export default {
   components: {
@@ -191,32 +178,35 @@ export default {
         data: {
           enterpriseId: null,
           name: null,
-          idNo:null
+          idNo: null
         }
       },
-      dataList:[],
-      zsList:[],
-      personInfo:{},
+      dataList: [],
+      zsList: [],
+      personInfo: {},
       activeName: "qualification"
     };
   },
   created() {
-    if (this.$route.query.idNo&&this.$route.query.enterpriseId){
-      this.queryParams.data.idNo=this.$route.query.idNo
-      this.queryParams.data.enterpriseId=this.$route.query.enterpriseId
-      personInfoList(this.queryParams).then(res=>{
-        this.zsList=res.data.records
-      })
-      getOnePersonInfo(this.$route.query.idNo,this.$route.query.enterpriseId).then(res=>{
-        console.log(res.data.data,55555)
-        this.personInfo=res.data.data
-      })
+    if (this.$route.query.idNo && this.$route.query.enterpriseId) {
+      this.queryParams.data.idNo = this.$route.query.idNo;
+      this.queryParams.data.enterpriseId = this.$route.query.enterpriseId;
+      personInfoList(this.queryParams).then(res => {
+        this.zsList = res.data.records;
+      });
+      getOnePersonInfo(
+        this.$route.query.idNo,
+        this.$route.query.enterpriseId
+      ).then(res => {
+        console.log(res.data.data, 55555);
+        this.personInfo = res.data.data;
+      });
     }
-    if (this.$route.query.idNo){
-      getOnePersonInfo(this.$route.query.idNo,null).then(res=>{
-        console.log(res.data.data,55555)
-        this.dataList=res.data.data
-      })
+    if (this.$route.query.idNo) {
+      getOnePersonInfo(this.$route.query.idNo, null).then(res => {
+        console.log(res.data.data, 55555);
+        this.dataList = res.data.data;
+      });
     }
   },
   mounted() {},