diff --git a/src/api/collect/splitCreateOrder.js b/src/api/collect/splitCreateOrder.js
index 4c2403e5..88188368 100644
--- a/src/api/collect/splitCreateOrder.js
+++ b/src/api/collect/splitCreateOrder.js
@@ -46,3 +46,13 @@ export function draftOrder(query) {
   });
 }
 
+export function updateOrder(query) {
+  return axios({
+    url: "/udiwms/basic/collect/order/update",
+    method: "post",
+    data: query
+  });
+}
+
+
+
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 8b0a255b..f9aaaddd 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -45,19 +45,19 @@
                 type="primary"
                 :disabled="isSelectOrder"
                 @click.native="selectPrescribe()"
-              >选入单据1
+              >选入单据
               </el-button>
               <el-button
                 type="primary"
                 :disabled="formData.tagStatus<2"
                 @click.native="saveDraftOrder()"
-              >单据挂起1
+              >单据挂起
               </el-button>
               <el-button
                 type="primary"
                 :disabled="formData.tagStatus<2"
                 @click.native="finishOrder()"
-              >处理完成1
+              >处理完成
               </el-button>
 
               <el-dropdown @command="handleCommand">
@@ -142,14 +142,24 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="2">
-              <el-button
-                type="primary"
-                size="mini"
-                @click.native.stop="addCode()"
-                style="margin-left: 15px"
-              >添加
-              </el-button>
+            <el-col :span="4">
+              <el-button-group style="display: flex;">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  icon="el-icon-plus"
+                  @click.native.stop="addCode()"
+                  style="margin-left: 15px"
+                >添加
+                </el-button>
+                <el-button
+                  type="primary"
+                  size="mini"
+                  icon="el-icon-delete"
+                  @click.native.stop="clearCode()"
+                >清空
+                </el-button>
+              </el-button-group>
             </el-col>
           </el-row>
           <el-alert
@@ -236,7 +246,7 @@ import prescribeCodePanel from "./PanelOrderTagCode";
 import PannelOrderBiz from "./PannelOrderBiz";
 import {listPage} from "@/api/basic/sysWorkplaceManage";
 import {enterCodeWeb} from "@/api/inout/order";
-import {draftOrder, finishOrder, startSplit, tagCode} from "@/api/collect/splitCreateOrder";
+import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
 import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
 import {getNextOrder} from "@/api/collect/collectOrder";
@@ -538,6 +548,15 @@ export default {
 
     },
 
