From e551396f837fb765ad75f0b2d9341a0489a850f1 Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Wed, 5 Jun 2024 21:24:49 +0800
Subject: [PATCH] =?UTF-8?q?flat:=20=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 .../tenant/main/serve/Dialog/addGroup.vue     | 38 ++++++++++++++++++-
 src/views/tenant/main/serve/index.vue         |  4 +-
 .../tenant/main/talents/certain/index.vue     |  1 +
 .../tenant/main/talents/latent/index.vue      |  2 +
 .../main/talents/personnelserve/index.vue     |  2 +-
 6 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e53644..eaffe2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules
 /dist
+/manage
 
 /tests/e2e/videos/
 /tests/e2e/screenshots/
diff --git a/src/views/tenant/main/serve/Dialog/addGroup.vue b/src/views/tenant/main/serve/Dialog/addGroup.vue
index 23513c0..9866866 100644
--- a/src/views/tenant/main/serve/Dialog/addGroup.vue
+++ b/src/views/tenant/main/serve/Dialog/addGroup.vue
@@ -118,8 +118,20 @@ const initFormValue = {
   groupName: "",
   sort: 0,
 }
+const checkAtturbute = {
+  name: '',
+  serveLabels: [],
+  policyIds: [],
+  talentsGroupId: [],
+}
+const AtturbuteMessage = {
+  name: '请输入服务名称',
+  serveLabels: '请选择服务场景',
+  policyIds: '请选择政策指南',
+  talentsGroupId: '请输入重点人群',
+}
 const initServeForm = {
-  companyName: '',
+  // companyName: '',
   name: '',
   serveLabels: [],
   policyIds: [],
@@ -220,6 +232,18 @@ export default {
     },
     async handleSubmit() {
       if (this.selectServer.id) {
+        const keys = Object.keys(checkAtturbute)
+        for (let i = 0; i < keys.length; i++) {
+          if (Array.isArray(checkAtturbute[keys[i]])) {
+            if (!this.serveForm[keys[i]].length) {
+              return this.$message.warning(AtturbuteMessage[keys[i]]);
+            }
+          } else {
+            if (!this.serveForm[keys[i]]) {
+              return this.$message.warning(AtturbuteMessage[keys[i]]);
+            }
+          }
+        }
         let copyForm = deepClone(this.serveForm)
         let serve = {
           ...this.selectServer,
@@ -297,6 +321,18 @@ export default {
     changeCard(data) {
       // 校验
       if (this.selectServer.id) {
+        const keys = Object.keys(checkAtturbute)
+        for (let i = 0; i < keys.length; i++) {
+          if (Array.isArray(checkAtturbute[keys[i]])) {
+            if (!this.serveForm[keys[i]].length) {
+              return this.$message.warning(AtturbuteMessage[keys[i]]);
+            }
+          } else {
+            if (!this.serveForm[keys[i]]) {
+              return this.$message.warning(AtturbuteMessage[keys[i]]);
+            }
+          }
+        }
         let copyForm = deepClone(this.serveForm)
         let serve = {
           ...this.selectServer,
diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue
index cc9f6d8..6cfff3b 100644
--- a/src/views/tenant/main/serve/index.vue
+++ b/src/views/tenant/main/serve/index.vue
@@ -65,13 +65,13 @@
                          icon="el-icon-document"
                          size="small"
                          @click="matchWorkStation(row)"
-              >匹配任务/岗位
+              >查看匹配岗位
               </el-button>
               <el-button type="text"
                          icon="el-icon-document"
                          size="small"
                          @click="matchPolicy(row)"
-              >匹配政策
+              >查看匹配政策
               </el-button>
               <el-button type="text"
                          icon="el-icon-document"
diff --git a/src/views/tenant/main/talents/certain/index.vue b/src/views/tenant/main/talents/certain/index.vue
index 41b7005..7393b9a 100644
--- a/src/views/tenant/main/talents/certain/index.vue
+++ b/src/views/tenant/main/talents/certain/index.vue
@@ -705,6 +705,7 @@ export default {
           return talentsEliminate(params);
         })
         .then(() => {
+          this.initDept();
           this.onLoad(this.page, this.query);
           this.dialogFlag = false
           this.$message.success('操作成功');
diff --git a/src/views/tenant/main/talents/latent/index.vue b/src/views/tenant/main/talents/latent/index.vue
index e220103..05dbb29 100644
--- a/src/views/tenant/main/talents/latent/index.vue
+++ b/src/views/tenant/main/talents/latent/index.vue
@@ -733,6 +733,7 @@ export default {
             return talentsApproval(params);
           })
           .then(() => {
+            this.initDept();
             this.onLoad(this.page, this.query);
             this.dialogFlag = false
             this.$message.success('操作成功');
@@ -760,6 +761,7 @@ export default {
             return talentsApproval(params);
           })
           .then(() => {
+            this.initDept();
             this.onLoad(this.page, this.query);
             this.dialogFlag = false
             this.$message.success('操作成功');
diff --git a/src/views/tenant/main/talents/personnelserve/index.vue b/src/views/tenant/main/talents/personnelserve/index.vue
index 9c3e339..7dc1dea 100644
--- a/src/views/tenant/main/talents/personnelserve/index.vue
+++ b/src/views/tenant/main/talents/personnelserve/index.vue
@@ -414,7 +414,7 @@ export default {
     onLoad(page, params = {}) {
       const {releaseTimeRange} = params;
       let paramsed = {
-        currentPage: page.currentPage,
+        current: page.currentPage,
         pageSize: page.pageSize,
         ...this.query
       };