diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 4b9539c2..5f0f430e 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -9,12 +9,12 @@
             <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(用户&nbsp:&nbsp{{
                   this.userInfo.userName
                 }})</span>
             </div>
@@ -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",
@@ -648,6 +655,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 +668,11 @@ export default {
               this.addCode();
             }).catch(() => {
             });
-          } else
+          } else {
+            this.$refs.inputRef.focus();
             this.$message.error(res.message)
+          }
+
         }
       }).catch(() => {
         this.loading = false
@@ -677,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
@@ -688,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
@@ -818,7 +839,6 @@ export default {
 
     printCodeResult(data, message) {
       const resultParts = [];
-
       if (data.udi) {
         resultParts.push("层级标识: " + data.udi);
       }
@@ -850,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)
     },
 
 
diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue
index 9818d6a9..5f0f430e 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{{
@@ -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)
     },