diff --git a/src/views/basic/collectPoint/collectPointManage.vue b/src/views/basic/collectPoint/collectPointManage.vue
index b7057fd4..259fd180 100644
--- a/src/views/basic/collectPoint/collectPointManage.vue
+++ b/src/views/basic/collectPoint/collectPointManage.vue
@@ -84,6 +84,7 @@
           <el-button type="primary" icon="el-icon-plus" @click="addCollectionPoints">新增采集点</el-button>
         </el-button-group>
       </div>
+        <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"  @current-change="handCurrentChange" highlight-current-row
       >
         <el-table-column type="index" label="序号"></el-table-column>
diff --git a/src/views/basic/collectPoint/gatherOrderType.vue b/src/views/basic/collectPoint/gatherOrderType.vue
index 05554204..a17df103 100644
--- a/src/views/basic/collectPoint/gatherOrderType.vue
+++ b/src/views/basic/collectPoint/gatherOrderType.vue
@@ -26,7 +26,7 @@
           <el-button type="primary" icon="el-icon-plus" @click="addCollectionPoints">新增单据类型</el-button>
         </el-button-group>
       </div>
-
+      <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
       >
diff --git a/src/views/basic/collectPoint/selectWorkplace.vue b/src/views/basic/collectPoint/selectWorkplace.vue
index bc9a63fe..476f7ade 100644
--- a/src/views/basic/collectPoint/selectWorkplace.vue
+++ b/src/views/basic/collectPoint/selectWorkplace.vue
@@ -35,6 +35,7 @@
           <el-button type="primary" icon="el-icon-plus" @click="addWork">选入工位</el-button>
         </el-button-group>
       </div>
+    <el-divider style="margin: 15px"></el-divider>
       <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">-->
diff --git a/src/views/basic/collectPoint/userWorkplace.vue b/src/views/basic/collectPoint/userWorkplace.vue
index 7609206c..7456be75 100644
--- a/src/views/basic/collectPoint/userWorkplace.vue
+++ b/src/views/basic/collectPoint/userWorkplace.vue
@@ -32,15 +32,16 @@
             <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
           </el-button-group>
         </div>
+        <el-divider style="margin: 15px"></el-divider>
         <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="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="用户账号" prop="userName" width="120"></el-table-column>
+          <el-table-column label="用户名称" prop="employeeName" width="120"></el-table-column>
+          <el-table-column label="用户仓库" prop="invName" width="120"></el-table-column>
+          <el-table-column label="所属部门" prop="deptName" width="260"></el-table-column>
+          <el-table-column label="备注" prop="remark" width="300"></el-table-column>
           <!--<el-table-column label="操作" fixed="right" width="100">-->
           <!--  <template slot-scope="scope">-->
           <!--    &lt;!&ndash;<el-button&ndash;&gt;-->
@@ -109,7 +110,7 @@
         >
           <el-table-column type="index" label="序号"></el-table-column>
           <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="workplaceName" width="140"></el-table-column>
           <el-table-column label="所属部门" prop="deptCodeName" width="90"></el-table-column>
           <el-table-column label="工位状态" prop="workplaceStatus" width="90">
             <template slot-scope="scope">
@@ -129,8 +130,8 @@
           <!--    <span>{{ corpTypeMap[scope.row.corpType] }}</span>-->
           <!--  </template>-->
           <!--</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="createTime" width="140"></el-table-column>
+          <el-table-column label="备注" prop="remake" width="240"></el-table-column>
           <el-table-column label="操作" fixed="right" width="100">
             <template slot-scope="scope">
               <el-button
diff --git a/src/views/basic/workplace/selectBusType.vue b/src/views/basic/workplace/selectBusType.vue
index 251f5299..e0e4d9ff 100644
--- a/src/views/basic/workplace/selectBusType.vue
+++ b/src/views/basic/workplace/selectBusType.vue
@@ -26,7 +26,7 @@
           <el-button type="primary" icon="el-icon-plus" @click="chooseBusType">选入</el-button>
         </el-button-group>
       </div>
-
+    <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
                 highlight-current-row @current-change="handCurrentChange" ref="table"
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 551e0986..f73815f8 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -101,6 +101,7 @@
                 <el-button type="primary" icon="el-icon-plus" @click="addWorkplace">新增工位</el-button>
               </el-button-group>
             </div>
+            <el-divider style="margin: 15px"></el-divider>
             <el-table v-loading="loading" :data="list" style="width: 100%" :row-style="{height: '32px' }"
                       highlight-current-row @current-change="handCurrentChange"
             >
