Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/components/tag-select/main.vue

@@ -37,7 +37,7 @@
           >{{ value }}</el-tag
         >
       </div>
-      <div class="tag-select-tip">请选择您所需的qq{{ name }}</div>
+      <div class="tag-select-tip">请选择您所需的标签：{{ name }}</div>
       <div class="tag-select-searchinp">
         <el-input
           v-model="search"

src/views/tenant/main/serve/index.vue

@@ -116,6 +116,7 @@
           </template>
           <!--/父子表-->
         </avue-crud>
+
         <!--批量导入-->
         <el-dialog title="导入" append-to-body :visible.sync="excelBox" :close-on-click-modal="false" width="555px">
           <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter"
@@ -139,7 +140,7 @@
       </basic-container>
       <ied ref="ied"></ied>
     </el-col>
-    
+
   </el-row>
   <!-- <serve-detail ref="copy" @back="backIndex" v-show="false"></serve-detail> -->
   <el-drawer
@@ -154,7 +155,7 @@
             :option="infoOption"
             :search.sync="search"
             :page.sync="infoPage"
-            @search-change="serveSearchChange" 
+            @search-change="serveSearchChange"
             @search-reset="serveResetChange"
             @size-change="infoSizeChange"
             @current-change="infoCurrentChange"
@@ -261,7 +262,7 @@ import {
 } from "@/api/tenant/serve";
 import { detail as missionDetail } from "@/api/tenant/mission";
 import { detail as workDetail } from "@/api/tenant/postzp";
-import { getWorkTypes } from "@/api/tenant/common";
+import {getLabelList, getWorkTypes} from "@/api/tenant/common";
 import { mapGetters } from "vuex";
 import addGroups from "./Dialog/addGroups";
 import transferGroups from "./Dialog/transferGroups";
@@ -671,9 +672,19 @@ export default {
   },
   created() {
     this.initDept();
-    this.getWorkTypes();
+    // this.getWorkTypes();
+    this.getLabelList();
   },
   methods: {
+    getLabelList() {
+      getLabelList().then( (res) => {
+        const arr = res.data.data.flatMap(obj => obj.child.map(item => item.concatName));
+        this.arr = arr.map(concatName => {
+          this.worktypeDic[concatName] = 1;
+          return concatName;
+        });
+      });
+    },
     showKeyAudience(row) {
       this.selectInfo = row
       this.getKeyAudience({
@@ -730,7 +741,6 @@ export default {
           const element = res.data.data[i];
           this.worktypeDic[element.name] = 1;
           this.arr.push(element.name)
-
         }
       });
     },
@@ -859,7 +869,7 @@ export default {
             detail(this.obj.id).then(
               (res) => {
                 this.obj = res.data.data;
-                this.tempWorkType = []
+                this.tempWorkType = this.obj.serveLabels.split(",");
                 done();
               },
               (error) => {
@@ -1213,7 +1223,7 @@ export default {
           this.workViewModel = res;
         })
       }
-      
+
     },
     // 启用服务
     playServe(row) {

src/views/tenant/main/talents/index.vue

@@ -307,7 +307,7 @@ export default {
             //     trigger: "blur",
             //   },
             // ],
-            slot: true,
+            // slot: true,
             addDisplay: false,
             // hide: true
           },