From 1e623fba4f41d084f61287c1588ecf65325679dc Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Wed, 8 May 2024 10:27:01 +0800
Subject: [PATCH] =?UTF-8?q?flat:=20=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tenant/main/talents/certain/index.vue     | 41 ++++++++----------
 .../tenant/main/talents/latent/index.vue      | 43 ++++++++-----------
 vue.config.js                                 |  2 +-
 3 files changed, 36 insertions(+), 50 deletions(-)

diff --git a/src/views/tenant/main/talents/certain/index.vue b/src/views/tenant/main/talents/certain/index.vue
index 6ed4930..2ce6b5e 100644
--- a/src/views/tenant/main/talents/certain/index.vue
+++ b/src/views/tenant/main/talents/certain/index.vue
@@ -46,22 +46,6 @@
     </el-col>
     <el-col :span="19">
       <basic-container>
-        <!--搜索栏-->
-        <el-form size="small" label-position="right" :inline="true" style="padding-left: 10px; padding-right: 10px">
-          <el-row :span="24">
-            <el-form-item label="姓名:">
-              <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-form-item>
-
-            <div class="searchBtn">
-              <el-button type="primary" size="small" icon="el-icon-search" @click="searchChange1">搜 索</el-button>
-              <el-button size="small" icon="el-icon-delete" @click="searchReset1">清 空</el-button>
-            </div>
-          </el-row>
-        </el-form>
         <!--/搜索栏-->
         <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="obj"
                    :permission="permissionList" :before-open="beforeOpen" @row-del="rowDel" @row-update="rowUpdate"
@@ -279,6 +263,21 @@ export default {
         dialogType: "drawer",
         dialogClickModal: false,
         column: [
+          {
+            label: "所属机构",
+            prop: "deptId",
+            type: "tree",
+            multiple: false,
+            dicData: this.depTree,
+            props: {
+              label: "title",
+            },
+            hide: true,
+            checkStrictly: true,
+            span: 24,
+            search: true,
+            change: this.deptChange
+          },
           {
             label: "机构名称",
             prop: "companyName",
@@ -309,6 +308,7 @@ export default {
                 trigger: "blur",
               },
             ],
+            search: true,
             slot: true
           },
           {
@@ -335,6 +335,7 @@ export default {
               {required: true, message: "请输入身份证号", trigger: "blur"},
               {trigger: "blur", validator: IdCardNo},
             ],
+            search: true,
           },
           {
             label: "手机号",
@@ -997,14 +998,6 @@ export default {
       this.onLoad(this.page, params);
       done();
     },
-    searchReset1() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange1() {
-      this.page.currentPage = 1;
-      this.onLoad(this.page, this.query);
-    },
     /*人才列表多选 */
     selectionChange(list) {
       this.selectionList = list;
diff --git a/src/views/tenant/main/talents/latent/index.vue b/src/views/tenant/main/talents/latent/index.vue
index 585c870..d71a493 100644
--- a/src/views/tenant/main/talents/latent/index.vue
+++ b/src/views/tenant/main/talents/latent/index.vue
@@ -46,22 +46,6 @@
     </el-col>
     <el-col :span="19">
       <basic-container>
-        <!--搜索栏-->
-        <el-form size="small" label-position="right" :inline="true" style="padding-left: 10px; padding-right: 10px">
-          <el-row :span="24">
-            <el-form-item label="姓名:">
-              <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-form-item>
-
-            <div class="searchBtn">
-              <el-button type="primary" size="small" icon="el-icon-search" @click="searchChange1">搜 索</el-button>
-              <el-button size="small" icon="el-icon-delete" @click="searchReset1">清 空</el-button>
-            </div>
-          </el-row>
-        </el-form>
         <!--/搜索栏-->
         <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" v-model="obj"
                    :permission="permissionList" :before-open="beforeOpen" @row-del="rowDel" @row-update="rowUpdate"
@@ -281,6 +265,21 @@ export default {
         dialogType: "drawer",
         dialogClickModal: false,
         column: [
+          {
+            label: "所属机构",
+            prop: "deptId",
+            type: "tree",
+            multiple: false,
+            dicData: this.depTree,
+            props: {
+              label: "title",
+            },
+            hide: true,
+            checkStrictly: true,
+            span: 24,
+            search: true,
+            change: this.deptChange
+          },
           {
             label: "机构名称",
             prop: "companyName",
@@ -311,7 +310,8 @@ export default {
                 trigger: "blur",
               },
             ],
-            slot: true
+            slot: true,
+            search: true,
           },
           {
             label: "姓别",
@@ -337,6 +337,7 @@ export default {
               {required: true, message: "请输入身份证号", trigger: "blur"},
               {trigger: "blur", validator: IdCardNo},
             ],
+            search: true,
           },
           {
             label: "手机号",
@@ -1000,14 +1001,6 @@ export default {
       this.onLoad(this.page, params);
       done();
     },
-    searchReset1() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange1() {
-      this.page.currentPage = 1;
-      this.onLoad(this.page, this.query);
-    },
     /*人才列表多选 */
     selectionChange(list) {
       this.selectionList = list;
diff --git a/vue.config.js b/vue.config.js
index 59fcc13..30536d1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,7 +23,7 @@ module.exports = {
     port: 1888,
     proxy: {
       "/api": {
-        target: 'http://192.168.1.105:8000',
+        target: 'http://10.165.0.173:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {