diff --git a/src/views/basic/collectPoint/userWorkplace.vue b/src/views/basic/collectPoint/userWorkplace.vue
index c79854b1..6108aa9d 100644
--- a/src/views/basic/collectPoint/userWorkplace.vue
+++ b/src/views/basic/collectPoint/userWorkplace.vue
@@ -424,6 +424,9 @@ export default {
       this.getUserBindWork(this.workQuery)
     },
     loadWorkList() {
+      if(this.rowData.id == null){
+        return this.$message.error("请选择用户")
+      }
       this.workQuery.userId = this.rowData.id
       this.getUserBindWork(this.workQuery)
     },
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 6fdbe4a9..ada3c2c0 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -71,11 +71,25 @@
             <el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form">
               <el-row :gutter="20">
                 <el-col :span="8">
+
                   <el-form-item label="当前部门:" class="query-form-item">
-                    <deptSelect style="width: 80%" :value.sync="query.deptCode"/>
-                    <!--<deptSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>-->
+                    <el-select v-model="query.deptCode" class="width-full" placeholder="请选择" filterable clearable
+                               @change="changeDept" style="width: 80%"
+                    >
+                      <el-option  v-for="item in DeptList" :key="item.id" :label="item.name" :value="item.code"/>
+                    </el-select>
+                    <!--<el-option v-for="item in " :key="item.id" :label="item.name" :value="item.code"/>-->
+                    <!--  <deptSelect  :value.sync="userQuery.deptCode"-->
+                    <!--               :changeValue.sync="changeUsers"/>-->
+                    <!--  &lt;!&ndash;<deptSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>&ndash;&gt;-->
                   </el-form-item>
                 </el-col>
+                <!--<el-col :span="8">-->
+                <!--  <el-form-item label="当前部门:" class="query-form-item">-->
+                <!--    <deptSelect style="width: 80%" :value.sync="query.deptCode"/>-->
+                <!--    &lt;!&ndash;<deptSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>&ndash;&gt;-->
+                <!--  </el-form-item>-->
+                <!--</el-col>-->
                 <el-col :span="8">
                   <el-form-item label="编码/名称:" class="query-form-item">
                     <el-input v-model="query.key" placeholder="请输入编码/工位名称" clearable style="width: 80%">
@@ -888,7 +902,8 @@ export default {
       busTypeTotal: 0,
       busTypeCodes: [],
       busData: null,
-      upData: null
+      upData: null,
+      DeptList: []
     }
   },
   computed: {},
@@ -1154,6 +1169,9 @@ export default {
       this.getWorkBindBusTypes()
     },
     loadUserList() {
+      if (this.rowData.workplaceId == null) {
+        return this.$message.error('请先选择工位')
+      }
       this.userQuery.workplaceCode = this.rowData.workplaceId
       this.getUserBindWork(this.userQuery)
     },
@@ -1167,6 +1185,9 @@ export default {
         this.getWorkBindBusTypes()
     },
     loadBusList() {
+      if (this.rowData.workplaceId == null) {
+        return this.$message.error('请先选择工位')
+      }
       this.getWorkBindBusTypes()
     },
     chooseBusType() {
@@ -1307,6 +1328,17 @@ export default {
     //     .catch(() => {
     //     })
     // },
+    getDepts() {
+      let data =
+        {
+          enable: true
+        }
+      filterList(data).then(res => {
+        if (res.code == 20000) {
+          this.DeptList = res.data.list || []
+        }
+      })
+    },
     deptChange() {
       this.getInvList()
       this.formData.invCode = ''
@@ -1355,6 +1387,9 @@ export default {
     closeDialog() {
       this.chooseBusTypeDialogVisible = false
       this.getWorkBindBusTypes()
+    },
+    changeDept(){
+      this.getList()
     }
   },
   created() {
@@ -1364,6 +1399,7 @@ export default {
     this.getTree()
     this.getLstTree()
     this.getDeptList()
+    this.getDepts()
   }
 }
 </script>
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 0b2f2c3b..70afaa8b 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -663,6 +663,7 @@ export default {
       this.orderFormData.invCode = tempData.invCode
       this.scanCode = "";
       this.corpOrderIdDisabled = false;
+      //todo 单据类型
 
       this.refreshCodesPanel()
     },
diff --git a/src/views/collect/IoSplitFinishCode.vue b/src/views/collect/IoSplitFinishCode.vue
index dcd18dc8..024645d8 100644
--- a/src/views/collect/IoSplitFinishCode.vue
+++ b/src/views/collect/IoSplitFinishCode.vue
@@ -1274,6 +1274,7 @@ export default {
     this.getInvList(this);
     this.getBusType(this);
     this.findWorkPlace(this, "");
+    this.getWorkBindBusTypes(this, "")
 
     this.splitType = this.$route.query.splitType;
     if (this.splitType == "search") {
diff --git a/src/views/collect/IoSplitOperateCode.vue b/src/views/collect/IoSplitOperateCode.vue
index cb84922a..7c1e7723 100644
--- a/src/views/collect/IoSplitOperateCode.vue
+++ b/src/views/collect/IoSplitOperateCode.vue
@@ -783,7 +783,8 @@ export default {
         limit: 10,
         startTime: null,
         endTime: null,
-        keywords: null,
+        keyWords: null,
+        workPlaceCode:null,
         // invCode: this.$store.getters.locInvCode,
         vueType: null,
       },
@@ -946,10 +947,12 @@ export default {
         id: "",
         billNo: null,
         mainAction: null,
+        statusType: 'draft',
         page: 1,
         limit: 10,
         startTime: null,
         endTime: null,
+        workPlaceCode:null,
         keyWords:null
       };
       this.actDateRange = [];