@@ -271,7 +272,7 @@
               <el-form :inline="true" :model="userQuery" class="query-form" size="mini"
                        style="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="请输入用户账号/名称"
@@ -302,7 +303,7 @@
                 <el-table-column label="用户账号" prop="userName"></el-table-column>
                 <el-table-column label="用户名称" prop="employeeName"></el-table-column>
                 <el-table-column label="备注" prop="remark"></el-table-column>
-                <el-table-column label="操作" fixed="right" width="50">
+                <el-table-column label="操作" fixed="right" width="80">
                   <template slot-scope="scope">
                     <el-button
                       type="text"
diff --git a/src/views/collect/CollectOrderAllotBlank.vue b/src/views/collect/CollectOrderAllotBlank.vue
index a639bf8e..a9becdaa 100644
--- a/src/views/collect/CollectOrderAllotBlank.vue
+++ b/src/views/collect/CollectOrderAllotBlank.vue
@@ -7,9 +7,7 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-          <span
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-          >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
+
           <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
               this.userInfo.companyName
             }}</span>
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index 40035697..1a2195a3 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -219,10 +219,10 @@
         <!-- 分割线 -->
         <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" :inline="true"
                  style="margin-top: 15px">
-          <el-form-item prop="key" label="采集工位:">
+          <el-form-item prop="key" label="作业工位:">
             <el-select
               v-model="filterQuery.workPlaceCode"
-              placeholder="请选择采集工位"
+              placeholder="请选择作业工位"
               filterable
               remote
               clearable>
@@ -249,6 +249,8 @@
           </el-form-item>
         </el-form>
 
+        <el-divider style="margin: 15px"></el-divider>
+
         <el-row :gutter="24">
           <el-col v-for="(info, index)  in list" :key="index" :xs="12" :sm="8" :md="8" :lg="6">
             <el-card :body-style="{margin:'20px'}"
diff --git a/src/views/collect/CollectOrderEndBlank.vue b/src/views/collect/CollectOrderEndBlank.vue
index d4f8ade1..9a50f8e3 100644
--- a/src/views/collect/CollectOrderEndBlank.vue
+++ b/src/views/collect/CollectOrderEndBlank.vue
@@ -7,9 +7,7 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-          <span
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-          >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
+
           <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
               this.userInfo.companyName
             }}</span>
