From 7ae5c17e35dc9a2ae09b01e3362648e993a925b7 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 19 Aug 2024 17:11:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/DealOrder.vue               |  10 +-
 src/views/collect/DealOrderBlank.vue          |  57 +++-
 src/views/collect/IoCreateOrder.vue           | 101 +++----
 src/views/collect/IoCreateOrderBlank.vue      | 133 ++++++++-
 src/views/collect/PanelOrderDeal.vue          |  13 +-
 src/views/collect/PanelOrderEndSearch.vue     |   7 +-
 src/views/collect/PanelOrderManuTagCode.vue   | 274 ++++++++++++++++++
 src/views/collect/PanelOrderTagCode.vue       |  31 +-
 src/views/collect/PannelOrderBiz.vue          |  31 +-
 src/views/inout/PanelCreateOrderBizDetail.vue | 262 ++++++++---------
 10 files changed, 678 insertions(+), 241 deletions(-)
 create mode 100644 src/views/collect/PanelOrderManuTagCode.vue

diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 772ab946..6ba868f0 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -134,7 +134,6 @@
                   id="inputer"
                   @focus="getInputFocus($event)"
                   @keypress.enter.native="enterKey($event)"
-                  ref="inputRef"
                   style="ime-mode: disabled"
                   type="tel"
                   placeholder="请点击输入框进行扫码设置或者扫码录入"
@@ -173,7 +172,7 @@
         </div>
         <el-descriptions title="单据信息" :column="4" border style="margin-top: 15px">
           <el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item>
-          <el-descriptions-item label="往来信息">{{ formData.fromCorpName }}</el-descriptions-item>
+          <el-descriptions-item label="往来信息">{{ formData.fromCorp }}</el-descriptions-item>
           <el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item>
           <el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item>
           <el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
@@ -192,11 +191,11 @@
         </el-tab-pane>
 
         <el-tab-pane label="扫码明细">
-          <prescribeCodePanel
+          <PanelOrderManuTagCode
             v-if="panelALive"
             :fifoSplit="3"
             :prescribeData="curRow"
-          ></prescribeCodePanel>
+          ></PanelOrderManuTagCode>
         </el-tab-pane>
 
         <el-tab-pane label="拆零明细">
@@ -242,6 +241,7 @@ import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import {convertDate} from "@/utils/date";
 import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
+import PanelOrderManuTagCode from "./PanelOrderManuTagCode";
 import prescribeCodePanel from "./PanelOrderTagCode";
 import PannelOrderBiz from "./PannelOrderBiz";
 import {listPage} from "@/api/basic/sysWorkplaceManage";
