diff --git a/src/views/basic/collectPoint/userWorkplace.vue b/src/views/basic/collectPoint/userWorkplace.vue
index 0b0efb26..6143167c 100644
--- a/src/views/basic/collectPoint/userWorkplace.vue
+++ b/src/views/basic/collectPoint/userWorkplace.vue
@@ -368,6 +368,7 @@ export default {
         page: 1,
         limit: 10,
         invCode: this.$store.getters.locInvCode,
+        deptCode: this.$store.getters.locDeptCode,
         key: '',
         userKey: '',
         deptName: ''
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index 07faa9b2..9d98c01a 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -223,6 +223,7 @@
             <el-select
               v-model="filterQuery.workPlaceCode"
               placeholder="请选择作业工位"
+              :disabled="showType != 1"
               filterable
               remote
               clearable>
@@ -465,6 +466,7 @@ export default {
       options: {
         findWorkPlace: [],
       },
+      showType: 1
     }
   },
 
@@ -629,6 +631,8 @@ export default {
   created() {
     if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
+      this.filterQuery.workPlaceCode = this.$route.query.workplaceId
+      this.showType = 2
     }
     this.findWorkPlace(this,"");
     getHead("prescribeAllot", "1").then((re) => {
diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index 39582ca6..a71a5891 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -27,30 +27,29 @@
       <el-menu
         :default-active="menuActive"
         class="el-menu-vertical-demo"
-        @open="handleOpen"
-      >
+        @open="handleOpen">
         <el-menu-item :index=0 @click="clickMenuItem(0)">
-          <i class="el-icon-menu"></i>
+          <i class="el-icon-s-operation"></i>
           <span slot="title">处理单据</span>
         </el-menu-item>
         <el-menu-item :index=1 @click="clickMenuItem(1)">
-          <i class="el-icon-menu"></i>
+          <i class="el-icon-truck"></i>
           <span slot="title">工位上货</span>
         </el-menu-item>
         <el-menu-item :index=2 @click="clickMenuItem(2)">
-          <i class="el-icon-document"></i>
+          <i class="el-icon-s-fold"></i>
           <span slot="title">工位退货</span>
         </el-menu-item>
         <el-menu-item :index=3 @click="clickMenuItem(3)">
-          <i class="el-icon-setting"></i>
+          <i class="el-icon-s-order"></i>
           <span slot="title">工位存量</span>
         </el-menu-item>
         <el-menu-item :index=4 @click="clickMenuItem(4)">
-          <i class="el-icon-setting"></i>
+          <i class="el-icon-edit-outline"></i>
           <span slot="title">待处理单</span>
         </el-menu-item>
         <el-menu-item :index=5 @click="clickMenuItem(5)">
-          <i class="el-icon-setting"></i>
+          <i class="el-icon-finished"></i>
           <span slot="title">已完成单</span>
         </el-menu-item>
       </el-menu>
diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue
index fcf5f839..574cde40 100644
--- a/src/views/collect/DealOrderBlank.vue
+++ b/src/views/collect/DealOrderBlank.vue
@@ -1,8 +1,26 @@
 <template>
-  <div>
+  <!--<div>-->
+  <!--  <div style="display: flex; justify-content: space-between; align-items: center;"  v-if="isLinkDisabled">-->
+  <!--    <div style="margin-left: auto;">-->
+  <!--          <span-->
+  <!--            style="margin: 10px;color: #2d8cf0;font-size: 14px;"-->
+  <!--          >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>-->
+  <!--      <span-->
+  <!--        style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"-->
+  <!--      >&nbsp&nbsp&nbsp&nbsp用户&nbsp:&nbsp({{-->
+  <!--          this.userInfo.userName-->
+  <!--        }})</span>-->
+  <!--    </div>-->
+  <!--  </div>-->
     <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px">
       <el-card>
 
+        <!--<el-row :gutter="0">-->
+        <!--  <el-col :span="24" align="right">-->
+
+        <!--  </el-col>-->
+        <!--</el-row>-->
+
         <!--  <el-alert-->
         <!--  style="margin-top: 15px"-->
         <!--  :title="msgTip"-->
@@ -82,13 +100,14 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item prop="busType" class="query-form-item" label="业务类型:">
+            <el-form-item prop="busType" class="query-form-item" label="当前业务类型:">
               <el-select v-model="formData.busType"
                          filterable
                          remote
                          @change="busTypeChange"
                          reserve-keyword
-                         placeholder="请选择业务类型" clearable style="width: 90%">
+                         placeholder="请选择业务类型" clearable style="width: 90%"
+              >
                 <el-option
                   v-for="item in busTypeList"
                   :key="item.documentTypeCode"
@@ -108,7 +127,8 @@
                          filterable
                          remote
                          reserve-keyword
-                         placeholder="请选择往来单位" clearable style="width: 90%">
+                         placeholder="请选择往来单位" clearable style="width: 90%"
+              >
                 <el-option
                   v-for="item in fromInvOptions"
                   :key="item.erpId"
@@ -165,7 +185,8 @@
             :type="scanResultType"
             :closable="false"
             :dangerouslyUseHTMLString="true"
-            :description="result">
+            :description="result"
+          >
           </el-alert>
 
         </div>
@@ -270,7 +291,7 @@
               <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"
               >
                 <!-- 假设这里有一些信息内容 -->
-                <p style="font-size: 14px;background-color: #e1f3fb"  @click="selectBusType(info.documentTypeCode)">{{ info.documentTypeCode }}</p>
+                <p style="font-size: 14px;background-color: #e1f3fb"  @click="selectBusType(info.documentTypeCode)">{{ info.remark }}</p>
                 <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
                            @click="selectBusType(info.documentTypeCode)">开始作业
                 </el-button>
@@ -797,8 +818,6 @@ export default {
     },
 
     startDeal() {
-      debugger
-      this.$message.error("开始处理单据")
       this.curRow = this.formData;
       this.dealSplitOrder()
       this.formData.tagStatus = 2;
@@ -871,7 +890,9 @@ export default {
       this.formData.confirmFinish = false;
       this.refreshCodesPanel(this)
     },
-
+    focusInput() {
+      this.$refs.inputRef.focus();
+    }
 
   },
   created() {
@@ -898,7 +919,11 @@ export default {
       this.getWorkBindBusTypes(this.formData.workPlaceCode);
     }
 
-
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.focusInput();
+    });
   }
 
 }
