flat: signGroup

src/views/tenant/main/serve/Dialog/pushService.vue

@@ -27,7 +27,7 @@
                        v-for="item in leftServeOptions"
                        :key="item.id"
                        :label="item.groupName"
-                       :value="item.id">
+                       :value="item.value">
                      </el-option>
                    </el-select>
                    <el-button size="small" slot="append" class="input-search" @click="leftSearch">搜索</el-button>
@@ -86,12 +86,21 @@
 </template>
 
 <script>
-import { getListAllByLabels, getListGroupByLabels, getServeAllPolicyList, getListByids, getSearchAll, pushPolicyUserServe, pushPostUserServe } from "@/api/tenant/serve.js";
+import {
+  getListAllByLabels,
+  getListGroupByLabels,
+  getServeAllPolicyList,
+  getListByids,
+  getSearchAll,
+  pushPolicyUserServe,
+  pushPostUserServe,
+  getListAllByPolicy
+} from "@/api/tenant/serve.js";
 import TextTooltip from "@/components/text-tooltip/index.vue";
 import {debounce} from '@/util/util'
 import {DateTime} from "@/util/dateTime";
 import CustomLoading from "@/components/Custom-Loading/index.vue";
-const pages = { pagerCount: 3, total: 0, size: 10, current: 1 }
+const pages = { pagerCount: 3, total: 0, size: 10, currentPage: 1 }
 const baseOptions = {
   size: 'medium',
   dateBtn: false,
@@ -194,7 +203,7 @@ export default {
     onPageLoad() {
       console.log('row', this.rowData)
       if(!this.rowData) return
-      this.getLeftServeList()
+      this.getLeftSignGroupList()
       this.getLeftUserList()
       // this.getRightListPolicy()
     },
@@ -231,16 +240,19 @@ export default {
       this.getRightSearch()
     }, 1000),
     leftSearch() {
-      console.log('search', this.formInline)
+      this.leftPages.currentPage = 1
       this.getLeftUserList('serve')
+      console.log('leftpages:', this.leftPages)
     },
     leftCurrentPageChange(current) {
-      this.leftPages.current = current
+      this.leftPages.currentPage = current
       this.getLeftUserList()
+      console.log('leftpages:', this.leftPages)
     },
     leftSizePageChange(current) {
       this.leftPages.size = current
       this.getLeftUserList()
+      console.log('leftpages:', this.leftPages)
     },
     leftSelectionChange(val) {
       this.leftUserSelections = val
@@ -327,35 +339,39 @@ export default {
       }
     },
     async getLeftUserList(type) {
-      const {current, size} = this.leftPages
+      const {currentPage, size} = this.leftPages
       const createTime = Date.now() + 3000
       let params = {
         ...this.formInline,
-        current, size,
-        labels: this.rowData.serveLabels,
+        current: currentPage,
+        size,
+        labels: this.rowData.talentsNames.join(','),
       }
-      console.log(params)
+      console.log('params', params)
       // params.labels = '未分组'
       this.leftLoading = true
-      let resData = await getListAllByLabels(params)
+      let resData = await getListAllByPolicy(params)
       if ( resData.data.code === 200 ) {
         const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
         setTimeout(() => {
           const { records, total, size, current } = resData.data.data
           this.leftUserDataList = records
-          this.leftPages = { total, size, current }
+          this.leftPages = { total, size, currentPage: current }
+          console.log('leftpages:', this.leftPages)
           this.leftLoading = false
         }, timed)
 
       }
     },
-    async getLeftServeList() {
-      let params = { labels: this.rowData.serveLabels }
+    async getLeftSignGroupList() {
+      const arr = this.rowData.talentsNames.map((v) => ({ groupName: v, value: v }))
+      this.leftServeOptions = [{groupName: '全部' }, ...arr]
+      // let params = { labels: this.rowData.talentsNames.join(',') }
       // params.labels = '未分组'
-      let resData = await getListGroupByLabels(params)
-      if ( resData.data.code === 200 ) {
-        this.leftServeOptions = [{groupName: '全部', value: ''}, ...resData.data.data]
-      }
+      // let resData = await getListAllByPolicy(params)
+      // if ( resData.data.code === 200 ) {
+      //   this.leftServeOptions = [{groupName: '全部', value: ''}, ...resData.data.data]
+      // }
     }
   }
 }

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

@@ -945,8 +945,14 @@ export default {
     },
     selectPushService(row) {
       console.log('点击')
-      this.selectPushServiceData = deepClone(row)
-      this.PushServiceVisible = true
+      detail(row.id).then((res) => {
+        if(res.data.code === 200) {
+          this.selectPushServiceData = res.data.data
+          this.PushServiceVisible = true
+        }
+      })
+      // this.selectPushServiceData = deepClone(row)
+      // this.PushServiceVisible = true
     },
     handleChange(item) {
       console.log(item)