From f616701db2c22fa6a2268dc4f3906f91f0b82a7b Mon Sep 17 00:00:00 2001
From: dengxin <2390584170@qq.com>
Date: Thu, 22 Feb 2024 10:36:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=87=8D=E7=82=B9=E4=BA=BA?=
 =?UTF-8?q?=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tenant/main/talents/index.vue | 30 ++++++++++++++++++++-----
 vue.config.js                           |  4 ++--
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/views/tenant/main/talents/index.vue b/src/views/tenant/main/talents/index.vue
index 44f0775..124eb50 100644
--- a/src/views/tenant/main/talents/index.vue
+++ b/src/views/tenant/main/talents/index.vue
@@ -55,7 +55,7 @@
               <el-input v-model="query.name" placeholder="姓名" clearable></el-input>
             </el-form-item>
             <el-form-item label="身份证:">
-              <el-input v-model="query.idNumber" placeholder="身份证" clearable></el-input>
+              <el-input v-model="query.idNumber" placeholder="请输入身份证" clearable></el-input>
             </el-form-item>
             <!-- <el-form-item label="标签:">
               <el-select v-model="query.worktypes" placeholder="标签" style="width: 100%" filterable clearable>
@@ -78,7 +78,8 @@
           @refresh-change="refreshChange" class="customPage">
           <!--自定义列-->
           <template slot="labelsBase" slot-scope="{ row }">
-            <el-tooltip effect="dark" :content="row.labelsBase" placement="top">
+            <el-tooltip effect="dark" placement="top">
+              <div slot="content" v-for="(item,index) in row.labelsBaseArr" :key="index">{{ item }}<br/></div>
               <div>{{ row.labelsBase | ellipsis }}</div>
             </el-tooltip>
           </template>
@@ -268,7 +269,7 @@ export default {
       const self = this;
       const IdCardNo = (rule, value, callback) => {
         // if (check18IdCardNo(value)) {
-          callback();
+        callback();
         // } else {
         //   callback(new Error("身份证格式不正确"));
         // }
@@ -299,6 +300,23 @@ export default {
         dialogType: "dialog",
         dialogClickModal: false,
         column: [
+          {
+            label: "社区街道名称",
+            prop: "companyName",
+            // search: true,
+            // span: 24,
+            // rules: [
+            //   {
+            //     required: true,
+            //     whitespace: true,
+            //     message: "请输入街道名称",
+            //     trigger: "blur",
+            //   },
+            // ],
+            slot: true,
+            addDisplay: false,
+            // hide: true
+          },
           {
             label: "姓名",
             prop: "name",
@@ -317,7 +335,7 @@ export default {
           {
             label: "身份证",
             prop: "idNumber",
-            hide: true,
+            // hide: true,
             span: 24,
             rules: [
               { required: true, message: "请输入身份证号", trigger: "blur" },
@@ -475,7 +493,6 @@ export default {
         this.arr = arr.map(concatName => {
           return { name: concatName };
         });
-        console.log(this.arr, '----------------');
       });
     },
     /*加载分组*/
@@ -886,6 +903,9 @@ export default {
         Object.assign(params, this.query),
         this.tenantId
       ).then((res) => {
+        res.data.data.records.forEach(item => {
+          item.labelsBaseArr = item.labelsBase.split(',');
+        })
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
diff --git a/vue.config.js b/vue.config.js
index bb6c2a3..0642742 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,8 +24,8 @@ module.exports = {
     proxy: {
       "/api": {
         // target: 'http://192.168.3.104:8000', // 本地服务接口地址
-        target: "http://39.98.184.58:8000",  // 阿里云后台地址
-        // target: "http://192.168.3.111:8000",  // 本地
+        // target: "http://39.98.184.58:8000",  // 阿里云后台地址
+        target: "http://192.168.3.111:8000",  // 本地
         ws: true,
         changeOrigin: true,
         pathRewrite: {