diff --git a/src/api/basic/workPlace/sysWorkplaceManage.js b/src/api/basic/workPlace/sysWorkplaceManage.js
index 6ed3f640..41e6094d 100644
--- a/src/api/basic/workPlace/sysWorkplaceManage.js
+++ b/src/api/basic/workPlace/sysWorkplaceManage.js
@@ -12,6 +12,14 @@ export function listPage(query) {
   });
 }
 
+export function getListByBusType(query) {
+  return axios({
+    url: "/udiwms/sysWorkplace/getListByBusType",
+    method: "post",
+    data: query
+  });
+}
+
 
 export function addWorkplace(query) {
   return axios({
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 1ad41c7f..1fdd7739 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -151,7 +151,6 @@
               <el-form-item label="计量单位:" prop="distributeLevel" label-width="160px">
 
                 <el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"
-                           clearable
                            @change="distributeLevelDiChange"
                            placeholder="请选择计量单位"
                 >
@@ -171,7 +170,6 @@
             <el-col :span="11" class="el-col">
               <el-form-item label="允许采集的最大层级:" prop="distributeMaxLevel" label-width="160px">
                 <el-select v-model="newProductData.distributeMaxLevel" size="small" style="width: 90%"
-                           clearable
                            placeholder="请选择允许采集的最大层级"
                 >
                   <el-option
@@ -1059,6 +1057,11 @@ export default {
               this.isSave = true
               this.$message.success('删除成功')
               this.getDetailList()
+              this.getDiLevel()
+              this.newProductData.distributeLevel = null
+              this.newProductData.distributeMaxLevel = null
+              this.newProductData.useLevel = null
+              this.newProductData.useMaxLevel = null
             }
           })
         } else {
diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue
index 0944244b..656d88a6 100644
--- a/src/views/basic/workplace/cargowWorkplaceManage.vue
+++ b/src/views/basic/workplace/cargowWorkplaceManage.vue
@@ -1025,7 +1025,29 @@ export default {
           this.deptList = res.data.list || []
         }
       })