diff --git a/src/views/collect/IoCreateOrderBlank.vue b/src/views/collect/IoCreateOrderBlank.vue
index 72bdc26a..e5983089 100644
--- a/src/views/collect/IoCreateOrderBlank.vue
+++ b/src/views/collect/IoCreateOrderBlank.vue
@@ -8,26 +8,23 @@
     >
       <el-card style="margin: 5px;">
 
-<!--        <el-row :gutter="0" v-if="isLinkDisabled">-->
-<!--          <el-col :span="24" align="right">-->
-<!--            <div class="inv-hos-title">-->
-<!--            <span-->
-<!--              style="margin: 10px;color: #2d8cf0;font-size: 14px;"-->
-<!--            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>-->
-
-<!--              <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp-->
-<!--                &lt;!&ndash;                {{&ndash;&gt;-->
-<!--                &lt;!&ndash;                  this.userInfo.companyName&ndash;&gt;-->
-<!--                &lt;!&ndash;                }}&ndash;&gt;-->
-<!--              </span>-->
-<!--              <span-->
-<!--                style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"-->
-<!--              >({{-->
-<!--                  this.userInfo.userName-->
-<!--                }})</span>-->
-<!--            </div>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
+        <!--<el-row :gutter="0" v-if="isLinkDisabled">-->
+        <!--  <el-col :span="24" align="right">-->
+        <!--    <div class="inv-hos-title">-->
+        <!--    <span-->
+        <!--      style="margin: 10px;color: #2d8cf0;font-size: 14px;"-->
+        <!--    >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>-->
+
+        <!--      <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户-->
+        <!--      </span>-->
+        <!--      <span-->
+        <!--        style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"-->
+        <!--      >({{-->
+        <!--          this.userInfo.userName-->
+        <!--        }})</span>-->
+        <!--    </div>-->
+        <!--  </el-col>-->
+        <!--</el-row>-->
 
         <el-alert
           style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
@@ -1720,7 +1717,7 @@ export default {
         this.loading = false;
       });
 
-      this.clearOrder()
+      // this.clearOrder()
     },
     /**
      * 上货完成后，清空数据
@@ -1747,14 +1744,14 @@ export default {
         preSpaceCode: null,
         preCurSpaceCode: null,  //单据
         sickerAdNum: null,
-        workPlaceCode: null,
+        workPlaceCode: Number(this.$route.query.workplaceId),
         fifoSplit: 1,
       }
       this.scanCode = "";
       this.result = "";
       this.refreshCodesPanel()
       this.init();
-
+      this.corpOrderIdDisabled = true
 
     },
 
@@ -1805,6 +1802,9 @@ export default {
         this.showSearch = true
       }
 
+    },
+    focusInput() {
+      this.$refs.inputRef.focus();
     }
   },
   filters: {},
@@ -1833,6 +1833,9 @@ export default {
       }
     };
     inputer.focus();
+    this.$nextTick(() => {
+      this.focusInput();
+    })
   },
   created() {
     this.splitType = this.$route.query.splitType;
diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue
index b7c57ea7..3945e056 100644
--- a/src/views/collect/IoSplitFifoCodePanel.vue
+++ b/src/views/collect/IoSplitFifoCodePanel.vue
@@ -503,6 +503,7 @@ export default {
       resultTotal: 0,
       resultDetailLoading: false,
       resultDetailList: [],
+      viewType: null
     }
   },
 
@@ -632,6 +633,10 @@ export default {
 
   },
   created() {
+    if (this.$route.query.workplaceId != null) {
+      this.filterQuery.workPlaceCode = Number(this.$route.query.workplaceId)
+      this.viewType = 1
+    }
     this.findWorkPlace(this,"")
     console.log(this.panelType)
     getHead("ioSplitFifoCode", "1").then((re) => {
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index 721bb85d..bedc1e88 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -314,6 +314,7 @@ export default {
       options: {
         findWorkPlace: [],
       },
+      showType: 1
     }
   },
 
@@ -409,6 +410,10 @@ export default {
 
   },
   created() {
+    if (this.$route.query.workplaceId != null) {
+      this.filterQuery.workPlaceCode = this.$route.query.workplaceId
+      this.showType = 2
+    }
     this.findWorkPlace(this,"");
     this.filterQuery.workPlaceCode = this.workPlaceCode +''
     getHead("prescribePanel", "1").then((re) => {
diff --git a/src/views/collect/chooseDraftOrderDialog.vue b/src/views/collect/chooseDraftOrderDialog.vue
index cae54721..1ff81476 100644
--- a/src/views/collect/chooseDraftOrderDialog.vue
+++ b/src/views/collect/chooseDraftOrderDialog.vue
@@ -1170,6 +1170,9 @@ export default {
 
     //选入
     choose(){
+      if (this.currentRow.billNo == null){
+        return this.$message.error("请选择单据")
+      }
       this.closeChooseDialog()
       this.handleChoose(this.currentRow)
     },