diff --git a/src/views/basic/collectPoint/gatherOrderType.vue b/src/views/basic/collectPoint/gatherOrderType.vue
index 3cd0e675..9f78edb7 100644
--- a/src/views/basic/collectPoint/gatherOrderType.vue
+++ b/src/views/basic/collectPoint/gatherOrderType.vue
@@ -66,16 +66,16 @@
       <el-dialog
         :title="fromMap[fromName]"
         :visible.sync="addCollectionPointsDialogVisible"
-        width="40%"
+        width="60%"
         v-if="addCollectionPointsDialogVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
       >
-        <el-form :model="formData" style="width: 80%;" ref="dataForm" :rules="formRules"
+        <el-form :model="formData" style="width: 100%;" ref="dataForm" :rules="formRules"
                  label-width="auto"
         >
-          <el-row :gutter="20" class="el-row">
-            <el-col :span="24" class="el-col">
+          <el-row :gutter="24" class="el-row">
+            <el-col :span="12" class="el-col">
               <el-form-item label="单据类型编号:" prop="code" class="query-form-item">
                 <el-input
                   placeholder="请输入单据类型编号"
@@ -84,7 +84,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="el-col">
+            <el-col :span="12" class="el-col">
               <el-form-item label="单据类型名称:" prop="name" class="query-form-item">
                 <el-input
                   placeholder="请输入单据类型名称"
@@ -93,7 +93,9 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="el-col">
+          </el-row>
+          <el-row :gutter="24" class="el-row">
+            <el-col :span="12" class="el-col">
               <el-form-item label="出入库类型:" prop="mainAction" class="query-form-item">
                 <el-select v-model="formData.mainAction" style="width: 80%" placeholder="请选择出入库类型" clearable>
                   <el-option label="出库" :value="mainActionMap.out"></el-option>
@@ -101,7 +103,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="el-col">
+            <el-col :span="12" class="el-col">
               <el-form-item label="是否内单据:" prop="innerOrder" class="query-form-item">
                 <el-select v-model="formData.innerOrder" style="width: 80%" placeholder="请选择" clearable>
                   <el-option label="否" :value="0"></el-option>
@@ -109,7 +111,9 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="el-col">
+          </el-row>
+          <el-row :gutter="24" class="el-row">
+            <el-col :span="12" class="el-col">
               <el-form-item label="来源系统:" prop="name" class="query-form-item">
                 <el-input
                   placeholder="请输入来源系统"
@@ -119,17 +123,19 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="24" class="el-col">
+            <el-col :span="12" class="el-col">
               <el-form-item label="所属仓库:" prop="invCode" class="query-form-item">
                 <invSelect :value.sync="formData.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"
                            style="width: 80%"
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="el-col">
+          </el-row>
+            <el-row :gutter="24" class="el-row">
+            <el-col :span="22" class="el-col">
               <el-form-item label="备注:" prop="remark" class="query-form-item">
                 <el-input
-                  v-model="formData.remark" style="width: 80%"
+                  v-model="formData.remark" style="width: 100%"
                   auto-complete="off"
                 ></el-input>
               </el-form-item>