-    }
+    },
+    edit(row) {
+      this.formData = row
+      // this.formData.invCode = String(row.invCode)
+      if (row.chargeUser == 0) {
+        this.formData.chargeUser = null
+      } else if (row.chargeUser == 1) {
+        this.formData.chargeUser = Number(row.chargeUser)
+      } else {
+        this.formData.chargeUser = row.chargeUser
+      }
+      this.fromName = 'edit'
+      this.invQuery.deptCode = row.deptCode
+      getUsers(this.invQuery).then(res => {
+        if (res.code == 20000) {
+          this.users = res.data.list || []
+        } else {
+          this.$message.error('错误')
+        }
+      })
+      this.getTree()
+      this.addWorkplaceDialogVisible = true
+    },
   },
   created() {
     this.getDepts()
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index c99c86ca..307a87fb 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -727,7 +727,7 @@ export default {
     onReset() {
       this.filterQuery = {
         billNo: null,
-        tagStatus: null,
+        tagStatus: 1,
         page: 1,
         limit: 9,
       };
diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue
index b0bff52f..4ab508a5 100644
--- a/src/views/collect/CollectOrderNew.vue
+++ b/src/views/collect/CollectOrderNew.vue
@@ -758,6 +758,7 @@ export default {
           if (response.code == 20000) {
             this.getList();
             this.getErrorList(this);
+            this.panelALive = false
             this.$message({
               type: "success",
               message: "删除成功！",
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index b3a3b52d..ab11abc9 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -1252,7 +1252,8 @@ export default {
       this.formData.confirmFinish = false;
       this.refreshCodesPanel(this)
       this.clearCode()
-
+      this.$refs.inputRef.focus();
+      this.$refs.inputRef.select();
     },
     toggleBusType() {
       //隐藏下拉框内容
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 580f5df4..b1db4dd8 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -190,7 +190,7 @@
               <el-button
                 type="primary"
                 size="mini"
-                @click.native.stop="addCode()"
+                @click.native.stop="enterKey($event)"
                 style="margin-left: 15px"
               >添加
               </el-button>
@@ -1060,6 +1060,7 @@ export default {
         key: val,
         page: 1,
         limit: 10,
+        workPlaceClass: 2
       }
       filterWorkOptimize(query)
         .then((response) => {
@@ -1769,6 +1770,7 @@ export default {
               type: "warning",
               closeOnClickModal: true,
               callback: (action) => {
+                this.scanCode = ""
                 this.$refs.inputRef.focus();
                 this.$refs.inputRef.select();
               },
diff --git a/src/views/collect/PanelOrderUpload.vue b/src/views/collect/PanelOrderUpload.vue
index 7c1f5026..0ea66588 100644
--- a/src/views/collect/PanelOrderUpload.vue
+++ b/src/views/collect/PanelOrderUpload.vue
@@ -278,17 +278,17 @@
 <script>
 import addOrder from '@/views/inout/DialogCreateOrder'
 import errOrder from '@/views/inout/IoCreateErrorOrder'
-import {executeFuc, getHead} from '@/utils/customConfig'
-import {convertDate} from '@/utils/date'
+import { executeFuc, getHead } from '@/utils/customConfig'
+import { convertDate } from '@/utils/date'
 import prescribeCodePanel from './PanelOrderTagCode'
 import PanelOrderManuTagCode from './PanelOrderManuTagCode'
 import prescribeOriginPanel from '@/views/collect/PannelOrderBiz'
 import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail'
-import CollectFinishOrderBackupDetail from "./CollectFinishOrderBackupDetail"
+import CollectFinishOrderBackupDetail from './CollectFinishOrderBackupDetail'
 
-import {orderFinish, orderPage, orderUpload} from '@/api/collect/collectOrder'
-import {filterWorkOptimize} from '@/api/basic/workPlace/sysWorkplaceManage'
-import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import { orderFinish, orderPage, orderUpload } from '@/api/collect/collectOrder'
+import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
+import { getWorkBindBusTypes, removeBusTypeById } from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: 'panelOrderUpload',
@@ -343,33 +343,33 @@ export default {
       pickerOptions: {
         shortcuts: [
           {
-            text: "最近一周",
+            text: '最近一周',
             onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', [start, end])
+            }
           },
           {
-            text: "最近一个月",
+            text: '最近一个月',
             onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+              picker.$emit('pick', [start, end])
+            }
           },
           {
-            text: "最近三个月",
+            text: '最近三个月',
             onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+              picker.$emit('pick', [start, end])
+            }
+          }
+        ]
       },
       actDateRange: [],
       //界面配置-------------end
@@ -384,7 +384,7 @@ export default {
         page: 1,
         limit: 10
       },
-      defaultSort: {prop: 'createTime', order: 'desc'},
+      defaultSort: { prop: 'createTime', order: 'desc' },
       loading: false,
       list: [],
       total: 0,
@@ -403,7 +403,7 @@ export default {
       isLinkDisabled: false,
       options: {
         findWorkPlace: [],
-        getBusType: [],
+        getBusType: []
       },
       showType: 1
     }
@@ -426,14 +426,14 @@ export default {
       _this.busQuery.workplaceCode = query
       getWorkBindBusTypes(this.busQuery).then(res => {
         if (res.code == 20000) {
-          let busTypes = res.data.list || [];
+          let busTypes = res.data.list || []
           // _this.options.getWorkPlace = res.data.list || [];
           let getWorkPlace = busTypes.map(busType => {
             return {
               code: busType.documentTypeCode,
               label: busType.busName
-            };
-          });
+            }
+          })
           _this.options.getBusType = getWorkPlace
           if (_this.options.getBusType.length == 1) {
             _this.filterQuery.busType = _this.options.getBusType[0].code
@@ -468,24 +468,32 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch
       this.$nextTick(() => {
-        console.log('组件已刷新');
-      });
+        console.log('组件已刷新')
+      })
     },
     onReset() {
       this.filterQuery = {
         busType: null,
         tagStatus: null,
+        uploadStatus: 1,
         billNo: null,
         workPlaceCode: null,
         page: 1,
         limit: 10
+      },
+        this.filterQuery.tagStatus = this.tagStatus
+        this.filterQuery.uploadStatus = String(this.status)
+      if (this.status == 2) {
+        this.filterQuery.uploadStatusName = '已上传'
       }
-      this.actDateRange = []
+        this.actDateRange = []
+
       this.getList()
     },
     onSubmit(_this) {
-      if (_this == null)
+      if (_this == null) {
         _this = this
+      }
       _this.filterQuery.page = 1
       _this.getList()
     },
@@ -493,11 +501,11 @@ export default {
     getList() {
       this.loading = true
       if (this.actDateRange !== null) {
-        this.filterQuery.startTime = this.actDateRange[0];
-        this.filterQuery.endTime = this.actDateRange[1];
+        this.filterQuery.startTime = this.actDateRange[0]
+        this.filterQuery.endTime = this.actDateRange[1]
       } else {
-        this.filterQuery.startTime = null;
-        this.filterQuery.endTime = null;
+        this.filterQuery.startTime = null
+        this.filterQuery.endTime = null
       }
       orderFinish(this.filterQuery).then(res => {
         this.loading = false
@@ -549,35 +557,34 @@ export default {
         })
     },
     orderUpload(_this, row) {
-      let params = row;
-      _this.$confirm("该订单将上传到外部系统，是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      let params = row
+      _this.$confirm('该订单将上传到外部系统，是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          orderUpload({billNo: params.billNo})
+          orderUpload({ billNo: params.billNo })
             .then((response) => {
               if (response.code == 20000) {
-                _this.getList();
+                _this.getList()
                 _this.$message({
-                  type: "success",
-                  message: "上传成功！",
-                });
+                  type: 'success',
+                  message: '上传成功！'
+                })
               } else if (response.code == 520) {
-                _this.$message.error(response.message);
-                _this.getList();
+                _this.$message.error(response.message)
+                _this.getList()
               } else {
-                _this.$message.error(response.message);
-                _this.getList();
+                _this.$message.error(response.message)
+                _this.getList()
               }
             })
             .catch(() => {
-            });
+            })
         })
         .catch(() => {
-        });
-
+        })
 
     }
 
diff --git a/src/views/collect/SelectCollectOrderEndDialog.vue b/src/views/collect/SelectCollectOrderEndDialog.vue
index 50a76e25..d9cf7a0a 100644
--- a/src/views/collect/SelectCollectOrderEndDialog.vue
+++ b/src/views/collect/SelectCollectOrderEndDialog.vue
@@ -504,7 +504,8 @@ export default {
         userIdFlag: true,
         key: val,
         page: 1,
-        limit: 10
+        limit: 10,
+        workPlaceClass:1
       }
       filterWorkOptimize(query)
         .then((response) => {
@@ -523,12 +524,13 @@ export default {
 
   },
   created() {
-    if (this.$route.query.workplaceId != null) {
-      this.isLinkDisabled = true
-      this.filterQuery.workPlaceCode = this.$route.query.workplaceId
-      this.showType = 2
-    }
+    // if (this.$route.query.workplaceId != null) {
+    //   this.isLinkDisabled = true
+    //   this.filterQuery.workPlaceCode = this.$route.query.workplaceId
+    //   this.showType = 2
+    // }
     this.findWorkPlace(this, '')
+    this.getWorkBindBusTypes(this, '')
     getHead('prescribePanelSelect', '1').then((re) => {
       // 处理返回的数据
       this.tableObj = re.data
diff --git a/src/views/collect/bindWorkDialog.vue b/src/views/collect/bindWorkDialog.vue
index 442f2b7b..e241a2a7 100644
--- a/src/views/collect/bindWorkDialog.vue
+++ b/src/views/collect/bindWorkDialog.vue
@@ -58,7 +58,7 @@ import {
   addWorkplace,
   updateWorkplace,
   deleteWorkplace,
-  createWorkplaceId
+  createWorkplaceId, getListByBusType
 } from '@/api/basic/workPlace/sysWorkplaceManage'
 import {bindWork} from "@/api/collect/collectOrder";
 
@@ -81,7 +81,8 @@ export default {
         invCode: null,//this.$store.getters.locInvCode
         page: 1,
         limit: 10,
-        workPlaceClass:1
+        workPlaceClass:1,
+        busType: null
       },
       showSearch: true,
       loading: false,
@@ -114,13 +115,16 @@ export default {
         path: ''
       })
       this.query = {
-        page: 1,
-        limit: 20
-      }
+        invCode: null,//this.$store.getters.locInvCode
+          page: 1,
+          limit: 10,
+          workPlaceClass:1
+      },
       this.getList()
     },
     getList() {
-      listPage(this.query).then(res => {
+      this.query.busType = this.prescribeListData.busType
+      getListByBusType(this.query).then(res => {
         if (res.code != 20000) {
           return this.$message.error('错误错误')
         }
diff --git a/src/views/collect/selectCollectOrderDialog.vue b/src/views/collect/selectCollectOrderDialog.vue
index 9828ac80..f0cd901a 100644
--- a/src/views/collect/selectCollectOrderDialog.vue
+++ b/src/views/collect/selectCollectOrderDialog.vue
@@ -123,7 +123,7 @@
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
-      <el-tabs type="border-card" style="margin-top: 55px">
+      <el-tabs type="border-card" style="margin-top: 55px" @tab-click="handleTabClick">
 
         <el-tab-pane label="待处理单据">
           <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
@@ -779,6 +779,9 @@ export default {
         return
       })
     },
+    handleTabClick(tab){
+      this.panelALive = false
+    }
   },
   created() {
     if (this.$route.query.workplaceId != null) {