Merge remote-tracking branch 'origin/master'

src/api/company/companyUser.js

@@ -111,3 +111,12 @@ export function changeCompanyUser(data, params) {
     params: params
   })
 }
+
+// 查询企业员工信息列表
+export function getCompanyUserListPage(query) {
+  return request({
+    url: '/company/companyUser/getCompanyUserListPage',
+    method: 'get',
+    params: query
+  })
+}

src/views/company/companyDomainBind/index.vue

@@ -82,7 +82,7 @@
           icon="el-icon-paperclip"
           size="mini"
           @click="handleBindingOpen"
-        >批量分配
+        >批量分配销售
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -178,50 +178,42 @@
       <el-scrollbar style="height: 692px;">
         <h3>选择分配域名:</h3>
         <el-divider></el-divider>
-        <el-form :model="dialog.company.queryParams" ref="companyQueryForm" :inline="true" label-width="68px">
-          <el-form-item label="公司名称" prop="companyName">
-            <el-input
-              v-model="dialog.company.queryParams.companyName"
-              placeholder="请输入销售公司名称"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="域名" prop="domain">
-            <el-input
-              v-model="dialog.company.queryParams.domain"
-              placeholder="请输入域名名称"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="companyHandleDialogQuery">搜索
-            </el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="companyResetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-        <el-table border v-loading="dialog.company.loading" :data="dialog.company.companyList"
-                  @selection-change="handleCompanySelectionChange"
-        >
-          <el-table-column type="selection" width="55" align="center"/>
-          <el-table-column label="编码" align="center" prop="id"/>
-          <el-table-column label="绑定域名" align="center" prop="domain"/>
-        </el-table>
+<!--        <el-form :model="dialog.company.queryParams" ref="companyQueryForm" :inline="true" label-width="68px">-->
+<!--          <el-form-item label="公司名称" prop="companyName">-->
+<!--            <el-input-->
+<!--              v-model="dialog.company.queryParams.companyName"-->
+<!--              placeholder="请输入销售公司名称"-->
+<!--              clearable-->
+<!--              size="small"-->
+<!--              @keyup.enter.native="handleQuery"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="域名" prop="domain">-->
+<!--            <el-input-->
+<!--              v-model="dialog.company.queryParams.domain"-->
+<!--              placeholder="请输入域名名称"-->
+<!--              clearable-->
+<!--              size="small"-->
+<!--              @keyup.enter.native="handleQuery"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item>-->
+<!--            <el-button type="primary" icon="el-icon-search" size="mini" @click="companyHandleDialogQuery">搜索-->
+<!--            </el-button>-->
+<!--            <el-button icon="el-icon-refresh" size="mini" @click="companyResetQuery">重置</el-button>-->
+<!--          </el-form-item>-->
+<!--        </el-form>-->
         <el-row :span="24">
-          <el-col :span="3">
-            <span style="margin-top: 100px">已选中绑定公司：{{ dialog.company.ids.length }}条</span>
-          </el-col>
-          <el-col :span="20">
-            <pagination
-              v-show="dialog.company.total>0"
-              :total="dialog.company.total"
-              :page.sync="dialog.company.queryParams.pageNum"
-              :limit.sync="dialog.company.queryParams.pageSize"
-              @pagination="getCompanyList()"
-            />
+          <el-col :span="24">
+            <span>选择域名：</span>
+            <el-select v-model="dialog.company.domainId" filterable placeholder="请选择" @change="domainChange">
+              <el-option
+                v-for="item in dialog.company.companyList"
+                :key="item.id"
+                :label="item.domain"
+                :value="item.id">
+              </el-option>
+            </el-select>
           </el-col>
         </el-row>
         <el-divider></el-divider>
@@ -299,7 +291,7 @@ import {
   exportCompanyDomainBind,
   domainBatchBinding
 } from '@/api/company/companyDomainBind'
-import { listCompanyUser } from '@/api/company/companyUser'
+import { getCompanyUserListPage } from '@/api/company/companyUser'
 import companyBindUser from '@/views/company/companyBindUser/index.vue'
 
 export default {
@@ -388,7 +380,8 @@ export default {
           // 总条数
           total: 0,
           //选中数组
-          ids: []
+          ids: [],
+          domainId:null,
         }
       },
       bindingDetailsOpen: false,
@@ -420,6 +413,15 @@ export default {
     }
   },
   methods: {
+    domainChange(){
+      if(this.dialog.company.domainId){
+        this.dialog.company.ids.push(this.dialog.company.domainId);
+      }
+    },
+    //判断勾选
+    selectable(row, index) {
+      return this.displayBoolean;
+    },
     handleClose(done) {
       this.$confirm('确认关闭？')
         .then(_ => {
@@ -585,7 +587,7 @@ export default {
     /** 查询域名管路列表 */
     getDialogList() {
       this.dialog.companyUser.loading = true
-      listCompanyUser(this.dialog.companyUser.queryParams).then(response => {
+      getCompanyUserListPage(this.dialog.companyUser.queryParams).then(response => {
         this.dialog.companyUser.companyDomainList = response.rows
         this.dialog.companyUser.total = response.total
         this.dialog.companyUser.loading = false
@@ -598,6 +600,7 @@ export default {
     // 多选框选中数据
     handleCompanySelectionChange(selection) {
       this.dialog.company.ids = selection.map(item => item.id)
+      this.displayBoolean = this.dialog.company.ids.length <= 0;
     },
     /** 查询企业列表 */
     getCompanyList() {
@@ -615,6 +618,7 @@ export default {
       this.dialog.companyUser.queryParams.domain = null
       this.dialog.company.ids = []
       this.dialog.company.queryParams.companyName = null
+      this.dialog.company.domainId = null;
     },
     //绑定提交
     bindSubmission() {
@@ -636,6 +640,8 @@ export default {
     //处理绑定
     handleBindingOpen() {
       this.bindingOpen = !this.bindingOpen
+      this.dialog.company.queryParams.pageNum=null;
+      this.dialog.company.queryParams.pageSize=null;
       this.getDialogList()
       this.getCompanyList()
     },