@@ -318,7 +318,7 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, selectPrescribeDialog, prescribeCodePanel, PannelOrderBiz
+    addOrder, errOrder, selectPrescribeDialog, prescribeCodePanel,PanelOrderManuTagCode, PannelOrderBiz
   },
   methods: {
     findFromInvList(val) {
diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue
index ff3f1593..f9aaaddd 100644
--- a/src/views/collect/DealOrderBlank.vue
+++ b/src/views/collect/DealOrderBlank.vue
@@ -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/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 20bac445..55e904a2 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -8,7 +8,7 @@
     >
       <el-card style="margin: 5px;">
 
-        <el-row :gutter="0"  v-if="isLinkDisabled">
+        <el-row :gutter="0" v-if="isLinkDisabled">
           <el-col :span="24" align="right">
             <div class="inv-hos-title">
             <span
@@ -289,7 +289,7 @@ import {filterNoPage, remoteFilter} from "@/api/basic/sicker/skPersonApi";
 import dialogInvProduct from "@/views/inout/DialogSelectInvProduct";
 import {listPage} from "@/api/basic/sysWorkplaceManage";
 import {printSplitLabel} from "@/api/collect/splitCreateOrder";
-import { findInvRemind } from "@/api/inout/splitCode";
+import {findInvRemind} from "@/api/inout/splitCode";
 
 export default {
   name: "ioCreateOrder",
@@ -340,7 +340,7 @@ export default {
   data() {
     return {
       isLinkDisabled: false,
-      userInfo:{
+      userInfo: {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
         userName: this.$store.getters.name,
@@ -492,6 +492,7 @@ export default {
       result: "",
       scanResultType: "success",
       msgTip: "工位存量提醒：",
+      splitType: null,
     };
   },
   components: {
@@ -502,47 +503,47 @@ export default {
     DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct
   },
   methods: {
-    changeInvRemind(val){
+    changeInvRemind(val) {
       let post = {
         workPlaceCode: val
       }
       findInvRemind(post).then((response) => {
         if (response.code === 20000) {
-         this.msgTip = response.data
-        }else {
+          this.msgTip = response.data
+        } else {
 
         }
       })
-    .catch(() => {
+        .catch(() => {
 
-      });
+        });
     },
-    successCloseData(){
+    successCloseData() {
       let workPlaceCode = this.orderFormData.workPlaceCode
-      this.orderFormData ={
+      this.orderFormData = {
         billNo: null,
-          corpOrderId: null,
-          action: null,
-          invCode: null,
-          fromCorp: null,
-          fromCorpName: null,
-          fromName: null,
-          fromInvCode: null,
-          remark: null,
-          fromType: 2,
-          errMsg: null,
-          checkPreInOrders: null,
-          checkPreInInvCode: null,
-          checkPreInSpaceCode: null,
-          curSpaceCode: null,
-          preSpaceCode: null,
-          preCurSpaceCode: null,  //单据
-          sickerAdNum: null,
-          workPlaceCode: null,
-          fifoSplit: 1,
+        corpOrderId: null,
+        action: null,
+        invCode: null,
+        fromCorp: null,
+        fromCorpName: null,
+        fromName: null,
+        fromInvCode: null,
+        remark: null,
+        fromType: 2,
+        errMsg: null,
+        checkPreInOrders: null,
+        checkPreInInvCode: null,
+        checkPreInSpaceCode: null,
+        curSpaceCode: null,
+        preSpaceCode: null,
+        preCurSpaceCode: null,  //单据
+        sickerAdNum: null,
+        workPlaceCode: null,
+        fifoSplit: 1,
       }
       this.orderFormData.workPlaceCode = workPlaceCode
-      this.scanCode= "";
+      this.scanCode = "";
       this.corpOrderIdDisabled = false;
       this.refreshCodesPanel()
     },
@@ -666,9 +667,9 @@ export default {
         if (response.code === 20000) {
           // this.$message.success("成功");
           const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
-            if(this.closeDialog != undefined){
-              this.closeDialog();
-            }
+          if (this.closeDialog != undefined) {
+            this.closeDialog();
+          }
           this.clearOrder();
         } else {
           // this.$message.error(response.message);
@@ -1212,9 +1213,9 @@ export default {
               this.retractLoading = false
               if (response.code == 20000) {
                 this.$message.success("撤回成功！");
-                  if(this.closeDialog != undefined){
-              this.closeDialog();
-            }
+                if (this.closeDialog != undefined) {
+                  this.closeDialog();
+                }
               } else {
                 this.$message.error(response.message);
               }
@@ -1240,9 +1241,9 @@ export default {
         this.codeLoading = false
         if (response.code === 20000) {
           this.$message.success("提交成功");
-            if(this.closeDialog != undefined){
-              this.closeDialog();
-            }
+          if (this.closeDialog != undefined) {
+            this.closeDialog();
+          }
         } else {
           this.$message.error(response.message);
         }
@@ -1255,9 +1256,9 @@ export default {
         this.checkLoading = false
         if (response.code === 20000) {
           this.$message.success("提交成功");
-            if(this.closeDialog != undefined){
-              this.closeDialog();
-            }
+          if (this.closeDialog != undefined) {
+            this.closeDialog();
+          }
         } else {
           this.$message.error(response.message);
         }
@@ -1318,7 +1319,7 @@ export default {
             this.$message.success("提交成功,等待处理，请刷新后查看！");
             this.successCloseData()
             console.log(this.closeDialog())
-              if(this.closeDialog != undefined){
+            if (this.closeDialog != undefined) {
               this.closeDialog();
             }
           } else {
@@ -1343,7 +1344,7 @@ export default {
           if (response.code === 20000) {
             this.$message.success("提交成功");
             this.successCloseData()
-              if(this.closeDialog != undefined){
+            if (this.closeDialog != undefined) {
               this.closeDialog();
             }
           } else {
@@ -1365,7 +1366,7 @@ export default {
           if (response.code === 20000) {
             this.$message.success("提交成功");
             this.successCloseData()
-              if(this.closeDialog != undefined){
+            if (this.closeDialog != undefined) {
               this.closeDialog();
             }
           } else {
@@ -1408,7 +1409,7 @@ export default {
           if (response.code === 20000) {
             this.$message.success("提交成功");
             this.successCloseData()
-            if(this.closeDialog != undefined){
+            if (this.closeDialog != undefined) {
               this.closeDialog();
             }
 
@@ -1433,9 +1434,9 @@ export default {
       saveOrderWeb(tQuery).then((response) => {
         this.saveLoading = false
         if (response.code === 20000) {
-            if(this.closeDialog != undefined){
-              this.closeDialog();
-            }
+          if (this.closeDialog != undefined) {
+            this.closeDialog();
+          }
         } else {
           this.$message.error(response.message);
         }
@@ -1754,7 +1755,7 @@ export default {
   },
   created() {
     this.init();
-    if (this.$route.query.workplaceId != null){
+    if (this.$route.query.workplaceId != null) {
       this.corpOrderIdDisabled = true
       this.isLinkDisabled = true
       this.workplaceId = this.$route.query.workplaceId
diff --git a/src/views/collect/IoCreateOrderBlank.vue b/src/views/collect/IoCreateOrderBlank.vue
index 1ff9c06f..230e36fc 100644
--- a/src/views/collect/IoCreateOrderBlank.vue
+++ b/src/views/collect/IoCreateOrderBlank.vue
@@ -8,7 +8,7 @@
     >
       <el-card style="margin: 5px;">
 
-        <el-row :gutter="0"  v-if="isLinkDisabled">
+        <el-row :gutter="0" v-if="isLinkDisabled">
           <el-col :span="24" align="right">
             <div class="inv-hos-title">
             <span
@@ -37,6 +37,10 @@
           type="warning">
         </el-alert>
 
+        <div class="scroll-alert" style="margin-top: 15px;">
+          <div class="scroll-text">{{ msgTip }}</div>
+        </div>
+
         <el-row>
           <el-button-group
             style="display: flex; margin: 0px 0 15px 0; float: right"
@@ -129,12 +133,14 @@
                 style="width: 90%"
                 :disabled="corpOrderIdDisabled"
                 filterable
+                @change="changeInvRemind"
               >
                 <el-option
                   v-for="item in curWorkPlaces"
                   :key="item.workplaceId"
                   :label="item.workplaceName"
                   :value="item.workplaceId"
+
                 >
                   <span style="float: left">{{ item.workplaceName }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{
@@ -283,6 +289,7 @@ import {filterNoPage, remoteFilter} from "@/api/basic/sicker/skPersonApi";
 import dialogInvProduct from "@/views/inout/DialogSelectInvProduct";
 import {listPage} from "@/api/basic/sysWorkplaceManage";
 import {printSplitLabel} from "@/api/collect/splitCreateOrder";
+import {findInvRemind} from "@/api/inout/splitCode";
 
 export default {
   name: "ioCreateOrder",
@@ -333,7 +340,7 @@ export default {
   data() {
     return {
       isLinkDisabled: false,
-      userInfo:{
+      userInfo: {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
         userName: this.$store.getters.name,
@@ -485,6 +492,7 @@ export default {
       result: "",
       scanResultType: "success",
       msgTip: "工位存量提醒：",
+      splitType: null,
     };
   },
   components: {
@@ -495,7 +503,50 @@ export default {
     DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct
   },
   methods: {
+    changeInvRemind(val) {
+      let post = {
+        workPlaceCode: val
+      }
+      findInvRemind(post).then((response) => {
+        if (response.code === 20000) {
+          this.msgTip = response.data
+        } else {
+
+        }
+      })
+        .catch(() => {
 
+        });
+    },
+    successCloseData() {
+      let workPlaceCode = this.orderFormData.workPlaceCode
+      this.orderFormData = {
+        billNo: null,
+        corpOrderId: null,
+        action: null,
+        invCode: null,
+        fromCorp: null,
+        fromCorpName: null,
+        fromName: null,
+        fromInvCode: null,
+        remark: null,
+        fromType: 2,
+        errMsg: null,
+        checkPreInOrders: null,
+        checkPreInInvCode: null,
+        checkPreInSpaceCode: null,
+        curSpaceCode: null,
+        preSpaceCode: null,
+        preCurSpaceCode: null,  //单据
+        sickerAdNum: null,
+        workPlaceCode: null,
+        fifoSplit: 1,
+      }
+      this.orderFormData.workPlaceCode = workPlaceCode
+      this.scanCode = "";
+      this.corpOrderIdDisabled = false;
+      this.refreshCodesPanel()
+    },
     //获取用户仓库列表
     findInvListByUser() {
       this.curInvOptions = [];
@@ -616,7 +667,9 @@ export default {
         if (response.code === 20000) {
           // this.$message.success("成功");
           const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails();
-          this.closeDialog();
+          if (this.closeDialog != undefined) {
+            this.closeDialog();
+          }
           this.clearOrder();
         } else {
           // this.$message.error(response.message);
@@ -890,6 +943,10 @@ export default {
 
     //添加条码
     addCode() {
+      if (this.$isBlank(this.orderFormData.workPlaceCode)) {
+        this.$message.warning("请选择工位！");
+        return;
+      }
       this.originCode = "";
       this.sictomText = "";
       this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim();
@@ -1156,7 +1213,9 @@ export default {
               this.retractLoading = false
               if (response.code == 20000) {
                 this.$message.success("撤回成功！");
-                this.closeDialog();
+                if (this.closeDialog != undefined) {
+                  this.closeDialog();
+                }
               } else {
                 this.$message.error(response.message);
               }
@@ -1182,7 +1241,9 @@ export default {
         this.codeLoading = false
         if (response.code === 20000) {
           this.$message.success("提交成功");
-          this.closeDialog();
+          if (this.closeDialog != undefined) {
+            this.closeDialog();
+          }
         } else {
           this.$message.error(response.message);
         }
@@ -1195,7 +1256,9 @@ export default {
         this.checkLoading = false
         if (response.code === 20000) {
           this.$message.success("提交成功");
-          this.closeDialog();
+          if (this.closeDialog != undefined) {
+            this.closeDialog();
+          }
         } else {
           this.$message.error(response.message);
         }
@@ -1254,7 +1317,11 @@ export default {
           }
           if (response.code === 20000) {
             this.$message.success("提交成功,等待处理，请刷新后查看！");
-            this.closeDialog();
+            this.successCloseData()
+            console.log(this.closeDialog())
+            if (this.closeDialog != undefined) {
+              this.closeDialog();
+            }
           } else {
             this.$message.error(response.message);
           }
@@ -1276,7 +1343,10 @@ export default {
           }
           if (response.code === 20000) {
             this.$message.success("提交成功");
-            this.closeDialog();
+            this.successCloseData()
+            if (this.closeDialog != undefined) {
+              this.closeDialog();
+            }
           } else {
             this.$message.error(response.message);
           }
@@ -1295,7 +1365,10 @@ export default {
 
           if (response.code === 20000) {
             this.$message.success("提交成功");
-            this.closeDialog();
+            this.successCloseData()
+            if (this.closeDialog != undefined) {
+              this.closeDialog();
+            }
           } else {
             this.$message.error(response.message);
           }
@@ -1335,7 +1408,11 @@ export default {
           this.submitLoading = false
           if (response.code === 20000) {
             this.$message.success("提交成功");
-            this.closeDialog();
+            this.successCloseData()
+            if (this.closeDialog != undefined) {
+              this.closeDialog();
+            }
+
           } else {
             this.$message.error(response.message);
           }
@@ -1357,7 +1434,9 @@ export default {
       saveOrderWeb(tQuery).then((response) => {
         this.saveLoading = false
         if (response.code === 20000) {
-          this.closeDialog();
+          if (this.closeDialog != undefined) {
+            this.closeDialog();
+          }
         } else {
           this.$message.error(response.message);
         }
@@ -1528,7 +1607,7 @@ export default {
       const resultParts = ["扫码解析结果：" + data.code];
 
       if (data.udi) {
-        resultParts.push("DI标识: " + data.udi);
+        resultParts.push("层级标识: " + data.udi);
       }
       if (data.batchNo) {
         resultParts.push("批次号: " + data.batchNo);
@@ -1546,7 +1625,7 @@ export default {
     },
     printLabel() {
       let query = {
-        labelId: 5,
+        labelId: 7,
       }
       printSplitLabel(query).then((response) => {
         const binaryData = [];
@@ -1676,7 +1755,7 @@ export default {
   },
   created() {
     this.init();
-    if (this.$route.query.workplaceId != null){
+    if (this.$route.query.workplaceId != null) {
       this.corpOrderIdDisabled = true
       this.isLinkDisabled = true
       this.workplaceId = this.$route.query.workplaceId
@@ -1688,6 +1767,32 @@ export default {
 
 
 <style scoped>
+.scroll-alert {
+  width: 100%; /* 或者你需要的宽度 */
+  overflow: hidden;
+  white-space: nowrap;
+  box-sizing: border-box;
+  /*border: 1px solid #f56c6c; !* 类似于 Element UI 警告框的边框 *!*/
+  background-color: rgba(255, 235, 59, 0.1); /* 类似于 Element UI 警告框的背景色 */
+  padding: 10px;
+  position: relative;
+}
+
+.scroll-text {
+  display: inline-block;
+  padding-left: 100%; /* 初始位置在容器右侧 */
+  animation: scroll 10s linear infinite; /* 滚动动画 */
+}
+
+@keyframes scroll {
+  from {
+    transform: translateX(0);
+  }
+  to {
+    transform: translateX(-100%);
+  }
+}
+
 .query-form-item {
   margin-right: 5px;
   margin-bottom: 6px;
diff --git a/src/views/collect/PanelOrderDeal.vue b/src/views/collect/PanelOrderDeal.vue
index 1d5b964d..57cd53dc 100644
--- a/src/views/collect/PanelOrderDeal.vue
+++ b/src/views/collect/PanelOrderDeal.vue
@@ -210,11 +210,11 @@
     <el-tabs type="border-card" style="margin: 15px">
 
       <el-tab-pane label="扫码明细">
-        <prescribeCodePanel
+        <PanelOrderManuTagCode
           v-if="panelALive"
           :fifoSplit="3"
           :prescribeData="curRow"
-        ></prescribeCodePanel>
+        ></PanelOrderManuTagCode>
       </el-tab-pane>
       <el-tab-pane label="拆零明细">
         <prescribeCodePanel
@@ -249,6 +249,7 @@ import {convertDate} from "@/utils/date";
 import prescribeOriginPanel from "@/views/collect/PannelOrderBiz";
 import prescribeCodePanel from "@/views/collect/PanelOrderTagCode";
 import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
+import PanelOrderManuTagCode from "./PanelOrderManuTagCode";
 
 export default {
   name: "prescribeAllotIngPanel",
@@ -273,7 +274,7 @@ export default {
       showSearch: true,
       filterQuery: {
         billNo: null,
-        tagStatusList: [-1,2],
+        tagStatusList: [-1, 2],
         page: 1,
         limit: 10,
       },
@@ -308,11 +309,11 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel
+    addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel, PanelOrderManuTagCode
   },
   methods: {
     //启动定时器
-    timerAuto(){
+    timerAuto() {
       //启动定时器
       this.timer = setInterval(() => {
         //查询订单是否支付成功
@@ -322,7 +323,7 @@ export default {
       //清楚定时器的方法
       // clearInterval(this.timer)
     },
-    linkPage(_this,row) {
+    linkPage(_this, row) {
 
       let url = window.location.origin + `#/tagCodeBlank` + `?billNo=` + row.billNo
       window.open(url, '_blank');
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index 8c7477ac..791e8294 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -208,11 +208,11 @@
     <el-tabs type="border-card" style="margin: 15px">
 
       <el-tab-pane label="扫码明细">
-        <prescribeCodePanel
+        <PanelOrderManuTagCode
           v-if="panelALive"
           :fifoSplit="3"
           :prescribeData="curRow"
-        ></prescribeCodePanel>
+        ></PanelOrderManuTagCode>
       </el-tab-pane>
       <el-tab-pane label="拆零明细">
         <prescribeCodePanel
@@ -248,6 +248,7 @@ import errOrder from "@/views/inout/IoCreateErrorOrder";
 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 {orderPage} from "@/api/collect/collectOrder";
 
@@ -299,7 +300,7 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel
+    addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel,PanelOrderManuTagCode
   },
   methods: {
 
diff --git a/src/views/collect/PanelOrderManuTagCode.vue b/src/views/collect/PanelOrderManuTagCode.vue
new file mode 100644
index 00000000..8be60f7a
--- /dev/null
+++ b/src/views/collect/PanelOrderManuTagCode.vue
@@ -0,0 +1,274 @@
+<template>
+  <div>
+    <el-table v-loading="codeLoading" :data="codeDetailList" style="width: 100%" :row-style="{height:'32px'}" border>
+      <template v-for="(item, index) in tableHeader2">
+        <el-table-column
+          v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+          type="index" :label="item.columnDesc"></el-table-column>
+        <el-table-column
+          v-if="item.columnType == 'selection'"
+          type="selection"
+          :width="item.width"
+          :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+        ></el-table-column>
+
+        <el-table-column
+          v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+          :prop="item.columnName"
+          :label="item.columnDesc"
+          :sortable="item.sort"
+          :width="item.width"
+          :show-overflow-tooltip="item.tooltip"
+          :key="item.columnName"
+        >
+          <template slot-scope="scope">
+            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+          :prop="item.columnName"
+          :label="item.columnDesc"
+          :sortable="item.sort"
+          :width="item.width"
+          :show-overflow-tooltip="item.tooltip"
+          :key="item.columnName"
+        >
+          <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
+                    item.lableRuleObj[scope.row[item.columnName]]
+                  }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+          :prop="item.columnName"
+          :label="item.columnDesc"
+          :sortable="item.sort"
+          :width="item.width"
+          :show-overflow-tooltip="item.tooltip"
+          :key="item.columnName"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                  <span>{{
+                      item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+                    }}</span>
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+          :prop="item.columnName"
+          :label="item.columnDesc"
+          :width="item.width"
+          :key="item.columnName"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                       :type="buttonItem.type"
+                       :size="buttonItem.size"
+                       :style="buttonItem.style"
+                       :key="buttonItem"
+                       v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                       :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                       @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+            >{{ buttonItem.name }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="item.columnType == 'text'  && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)"
+          :prop="item.columnName"
+          :label="item.columnDesc"
+          :sortable="item.sort"
+          :width="item.width"
+          :show-overflow-tooltip="item.tooltip"
+          :key="item.columnName"
+        >
+          <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                    scope.row[item.columnName]
+                  }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)"
+          :prop="item.columnName"
+          :label="item.columnDesc"
+          :sortable="item.sort"
+          :width="item.width"
+          :show-overflow-tooltip="item.tooltip"
+          :key="item.columnName"
+        >
+          <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                    convertDateFun(scope.row[item.columnName])
+                  }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </el-table>
+
+    <pagination
+      v-show="codeTotal>0"
+      :total="codeTotal"
+      :limit.sync="codeQuery.limit"
+      :page.sync="codeQuery.page"
+      @pagination="codeHandleCurrentChange"
+    ></pagination>
+
+  </div>
+</template>
+
+<script>
+import {convertDate} from "@/utils/date";
+import {executeFuc, getHead} from "@/utils/customConfig";
+import {autoCodeDetail, autoCodeResult, manualCodeDetail} from "@/api/collect/collectOrder";
+
+export default {
+
+  /**
+   * 手动扫码
+   */
+  name: "PanelOrderManuTagCode",
+  props: {
+    prescribeData: {
+      type: Object,
+      default: null,
+      required: true
+    },
+    //上货方式：1:拆零上货；2:整取上货;3：手动扫码查询
+    fifoSplit: {
+      type: Object,
+      default: null,
+      required: true
+    },
+  },
+  data() {
+
+    return {
+      //界面配置相关
+      //赋码明细
+      tableHeader2: [],
+      queryList2: [],
+      tableObj2: [],
+      fromList2: [],
+      convertDateFun: convertDate,
+      //界面配置-------------end
+
+      codeLoading: false,
+      codeDetailList: [],
+      codeTotal: 0,
+      codeQuery: {
+        fifoSplit: null,
+        page: 1,
+        limit: 10,
+      },
+      splitType: true,
+    }
+  },
+  methods: {
+    //界面配置相关------------
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
+    },
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.query.sort = 'desc'
+      } else {
+        this.query.sort = 'asc'
+      }
+      this.query.orderBy = column.prop;
+      this.getList(this);
+    },
+    ///界面配置相关------------end
+
+    getList(_this) {
+      if (_this.prescribeData == null)
+        return
+      if (_this.prescribeData != null) {
+        _this.codeQuery.page = 1
+        _this.codeQuery.orderIdFk = this.prescribeData.billNo
+      }
+      _this.codeLoading = true;
+      if (_this.fifoSplit == 3) {
+        manualCodeDetail(_this.codeQuery).then(res => {
+          _this.codeLoading = false
+          if (res.code != 20000) {
+            _this.$message.error(res.message)
+            return
+          }
+          _this.codeDetailList = res.data.list
+          _this.codeLoading = false
+        }).catch(() => {
+          _this.codeLoading = false
+          _this.$message.error("数据加载失败")
+        })
+      } else {
+        _this.codeQuery.fifoSplit = this.fifoSplit
+        autoCodeResult(_this.codeQuery).then(res => {
+          _this.codeLoading = false
+          if (res.code != 20000) {
+            _this.$message.error(res.message)
+            return
+          }
+          _this.codeDetailList = res.data.list
+          _this.codeLoading = false
+        }).catch(() => {
+          _this.codeLoading = false
+          _this.$message.error("数据加载失败")
+        })
+      }
+
+    },
+    codeHandleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getCodeDetail(this, null);
+    },
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (row.count != row.scanCount) {
+        rowBackground.color = '#f60303';
+      }
+
+      rowBackground.height = "32px"
+      return rowBackground;
+    },
+  },
+
+  created() {
+    if (this.fifoSplit == 2 || this.fifoSplit == 1) {
+      this.splitType = false
+    }
+
+    if (this.tableHeader2 == null || this.tableHeader2.length == 0) {
+      getHead("PanelOrderManuTagCode", "1").then((re) => {
+        // 处理返回的数据
+        this.tableObj2 = re.data;
+        this.tableHeader2 = re.data.tableList;
+        this.queryList2 = re.data.queryList;
+        this.fromList2 = re.data.fromList;
+        this.getList(this);
+      });
+    } else {
+      this.getPrescribeDetail(this);
+    }
+
+
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/collect/PanelOrderTagCode.vue b/src/views/collect/PanelOrderTagCode.vue
index 3cf55a60..80c7a149 100644
--- a/src/views/collect/PanelOrderTagCode.vue
+++ b/src/views/collect/PanelOrderTagCode.vue
@@ -234,21 +234,36 @@ export default {
       this.filterQuery.page = val.page;
       this.getCodeDetail(this, null);
     },
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (row.count != row.scanCount) {
+        rowBackground.color = '#f60303';
+      }
 
+      rowBackground.height = "32px"
+      return rowBackground;
+    },
   },
 
   created() {
     if (this.fifoSplit == 2 || this.fifoSplit == 1) {
       this.splitType = false
     }
-    getHead("prescribePanel-2", "1").then((re) => {
-      // 处理返回的数据
-      this.tableObj2 = re.data;
-      this.tableHeader2 = re.data.tableList;
-      this.queryList2 = re.data.queryList;
-      this.fromList2 = re.data.fromList;
-      this.getList(this);
-    });
+
+    if (this.tableHeader2 == null || this.tableHeader2.length == 0) {
+      getHead("prescribePanel-2", "1").then((re) => {
+        // 处理返回的数据
+        this.tableObj2 = re.data;
+        this.tableHeader2 = re.data.tableList;
+        this.queryList2 = re.data.queryList;
+        this.fromList2 = re.data.fromList;
+        this.getList(this);
+      });
+    } else {
+      this.getPrescribeDetail(this);
+    }
+
+
   }
 
 }
diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue
index cda2c91b..aed89d4c 100644
--- a/src/views/collect/PannelOrderBiz.vue
+++ b/src/views/collect/PannelOrderBiz.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border :row-style="{ height: '32px' }">
+    <el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border :row-style="rowStyle">
       <template v-for="(item, index) in tableHeader1">
         <el-table-column
           v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@@ -228,16 +228,31 @@ export default {
       })
     },
 
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (row.count != row.scanCount) {
+        rowBackground.color = '#f60303';
+      }
+
+      rowBackground.height = "32px"
+      return rowBackground;
+    },
+
   },
   created() {
-    getHead("prescribeOriginPanel", "1").then((re) => {
-      // 处理返回的数据
-      this.tableObj1 = re.data;
-      this.tableHeader1 = re.data.tableList;
-      this.queryList1 = re.data.queryList;
-      this.fromList1 = re.data.fromList;
+    if (this.tableHeader1 == null || this.tableHeader1.length == 0) {
+      getHead("prescribeOriginPanel", "1").then((re) => {
+        // 处理返回的数据
+        this.tableObj1 = re.data;
+        this.tableHeader1 = re.data.tableList;
+        this.queryList1 = re.data.queryList;
+        this.fromList1 = re.data.fromList;
+        this.getPrescribeDetail(this);
+      });
+    } else {
       this.getPrescribeDetail(this);
-    });
+    }
+
     if (this.dealStatus == 1) {
       this.countVisible = false;
     } else {
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 4f1b9aff..a918c50a 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -3,18 +3,18 @@
     <el-row>
       <div style="margin: 0px 60px 10px auto; height: 35px;  float: right;">
         <el-button-group>
-<!--          <el-button-->
-<!--            type="primary"-->
-<!--            ref="mainTable"-->
-<!--            @click.native.stop="selectWarlockBagFunction()"-->
-<!--            :loading="loading"-->
-<!--          >术式套包录入-->
-<!--          </el-button>-->
+          <!--          <el-button-->
+          <!--            type="primary"-->
+          <!--            ref="mainTable"-->
+          <!--            @click.native.stop="selectWarlockBagFunction()"-->
+          <!--            :loading="loading"-->
+          <!--          >术式套包录入-->
+          <!--          </el-button>-->
           <el-button
-            type="primary"
-            ref="mainTable"
-            @click.native.stop="selectProductFunction()"
-            :loading="loading"
+              type="primary"
+              ref="mainTable"
+              @click.native.stop="selectProductFunction()"
+              :loading="loading"
           >物资录入
           </el-button>
         </el-button-group>
@@ -29,9 +29,9 @@
               max-height="350" height="350" ref="multipleTable">
       <el-table-column label="序号" type="index" width="50"></el-table-column>
       <el-table-column
-        label="DI/物资编码" width="150"
-        prop="nameCode"
-        show-overflow-tooltip
+          label="DI/物资编码" width="150"
+          prop="nameCode"
+          show-overflow-tooltip
       ></el-table-column>
       <el-table-column width="150"
                        label="物资名称"
@@ -122,87 +122,87 @@
     </el-table>
 
     <el-dialog
-      title="业务详情-术式套包录入"
-      :visible.sync="selectWarlockBagVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="85%"
-      v-if="selectWarlockBagVisible"
-      :append-to-body='true'
+        title="业务详情-术式套包录入"
+        :visible.sync="selectWarlockBagVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectWarlockBagVisible"
+        :append-to-body='true'
     >
       <selectWarlockBag
-        :closeDialog="closeDialog"
-        :data="thisData"
-        :type="2"
+          :closeDialog="closeDialog"
+          :data="thisData"
+          :type="2"
       ></selectWarlockBag>
     </el-dialog>
 
     <el-dialog
-      title="业务详情-物资录入"
-      :visible.sync="selectProductVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="85%"
-      v-if="selectProductVisible"
-      :append-to-body='true'
+        title="业务详情-物资录入"
+        :visible.sync="selectProductVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectProductVisible"
+        :append-to-body='true'
     >
       <stockOrderNewSelectProduct
-        :closeDialog="closeDialog"
-        :data="thisData"
+          :closeDialog="closeDialog"
+          :data="thisData"
       ></stockOrderNewSelectProduct>
     </el-dialog>
     <el-dialog
-      title="库存物资录入"
-      :visible.sync="selectInvProductVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="85%"
-      v-if="selectInvProductVisible"
-      :append-to-body='true'
+        title="库存物资录入"
+        :visible.sync="selectInvProductVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectInvProductVisible"
+        :append-to-body='true'
     >
       <dialogInvProduct
-        :closeDialog="closeDialogC2"
-        :invQueryData="invQueryData"
-        :orderQuery="thisData"
-        :type="2"
+          :closeDialog="closeDialogC2"
+          :invQueryData="invQueryData"
+          :orderQuery="thisData"
+          :type="2"
       ></dialogInvProduct>
     </el-dialog>
 
 
     <!--    绑定产品-->
     <el-dialog
-      title="绑定产品"
-      :visible.sync="selectRlVisible"
-      width="80%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="selectRlVisible"
-      append-to-body
+        title="绑定产品"
+        :visible.sync="selectRlVisible"
+        width="80%"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="selectRlVisible"
+        append-to-body
     >
       <selectRlDialog
-        :curRow="curRow"
-        :type="bizType"
-        v-on:selectBindRl="selectBindRl"
-        v-on:closeBindDialog="closeBindDialog"
+          :curRow="curRow"
+          :type="bizType"
+          v-on:selectBindRl="selectBindRl"
+          v-on:closeBindDialog="closeBindDialog"
       ></selectRlDialog>
     </el-dialog>
 
 
     <!--    绑定供应商-->
     <el-dialog
-      title="绑定供应商"
-      :visible.sync="dialogTableVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="dialogTableVisible"
-      width="80%"
-      append-to-body
+        title="绑定供应商"
+        :visible.sync="dialogTableVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="dialogTableVisible"
+        width="80%"
+        append-to-body
     >
       <DialogSelectUnit
-        :codeId="curRow"
-        :type="bizType"
-        v-on:selectSupUnit="selectSupUnit"
-        v-on:closeBindDialog="closeBindDialog"
+          :codeId="curRow"
+          :type="bizType"
+          v-on:selectSupUnit="selectSupUnit"
+          v-on:closeBindDialog="closeBindDialog"
       ></DialogSelectUnit>
     </el-dialog>
 
@@ -272,23 +272,23 @@ export default {
   components: {
     selectRlDialog, DialogSelectUnit,
     stockOrderNewSelectProduct,
-    dialogInvProduct,selectWarlockBag
+    dialogInvProduct, selectWarlockBag
   },
   methods: {
     getOrderDetails() {
       this.loading = true;
       this.query.orderId = this.idQuery.billNo;
       getDetailBizs(this.query) //查找该单号下的所有条码
-        .then((response) => {
-          this.detailList = response.data.list || [];
-          this.total = response.data.total || 0;
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.detailList = [];
-          this.total = 0;
-        });
+          .then((response) => {
+            this.detailList = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.detailList = [];
+            this.total = 0;
+          });
     },
 
 
@@ -362,7 +362,7 @@ export default {
 
     },
 
-    selectWarlockBagFunction(){
+    selectWarlockBagFunction() {
       this.thisData = this.idQuery;
       if (this.$isBlank(this.idQuery.action)) {
         this.$message.error("单据类型不能为空！")
@@ -396,22 +396,22 @@ export default {
         row.batchNo = null;
       }
       updateBizProduct(row)
-        .then((response) => {
-          this.loading = false;
-          if (response.code === 20000) {
-            this.$message.success("保存成功！");
-            this.selectedIndex = null;
-            this.refreshPanel();
-
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-          this.dataList = [];
-          this.pageTotal = 0;
-        });
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success("保存成功！");
+              this.selectedIndex = null;
+              this.refreshPanel();
+
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.dataList = [];
+            this.pageTotal = 0;
+          });
     },
 
     copyDetail(row) {
@@ -423,19 +423,19 @@ export default {
       }
       this.loading = true;
       addBizProduct(data)
-        .then((response) => {
-          this.loading = false;
-          if (response.code === 20000) {
-            this.getOrderDetails();
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-          this.dataList = [];
-          this.pageTotal = 0;
-        });
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.getOrderDetails();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.dataList = [];
+            this.pageTotal = 0;
+          });
     },
 
     deleteDetail(row) {
@@ -444,19 +444,19 @@ export default {
       }
       this.loading = true;
       delBizProduct(data)
-        .then((response) => {
-          this.loading = false;
-          if (response.code === 20000) {
-            this.getOrderDetails();
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-          this.dataList = [];
-          this.pageTotal = 0;
-        });
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.getOrderDetails();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+            this.dataList = [];
+            this.pageTotal = 0;
+          });
     },
     bindRl(val) {
       this.curRow = val;
@@ -474,12 +474,12 @@ export default {
         bindRlFk: row.id,
       };
       updateBizBind(query).then((response) => {
-          if (response.code == 20000) {
-            this.$message.success("绑定成功");
-            this.getOrderDetails();
-          } else
-            this.$message.error(response.message);
-        }
+            if (response.code == 20000) {
+              this.$message.success("绑定成功");
+              this.getOrderDetails();
+            } else
+              this.$message.error(response.message);
+          }
       ).catch(() => {
 
       });
@@ -516,12 +516,12 @@ export default {
 
   watch: {
     'idQuery.billNo':
-      {
-        handler() {
-          this.refreshOrder(this.idQuery);
+        {
+          handler() {
+            this.refreshOrder(this.idQuery);
+          }
+          ,
         }
-        ,
-      }
   }
   ,
 

From a989ea2a62eb24ab7628624d24b526af0a5c9954 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 19 Aug 2024 17:30:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=8F=E4=B8=80=EF=BC=8C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/DealOrderBlank.vue        | 10 +++++-----
 src/views/collect/PanelOrderManuTagCode.vue | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue
index 772ab946..5c5f93a0 100644
--- a/src/views/collect/DealOrderBlank.vue
+++ b/src/views/collect/DealOrderBlank.vue
@@ -134,7 +134,6 @@
                   id="inputer"
                   @focus="getInputFocus($event)"
                   @keypress.enter.native="enterKey($event)"
-                  ref="inputRef"
                   style="ime-mode: disabled"
                   type="tel"
                   placeholder="请点击输入框进行扫码设置或者扫码录入"
@@ -173,7 +172,7 @@
         </div>
         <el-descriptions title="单据信息" :column="4" border style="margin-top: 15px">
           <el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item>
-          <el-descriptions-item label="往来信息">{{ formData.fromCorpName }}</el-descriptions-item>
+          <el-descriptions-item label="往来信息">{{ formData.fromCorp }}</el-descriptions-item>
           <el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item>
           <el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item>
           <el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
@@ -192,11 +191,11 @@
         </el-tab-pane>
 
         <el-tab-pane label="扫码明细">
-          <prescribeCodePanel
+          <PanelOrderManuTagCode
             v-if="panelALive"
             :fifoSplit="3"
             :prescribeData="curRow"
-          ></prescribeCodePanel>
+          ></PanelOrderManuTagCode>
         </el-tab-pane>
 
         <el-tab-pane label="拆零明细">
@@ -242,6 +241,7 @@ import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import {convertDate} from "@/utils/date";
 import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
+import PanelOrderManuTagCode from "./PanelOrderManuTagCode";
 import prescribeCodePanel from "./PanelOrderTagCode";
 import PannelOrderBiz from "./PannelOrderBiz";
 import {listPage} from "@/api/basic/sysWorkplaceManage";
@@ -318,7 +318,7 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, selectPrescribeDialog, prescribeCodePanel, PannelOrderBiz
+    addOrder, errOrder, selectPrescribeDialog, prescribeCodePanel, PanelOrderManuTagCode, PannelOrderBiz
   },
   methods: {
     findFromInvList(val) {
diff --git a/src/views/collect/PanelOrderManuTagCode.vue b/src/views/collect/PanelOrderManuTagCode.vue
index 8be60f7a..7428de3c 100644
--- a/src/views/collect/PanelOrderManuTagCode.vue
+++ b/src/views/collect/PanelOrderManuTagCode.vue
@@ -243,6 +243,22 @@ export default {
       rowBackground.height = "32px"
       return rowBackground;
     },
+
+    /**
+     * 扫码减一
+     */
+    removeOneDialog() {
+      //todo
+    },
+
+    /**
+     * 删除条码
+     */
+    deleteDialog() {
+      //todo
+    },
+
+
   },
 
   created() {