@@ -58,6 +56,7 @@ export default {
   },
   data() {
     return {
+      type: 1,
       isLinkDisabled: false,
       userInfo: {
         inv: this.$store.getters.locInvName,
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 4b9539c2..c1fc485f 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -9,12 +9,9 @@
             <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;">{{
-                  this.userInfo.companyName
-                }}</span>
               <span
                 style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-              >(用户&nbsp:&nbsp{{
+              >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
                   this.userInfo.userName
                 }})</span>
             </div>
@@ -415,17 +412,17 @@ export default {
   },
   methods: {
 
-    getBillNo(billNo, workPlaceCode) {
+    getBillNo(billNo) {
       let post = {
         billNo: billNo,
-        workPlaceCode: workPlaceCode,
+        workPlaceCode: this.workplaceId,
         page: 1,
         limit: 10,
       }
       findByBill(post).then(res => {
         if (res.code == 20000) {
-          if (res.data.list.length > 0) {
-            this.formData = res.data.list[0]
+          if (res.data.billNo != null) {
+            this.formData = res.data
           }
         }
       })
@@ -443,25 +440,25 @@ export default {
         if (res.code == 20000) {
           this.busTypeList = res.data.list
           this.busTypeTotal = res.data.total
-          if (this.busTypeList.length == 1) {
-
-            let busType = this.busTypeList[0]
-            this.formData.busType = this.busTypeList[0].documentTypeCode
-            this.selectBusTypeDisabled = false
-            this.formDataVisible = busType
-            if (this.formDataVisible.scanType == 1) {
-              this.findFromInvList("");
-            }
-            if (this.formData.billNo != null) {
-              this.getBillNo(this.formData.billNo, this.formData.workplaceCode)
-              this.startDeal();
-            } else {
-              this.findCurOrder();
-            }
 
+          if (this.formData.billNo != null) {
+            this.getBillNo(this.formData.billNo)
+            this.startDeal();
           } else {
-            this.formData.busType = null
+            if (this.busTypeList.length == 1) {
+              let busType = this.busTypeList[0]
+              this.formData.busType = this.busTypeList[0].documentTypeCode
+              this.selectBusTypeDisabled = false
+              this.formDataVisible = busType
+              if (this.formDataVisible.scanType == 1) {
+                this.findFromInvList("");
+              }
+            } else {
+              this.formData.busType = null
+            }
+            this.findCurOrder();
           }
+
         }
         return
       })
@@ -577,6 +574,9 @@ export default {
           this.isSuccess = true;
           this.printCodeResult(response.data, response.message)
           this.filterQuery.code = response.data.code;
+          this.scanCode = ""
+          this.originCode = ""
+
           this.addCode();
         } else {
           if (response.code == 502) {
@@ -584,15 +584,18 @@ export default {
             this.isSuccess = false;
             this.printCodeResult(response.data, response.message)
             this.filterQuery.code = response.data.code;
-            this.originCode = this.filterQuery.code;
+            this.originCode = response.data.code;
+            this.scanCode = ""
           } else if (response.code == 501) {
             this.checkSuccess = false;
             this.$message.error(response.message);
+            this.scanCode = ""
           } else if (response.code == 503) {
             this.checkSuccess = false;
             this.isSuccess = false;
             this.printCodeResult(response.data, response.message)
             this.filterQuery.code = response.data.code;
+            this.scanCode = ""
             this.$confirm(response.message, "提示", {
               type: "warning",
             })
@@ -608,6 +611,7 @@ export default {
             this.filterQuery.code = "01" + response.data.nameCode;
             this.originCode = this.filterQuery.code;
           } else {
+            this.scanCode = ""
             this.$alert(response.message, "提示", {
               confirmButtonText: "确定",
               type: "warning",
@@ -648,6 +652,7 @@ export default {
           this.formData.insert = false;
           this.formData = res.data;
           this.curRow = this.formData;
+          this.$refs.inputRef.focus();
           this.refreshCodesPanel(this);
         } else {
           if (res.code == 502) {
@@ -660,8 +665,11 @@ export default {
               this.addCode();
             }).catch(() => {
             });
-          } else
+          } else {
+            this.$refs.inputRef.focus();
             this.$message.error(res.message)
+          }
+
         }
       }).catch(() => {
         this.loading = false
@@ -677,9 +685,7 @@ export default {
         draftOrder(this.formData).then(res => {
           this.loading = false
           if (res.code == 20000) {
-            this.formData = {tagStatus: -1};
-            this.curRow = null
-            this.refreshCodesPanel(this)
+            this.resetWork()
           }
         }).catch(() => {
           this.loading = false
@@ -688,27 +694,39 @@ export default {
       });
     },
 
-    finishOrder() {
+    confirmFinishOrder() {
       this.$confirm('是否确定完成此单据?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        finishOrder(this.formData).then(res => {
-          this.loading = false
-          if (res.code == 20000) {
-            this.formData = {tagStatus: -1};
-            this.curRow = null
-            this.refreshCodesPanel(this)
-          }
-        }).catch(() => {
-          this.loading = false
-        })
+        this.finishOrder()
       }).catch(() => {
       });
+    },
 
+    finishOrder() {
+      finishOrder(this.formData).then(res => {
+        this.loading = false
+        if (res.code == 20000) {
+          this.resetWork()
+        } else if (res.code == 502) {
+          this.$confirm(res.message, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.formData.confirmFinish = true;
+            this.finishOrder();
+          }).catch(() => {
+          });
+        }
+      }).catch(() => {
+        this.loading = false
+      })
     },
 
+
     updateOrder() {
       updateOrder(this.formData).then(res => {
         this.loading = false
@@ -818,7 +836,6 @@ export default {
 
     printCodeResult(data, message) {
       const resultParts = [];
-
       if (data.udi) {
         resultParts.push("层级标识: " + data.udi);
       }
@@ -850,6 +867,22 @@ export default {
       this.originCode = "";
       this.formData.code = "";
       this.scanCode = "";
+      this.scanTitle = "扫码结果：";
+      this.result = "";
+    },
+
+    /**
+     * 重置
+     */
+    resetWork() {
+      this.formData = {
+        tagStatus: -1,
+        workPlaceCode: this.formData.workPlaceCode,
+        busType: this.formData.busType
+      };
+      this.curRow = null
+      this.formData.confirmFinish = false;
+      this.refreshCodesPanel(this)
     },
 
 
@@ -869,7 +902,9 @@ export default {
     }
     if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
-      this.selectBusTypeDisabled = true
+      if (this.$route.query.billNo == null) {
+        this.selectBusTypeDisabled = true
+      }
       this.corpOrderIdDisabled = true
       this.workplaceId = Number(this.$route.query.workplaceId);
       this.formData.workPlaceCode = Number(this.$route.query.workplaceId);
diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue
index 9818d6a9..0812576b 100644
--- a/src/views/collect/DealOrderBlank.vue
+++ b/src/views/collect/DealOrderBlank.vue
@@ -9,9 +9,9 @@
             <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;">{{-->
-<!--                  this.userInfo.companyName-->
-<!--                }}</span>-->
+              <!--              <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">{{-->
+              <!--                  this.userInfo.companyName-->
+              <!--                }}</span>-->
               <span
                 style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
               >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
@@ -415,17 +415,17 @@ export default {
   },
   methods: {
 
-    getBillNo(billNo, workPlaceCode) {
+    getBillNo(billNo) {
       let post = {
         billNo: billNo,
-        workPlaceCode: workPlaceCode,
+        workPlaceCode: this.workplaceId,
         page: 1,
         limit: 10,
       }
       findByBill(post).then(res => {
         if (res.code == 20000) {
-          if (res.data.list.length > 0) {
-            this.formData = res.data.list[0]
+          if (res.data.billNo != null) {
+            this.formData = res.data
           }
         }
       })
@@ -443,25 +443,25 @@ export default {
         if (res.code == 20000) {
           this.busTypeList = res.data.list
           this.busTypeTotal = res.data.total
-          if (this.busTypeList.length == 1) {
-
-            let busType = this.busTypeList[0]
-            this.formData.busType = this.busTypeList[0].documentTypeCode
-            this.selectBusTypeDisabled = false
-            this.formDataVisible = busType
-            if (this.formDataVisible.scanType == 1) {
-              this.findFromInvList("");
-            }
-            if (this.formData.billNo != null) {
-              this.getBillNo(this.formData.billNo, this.formData.workplaceCode)
-              this.startDeal();
-            } else {
-              this.findCurOrder();
-            }
 
+          if (this.formData.billNo != null) {
+            this.getBillNo(this.formData.billNo)
+            this.startDeal();
           } else {
-            this.formData.busType = null
+            if (this.busTypeList.length == 1) {
+              let busType = this.busTypeList[0]
+              this.formData.busType = this.busTypeList[0].documentTypeCode
+              this.selectBusTypeDisabled = false
+              this.formDataVisible = busType
+              if (this.formDataVisible.scanType == 1) {
+                this.findFromInvList("");
+              }
+            } else {
+              this.formData.busType = null
+            }
+            this.findCurOrder();
           }
+
         }
         return
       })
@@ -577,6 +577,9 @@ export default {
           this.isSuccess = true;
           this.printCodeResult(response.data, response.message)
           this.filterQuery.code = response.data.code;
+          this.scanCode = ""
+          this.originCode = ""
+
           this.addCode();
         } else {
           if (response.code == 502) {
@@ -584,15 +587,18 @@ export default {
             this.isSuccess = false;
             this.printCodeResult(response.data, response.message)
             this.filterQuery.code = response.data.code;
-            this.originCode = this.filterQuery.code;
+            this.originCode = response.data.code;
+            this.scanCode = ""
           } else if (response.code == 501) {
             this.checkSuccess = false;
             this.$message.error(response.message);
+            this.scanCode = ""
           } else if (response.code == 503) {
             this.checkSuccess = false;
             this.isSuccess = false;
             this.printCodeResult(response.data, response.message)
             this.filterQuery.code = response.data.code;
+            this.scanCode = ""
             this.$confirm(response.message, "提示", {
               type: "warning",
             })
@@ -608,6 +614,7 @@ export default {
             this.filterQuery.code = "01" + response.data.nameCode;
             this.originCode = this.filterQuery.code;
           } else {
+            this.scanCode = ""
             this.$alert(response.message, "提示", {
               confirmButtonText: "确定",
               type: "warning",
@@ -661,7 +668,7 @@ export default {
               this.addCode();
             }).catch(() => {
             });
-          } else{
+          } else {
             this.$refs.inputRef.focus();
             this.$message.error(res.message)
           }
@@ -681,9 +688,7 @@ export default {
         draftOrder(this.formData).then(res => {
           this.loading = false
           if (res.code == 20000) {
-            this.formData = {tagStatus: -1};
-            this.curRow = null
-            this.refreshCodesPanel(this)
+            this.resetWork()
           }
         }).catch(() => {
           this.loading = false
@@ -692,27 +697,39 @@ export default {
       });
     },
 
-    finishOrder() {
+    confirmFinishOrder() {
       this.$confirm('是否确定完成此单据?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        finishOrder(this.formData).then(res => {
-          this.loading = false
-          if (res.code == 20000) {
-            this.formData = {tagStatus: -1};
-            this.curRow = null
-            this.refreshCodesPanel(this)
-          }
-        }).catch(() => {
-          this.loading = false
-        })
+        this.finishOrder()
       }).catch(() => {
       });
+    },
 
+    finishOrder() {
+      finishOrder(this.formData).then(res => {
+        this.loading = false
+        if (res.code == 20000) {
+          this.resetWork()
+        } else if (res.code == 502) {
+          this.$confirm(res.message, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.formData.confirmFinish = true;
+            this.finishOrder();
+          }).catch(() => {
+          });
+        }
+      }).catch(() => {
+        this.loading = false
+      })
     },
 
+
     updateOrder() {
       updateOrder(this.formData).then(res => {
         this.loading = false
@@ -822,7 +839,6 @@ export default {
 
     printCodeResult(data, message) {
       const resultParts = [];
-
       if (data.udi) {
         resultParts.push("层级标识: " + data.udi);
       }
@@ -854,6 +870,22 @@ export default {
       this.originCode = "";
       this.formData.code = "";
       this.scanCode = "";
+      this.scanTitle = "扫码结果：";
+      this.result = "";
+    },
+
+    /**
+     * 重置
+     */
+    resetWork() {
+      this.formData = {
+        tagStatus: -1,
+        workPlaceCode: this.formData.workPlaceCode,
+        busType: this.formData.busType
+      };
+      this.curRow = null
+      this.formData.confirmFinish = false;
+      this.refreshCodesPanel(this)
     },
 
 
@@ -873,7 +905,9 @@ export default {
     }
     if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
-      this.selectBusTypeDisabled = true
+      if (this.$route.query.billNo == null) {
+        this.selectBusTypeDisabled = true
+      }
       this.corpOrderIdDisabled = true
       this.workplaceId = Number(this.$route.query.workplaceId);
       this.formData.workPlaceCode = Number(this.$route.query.workplaceId);
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index e7af0715..3fc03a31 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -14,9 +14,7 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-              <span
-                style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-              >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
+
               <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
                   this.userInfo.companyName
                 }}</span>
@@ -30,7 +28,7 @@
         </el-row>
 
         <el-alert
-          style="margin-top: 15px;margin-bottom: 10px;font-size: 20px;"
+          style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
           :title="msgTip"
           :closable="false"
           type="warning">
@@ -161,7 +159,7 @@
           </el-col>
           <el-col :span="8" v-if="splitType=='out'">
             <el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">
-              <el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable">
+              <el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable" @change="splitChange">
                 <el-radio :label="1">拆零上货</el-radio>
                 <el-radio :label="2">整取上货</el-radio>
               </el-radio-group>
@@ -317,6 +315,7 @@ import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
 import {printSplitLabel} from "@/api/collect/splitCreateOrder";
 import {findInvRemind} from "@/api/inout/splitCode";
 import chooseDraftOrderDialog from "./chooseDraftOrderDialog"
+import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 
 export default {
   name: "ioCreateOrder",
@@ -371,6 +370,7 @@ export default {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
         userName: this.$store.getters.name,
+        userId: this.$store.getters.userId,
         companyName: this.$store.getters.companyName,
       },
       workplaceId: null,
@@ -542,9 +542,15 @@ export default {
       findInvRemind(post).then((response) => {
         if (response.code === 20000) {
           this.msgTip = response.data
+          this.$refs.inputRef.focus();
         }
       }).catch(() => {
       });
+
+    },
+
+    splitChange() {
+      this.$refs.inputRef.focus();
     },
     successCloseData() {
       let workPlaceCode = this.orderFormData.workPlaceCode
@@ -958,13 +964,13 @@ export default {
     //获取当前货位
     findCurWorkPlaces(val) {
       let query = {
-        key: val,
-        status: 1,
-        // invCode: this.orderFormData.invCode,
+        // key: val,
+        // status: 1,
+        userId: this.userInfo.userId,
         page: 1,
         limit: 100,
       }
-      listPage(query).then((res) => {
+      getUserBindWork(query).then((res) => {
         this.curWorkPlaces = res.data.list || [];
         if (this.curWorkPlaces.length == 1 && this.$isNotBlank(this.orderFormData.workPlaceCode)) {
           this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
@@ -1552,6 +1558,7 @@ export default {
             this.originCode = this.codeFormData.code;
           } else if (response.code == 501) {
             this.checkSuccess = false;
+            this.scanCode = ""
             this.$message.error(response.message);
           } else if (response.code == 503) {
             this.checkSuccess = false;
diff --git a/src/views/collect/IoCreateOrderBlank.vue b/src/views/collect/IoCreateOrderBlank.vue
index d7bf0c13..671d9bd0 100644
--- a/src/views/collect/IoCreateOrderBlank.vue
+++ b/src/views/collect/IoCreateOrderBlank.vue
@@ -14,9 +14,7 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-              <span
-                style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-              >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
+
               <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
                   this.userInfo.companyName
                 }}</span>
@@ -45,11 +43,11 @@
             <!--&gt;草稿保存-->
             <!--</el-button>-->
             <el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
-                       v-if="splitType=='out'"style="margin-right: 8px;border-radius: 5%;"
+                       v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
             >选入草稿单据
             </el-button>
             <el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
-                       v-if="splitType=='out'"style="margin-right: 8px;border-radius: 5%;"
+                       v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
             >草稿保存
             </el-button>
             <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
@@ -157,7 +155,7 @@
           </el-col>
           <el-col :span="8" v-if="splitType=='out'">
             <el-form-item prop="fifoSplit" class="query-form-item" label="上货方式:">
-              <el-radio-group v-model="orderFormData.fifoSplit">
+              <el-radio-group v-model="orderFormData.fifoSplit" :disabled="fifoSplitEnable">
                 <el-radio :label="1">拆零上货</el-radio>
                 <el-radio :label="2">整取上货</el-radio>
               </el-radio-group>
@@ -314,6 +312,7 @@ import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
 import {printSplitLabel} from "@/api/collect/splitCreateOrder";
 import {findInvRemind} from "@/api/inout/splitCode";
 import chooseDraftOrderDialog from "./chooseDraftOrderDialog"
+import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 
 export default {
   name: "ioCreateOrder",
@@ -368,6 +367,7 @@ export default {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
         userName: this.$store.getters.name,
+        userId: this.$store.getters.userId,
         companyName: this.$store.getters.companyName,
       },
       workplaceId: null,
@@ -518,7 +518,9 @@ export default {
       scanResultType: "success",
       msgTip: "当前工位存量提醒：",
       splitType: null,
-      rowData: {}
+      rowData: {},
+      curWorkPlace: null,
+      fifoSplitEnable: false,
     };
   },
   components: {
@@ -526,23 +528,20 @@ export default {
     codeDetailPanel,
     editCodeDialog,
     DialogCreateOrderSelect,
-    DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct,chooseDraftOrderDialog
+    DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct, chooseDraftOrderDialog
   },
   methods: {
     changeInvRemind(val) {
       let post = {
         workPlaceCode: val
       }
+      this.defaultSplitType()
       findInvRemind(post).then((response) => {
         if (response.code === 20000) {
           this.msgTip = response.data
-        } else {
-
         }
-      })
-        .catch(() => {
-
-        });
+      }).catch(() => {
+      });
     },
     successCloseData() {
       let workPlaceCode = this.orderFormData.workPlaceCode
@@ -567,10 +566,21 @@ export default {
         sickerAdNum: null,
         workPlaceCode: null,
         fifoSplit: 1,
+
       }
       this.orderFormData.workPlaceCode = workPlaceCode
       this.scanCode = "";
       this.corpOrderIdDisabled = false;
+
+
+      this.splitType = this.$route.query.splitType;
+      if (this.splitType == "search") {
+      } else if (this.splitType == "out") {
+        this.orderFormData.action = 'SC72197936495755';
+      } else if (this.splitType == "return") {
+        this.orderFormData.action = 'SC72249388338364';
+      }
+      this.orderFormData.fromCorp = "72198012799726";
       this.refreshCodesPanel()
     },
     //获取用户仓库列表
@@ -593,6 +603,16 @@ export default {
         .catch(() => {
         });
     },
+    defaultSplitType() {
+      this.curWorkPlace = this.curWorkPlaces.find(item => item.workplaceId == this.orderFormData.workPlaceCode);
+      this.orderFormData.fifoSplit = this.curWorkPlace.workplaceType
+      if (this.curWorkPlace.workplaceType == 1 || this.curWorkPlace.workplaceType == 2) {
+        this.fifoSplitEnable = true;
+      } else {
+        this.orderFormData.fifoSplit = 1;
+        this.fifoSplitEnable = false;
+      }
+    },
     //仓库改变
     changeInv(row) {
       this.orderFormData.action = null;
@@ -935,16 +955,17 @@ export default {
     //获取当前货位
     findCurWorkPlaces(val) {
       let query = {
-        key: val,
-        status: 1,
-        // invCode: this.orderFormData.invCode,
+        // key: val,
+        // status: 1,
+        userId: this.userInfo.userId,
         page: 1,
         limit: 100,
       }
-      listPage(query).then((res) => {
+      getUserBindWork(query).then((res) => {
         this.curWorkPlaces = res.data.list || [];
-        if (this.curWorkPlaces.length == 1) {
+        if (this.curWorkPlaces.length == 1 && this.$isNotBlank(this.orderFormData.workPlaceCode)) {
           this.orderFormData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
+          this.defaultSplitType()
         }
       })
     },
@@ -1221,6 +1242,10 @@ export default {
 
     refreshOrder(orderQuery) {
       this.orderFormData = orderQuery;
+      this.scanCode = "";
+      this.result = "";
+      this.refreshCodesPanel()
+      this.init();
     },
 
     //撤回单据
@@ -1445,7 +1470,7 @@ export default {
       }
     },
     //选入草稿单据
-    chooseDraftOrder(){
+    chooseDraftOrder() {
       if (this.$isBlank(this.orderFormData.workPlaceCode)) {
         this.$message.warning("请选择工位！");
         return;
@@ -1454,12 +1479,12 @@ export default {
       this.rowData.fifoSplit = this.orderFormData.fifoSplit
       this.chooseDraftOrderVisible = true
     },
-    closeChooseDialog(){
+    closeChooseDialog() {
       this.chooseDraftOrderVisible = false
     },
-    handleChoose(billNo){
-      this.orderFormData.billNo = billNo
-      this.refreshCodesPanel();
+    handleChoose(currentRow) {
+      this.orderQuery = currentRow
+      this.refreshOrder(this.orderQuery)
     },
     draftOrder() {
       let tQuery = Object.assign(
@@ -1721,8 +1746,6 @@ export default {
     init() {
       //页面初始化
       this.codeFormData.code = "";
-
-      this.splitType = this.$route.query.splitType;
       if (this.splitType == "search") {
       } else if (this.splitType == "out") {
         this.orderFormData.action = 'SC72197936495755';
@@ -1796,6 +1819,7 @@ export default {
     inputer.focus();
   },
   created() {
+    this.splitType = this.$route.query.splitType;
     this.init();
     if (this.$route.query.workplaceId != null) {
       this.corpOrderIdDisabled = true
diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue
index bbc4e293..6cb5dbd2 100644
--- a/src/views/collect/IoSplitFifoCodePanel.vue
+++ b/src/views/collect/IoSplitFifoCodePanel.vue
@@ -4,19 +4,19 @@
       <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
                size="mini" label-width="100px">
         <el-row style=" display:flex;  flex-wrap: wrap; ">
-          <el-col :span="20">
-            <el-form-item prop="code" label="扫码查询:">
-              <el-input
-                id="inputer"
-                @focus="getInputFocus($event)"
-                @keypress.enter.native="enterKey($event)"
-                ref="inputRef"
-                style="ime-mode: disabled"
-                type="tel"
-                v-model="filterQuery.code"
-              ></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="20">-->
+<!--            <el-form-item prop="code" label="扫码查询:">-->
+<!--              <el-input-->
+<!--                id="inputer"-->
+<!--                @focus="getInputFocus($event)"-->
+<!--                @keypress.enter.native="enterKey($event)"-->
+<!--                ref="inputRef"-->
+<!--                style="ime-mode: disabled"-->
+<!--                type="tel"-->
+<!--                v-model="filterQuery.code"-->
+<!--              ></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <!--<el-col :span="20">-->
           <!--  <el-form-item prop="code" label="查询:">-->
           <!--    <el-input-->
diff --git a/src/views/collect/IoSplitFinishCode.vue b/src/views/collect/IoSplitFinishCode.vue
index 8b1b3eac..ac920d52 100644
--- a/src/views/collect/IoSplitFinishCode.vue
+++ b/src/views/collect/IoSplitFinishCode.vue
@@ -687,6 +687,7 @@ import {convertDate} from "@/utils/date";
 import {isBlank} from "@/utils/strUtil";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
 import {getCodeList} from "@/api/inout/code";
+import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
 
 export default {
   name: "IoSplitFinishCode",
@@ -712,6 +713,7 @@ export default {
       defaultSort: {prop: 'createTime', order: 'desc'},
       options: {
         getInvList: [],
+        getWorkPlaceList: [],
         getDeptList: [],
         getBusType: [],
       },
@@ -1017,10 +1019,36 @@ export default {
         .catch(() => {
         });
     },
+    getWorkPlaceList(_this){
+      getUserBindWork({
+        autoUserId: 1,
+        page:  1,
+        limit: 200,
+      }).then((response) => {
+        let  getWorkPlaceList = []
+        if(response.code == 20000 && response.data.list.length > 0){
+          response.data.list.forEach( item => {
+            let post = {
+              code: item.workplaceId,
+                label: item.workplaceName
+            }
+            getWorkPlaceList.push(post)
+          })
+          _this.options.getWorkPlaceList = getWorkPlaceList
+        }
+      })
+        .catch(() => {
+        });
+    },
+
     invChange(_this) {
       _this.filterQuery.action = null;
       _this.getBusType(_this);
     },
+    placeChange(_this) {
+      // _this.filterQuery.workKey = _this.filterQuery.workplaceName;
+      // _this.getWorkPlaceList(_this);
+    },
 
     findMethod(query) {
       this.fromOptions = [];
@@ -1163,6 +1191,7 @@ export default {
   created() {
     this.getInvList(this);
     this.getBusType(this);
+    this.getWorkPlaceList(this);
 
     this.splitType = this.$route.query.splitType;
     if (this.splitType == "search") {
diff --git a/src/views/collect/fieldOperation.vue b/src/views/collect/fieldOperation.vue
index bdc234fd..ae8ecedb 100644
--- a/src/views/collect/fieldOperation.vue
+++ b/src/views/collect/fieldOperation.vue
@@ -20,13 +20,12 @@
 
 
     <el-row :gutter="8">
-      <el-col v-for="(info, index)  in stationList"  :key="index" :xs="12" :sm="8" :md="8" :lg="6">
+      <el-col v-for="(info, index)  in stationList"  :key="index" :xs="12" :sm="8" :md="8" :lg="6" >
         <el-card :body-style="{margin:'20px'}"
                  style="margin:20px 20px 20px 20px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;"
-
         >
 
-          <div style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */"  @click="handleClick(index)">
+          <div style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */" >
             <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.workplaceName }}</p> <!-- 假设你的信息对象中包含一个title属性 -->
 <!--            <div style="width: 60px; height: 60px;  display: flex; justify-content: center; align-items: center;">-->
 <!--              &lt;!&ndash; 二维码占位，这里用灰色方块代替 &ndash;&gt;-->
@@ -35,9 +34,9 @@
 
 <!--            </div>-->
           </div>
-          <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"  @click="handleClick(index)">
+          <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"  >
             <!-- 假设这里有一些信息内容 -->
-            <p style="font-size: 14px;background-color: #e1f3fb">{{ info.remake }}</p>
+            <p style="font-size: 14px;background-color: #e1f3fb" >{{ info.remake }}</p>
             <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="handleClick(index)">开始作业</el-button>
 
           </div>
diff --git a/src/views/collect/ioSplitFifoCode.vue b/src/views/collect/ioSplitFifoCode.vue
index 10ac4011..af10fa79 100644
--- a/src/views/collect/ioSplitFifoCode.vue
+++ b/src/views/collect/ioSplitFifoCode.vue
@@ -8,15 +8,13 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-          <span
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-          >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
+
           <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
               this.userInfo.companyName
             }}</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>
diff --git a/src/views/collect/ioSplitFifoCodeBlank.vue b/src/views/collect/ioSplitFifoCodeBlank.vue
index 10ac4011..b7db8b5e 100644
--- a/src/views/collect/ioSplitFifoCodeBlank.vue
+++ b/src/views/collect/ioSplitFifoCodeBlank.vue
@@ -8,9 +8,7 @@
             <span
               style="margin: 10px;color: #2d8cf0;font-size: 14px;"
             >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-          <span
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-          >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
+
           <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
               this.userInfo.companyName
             }}</span>