@@ -193,6 +199,12 @@ export default {
         ],
         invCode: [
           { required: true, message: '请选择单据所属仓库', trigger: 'blur' }
+        ],
+        mainAction: [
+          { required: true, message: '请选择出入库类型', trigger: 'blur' }
+        ],
+        innerOrder: [
+          { required: true, message: '是否内部单据', trigger: 'blur' }
         ]
       },
       mainActions: {
@@ -200,8 +212,8 @@ export default {
         WareHouseOut: '出库'
       },
       innerOrderMap: {
-        1: '是',
-        2: '否'
+        0: '否',
+        1: '是'
       },
       mainActionMap: {
         in: 'WareHouseIn',
@@ -271,19 +283,18 @@ export default {
     formSubmit() {
       if (this.fromName == 'add') {
         this.$refs['dataForm'].validate((valid) => {
-          if (!valid) {
-            return this.$message.error('请完善单据信息!')
+          if (valid) {
+            addCollectBusType(this.formData).then(res => {
+              if (res.code == 20000) {
+                this.$message.success('新增成功')
+                this.addCollectionPointsDialogVisible = false
+                this.getList()
+              } else {
+                this.$message.error('新增失败')
+              }
+            }).catch(() => {
+            })
           }
-          addCollectBusType(this.formData).then(res => {
-            if (res.code == 20000) {
-              this.$message.success('新增成功')
-              this.addCollectionPointsDialogVisible = false
-              this.getList()
-            } else {
-              this.$message.error('新增失败')
-            }
-          }).catch(() => {
-          })
         })
       } else {
         updateCollectBusType(this.formData).then(res => {
diff --git a/src/views/basic/collectPoint/selectWorkplace.vue b/src/views/basic/collectPoint/selectWorkplace.vue
index dd8961c6..094e3424 100644
--- a/src/views/basic/collectPoint/selectWorkplace.vue
+++ b/src/views/basic/collectPoint/selectWorkplace.vue
@@ -35,12 +35,14 @@
           <el-button type="primary" icon="el-icon-plus" @click="addWork">选入工位</el-button>
         </el-button-group>
       </div>
-      <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }" highlight-current-row @current-change="handCurrentChange"
+      <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }" highlight-current-row @current-change="handCurrentChange" ref="table"
       >
-        <el-table-column label width="45">
-          <template slot-scope="scope">
-            <el-radio :label="scope.row.workplaceId" v-model="radioCheck"><span></span></el-radio>
-          </template>
+        <!--<el-table-column label width="45">-->
+        <!--  <template slot-scope="scope">-->
+        <!--    <el-radio :label="scope.row.workplaceId" v-model="radioCheck"><span></span></el-radio>-->
+        <!--  </template>-->
+        <!--</el-table-column>-->
+        <el-table-column type="selection" width="55" :selectable="checkSelectable">
         </el-table-column>
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column>
@@ -298,6 +300,10 @@ export default {
       type: Object,
       required: true,
     },
+    workPlaceCode: {
+      type: Array,
+      required: true,
+    },
   },
   data() {
     return {
@@ -309,7 +315,7 @@ export default {
       },
       workQuery: {
         userId: null,
-        workplaceId: null
+        workplaceId: []
       },
       showSearch: true,
       Dictionary: true,
@@ -356,7 +362,8 @@ export default {
         2: '禁止录入',
       },
       radioCheck: '',
-      rowData: {}
+      rowData: {},
+      rowList:[]
     }
   },
   methods: {
@@ -551,8 +558,9 @@ export default {
         })
     },
     handCurrentChange(row){
-      this.radioCheck = row.workplaceId
-      this.rowData = row
+      this.rowList = row
+      // this.workQuery.workplaceId = row
+      // this.rowData = row
     },
     handleNodeClick(row){
       this.query.code = row.code
@@ -561,8 +569,14 @@ export default {
 
     //选入工位
     addWork(){
+      let selectList = this.$refs.table.selection
+      let list = selectList.map(item => item.workplaceId)
       this.workQuery.userId = this.userId
-      this.workQuery.workplaceId = this.rowData.workplaceId
+      this.workQuery.workplaceId = list
+      if (list.length == 0){
+         // return this.closeDialog()
+        return this.$message.error("未选择工位或该用户已没有可增加工位")
+      }
       userBindWork(this.workQuery).then(res => {
         if (res.code == 20000){
           this.closeDialog()
@@ -570,11 +584,24 @@ export default {
         }else {
           this.$message.error(res.message)
         }
+      }).catch(() => {
+
       })
     },
     checkDetail(row){
       this.formData = row
       this.WorkplaceDialogVisible = true
+    },
+    checkSelectable(row) {
+      if (this.workPlaceCode == null) {
+        return true
+      } else {
+        if (this.workPlaceCode.length > 0) {
+          return this.workPlaceCode.indexOf(row.workplaceId) === -1
+        } else {
+          return true
+        }
+      }
     }
   },
   created() {
diff --git a/src/views/basic/collectPoint/userWorkplace.vue b/src/views/basic/collectPoint/userWorkplace.vue
index 509a8d7b..abcbbaf1 100644
--- a/src/views/basic/collectPoint/userWorkplace.vue
+++ b/src/views/basic/collectPoint/userWorkplace.vue
@@ -2,23 +2,28 @@
   <div>
     <el-card>
       <div>
-
-        <el-form :model="userQuery" label-width="auto" v-show="showSearch" size="mini" class="order-el-form">
-          <el-row :gutter="20">
+        <el-form :inline="true" :model="userQuery" size="mini" v-if="showSearch">
+          <el-row>
             <el-col :span="8">
               <el-form-item label="当前仓库:" class="query-form-item">
                 <invSelect :value.sync="userQuery.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="账号/名称:" class="query-form-item">
-                <el-input v-model="userQuery.key" placeholder="请输入账号/名称" clearable>
+              <el-form-item label="账号/名称:">
+                <el-input v-model="userQuery.userKey" placeholder="请输入账号/名称" clearable>
                 </el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="所属部门:">
+                <el-input v-model="query.deptName" placeholder="所属部门" clearable></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
 
+
         <div class="top-right-btn">
           <el-button-group>
             <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
@@ -26,12 +31,14 @@
             <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
           </el-button-group>
         </div>
-        <el-table v-loading="loading" :data="userList" style="width: 100%" :row-style="{height: '32px' }"
+        <el-table v-loading="loading" :data="userList" style="width: 100%" :row-style="{height: '32px' }" ref="userTable"
                   @current-change="handCurrentChange" highlight-current-row
         >
           <el-table-column type="index" label="序号"></el-table-column>
           <el-table-column label="用户账号" prop="userName"></el-table-column>
-          <el-table-column label="用名称" prop="employeeName"></el-table-column>
+          <el-table-column label="用户名称" prop="employeeName"></el-table-column>
+          <el-table-column label="用户仓库" prop="invName"></el-table-column>
+          <el-table-column label="所属部门" prop="deptName"></el-table-column>
           <el-table-column label="备注" prop="remark"></el-table-column>
           <!--<el-table-column label="操作" fixed="right" width="100">-->
           <!--  <template slot-scope="scope">-->
@@ -67,7 +74,7 @@
     </el-card>
     <el-tabs type="border-card" style="margin: 15px">
       <el-tab-pane>
-        <span slot="label">{{ rowData.employeeName }}-工位列表</span>
+        <span slot="label">{{ employeeName }}-工位列表</span>
         <el-form :inline="true" :model="workQuery" class="query-form" size="mini">
           <el-form-item class="query-form-item" label="工位编码/工位名称:">
             <el-input
@@ -108,7 +115,7 @@
               <span>{{ operationTypes[scope.row.operationType] }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="结果处理" prop="checkInsert" width="150">
+          <el-table-column label="结果处理" prop="checkInsert" width="100">
             <template slot-scope="scope">
               <span>{{ checkInserts[scope.row.checkInsert] }}</span>
             </template>
@@ -119,7 +126,7 @@
             </template>
           </el-table-column>
           <el-table-column label="负责人" prop="employeeName" width="90"></el-table-column>
-          <el-table-column label="往来单位标题" prop="unitTittle" width="90"></el-table-column>
+          <el-table-column label="往来单位标题" prop="unitTittle" width="100"></el-table-column>
           <el-table-column label="创建时间" prop="createTime" width="90"></el-table-column>
           <el-table-column label="备注" prop="remake" width="90"></el-table-column>
           <el-table-column label="操作" fixed="right" width="100">
@@ -162,6 +169,7 @@
       <selectWorkplace
         :userId="userId"
         :closeDialog="closeDialog"
+        :workPlaceCode="workPlaceCode"
       >
 
       </selectWorkplace>
@@ -336,6 +344,7 @@
 <script>
 import { getUserBindWork, getUsers,delUserBindWork } from '@/api/basic/collectPoint/userWorkplace'
 import selectWorkplace from './selectWorkplace'
+import { authAdminList } from '@/api/auth/authAdmin'
 
 export default {
   components: { selectWorkplace },
@@ -356,7 +365,9 @@ export default {
         page: 1,
         limit: 10,
         invCode: this.$store.getters.locInvCode,
-        key: ''
+        key: '',
+        userKey: '',
+        deptName: ''
       },
       workQuery: {
         page: 1,
@@ -379,10 +390,12 @@ export default {
         2: '禁止录入'
       },
       userId: '',
+      workPlaceCode: [],
       addWorkplaceDialogVisible: false,
       formData: null,
       userTotal: 0,
       workTotal: 0,
+      employeeName: '用户'
     }
   },
   methods: {
@@ -402,6 +415,9 @@ export default {
       this.getUsers()
     },
     onSubmit() {
+      this.workList = []
+      this.employeeName =  '用户'
+      this.$refs.userTable.setCurrentRow(null);
       this.userQuery.page = 1
       this.getUsers()
     },
@@ -418,19 +434,35 @@ export default {
       this.workQuery.userId = this.rowData.id
       this.getUserBindWork(this.workQuery)
     },
+    // getUsers() {
+    //   getUsers(this.userQuery).then(res => {
+    //     if (res.code == 20000) {
+    //       this.userList = res.data.list || []
+    //       this.userTotal = res.data.total
+    //     } else {
+    //       this.$message.error('获取错误')
+    //     }
+    //   })
+    // },
     getUsers() {
-      getUsers(this.userQuery).then(res => {
-        if (res.code == 20000) {
-          this.userList = res.data.list || []
-          this.userTotal = res.data.total
-        } else {
-          this.$message.error('获取错误')
-        }
-      })
+      this.loading = true;
+      this.userQuery.key = 'key';
+      authAdminList(this.userQuery)
+        .then(response => {
+          this.loading = false;
+          this.userList = response.data.list || [];
+          this.userTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.userList = [];
+          this.userTotal = 0;
+        });
     },
     handCurrentChange(row) {
       this.rowData = row
       this.workQuery.userId = row.id
+      this.employeeName = row.employeeName
       this.getUserBindWork(this.workQuery)
     },
     getUserBindWork(query){
@@ -448,6 +480,7 @@ export default {
         return this.$message.error('请先选择用户')
       }
       this.userId = this.rowData.id
+      this.workPlaceCode =  this.workList.map(item => item.workplaceId);
       this.selectUserWorkDialogVisible = true
     },
     closeDialog() {
@@ -466,6 +499,8 @@ export default {
         }
         delUserBindWork(query).then(res => {
           if (res.code == 20000) {
+            this.workQuery.userId = this.rowData.id
+            this.getUserBindWork(this.workQuery)
             this.$message.success('移除成功')
           }else {
             this.$message.error(res.message)
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 5b470c9d..2237ef1f 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -112,15 +112,15 @@
             <el-table-column label="工位编码" prop="workplaceId" width="90"></el-table-column>
             <el-table-column label="工位名称" prop="workplaceName" width="90"></el-table-column>
             <el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>
-            <el-table-column label="来源单据类型编号" prop="busTypeCode" width="150"></el-table-column>
-            <el-table-column label="来源单据类型名称" prop="busTypeName" width="150"></el-table-column>
+            <el-table-column label="单据类型编号" prop="busTypeCode" width="100"></el-table-column>
+            <el-table-column label="单据类型名称" prop="busTypeName" width="100"></el-table-column>
             <el-table-column label="所属仓库" prop="invName" width="90"></el-table-column>
-            <el-table-column label="作业方式" prop="operationType" width="90">
+            <el-table-column label="作业方式" prop="operationType" width="120">
               <template slot-scope="scope">
                 <span>{{ operationTypes[scope.row.operationType] }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="结果处理" prop="checkInsert" width="150">
+            <el-table-column label="结果处理" prop="checkInsert" width="100">
               <template slot-scope="scope">
                 <span>{{ checkInserts[scope.row.checkInsert] }}</span>
               </template>
@@ -131,9 +131,9 @@
               </template>
             </el-table-column>
             <el-table-column label="负责人" prop="employeeName" width="90"></el-table-column>
-            <el-table-column label="往来单位标题" prop="unitTittle" width="90"></el-table-column>
-            <el-table-column label="创建时间" prop="createTime" width="90"></el-table-column>
-            <el-table-column label="备注" prop="remake" width="90"></el-table-column>
+            <el-table-column label="往来单位标题" prop="unitTittle" width="120"></el-table-column>
+            <el-table-column label="创建时间" prop="createTime" width="120"></el-table-column>
+            <el-table-column label="备注" prop="remake" width="120"></el-table-column>
             <el-table-column label="操作" fixed="right" width="120">
               <template slot-scope="scope">
                 <el-button
@@ -167,13 +167,15 @@
             </pagination>
         </el-card>
           <el-card>
+            <div>{{this.rowData.workplaceName}}-用户列表</div>
+
             <el-form :inline="true" :model="userQuery" class="query-form" size="mini"
-                     style="margin-top: 30px;margin-bottom: 10px" v-if="rowData != null"
+                     style="margin-top: 30px;margin-bottom: 10px"
             >
-              <el-form-item class="query-form-item" label="工位编码/工位名称:">
+              <el-form-item class="query-form-item" label="用户账号/用户名称:">
                 <el-input
                   v-model="userQuery.userKey"
-                  placeholder="请输入工位编码/名称"
+                  placeholder="请输入用户账号/名称"
                   clearable
                 ></el-input>
               </el-form-item>
@@ -195,7 +197,6 @@
             </el-form>
 
             <el-table v-loading="userLoading" :data="userList" style="width: 100%;" :row-style="{height: '32px' }"
-                      v-if="rowData != null"
                       highlight-current-row
             >
               <el-table-column type="index" label="序号"></el-table-column>
@@ -241,16 +242,16 @@
     <el-dialog
       :title="fromMap[fromName]"
       :visible.sync="addWorkplaceDialogVisible"
-      width="40%"
+      width="60%"
       v-if="addWorkplaceDialogVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
     >
-      <el-form :model="formData" style="width: 60%;" ref="dataForm" :rules="formRules"
+      <el-form :model="formData" style="width: 100%;" ref="dataForm" :rules="formRules"
                label-width="auto"
       >
-        <el-row :gutter="20" class="el-row">
-          <el-col :span="24" class="el-col">
+        <el-row :gutter="24" class="el-row">
+          <el-col :span="12" class="el-col">
             <el-form-item label="工位编码:" prop="workplaceId" class="query-form-item">
               <el-input
                 disabled
@@ -259,7 +260,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24" class="el-col">
+          <el-col :span="12" class="el-col">
             <el-form-item label="工位名称:" prop="workplaceName" class="query-form-item">
               <el-input
                 v-model="formData.workplaceName" style="width: 80%"
@@ -267,9 +268,10 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
 
-
-          <el-col :span="24" class="el-col">
+          <el-row :gutter="24" class="el-row">
+          <el-col :span="12" class="el-col">
             <el-form-item label="作业方式:" prop="operationType" class="query-form-item">
               <el-select v-model="formData.operationType" style="width: 80%" placeholder="选择扫码方式" clearable>
                 <el-option label="扫码生成业务单" :value="1"></el-option>
@@ -280,7 +282,7 @@
           </el-col>
 
 
-          <el-col :span="24" class="el-col">
+          <el-col :span="12" class="el-col">
             <el-form-item label="结果处理:" prop="checkInsert" class="query-form-item">
               <el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式" clearable>
                 <el-option label="不插入" :value="1"></el-option>
@@ -289,7 +291,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24" class="el-col">
+          <el-col :span="12" class="el-col">
             <el-form-item label="提醒方式:" prop="warnType" class="query-form-item">
               <el-select v-model="formData.warnType" style="width: 80%" placeholder="选择扫码方式" clearable>
                 <el-option label="信息提醒" :value="1"></el-option>
@@ -298,7 +300,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24" class="el-col">
+          <el-col :span="12" class="el-col">
             <el-form-item label="所属仓库:" prop="invCode" class="query-form-item">
               <el-select v-model="formData.invCode" placeholder="请选择所属仓库"
                          style="width: 80%"
@@ -316,7 +318,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24" class="el-col">
+          <el-col :span="12" class="el-col">
             <el-form-item label="工位负责人:" prop="chargeUser" class="query-form-item">
               <el-select v-model="formData.chargeUser" placeholder="请选择负责人"
                          style="width: 80%"
@@ -337,7 +339,7 @@
               <!--&gt;</el-input>-->
             </el-form-item>
           </el-col>
-          <el-col :span="24" class="el-col">
+          <el-col :span="12" class="el-col">
             <el-form-item label="单据类型:" prop="busType" class="query-form-item">
               <el-select v-model="formData.orderId" placeholder="请选择单据类型"
                          style="width: 80%"
@@ -373,7 +375,7 @@
           <!--</el-col>-->
 
 
-          <el-col :span="24" class="el-col">
+          <el-col :span="12" class="el-col">
             <el-form-item label="往来类型标题:" prop="remake" class="query-form-item">
               <el-input
                 v-model="formData.unitTittle" style="width: 80%"
@@ -381,17 +383,18 @@
               ></el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :span="24" class="el-col">
-            <el-form-item label="备注:" prop="unitTittle" class="query-form-item">
-              <el-input
-                v-model="formData.remake" style="width: 80%"
-                auto-complete="off"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-
         </el-row>
+        <el-row :gutter="24" class="el-row">
+        <el-col :span="22" class="el-col">
+          <el-form-item label="备注:" prop="unitTittle" class="query-form-item">
+            <el-input
+              v-model="formData.remake" style="width: 100%"
+              auto-complete="off"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        </el-row>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click.native="hideForm">取消</el-button>
@@ -496,7 +499,7 @@ export default {
         code: null
       },
       showSearch: true,
-      Dictionary: true,
+      Dictionary: false,
       loading: false,
       list: [],
       treeList: [
@@ -555,12 +558,14 @@ export default {
       },
       userList: [],
       userLoading: false,
-      rowData: null,
+      rowData: {
+        workplaceName: '工位'
+      },
       userQuery: {
         page: 1,
         limit: 10,
         userKey: null,
-        workplaceId: null
+        workplaceCode: null
       },
       formName: 'add',
       formMap: {
@@ -718,7 +723,7 @@ export default {
       this.invQuery.invCode = invCode
       getUsers(this.invQuery).then(res => {
         if (res.code == 20000) {
-          this.users = res.data || []
+          this.users = res.data.list || []
         } else {
           this.$message.error('错误')
         }
@@ -777,11 +782,11 @@ export default {
     },
     handCurrentChange(row) {
       this.rowData = row
-      this.userQuery.workplaceId = row.workplaceId
+      this.userQuery.workplaceCode = row.workplaceId
       this.getUserBindWork(this.userQuery)
     },
     loadUserList() {
-      this.userQuery.workplaceId = this.rowData.workplaceId
+      this.userQuery.workplaceCode = this.rowData.workplaceId
       this.getUserBindWork(this.userQuery)
     },
     onUserReset() {
@@ -789,7 +794,7 @@ export default {
         page: 1,
         limit: 10,
         userKey: null,
-        workplaceId: this.rowData.workplaceId
+        workplaceCode: this.rowData.workplaceId
       }
       this.getUserBindWork(this.userQuery)
     },
@@ -814,7 +819,7 @@ export default {
         }
         delUserBindWork(query).then(res => {
           if (res.code == 20000) {
-            this.userQuery.workplaceId = this.rowData.workplaceId
+            this.userQuery.workplaceCode = this.rowData.workplaceId
             this.getUserBindWork(this.userQuery)
             this.$message.success('移除成功')
           } else {