From 8542afd9301c0852def52f49dbc552c5e2cd7573 Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Wed, 5 Jun 2024 17:37:42 +0800
Subject: [PATCH] =?UTF-8?q?flat:=206.5=20=E7=89=88=E6=9C=AC=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=201.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/cuser/talents/index.vue      |  1 +
 .../tenant/main/talents/certain/index.vue     | 11 +--
 .../tenant/main/talents/latent/index.vue      | 13 ++--
 .../main/talents/personnelserve/index.vue     | 69 -------------------
 vue.config.js                                 |  2 +-
 5 files changed, 16 insertions(+), 80 deletions(-)

diff --git a/src/views/manage/cuser/talents/index.vue b/src/views/manage/cuser/talents/index.vue
index 6cbab0b..afda5a3 100644
--- a/src/views/manage/cuser/talents/index.vue
+++ b/src/views/manage/cuser/talents/index.vue
@@ -251,6 +251,7 @@ export default {
         calcHeight: 180,
         align: "center",
         menuAlign: "center",
+        addBtn: false,
         tip: false,
         columnBtn: false,
         searchBtn: true,
diff --git a/src/views/tenant/main/talents/certain/index.vue b/src/views/tenant/main/talents/certain/index.vue
index 319c74a..41b7005 100644
--- a/src/views/tenant/main/talents/certain/index.vue
+++ b/src/views/tenant/main/talents/certain/index.vue
@@ -81,11 +81,11 @@
                        @click="handleTransfer"
                        v-show="vaildData(permission.tenant_main_talents_certain_index_transfergroup, false)">转移推送
             </el-button>
-            <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
-                       :disabled="!selectionList.length" plain
-                       v-show="vaildData(permission.tenant_main_talents_certain_index_transfergroup, false)">
-              删除
-            </el-button>
+            <!--            <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"-->
+            <!--                       :disabled="!selectionList.length" plain-->
+            <!--                       v-show="vaildData(permission.tenant_main_talents_certain_index_transfergroup, false)">-->
+            <!--              删除-->
+            <!--            </el-button>-->
           </template>
           <template slot="name" slot-scope="{row}">
             <span>{{ row.name }}</span>
@@ -336,6 +336,7 @@ export default {
         align: "center",
         menuAlign: "center",
         tip: false,
+        delBtn: false,
         columnBtn: false,
         searchBtn: true,
         searchShow: true,
diff --git a/src/views/tenant/main/talents/latent/index.vue b/src/views/tenant/main/talents/latent/index.vue
index dfd9b2d..e220103 100644
--- a/src/views/tenant/main/talents/latent/index.vue
+++ b/src/views/tenant/main/talents/latent/index.vue
@@ -81,11 +81,11 @@
                        @click="handleTransfer"
                        v-show="vaildData(permission.tenant_main_talents_latent_index_tansfergroup, false)">转移推送
             </el-button>
-            <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
-                       :disabled="!selectionList.length" plain
-                       v-show="vaildData(permission.tenant_main_talents_latent_index_tansfergroup, false)">
-              删除
-            </el-button>
+            <!--            <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"-->
+            <!--                       :disabled="!selectionList.length" plain-->
+            <!--                       v-show="vaildData(permission.tenant_main_talents_latent_index_tansfergroup, false)">-->
+            <!--              删除-->
+            <!--            </el-button>-->
           </template>
           <template slot="name" slot-scope="{row}">
             <span>{{ row.name }}</span>
@@ -342,6 +342,7 @@ export default {
         tip: false,
         columnBtn: false,
         searchBtn: true,
+        delBtn: false,
         searchShow: true,
         viewBtn: true,
         menuWidth: 170,
@@ -719,6 +720,7 @@ export default {
         let params = {
           idNumber: this.dialogInfo.idNumber,
           id: this.dialogInfo.id,
+          name: this.dialogInfo.name,
           approvalStatus: 1,
           content: value,
         }
@@ -744,6 +746,7 @@ export default {
         let params = {
           idNumber: this.dialogInfo.idNumber,
           id: this.dialogInfo.id,
+          name: this.dialogInfo.name,
           approvalStatus: 0,
           content: value,
           groupId: this.GroupValue
diff --git a/src/views/tenant/main/talents/personnelserve/index.vue b/src/views/tenant/main/talents/personnelserve/index.vue
index d1ccc1a..9d3a2ba 100644
--- a/src/views/tenant/main/talents/personnelserve/index.vue
+++ b/src/views/tenant/main/talents/personnelserve/index.vue
@@ -15,13 +15,6 @@
         @size-change="sizeChange"
         class="customPage"
       >
-        <!--自定义列-->
-        <template slot="labelsBase" slot-scope="{ row }">
-          <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>
 
         <template slot-scope="{row}" slot="menu">
           <el-button type="text"
@@ -302,68 +295,6 @@ export default {
             ],
             span: 24,
           },
-          {
-            label: "经办时间",
-            prop: "aae036",
-            display: false,
-            span: 24,
-            rules: [
-              {required: true, message: "请输入经办时间", trigger: "blur"},
-            ],
-          },
-          {
-            label: "用户类型",
-            prop: "userId",
-            type: "select",
-            dicData: [
-              {
-                value: "0",
-                label: "未注册用户",
-              },
-              {
-                value: "1",
-                label: "已注册用户",
-              },
-            ],
-            display: false,
-            hide: true,
-            // search: true
-          },
-          {
-            label: "分组",
-            prop: "groupId",
-            type: "tree",
-            span: 24,
-            display: true,
-            dicData: self.treeData,
-            props: {
-              label: "groupName",
-              value: "id",
-            },
-            rules: [
-              {
-                required: true,
-                message: "请选择分组",
-                trigger: "change",
-              },
-            ],
-            placeholder: "请选择 分组",
-          },
-          {
-            label: "标签名称",
-            prop: "labelsBase",
-            rules: [
-              {
-                required: true,
-                message: "请选择标签名称",
-                trigger: ["blur"],
-              },
-            ],
-            slot: true,
-            formslot: true,
-            span: 24,
-          },
-
           {
             label: "备注",
             prop: "remarks",
diff --git a/vue.config.js b/vue.config.js
index fe2292a..74507a2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,7 +24,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: {