diff --git a/src/api/basic/collectPoint/gatherOrderType.js b/src/api/basic/collectPoint/gatherOrderType.js
index 1ec21596..17b21b90 100644
--- a/src/api/basic/collectPoint/gatherOrderType.js
+++ b/src/api/basic/collectPoint/gatherOrderType.js
@@ -34,3 +34,13 @@ export function delCollectBusType(query) {
     data: query
   });
 }
+
+
+
+export function genCode(query) {
+  return axios({
+    url: "/udiwms/basic/collectBusType/genCode",
+    method: "post",
+    data: query
+  });
+}
diff --git a/src/views/basic/collectPoint/gatherOrderType.vue b/src/views/basic/collectPoint/gatherOrderType.vue
index 9f78edb7..37dd720f 100644
--- a/src/views/basic/collectPoint/gatherOrderType.vue
+++ b/src/views/basic/collectPoint/gatherOrderType.vue
@@ -162,7 +162,7 @@ import {
   getCollectBusType,
   addCollectBusType,
   updateCollectBusType,
-  delCollectBusType
+  delCollectBusType, genCode
 } from '@/api/basic/collectPoint/gatherOrderType'
 import { getBusTypeList } from '@/api/basic/busType'
 
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 2237ef1f..7d123948 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -120,7 +120,7 @@
                 <span>{{ operationTypes[scope.row.operationType] }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="结果处理" prop="checkInsert" width="100">
+            <el-table-column label="结果处理" prop="checkInsert" width="120">
               <template slot-scope="scope">
                 <span>{{ checkInserts[scope.row.checkInsert] }}</span>
               </template>
@@ -132,8 +132,8 @@
             </el-table-column>
             <el-table-column label="负责人" prop="employeeName" 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="创建时间" prop="createTime" width="140"></el-table-column>
+            <el-table-column label="备注" prop="remake" width="140"></el-table-column>
             <el-table-column label="操作" fixed="right" width="120">
               <template slot-scope="scope">
                 <el-button
@@ -356,23 +356,23 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!--<el-col :span="24" class="el-col">-->
-          <!--  <el-form-item label="所属组别:" prop="grouping" class="query-form-item">-->
-          <!--    <el-select v-model="formData.constituencies" placeholder="请选择所属组别"-->
-          <!--               style="width: 80%"-->
-          <!--               clearable-->
-          <!--    >-->
-          <!--      <el-option-->
-          <!--        v-for="item in fromDeptOptions"-->
-          <!--        :key="item.code"-->
-          <!--        :label="item.label"-->
-          <!--        :value="item.code"-->
-          <!--      >-->
-          <!--        <span style="float: left">{{ item.label }}</span>-->
-          <!--      </el-option>-->
-          <!--    </el-select>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
+          <el-col :span="12" class="el-col">
+            <el-form-item label="所属组别:" prop="grouping" class="query-form-item">
+              <el-select v-model="formData.constituencies" placeholder="请选择所属组别"
+                         style="width: 80%"
+                         clearable
+              >
+                <el-option
+                  v-for="item in fromDeptOptions"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.label }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
 
           <el-col :span="12" class="el-col">
@@ -578,12 +578,17 @@ export default {
       total: 0,
       userTotal: 0
     }
+  },
+  computed: {
+
   },
   methods: {
     hideSearch() {
       this.showSearch = !this.showSearch
     },
     onSubmit() {
+      this.userList = []
+      this.rowData.workplaceName = "工位"
       this.query.page = 1
       this.getList()
     },
@@ -600,7 +605,7 @@ export default {
     getList() {
       listPage(this.query).then(res => {
         if (res.code != 20000) {
-          return this.$message.error('错误错误')
+          return this.$message.error(res.message)
         }
         this.list = res.data.list || []
         this.total = res.data.total || 0
@@ -647,7 +652,7 @@ export default {
         })
     },
     formSubmit() {
-      this.formData.constituencies = this.groupData.code
+      // this.formData.constituencies = this.groupData.code
       if (this.fromName == 'add') {
         this.$refs['dataForm'].validate((valid) => {
           if (!valid) {
@@ -665,8 +670,7 @@ export default {
               }
               this.getList()
             }).catch(() => {
-              this.addWorkplaceDialogVisible = false
-              this.$message.error('新增错误')
+
             })
           }
         })
@@ -687,7 +691,17 @@ export default {
     },
     edit(row) {
       this.formData = row
+      this.formData.invCode = String(row.invCode)
+      this.formData.chargeUser = Number(row.chargeUser)
       this.fromName = 'edit'
+      this.invQuery.invCode = row.invCode
+      getUsers(this.invQuery).then(res => {
+        if (res.code == 20000) {
+          this.users = res.data.list || []
+        } else {
+          this.$message.error('错误')
+        }
+      })
       this.addWorkplaceDialogVisible = true
     },
     deleteWorkplace(row) {