+    updateOrder() {
+      updateOrder(this.formData).then(res => {
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+
+    },
+
     //选择单据
     selectPrescribe() {
       console.log(this.formData.workPlaceCode)
@@ -546,7 +565,10 @@ export default {
 
     //获取下一单据
     nextCollectOrder() {
-      getNextOrder(this.formData).then(res => {
+      let nextQuery = {
+        workPlaceCode: this.formData.workPlaceCode
+      }
+      getNextOrder(nextQuery).then(res => {
         this.loading = false
         if (res.code == 20000) {
           this.formData = res.data;
@@ -568,6 +590,9 @@ export default {
       this.formData = row;
       this.curRow = row;
       this.dealSplitOrder()
+      this.formData.tagStatus = 2;
+      this.updateOrder();
+      this.refreshCodesPanel(this);
       this.refreshCodesPanel(this);
     },
 
@@ -576,10 +601,8 @@ export default {
       startSplit(this.formData).then(res => {
         this.loading = false
         if (res.code == 20000) {
-          console.log(res.data)
           this.refreshCodesPanel(this);
         } else {
-          console.log(res.message)
 
         }
       }).catch(() => {
@@ -617,7 +640,12 @@ export default {
     },
     handleCommand(command) {
       // this.$message('click on item ' + command);
-    }
+    },
+    clearCode() {
+      this.originCode = "";
+      this.formData.code = "";
+      this.scanCode = "";
+    },
   },
   created() {
     getHead("prescribeTagCodeDeal", "1").then((re) => {
@@ -633,10 +661,7 @@ export default {
       this.corpOrderIdDisabled = true
       this.formData.workPlaceCode = Number(this.$route.query.workplaceId);
     }
-
     this.findCurWorkPlaces();
-
-
   }
 
 }
diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue
index 5d304017..ff3f1593 100644
--- a/src/views/collect/DealOrderBlank.vue
+++ b/src/views/collect/DealOrderBlank.vue
@@ -45,19 +45,19 @@
                 type="primary"
                 :disabled="isSelectOrder"
                 @click.native="selectPrescribe()"
-              >选入单据1
+              >选入单据
               </el-button>
               <el-button
                 type="primary"
                 :disabled="formData.tagStatus<2"
                 @click.native="saveDraftOrder()"
-              >单据挂起1
+              >单据挂起
               </el-button>
               <el-button
                 type="primary"
                 :disabled="formData.tagStatus<2"
                 @click.native="finishOrder()"
-              >处理完成1
+              >处理完成
               </el-button>
 
               <el-dropdown @command="handleCommand">
@@ -153,9 +153,10 @@
             </el-col>
           </el-row>
           <el-alert
-            title="扫码解析结果:"
+            :title="scanTitle"
             :type="scanResultType"
             :closable="false"
+            :dangerouslyUseHTMLString="true"
             :description="result">
           </el-alert>
 
@@ -295,6 +296,7 @@ export default {
       //扫码相关
       scanCode: "",
       isSuccess: false,
+      scanTitle: "扫码结果:",
       result: "  \n",
       msgTip: "信息提醒：",
       originCode: "",
@@ -408,14 +410,14 @@ export default {
           this.$refs.inputRef.focus();
           this.$refs.inputRef.select();
           this.isSuccess = true;
-          this.printCodeResult(response.data)
+          this.printCodeResult(response.data, response.message)
           this.filterQuery.code = response.data.code;
           this.addCode();
         } else {
           if (response.code == 502) {
             this.checkSuccess = false;
             this.isSuccess = false;
-            this.printCodeResult(response.data)
+            this.printCodeResult(response.data, response.message)
             this.filterQuery.code = response.data.code;
             this.originCode = this.filterQuery.code;
           } else if (response.code == 501) {
@@ -424,7 +426,7 @@ export default {
           } else if (response.code == 503) {
             this.checkSuccess = false;
             this.isSuccess = false;
-            this.printCodeResult(response.data)
+            this.printCodeResult(response.data, response.message)
             this.filterQuery.code = response.data.code;
             this.$confirm(response.message, "提示", {
               type: "warning",
@@ -463,20 +465,36 @@ export default {
       if (this.$isBlank(this.filterQuery.code) && this.$isBlank(this.scanCode)) {
         return;
       }
+      if (this.$isNotBlank(this.scanCode)) {
+        this.filterQuery.code = this.scanCode.trim();
+      }
       let tagQuery = {
         workPlaceCode: this.formData.workPlaceCode,
         fromCorp: this.formData.fromCorp,
         billNo: this.formData.billNo,
         code: this.filterQuery.code.trim(),
+        insert: this.formData.insert
       };
       tagCode(tagQuery).then(res => {
         this.loading = false
         if (res.code == 20000) {
           this.formData.tagStatus = 2;
+          this.formData.insert = false;
           this.formData = res.data;
           this.refreshCodesPanel(this);
         } else {
-          this.$message.error(res.message)
+          if (res.code == 502) {
+            this.$confirm(res.message + '是否强制添加?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.formData.insert = true;
+              this.addCode();
+            }).catch(() => {
+            });
+          } else
+            this.$message.error(res.message)
         }
       }).catch(() => {
         this.loading = false
@@ -570,8 +588,8 @@ export default {
     },
 
 
-    printCodeResult(data, isSuccess) {
-      const resultParts = ["追溯码：" + data.code + "\r\n"];
+    printCodeResult(data, message) {
+      const resultParts = [];
 
       if (data.udi) {
         resultParts.push("层级标识: " + data.udi);
@@ -588,7 +606,14 @@ export default {
       if (data.serialNo) {
         resultParts.push("序列号: " + data.serialNo);
       }
+      this.scanTitle = "扫码结果：" + data.code;
       this.result = resultParts.join(" , ");
+      if (message == 'success') {
+        this.scanResultType = "success";
+      } else {
+        this.scanResultType = "warning";
+        this.result = this.result + "\n" + message;
+      }
     },
     handleCommand(command) {
       // this.$message('click on item ' + command);