From f82d9ab03664ebdfe4b3aedca6f348de5c166d7e Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 31 Oct 2024 12:00:45 +0800
Subject: [PATCH] =?UTF-8?q?10/31=20=E4=B8=8A=E8=B4=A7=E5=B7=A5=E4=BD=8D?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A7=E4=BD=8D=E4=B8=8A=E6=9E=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/workPlace/SysWorkplaceQueue.js  |  11 +
 src/views/basic/workplace/addPlaidDialog.vue  |   4 +-
 .../basic/workplace/cargowWorkplaceManage.vue | 135 ++-
 src/views/collect/DealOrder.vue               | 852 +++++++++---------
 .../inoutDrug/DialogSelectInvProduct.vue      |   2 +
 .../inoutDrug/PanelCreateOrderBizDrug.vue     |   2 +-
 6 files changed, 540 insertions(+), 466 deletions(-)

diff --git a/src/api/basic/workPlace/SysWorkplaceQueue.js b/src/api/basic/workPlace/SysWorkplaceQueue.js
index cca7f1ae..8ee03e97 100644
--- a/src/api/basic/workPlace/SysWorkplaceQueue.js
+++ b/src/api/basic/workPlace/SysWorkplaceQueue.js
@@ -53,6 +53,17 @@ export function getByCode(query) {
   });
 }
 
+export function printQueueLabel(query) {
+  return axios({
+    url: "/udiwms/sysWorkplaceQueue/label/print",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
+}
+
+
 
 
 
diff --git a/src/views/basic/workplace/addPlaidDialog.vue b/src/views/basic/workplace/addPlaidDialog.vue
index 098dba8d..682e161b 100644
--- a/src/views/basic/workplace/addPlaidDialog.vue
+++ b/src/views/basic/workplace/addPlaidDialog.vue
@@ -6,7 +6,7 @@
     >
       <el-row :gutter="24">
         <el-col :span="12" class="el-col">
-          <el-form-item label="分格编码:" prop="code" class="query-form-item">
+          <el-form-item label="货位编码:" prop="code" class="query-form-item">
             <el-input
               disabled
               v-model="formData.code" style="width: 80%"
@@ -15,7 +15,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" class="el-col">
-          <el-form-item label="分格名称:"  class="query-form-item"  prop="name" placeholder="请输入分格名称">
+          <el-form-item label="货位名称:"  class="query-form-item"  prop="name" placeholder="请输入分格名称">
             <el-input
               v-model="formData.name" style="width: 80%"
               auto-complete="off"
diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue
index a5f087ab..c8fd0f59 100644
--- a/src/views/basic/workplace/cargowWorkplaceManage.vue
+++ b/src/views/basic/workplace/cargowWorkplaceManage.vue
@@ -136,6 +136,11 @@
                   <span>{{ workPlaceClasss[scope.row.workPlaceClass] }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="货位上架" prop="queueStatus" width="90">
+                <template slot-scope="scope">
+                  <span>{{ queueStatusMap[scope.row.queueStatus] }}</span>
+                </template>
+              </el-table-column>
               <!--<el-table-column label="所属组别" prop="categoryName" width="90"></el-table-column>-->
               <!--<el-table-column label="单据类型编号" prop="busTypeCode" width="100"></el-table-column>-->
               <!--<el-table-column label="单据类型名称" prop="busTypeName" width="100"></el-table-column>-->
@@ -147,7 +152,7 @@
 
               <el-table-column label="创建时间" prop="createTime" width="140"></el-table-column>
               <el-table-column label="备注" prop="remake" width="140"></el-table-column>
-              <el-table-column label="操作" fixed="right" width="160">
+              <el-table-column label="操作" fixed="right" width="240">
                 <template slot-scope="scope">
                   <el-button
                     type="text"
@@ -155,6 +160,12 @@
                     @click.native.stop="printLabel(scope.row)"
                   >工位标签
                   </el-button>
+                  <el-button
+                    type="text"
+                    size="small"
+                    @click.native.stop="printQueueList(scope.row)"
+                  >分格标签
+                  </el-button>
 
                   <el-button
                     type="text"
@@ -249,14 +260,14 @@
             </el-tab-pane>
             <el-tab-pane>
               <!--              {{ workplaceName }}--->
-              <span slot="label">工位分格</span>
+              <span slot="label">货位</span>
               <el-form :inline="true" :model="queueQuery" class="query-form" size="mini"
                        style="margin-bottom: 10px"
               >
                 <el-form-item class="query-form-item" label="名称/编号:">
                   <el-input
                     v-model="queueQuery.key"
-                    placeholder="请输入分格名称或分格编号"
+                    placeholder="请输入货位名称或货位编号"
                     clearable
                   ></el-input>
                 </el-form-item>
@@ -275,7 +286,7 @@
                     >
                     <el-button type="primary" @click="addPlaid"
                                icon="el-icon-plus"
-                    >新增工位分格
+                    >新增货位
                     </el-button
                     >
                     <!--<el-button type="primary" @click="choosePlaid"-->
@@ -291,8 +302,8 @@
               >
                 <el-table-column type="index" label="序号"></el-table-column>
                 <!--                <el-table-column label="业务类型编码 " prop="documentTypeCode" width="100"></el-table-column>-->
-                <el-table-column label="格子名称" prop="name"></el-table-column>
-                <el-table-column label="格子编号 " prop="code"></el-table-column>
+                <el-table-column label="货位名称" prop="name"></el-table-column>
+                <el-table-column label="货位编号 " prop="code"></el-table-column>
                 <el-table-column label="备注" prop="remark"></el-table-column>
                 <el-table-column label="操作" fixed="right" width="120">
                   <template slot-scope="scope">
@@ -381,8 +392,8 @@
               <el-col :span="12" class="el-col">
                 <el-form-item label="工位状态:" prop="workplaceStatus" class="query-form-item">
                   <el-select v-model="formData.workplaceStatus" style="width: 80%" placeholder="工位状态">
-                    <el-option label="暂停" :value="0"></el-option>
-                    <el-option label="启用" :value="1"></el-option>
+                    <el-option label="暂停" :value=0></el-option>
+                    <el-option label="启用" :value=1></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -441,6 +452,16 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="24">
+              <el-col :span="12" class="el-col">
+                <el-form-item label="按货位上架:" prop="queueStatus" class="query-form-item">
+                  <el-select v-model="formData.queueStatus" style="width: 80%" placeholder="货位上架">
+                    <el-option label="关闭" :value="0"></el-option>
+                    <el-option label="启用" :value="1"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row :gutter="24">
 
               <el-col :span="12" class="el-col">
@@ -577,7 +598,7 @@ import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoi
 import { delCollect, getBindCollectList } from '@/api/basic/collectPoint/cargowWorkplaceManage'
 import addCollectWorkplace from './addCollectWorkplace'
 import addPlaidDialog from './addPlaidDialog'
-import { deleteQueue, getQueueList } from '@/api/basic/workPlace/SysWorkplaceQueue'
+import { deleteQueue, getQueueList, printQueueLabel } from '@/api/basic/workPlace/SysWorkplaceQueue'
 
 export default {
   components: { addCollectWorkplace, addPlaidDialog },
@@ -664,6 +685,10 @@ export default {
         1: '采集工位',
         2: '上货工位'
       },
+      queueStatusMap:{
+        0 : '关闭',
+        1 : '启用',
+      },
       orderFinishVerifys: {
         0: '完全赋码',
         1: '部分赋码',
@@ -727,8 +752,8 @@ export default {
       collectWorks: [],
       plaidName: 'add',
       plaids: {
-        'add': '新增工位分格',
-        'edit': '编辑工位分格'
+        'add': '新增货位',
+        'edit': '编辑货位'
       },
       fromName: 'add',
       fromMap: {
@@ -752,6 +777,7 @@ export default {
         chargeUser: null,
         constituencies: null,
         invRemindNumber: 0,
+        queueStatus:0,
         remake: null
       },
       fromDeptOptions: [],
@@ -891,27 +917,7 @@ export default {
         }
       })
     },
-    removeQueue(row) {
-      this.$confirm('此操作将永久删除该工位分格, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteQueue(row).then(res => {
-          if (res.code == 20000) {
-            this.$message.success('删除成功')
-            this.getQueueList()
-          } else {
-            this.$message.error(res.message)
-          }
-        })
-      })
-    },
-    updateQueue(row) {
-      this.queueData = row
-      this.plaidName = 'edit'
-      this.plaidDialogVisible = true
-    },
+
     onCollectList() {
       if (this.rowData.workplaceId == null) {
         return this.$message.error('请选择上货工位')
@@ -975,13 +981,7 @@ export default {
       // this.collectWorks = this.collectWorkPlaceCodes.concat(this.collectBusTypeCodes);
 
     },
-    addPlaid() {
-      if (this.rowData.workplaceId == null) {
-        return this.$message.error('请选择上货工位')
-      }
-      this.queueData = null
-      this.plaidDialogVisible = true
-    },
+
     removeCollect(row) {
       this.$confirm('此操作将永久删除该采集工位, 是否继续?', '提示', {
         confirmButtonText: '确定',
@@ -1012,10 +1012,7 @@ export default {
       this.getCargowBindCollectList()
       this.chooseCollectDialogVisible = false
     },
-    closePlaidDialog() {
-      this.plaidDialogVisible = false
-      this.getQueueList()
-    },
+
     printLabel(row) {
       row.labelId = 6
       printWorkLabel(row).then((response) => {
@@ -1060,6 +1057,7 @@ export default {
         chargeUser: null,
         constituencies: '1001',
         invRemindNumber: 0,
+        queueStatus:0,
         remake: null
       }
       if (this.groupData != null) {
@@ -1205,6 +1203,7 @@ export default {
     },
     edit(row) {
       this.formData = row
+      this.formData.queueStatus =  Number(row.queueStatus)
       // this.formData.invCode = String(row.invCode)
       if (row.chargeUser == 0) {
         this.formData.chargeUser = null
@@ -1224,6 +1223,56 @@ export default {
       })
       this.getTree()
       this.addWorkplaceDialogVisible = true
+    },
+    //工位分格
+    addPlaid() {
+      if (this.rowData.workplaceId == null) {
+        return this.$message.error('请选择上货工位')
+      }
+      this.queueData = null
+      this.plaidDialogVisible = true
+    },
+    removeQueue(row) {
+      this.$confirm('此操作将永久删除该工位分格, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteQueue(row).then(res => {
+          if (res.code == 20000) {
+            this.$message.success('删除成功')
+            this.getQueueList()
+          } else {
+            this.$message.error(res.message)
+          }
+        })
+      })
+    },
+    updateQueue(row) {
+      this.queueData = row
+      this.plaidName = 'edit'
+      this.plaidDialogVisible = true
+    },
+    closePlaidDialog() {
+      this.plaidDialogVisible = false
+      this.getQueueList()
+    },
+    printQueue(row) {
+      row.labelId = 8
+      printQueueLabel(row).then(res  => {
+        const binaryData = []
+        binaryData.push(res)
+        let url = window.URL.createObjectURL(
+          new Blob(binaryData, { type: 'application/pdf' })
+        )
+        this.loading = false
+        window.open(url)
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    printQueueList(row){
+
     }
   },
   created() {
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 0f42cc4f..597ca3e1 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -73,7 +73,8 @@
         </el-row>
 
         <el-row style="margin-top: 6px;margin-bottom: -6px;"
-                v-if="this.formDataVisible != null &&  this.formDataVisible.scanType == 1">
+                v-if="this.formDataVisible != null &&  this.formDataVisible.scanType == 1"
+        >
           <!--          <el-col :span="6">-->
           <!--            <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">-->
           <!--              <el-select-->
@@ -131,7 +132,8 @@
                   v-for="item in invList"
                   :key="item.name"
                   :label="item.name"
-                  :value="item.code">
+                  :value="item.code"
+                >
                   <span style="float: left">{{ item.name }}</span>
                 </el-option>
               </el-select>
@@ -146,7 +148,8 @@
                          remote
                          reserve-keyword
                          @change="changeCorp"
-                         placeholder="请选择收货方" clearable style="width: 90%">
+                         placeholder="请选择收货方" clearable style="width: 90%"
+              >
                 <el-option
                   v-for="item in fromInvOptions"
                   :key="item.code"
@@ -191,7 +194,8 @@
                 </el-button>
                 <!-- :disabled="!formData.billNo ||  (this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"-->
                 <el-button type="primary"
-                           @click="addGs">ALT+29
+                           @click="addGs"
+                >ALT+29
                 </el-button>
                 <el-button
                   type="primary"
@@ -214,7 +218,8 @@
             :type="scanResultType"
             :closable="false"
             :dangerouslyUseHTMLString="true"
-            :description="result">
+            :description="result"
+          >
           </el-alert>
           <el-alert
             v-if="warnVisible"
@@ -222,7 +227,8 @@
             type="warning"
             :closable="true"
             :dangerouslyUseHTMLString="true"
-            :description="warnResult">
+            :description="warnResult"
+          >
           </el-alert>
           <el-alert
             v-if="errVisible"
@@ -230,7 +236,8 @@
             type="warning"
             :closable="true"
             :dangerouslyUseHTMLString="true"
-            :description="errResult">
+            :description="errResult"
+          >
           </el-alert>
 
 
@@ -353,7 +360,8 @@
 
               <div
                 style="display: flex; justify-content: space-between; align-items: center; height: 46px; /* 约为 200px 的 1/3 */"
-                @click="selectBusType(info.documentTypeCode)">
+                @click="selectBusType(info.documentTypeCode)"
+              >
                 <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.busName }}</p>
                 <!-- 假设你的信息对象中包含一个title属性 -->
                 <!--            <div style="width: 60px; height: 60px;  display: flex; justify-content: center; align-items: center;">-->
@@ -369,7 +377,8 @@
                 <p style="font-size: 14px;background-color: #e1f3fb" @click="selectBusType(info.documentTypeCode)">
                   {{ info.remark }}</p>
                 <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
-                           @click="selectBusType(info.documentTypeCode)">开始作业
+                           @click="selectBusType(info.documentTypeCode)"
+                >开始作业
                 </el-button>
 
               </div>
@@ -387,17 +396,17 @@
 </template>
 
 <script>
-import addOrder from "@/views/inout/DialogCreateOrder";
-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 prescribeOriginPanel from "./PannelOrderBiz";
-import prescribeCodePanel from "./PanelOrderTagCode";
-import PannelOrderBiz from "./PannelOrderBiz";
-import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
-import {enterCodeWeb, batchVailCode, enterCodeBillNo} from "@/api/inout/order";
+import addOrder from '@/views/inout/DialogCreateOrder'
+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 prescribeOriginPanel from './PannelOrderBiz'
+import prescribeCodePanel from './PanelOrderTagCode'
+import PannelOrderBiz from './PannelOrderBiz'
+import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage'
+import { enterCodeWeb, batchVailCode, enterCodeBillNo } from '@/api/inout/order'
 import {
   cancelOrder,
   draftOrder,
@@ -406,25 +415,25 @@ import {
   tagCode,
   updateOrder,
   vailOrderFinish
-} from "@/api/collect/splitCreateOrder";
-import {selectCorpList} from "@/api/basic/basicUnitMaintain";
-import {getCurOrder, getNextOrder, findByBill, findFromCorp, orderDetail} from "@/api/collect/collectOrder";
-import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
-import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
-import {getInvListByUser} from "@/api/system/invWarehouse";
-import {orderbatchAddCode} from "@/api/inout/splitCode";
-import {isBlank} from "@/utils/strUtil";
+} from '@/api/collect/splitCreateOrder'
+import { selectCorpList } from '@/api/basic/basicUnitMaintain'
+import { getCurOrder, getNextOrder, findByBill, findFromCorp, orderDetail,removeByScanCode } from '@/api/collect/collectOrder'
+import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail'
+import { getWorkBindBusTypes, removeBusTypeById } from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import { getInvListByUser } from '@/api/system/invWarehouse'
+import { orderbatchAddCode } from '@/api/inout/splitCode'
+import { isBlank } from '@/utils/strUtil'
 
 export default {
   /**
    * 处理处方
    */
-  name: "prescribeTagCodeDeal",
+  name: 'prescribeTagCodeDeal',
   props: {
     resetKey: {
       type: Function,
       required: true
-    },
+    }
   },
   data() {
     return {
@@ -432,7 +441,7 @@ export default {
         'prescribeOriginPanel',
         'prescribeCodePanel1',
         'prescribeCodePanel2',
-        'PanelOrderAllDetail',
+        'PanelOrderAllDetail'
       ],
       editableTabsValue: 'prescribeOriginPanel',
       fromInvOptions: [],
@@ -451,15 +460,15 @@ export default {
       filterQuery: {
         billNo: null,
         page: 1,
-        limit: 10,
+        limit: 10
       },
       list: [],
       total: 0,
-      defaultSort: {prop: 'createTime', order: 'desc'},
+      defaultSort: { prop: 'createTime', order: 'desc' },
       formDataVisible: {
         scanType: null,
-        unitTittle: "往来单位",
-        corpType: 1,
+        unitTittle: '往来单位',
+        corpType: 1
       },
       curWorkPlaces: [],
       erpList: [],
@@ -470,7 +479,7 @@ export default {
         busType: null,
         workPlaceCode: null,
         fromCorp: null,
-        confirmFinish: false,
+        confirmFinish: false
       },
       selectPrescriptionVisible: false,
       corpOrderIdDisabled: false,
@@ -480,22 +489,22 @@ export default {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
         userName: this.$store.getters.name,
-        companyName: this.$store.getters.companyName,
+        companyName: this.$store.getters.companyName
       },
       curRow: null,
       panelALive: false,
       autoFinishOrderFlag: true,//是否对完成的单据提示立即提交
 
       //扫码相关
-      scanCode: "",
+      scanCode: '',
       isSuccess: false,
       checked: true,
-      scanTitle: "扫码结果:",
-      result: "  \n",
-      msgTip: "信息提醒：",
-      originCode: "",
+      scanTitle: '扫码结果:',
+      result: '  \n',
+      msgTip: '信息提醒：',
+      originCode: '',
       checkSuccess: false,
-      scanResultType: "success",
+      scanResultType: 'success',
       isSelectOrder: false,
       isFinishOrder: true,
       busQuery: {
@@ -511,13 +520,13 @@ export default {
       viewType: 1,
       scanDisabled: false,
       valiCodes: [],
-      warnResult: "",
-      errResult: "",
+      warnResult: '',
+      errResult: '',
       warnVisible: false,
       errVisible: false,
       workplaceId: null,
       ws: null,
-      scanTip: "扫码录入:",
+      scanTip: '扫码录入:',
       scanSplit: false,
       //
       labels: {
@@ -525,7 +534,7 @@ export default {
         2: '扫码剔除:'
       },
       labelName: 1,
-      scanStatus: null, // 1:扫码剔除; null 处理单据
+      scanStatus: null // 1:扫码剔除; null 处理单据
     }
   },
 
@@ -540,7 +549,7 @@ export default {
   },
   watch: {
     resetKey(newVal, oldVal) {
-      this.$refs.inputRef.focus();
+      this.$refs.inputRef.focus()
     }
   },
   methods: {
@@ -550,13 +559,13 @@ export default {
         billNo: billNo,
         workPlaceCode: this.workplaceId,
         page: 1,
-        limit: 10,
+        limit: 10
       }
       findByBill(post).then(res => {
         if (res.code == 20000) {
           if (res.data.billNo != null) {
             this.formData = res.data
-            this.scanCode = "";
+            this.scanCode = ''
             this.formData.workPlaceCode = this.workplaceId
             this.checked = false
           }
@@ -571,7 +580,7 @@ export default {
       this.formData.busType = val
       this.selectBusTypeDisabled = false
       if (this.formData.workPlaceCode != null) {
-        this.findCurOrder();
+        this.findCurOrder()
       }
     },
     getWorkBindBusTypes(workplaceId) {
@@ -582,33 +591,33 @@ export default {
           this.busTypeTotal = res.data.total
           if (this.formData.billNo != null) {
             this.getBillNo(this.formData.billNo)
-            this.startDeal();
+            this.startDeal()
           } else {
             if (this.busTypeList.length == 1 && this.$route.query.busType == null) {
               this.formDataVisible = this.busTypeList[0]
               this.formData.busType = this.busTypeList[0].documentTypeCode
               this.selectBusTypeDisabled = false
               if (this.formDataVisible.scanType == 1) {
-                this.findFromInvList("");
-                this.getInvList();
-                this.placeholder = '请点击输入框进行扫码生成业务单据';
+                this.findFromInvList('')
+                this.getInvList()
+                this.placeholder = '请点击输入框进行扫码生成业务单据'
               } else {
-                this.findCurOrder();
+                this.findCurOrder()
               }
 
             } else {
               console.log(this.$route.query.busType)
               if (this.$route.query.busType != null) {
                 this.formData.busType = this.$route.query.busType
-                this.$refs.inputRef.focus();
-                this.formDataVisible = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType);
+                this.$refs.inputRef.focus()
+                this.formDataVisible = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType)
 
                 if (this.formDataVisible.scanType == 1) {
-                  this.findFromInvList("");
-                  this.getInvList();
-                  this.placeholder = '请点击输入框进行扫码生成业务单据';
+                  this.findFromInvList('')
+                  this.getInvList()
+                  this.placeholder = '请点击输入框进行扫码生成业务单据'
                 } else {
-                  this.findCurOrder();
+                  this.findCurOrder()
                 }
               }
 
@@ -624,13 +633,13 @@ export default {
       let cQuery = {
         corpType: this.formDataVisible.corpType,
         invCode: this.formData.invCode
-      };
+      }
       findFromCorp(cQuery)
         .then((response) => {
-          this.fromInvOptions = response.data || [];
+          this.fromInvOptions = response.data || []
         })
         .catch(() => {
-        });
+        })
     },
     workPlaceCodeChange(value) {
       this.getWorkBindBusTypes(value)
@@ -638,33 +647,33 @@ export default {
     },
 
     busTypeChange(value) {
-      let busType = this.busTypeList.find(item => item.documentTypeCode === value);
+      let busType = this.busTypeList.find(item => item.documentTypeCode === value)
       this.formData.busType = busType.documentTypeCode
       this.selectBusTypeDisabled = false
       this.formDataVisible = busType
       if (this.formDataVisible.scanType == 1) {
-        this.findFromInvList("");
+        this.findFromInvList('')
       }
-      this.findCurOrder();
+      this.findCurOrder()
     },
 
     handleClick(blankName) {
       // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
       let url = window.location.origin + `#/` + blankName + `?workplaceId=` + this.workplaceId
       // this.$router.push( workplaceId)
-      window.open(url, '_blank');
+      window.open(url, '_blank')
     },
     handleClickOut(blankName) {
       // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
       let url = window.location.origin + `#/` + blankName + `?splitType=out&workplaceId=` + this.workplaceId
       // this.$router.push( workplaceId)
-      window.open(url, '_blank');
+      window.open(url, '_blank')
     },
     handleClickReturn(blankName) {
       // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
       let url = window.location.origin + `#/` + blankName + `?splitType=return&workplaceId=` + this.workplaceId
       // this.$router.push( workplaceId)
-      window.open(url, '_blank');
+      window.open(url, '_blank')
     },
     //获取当前货位
     findCurWorkPlaces(val) {
@@ -673,61 +682,61 @@ export default {
         status: 1,
         // invCode: this.formData.invCode,
         page: 1,
-        limit: 100,
+        limit: 100
       }
       listPage(query).then((res) => {
-        this.curWorkPlaces = res.data.list || [];
+        this.curWorkPlaces = res.data.list || []
         if (this.curWorkPlaces.length == 1 && this.formData.workPlaceCode == null) {
-          this.formData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
-          this.workPlaceCodeChange(this.formData.workPlaceCode);
+          this.formData.workPlaceCode = this.curWorkPlaces[0].workplaceId
+          this.workPlaceCodeChange(this.formData.workPlaceCode)
         }
       })
     },
     //界面配置相关------------
     executeFuc(row, type, clickFuc, value) {
-      return executeFuc(this, row, type, clickFuc, value);
+      return executeFuc(this, row, type, clickFuc, value)
     },
     executeEval(row, expression, defaultRet) {
       if (expression) {
-        return eval(expression);
+        return eval(expression)
       }
-      return defaultRet;
+      return defaultRet
     },
     ///界面配置相关------------end
 
-
     hideSearch() {
-      this.showSearch = !this.showSearch;
+      this.showSearch = !this.showSearch
     },
 
     refreshCodesPanel(_this) {
-      _this.panelALive = false;
+      _this.panelALive = false
       _this.$nextTick(() => {
-        _this.panelALive = true;
-      });
-      _this.getBizDetailList();
-      _this.vailOrderFinish();
+        _this.panelALive = true
+      })
+      _this.getBizDetailList()
+      _this.vailOrderFinish()
     },
     refreshCodesPanelP() {
       let _this = this
-      _this.panelALive = false;
+      _this.panelALive = false
       _this.$nextTick(() => {
-        _this.panelALive = true;
-      });
-      _this.vailOrderFinish();
+        _this.panelALive = true
+      })
+      _this.vailOrderFinish()
     },
 
     getInputFocus(event) {
-      event.currentTarget.select();
+      event.currentTarget.select()
     },
     getBizDetailList() {
       let preQuery = {}
-      if (this.formData == null)
+      if (this.formData == null) {
         return
+      }
       if (this.formData != null) {
         preQuery = {
           orderIdFk: this.formData.billNo
-        };
+        }
       }
       orderDetail(preQuery).then(res => {
         if (res.code != 20000) {
@@ -735,67 +744,67 @@ export default {
           return
         }
         this.splitBizList = res.data.list
-        let tip = "";
+        let tip = ''
         this.splitBizList.forEach((item) => {
           if (item.splitUnCheck) {
-            tip = tip + item.cpmctymc + ","
+            tip = tip + item.cpmctymc + ','
           }
-        });
+        })
         if (this.$isNotBlank(tip)) {
-          tip = "请扫码确认以下产品" + tip + "需拆零的追溯码！"
-          this.$alert(tip, "提示", {
-            confirmButtonText: "确定",
-            type: "warning",
+          tip = '请扫码确认以下产品' + tip + '需拆零的追溯码！'
+          this.$alert(tip, '提示', {
+            confirmButtonText: '确定',
+            type: 'warning',
             closeOnClickModal: true,
             callback: (action) => {
-            },
-          });
-          this.scanTip = "扫码拆零确认:"
-          this.$refs.inputRef.focus();
-          this.$refs.inputRef.select();
+            }
+          })
+          this.scanTip = '扫码拆零确认:'
+          this.$refs.inputRef.focus()
+          this.$refs.inputRef.select()
           this.scanSplit = true
-          return;
+          return
         } else {
-          this.overdeleteCode();
+          this.overdeleteCode()
         }
 
-
       }).catch(() => {
-        this.$message.error("数据加载失败")
+        this.$message.error('数据加载失败')
       })
     },
 
     enterKey() {
       if (this.formData.billNo == null && this.formDataVisible.scanType != 1) {
         this.enterBillNoKey()
-        return;
+        return
       }
-      this.checkSuccess = true;
-      this.filterQuery.code = this.scanCode.trim();
-      if (this.filterQuery.code.includes(";")) {
-        const codeArray = this.filterQuery.code.split(";");
+      this.checkSuccess = true
+      this.filterQuery.code = this.scanCode.trim()
+      if (this.filterQuery.code.includes(';')) {
+        const codeArray = this.filterQuery.code.split(';')
         let params = {
-          codeList: codeArray,
-        };
+          codeList: codeArray
+        }
         this.batchVailCode(params)
-        return;
+        return
       }
-      if (this.filterQuery.code)
+      if (this.filterQuery.code) {
         if (!this.parseString(this.filterQuery.code)) {
-          this.$refs.inputRef.focus();
-          this.$refs.inputRef.select();
-          this.$message.error("非法产品编码");
-          return;
+          this.$refs.inputRef.focus()
+          this.$refs.inputRef.select()
+          this.$message.error('非法产品编码')
+          return
         }
+      }
       let tQuery = {
-        viewType: "tagCode",
+        viewType: 'tagCode',
         workPlaceCode: this.workplaceId,
         originCode: this.originCode,
         busType: this.formData.busType,
-        code: this.filterQuery.code.trim(),
-      };
+        code: this.filterQuery.code.trim()
+      }
       if (this.scanStatus == 1) {
-        const codeArray = this.filterQuery.code.split(";");
+        const codeArray = this.filterQuery.code.split(';')
         let query = {
           orderId: this.formData.billNo,
           codeList: codeArray
@@ -805,159 +814,159 @@ export default {
       } else {
         enterCodeWeb(tQuery).then((response) => {
           if (response.code === 20000) {
-            this.$refs.inputRef.focus();
-            this.$refs.inputRef.select();
-            this.isSuccess = true;
+            this.$refs.inputRef.focus()
+            this.$refs.inputRef.select()
+            this.isSuccess = true
             this.printCodeResult(response.data, response.message)
-            this.filterQuery.code = response.data.code;
-            this.scanCode = ""
-            this.originCode = ""
-            this.addCode();
+            this.filterQuery.code = response.data.code
+            this.scanCode = ''
+            this.originCode = ''
+            this.addCode()
           } else {
             if (response.code == 502) {
-              this.checkSuccess = false;
-              this.isSuccess = false;
+              this.checkSuccess = false
+              this.isSuccess = false
               this.printCodeResult(response.data, response.message)
-              this.filterQuery.code = response.data.code;
-              this.originCode = response.data.code;
-              this.scanCode = ""
+              this.filterQuery.code = response.data.code
+              this.originCode = response.data.code
+              this.scanCode = ''
             } else if (response.code == 501) {
-              this.checkSuccess = false;
-              this.$message.error(response.message);
-              this.scanCode = ""
+              this.checkSuccess = false
+              this.$message.error(response.message)
+              this.scanCode = ''
             } else if (response.code == 503) {
-              this.checkSuccess = false;
-              this.isSuccess = false;
+              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",
+              this.filterQuery.code = response.data.code
+              this.scanCode = ''
+              this.$confirm(response.message, '提示', {
+                type: 'warning'
               })
                 .then(() => {
-                  this.filterQuery.code = response.data.code;
-                  this.addCode();
+                  this.filterQuery.code = response.data.code
+                  this.addCode()
                 })
                 .catch(() => {
-                  this.filterQuery.code = response.data.code;
-                });
+                  this.filterQuery.code = response.data.code
+                })
             } else if (response.code == 508) {
-              this.originCode = "";
-              this.filterQuery.code = "01" + response.data.nameCode;
-              this.originCode = this.filterQuery.code;
+              this.originCode = ''
+              this.filterQuery.code = '01' + response.data.nameCode
+              this.originCode = this.filterQuery.code
             } else if (response.code == 601) {
               this.formData.billNo = response.data.billNo
-              this.placeholder = "已选入单据，请扫UDI码进行作业"
+              this.placeholder = '已选入单据，请扫UDI码进行作业'
               this.getBillNo(this.formData.billNo)
-              this.startDeal();
+              this.startDeal()
 
             } else {
-              this.scanCode = ""
-              this.$alert(response.message, "提示", {
-                confirmButtonText: "确定",
-                type: "warning",
+              this.scanCode = ''
+              this.$alert(response.message, '提示', {
+                confirmButtonText: '确定',
+                type: 'warning',
                 closeOnClickModal: true,
                 callback: (action) => {
-                  this.$refs.inputRef.focus();
-                  this.$refs.inputRef.select();
-                },
-              });
+                  this.$refs.inputRef.focus()
+                  this.$refs.inputRef.select()
+                }
+              })
             }
           }
-          this.loading = false;
-        });
+          this.loading = false
+        })
       }
 
     },
 
     enterBillNoKey(billNo) {
-      this.checkSuccess = true;
-      this.filterQuery.code = this.scanCode;
+      this.checkSuccess = true
+      this.filterQuery.code = this.scanCode
       let tQuery = {
-        viewType: "tagCode",
+        viewType: 'tagCode',
         workPlaceCode: this.workplaceId,
         originCode: this.originCode,
         busType: this.formData.busType,
-        code: this.filterQuery.code.trim(),
-      };
+        code: this.filterQuery.code.trim()
+      }
       if (billNo != null) {
         tQuery.code = billNo
       }
       enterCodeBillNo(tQuery).then((response) => {
         if (response.code === 20000) {
-          this.$refs.inputRef.focus();
-          this.$refs.inputRef.select();
-          this.isSuccess = true;
+          this.$refs.inputRef.focus()
+          this.$refs.inputRef.select()
+          this.isSuccess = true
           this.printCodeResult(response.data, response.message)
-          this.filterQuery.code = response.data.code;
-          this.scanCode = ""
-          this.originCode = ""
+          this.filterQuery.code = response.data.code
+          this.scanCode = ''
+          this.originCode = ''
 
-          this.addCode();
+          this.addCode()
         } else {
           if (response.code == 502) {
-            this.checkSuccess = false;
-            this.isSuccess = false;
+            this.checkSuccess = false
+            this.isSuccess = false
             this.printCodeResult(response.data, response.message)
-            this.filterQuery.code = response.data.code;
-            this.originCode = response.data.code;
-            this.scanCode = ""
+            this.filterQuery.code = response.data.code
+            this.originCode = response.data.code
+            this.scanCode = ''
           } else if (response.code == 501) {
-            this.checkSuccess = false;
-            this.$message.error(response.message);
-            this.scanCode = ""
+            this.checkSuccess = false
+            this.$message.error(response.message)
+            this.scanCode = ''
           } else if (response.code == 503) {
-            this.checkSuccess = false;
-            this.isSuccess = false;
+            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",
+            this.filterQuery.code = response.data.code
+            this.scanCode = ''
+            this.$confirm(response.message, '提示', {
+              type: 'warning'
             })
               .then(() => {
-                this.filterQuery.code = response.data.code;
-                this.addCode();
+                this.filterQuery.code = response.data.code
+                this.addCode()
               })
               .catch(() => {
-                this.filterQuery.code = response.data.code;
-              });
+                this.filterQuery.code = response.data.code
+              })
           } else if (response.code == 508) {
-            this.originCode = "";
-            this.filterQuery.code = "01" + response.data.nameCode;
-            this.originCode = this.filterQuery.code;
+            this.originCode = ''
+            this.filterQuery.code = '01' + response.data.nameCode
+            this.originCode = this.filterQuery.code
           } else if (response.code == 601) {
-            this.placeholder = "已选入单据，请扫UDI码进行作业"
+            this.placeholder = '已选入单据，请扫UDI码进行作业'
             this.formData.billNo = response.data.billNo
             this.getBillNo(this.formData.billNo)
-            this.startDeal();
+            this.startDeal()
 
           } else {
-            this.scanCode = ""
-            this.$alert(response.message, "提示", {
-              confirmButtonText: "确定",
-              type: "warning",
+            this.scanCode = ''
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
               closeOnClickModal: true,
               callback: (action) => {
-                this.$refs.inputRef.focus();
-                this.$refs.inputRef.select();
-              },
-            });
+                this.$refs.inputRef.focus()
+                this.$refs.inputRef.select()
+              }
+            })
           }
         }
-        this.loading = false;
-      });
+        this.loading = false
+      })
     },
 
     addCode(code) {
       if (this.$isNotBlank(code)) {
-        this.filterQuery.code = code;
+        this.filterQuery.code = code
       }
       if (this.$isBlank(this.filterQuery.code)) {
-        this.filterQuery.code = this.scanCode.trim();
+        this.filterQuery.code = this.scanCode.trim()
       }
       if (this.$isBlank(this.filterQuery.code) && this.$isBlank(this.scanCode)) {
-        return;
+        return
       }
       let tagQuery = {
         workPlaceCode: this.formData.workPlaceCode,
@@ -967,17 +976,17 @@ export default {
         billNo: this.formData.billNo,
         code: this.filterQuery.code.trim(),
         insert: this.formData.insert,
-        busType: this.formData.busType,
-      };
+        busType: this.formData.busType
+      }
       tagCode(tagQuery).then(res => {
         this.loading = false
         if (res.code == 20000) {
-          this.formData.tagStatus = 2;
-          this.formData.insert = false;
-          this.formData = res.data;
-          this.curRow = this.formData;
-          this.$refs.inputRef.focus();
-          this.refreshCodesPanel(this);
+          this.formData.tagStatus = 2
+          this.formData.insert = false
+          this.formData = res.data
+          this.curRow = this.formData
+          this.$refs.inputRef.focus()
+          this.refreshCodesPanel(this)
         } else {
           if (res.code == 502) {
             this.$confirm(res.message + '是否强制添加?', '提示', {
@@ -985,12 +994,12 @@ export default {
               cancelButtonText: '取消',
               type: 'warning'
             }).then(() => {
-              this.formData.insert = true;
-              this.addCode();
+              this.formData.insert = true
+              this.addCode()
             }).catch(() => {
-            });
+            })
           } else {
-            this.$refs.inputRef.focus();
+            this.$refs.inputRef.focus()
             this.$message.error(res.message)
           }
 
@@ -1018,7 +1027,7 @@ export default {
           this.loading = false
         })
       }).catch(() => {
-      });
+      })
     },
 
     cancelOrder() {
@@ -1036,7 +1045,7 @@ export default {
           this.loading = false
         })
       }).catch(() => {
-      });
+      })
     },
 
     confirmFinishOrder() {
@@ -1047,7 +1056,7 @@ export default {
       }).then(() => {
         this.finishOrder()
       }).catch(() => {
-      });
+      })
     },
 
     finishOrder() {
@@ -1062,16 +1071,16 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            this.formData.confirmFinish = true;
-            this.finishOrder();
+            this.formData.confirmFinish = true
+            this.finishOrder()
           }).catch(() => {
-          });
+          })
         } else if (res.code == 503) {
           this.$alert('该单据未全部赋码无法完成,请检查后重试', '提示', {
             confirmButtonText: '确定',
             callback: action => {
             }
-          });
+          })
         } else {
           this.$message.error(res.message)
         }
@@ -1081,7 +1090,7 @@ export default {
     },
 
     updateOrder() {
-      this.formData.workPlaceCode = this.workplaceId;
+      this.formData.workPlaceCode = this.workplaceId
       updateOrder(this.formData).then(res => {
         this.loading = false
       }).catch(() => {
@@ -1096,7 +1105,7 @@ export default {
       if (this.$route.query.busType != null) {
         this.formData.busType = this.$route.query.busType
       }
-      this.selectPrescriptionVisible = true;
+      this.selectPrescriptionVisible = true
     },
 
     //获取下一单据
@@ -1107,8 +1116,8 @@ export default {
       getNextOrder(nextQuery).then(res => {
         this.loading = false
         if (res.code == 20000) {
-          this.formData = res.data;
-          this.startDeal();
+          this.formData = res.data
+          this.startDeal()
         } else {
           this.$message.error(res.message)
         }
@@ -1125,22 +1134,22 @@ export default {
       getCurOrder(nextQuery).then(res => {
         this.loading = false
         if (res.code == 20000) {
-          let temp = res.data;
+          let temp = res.data
           if (temp.tagStatus === -1) {
             this.$confirm('检测到当前工位存在挂起单据，是否继续上一次单据处理?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
             }).then(() => {
-              this.formData = temp;
-              this.startDeal();
+              this.formData = temp
+              this.startDeal()
             }).catch(() => {
-            });
+            })
           } else if (temp.tagStatus === 2 || temp.tagStatus === 1) {
 
-            this.formData = temp;
+            this.formData = temp
             this.panelALive = true
-            this.startDeal();
+            this.startDeal()
             // this.$confirm('检测到当前工位存在正在处理单据，是否继续上一次单据处理?', '提示', {
             //   confirmButtonText: '确定',
             //   cancelButtonText: '取消',
@@ -1151,10 +1160,9 @@ export default {
             // });
           }
 
-
         } else {
           // this.$message.error(res.message)
-          this.$refs.inputRef.focus();
+          this.$refs.inputRef.focus()
         }
       }).catch(() => {
         this.loading = false
@@ -1162,31 +1170,31 @@ export default {
     },
 
     closeDialog() {
-      this.selectPrescriptionVisible = false;
+      this.selectPrescriptionVisible = false
     },
 
     confirmSelect(row) {
-      this.formData = row;
-      this.formData.workPlaceCode = this.workplaceId;
-      this.startDeal();
+      this.formData = row
+      this.formData.workPlaceCode = this.workplaceId
+      this.startDeal()
     },
 
     startDeal() {
       this.autoFinishOrderFlag = true
-      this.curRow = this.formData;
+      this.curRow = this.formData
       this.dealSplitOrder()
       //处理哪个活动的明细子组件
       // this.selectTabsname(this.formData.busType);
-      this.formData.tagStatus = 2;
-      this.updateOrder();
+      this.formData.tagStatus = 2
+      this.updateOrder()
       // this.refreshCodesPanel(this);
-      this.$refs.inputRef.focus();
+      this.$refs.inputRef.focus()
     },
 
     selectTabsname(value) {
       if (this.$isBlank(this.filterQuery.code) && this.busTypeList.length > 0) {
-        let busType = this.busTypeList.find(item => item.documentTypeCode === value);
-        let autoTag = busType.autoTag;
+        let busType = this.busTypeList.find(item => item.documentTypeCode === value)
+        let autoTag = busType.autoTag
         if (autoTag == 1) {
           this.editableTabsValue = this.tabsName[1]
         }
@@ -1197,46 +1205,45 @@ export default {
       startSplit(this.formData).then(res => {
         this.loading = false
         if (res.code == 20000) {
-          this.selectPrescriptionVisible = false;
-          this.refreshCodesPanel(this);
+          this.selectPrescriptionVisible = false
+          this.refreshCodesPanel(this)
         } else if (res.code == 501) {
 
-          this.$refs.childRef.getList();
-          this.$refs.childRef.getDraftList();
-          this.$refs.childRef.getOtherList();
+          this.$refs.childRef.getList()
+          this.$refs.childRef.getDraftList()
+          this.$refs.childRef.getOtherList()
           this.$message.warning(res.message)
-          this.refreshCodesPanel(this);
+          this.refreshCodesPanel(this)
         }
       }).catch(() => {
         this.loading = false
       })
     },
 
-
     printCodeResult(data, message) {
-      const resultParts = [];
+      const resultParts = []
       if (data.udi) {
-        resultParts.push("层级标识: " + data.udi);
+        resultParts.push('层级标识: ' + data.udi)
       }
       if (data.batchNo) {
-        resultParts.push("批次号: " + data.batchNo);
+        resultParts.push('批次号: ' + data.batchNo)
       }
       if (data.produceDate) {
-        resultParts.push("生产日期: " + data.produceDate);
+        resultParts.push('生产日期: ' + data.produceDate)
       }
       if (data.expireDate) {
-        resultParts.push("失效日期: " + data.expireDate);
+        resultParts.push('失效日期: ' + data.expireDate)
       }
       if (data.serialNo) {
-        resultParts.push("序列号: " + data.serialNo);
+        resultParts.push('序列号: ' + data.serialNo)
       }
-      this.scanTitle = "扫码结果：" + data.code;
-      this.result = resultParts.join(" , ");
+      this.scanTitle = '扫码结果：' + data.code
+      this.result = resultParts.join(' , ')
       if (message == 'success') {
-        this.scanResultType = "success";
+        this.scanResultType = 'success'
       } else {
-        this.scanResultType = "warning";
-        this.result = this.result + "\n" + message;
+        this.scanResultType = 'warning'
+        this.result = this.result + '\n' + message
       }
     },
 
@@ -1247,12 +1254,11 @@ export default {
         type: 'warning'
       }).then(() => {
         this.formData.insert = true
-        this.addCode(data.code);
+        this.addCode(data.code)
       }).catch(() => {
-      });
+      })
     },
 
-
     vailOrderFinish() {
       if (!this.autoFinishOrderFlag) {
         return
@@ -1261,15 +1267,15 @@ export default {
         this.loading = false
         if (res.code == 20000) {
           if (res.data) {
-            this.$confirm("单据已赋码或可自动赋码，是否立即完成单据？", '提示', {
+            this.$confirm('单据已赋码或可自动赋码，是否立即完成单据？', '提示', {
               confirmButtonText: '立即提交',
               cancelButtonText: '手动扫码',
               type: 'warning'
             }).then(() => {
-              this.finishOrder();
+              this.finishOrder()
             }).catch(() => {
               this.autoFinishOrderFlag = false
-            });
+            })
           }
         } else {
 
@@ -1279,43 +1285,44 @@ export default {
       })
     },
 
-
     async printMutiCodeResult(vailCodeResultResponses) {
-      this.warnResult = "";
-      this.errResult = "";
-      this.result = "";
-      this.warnVisible = false;
-      this.errVisible = false;
+      this.warnResult = ''
+      this.errResult = ''
+      this.result = ''
+      this.warnVisible = false
+      this.errVisible = false
       for (let i = 0; i < vailCodeResultResponses.length; i++) {
         let data = vailCodeResultResponses[i]
-        if (data.status == 1)
-          this.result = this.result + ";" + vailCodeResultResponses[i].code;
-        else if (data.status == 2) {
-          this.warnResult = this.warnResult + "\n" + vailCodeResultResponses[i].code + ":" + vailCodeResultResponses[i].errMsg;
+        if (data.status == 1) {
+          this.result = this.result + ';' + vailCodeResultResponses[i].code
+        } else if (data.status == 2) {
+          this.warnResult = this.warnResult + '\n' + vailCodeResultResponses[i].code + ':' + vailCodeResultResponses[i].errMsg
         } else if (data.status == 3) {
-          this.result = this.result + "\n" + vailCodeResultResponses[i].code;
+          this.result = this.result + '\n' + vailCodeResultResponses[i].code
           // this.warnResult = this.warnResult + "\n" + vailCodeResultResponses[i].code + ":" + vailCodeResultResponses[i].errMsg;
           await this.popupTip(data)
         }
         // else
         //   this.errResult = this.errResult + "\n" + vailCodeResultResponses[i].code + ":" + vailCodeResultResponses[i].errMsg;
       }
-      if (!isBlank(this.warnResult))
-        this.warnVisible = true;
-      if (!isBlank(this.errResult))
-        this.errVisible = true;
+      if (!isBlank(this.warnResult)) {
+        this.warnVisible = true
+      }
+      if (!isBlank(this.errResult)) {
+        this.errVisible = true
+      }
     },
     handleCommand(command) {
       // this.$message('click on item ' + command);
     },
     clearCode() {
-      this.originCode = "";
-      this.formData.code = "";
-      this.scanCode = "";
-      this.scanTitle = "扫码结果：";
-      this.result = "";
-      this.warnResult = ""
-      this.errResult = ""
+      this.originCode = ''
+      this.formData.code = ''
+      this.scanCode = ''
+      this.scanTitle = '扫码结果：'
+      this.result = ''
+      this.warnResult = ''
+      this.errResult = ''
       this.warnVisible = false
       this.errVisible = false
     },
@@ -1328,13 +1335,13 @@ export default {
         tagStatus: -1,
         workPlaceCode: this.formData.workPlaceCode,
         busType: this.formData.busType
-      };
+      }
       this.curRow = null
-      this.formData.confirmFinish = false;
+      this.formData.confirmFinish = false
       this.refreshCodesPanel(this)
       this.clearCode()
-      this.$refs.inputRef.focus();
-      this.$refs.inputRef.select();
+      this.$refs.inputRef.focus()
+      this.$refs.inputRef.select()
     },
     toggleBusType() {
       //隐藏下拉框内容
@@ -1342,10 +1349,9 @@ export default {
       this.selectBusTypeDisabled = true
     },
 
-
     getInvList() {
       let query = {
-        advanceType: 1,
+        advanceType: 1
       }
       getInvListByUser(query)
         .then((response) => {
@@ -1355,46 +1361,46 @@ export default {
         })
     },
     changeCorp() {
-      let corp = this.fromInvOptions.find(item => item.code === this.formData.fromCorp);
+      let corp = this.fromInvOptions.find(item => item.code === this.formData.fromCorp)
       this.formData.fromCorpName = corp.name
     },
     //处理事件
     handleRecCodesEvent(event) {
-      console.log('接收 recCodes event:', event.detail.recCodes);
+      console.log('接收 recCodes event:', event.detail.recCodes)
       let params = {
-        codeList: event.detail.recCodes,
-      };
+        codeList: event.detail.recCodes
+      }
       if (this.formData.billNo == null) {
-        this.$message.error("请先选入单据！");
+        this.$message.error('请先选入单据！')
         return
       }
       this.batchVailCode(params)
 
     },
 
-
     batchVailCode(params) {
       if (this.scanStatus == 1) {
         //剔除
+        const codeArray = this.filterQuery.code.split(';')
         // const codeArray = this.codeFormData.code.split(';')
         let query = {
           orderId: this.formData.billNo,
-          codeList: params
+          codeList: codeArray
         }
         //剔除码
         this.removeCodesTemp(query)
       } else {
         batchVailCode(params).then((res) => {
           if (res.code === 20000) {
-            this.valiCodes = [];
-            let list = res.data;
+            this.valiCodes = []
+            let list = res.data
             list.forEach(item => {
               if (item.status === 1) {
-                this.valiCodes.push(item.code);
+                this.valiCodes.push(item.code)
               }
-            });
-            this.$refs.inputRef.focus();
-            this.$refs.inputRef.select();
+            })
+            this.$refs.inputRef.focus()
+            this.$refs.inputRef.select()
             this.printMutiCodeResult(list)
             if (this.valiCodes != null && this.valiCodes.length > 0) {
               //批量添加
@@ -1406,72 +1412,79 @@ export default {
                 insert: this.formData.insert,
                 busType: this.formData.busType,
                 fromCorpName: this.formData.fromCorpName,
-                invCode: this.formData.invCode,
+                invCode: this.formData.invCode
               }
               orderbatchAddCode(params2).then((res) => {
                 if (res.code === 20000) {
-                  this.formData.tagStatus = 2;
-                  this.formData.insert = false;
-                  this.curRow = this.formData;
-                  this.$refs.inputRef.focus();
-                  this.refreshCodesPanel(this);
+                  this.formData.tagStatus = 2
+                  this.formData.insert = false
+                  this.curRow = this.formData
+                  this.$refs.inputRef.focus()
+                  this.refreshCodesPanel(this)
                   this.printMutiCodeResult(res.data.vailCodeResultResponses)
                 } else {
                   this.$message.error(res.message)
                 }
-              });
+              })
               // this.scanCode = this.valiCodes.join(";");
             }
 
           } else {
             this.$message.error(res.message)
           }
-        });
+        })
       }
 
     },
     removeCodesTemp(query) {
-      removeByScanCode(query).then(res => {
-        if (res.code == 20000) {
-          this.$message.success("剔除成功")
-          this.scanCode = ""
-          this.panelALive = false
-          this.$nextTick(() => {
-            this.panelALive = true;
-          });
-          this.result = ""
-        } else {
-          this.result = ""
-          this.scanCode = ""
-          this.$message.error(res.message)
+      removeByScanCode(query).then(res =>{
+        if (res.code == 20000){
+              this.$message.success('剔除成功')
+              this.scanCode = ''
+              this.panelALive = false
+              this.$nextTick(() => {
+                this.panelALive = true
+              })
+              this.result = ''
+        }else if (res.code == 501){
+              this.warnVisible = true
+              this.warnResult = res.data
+              this.panelALive = false
+              this.$nextTick(() => {
+                this.panelALive = true
+              })
+        }else {
+              this.result = ''
+              this.scanCode = ''
+              this.$message.error(res.message)
         }
       })
     },
     //扫码校验
     addGs() {
-      const input = this.$refs.inputRef.$refs.input;
-      const textToInsert = "\u001D";
-      const start = input.selectionStart;
-      const end = input.selectionEnd;
-      this.scanCode = this.scanCode.slice(0, start) + textToInsert + this.scanCode.slice(end);
+      const input = this.$refs.inputRef.$refs.input
+      const textToInsert = '\u001D'
+      const start = input.selectionStart
+      const end = input.selectionEnd
+      this.scanCode = this.scanCode.slice(0, start) + textToInsert + this.scanCode.slice(end)
       this.$nextTick(() => {
-        this.focus = true;
-        input.selectionStart = input.selectionEnd = start + textToInsert.length;
-        this.$refs.inputRef.focus();
-      });
+        this.focus = true
+        input.selectionStart = input.selectionEnd = start + textToInsert.length
+        this.$refs.inputRef.focus()
+      })
     },
 
     handleScanComplete(fullScanData) {
-      console.log("Scan complete:", fullScanData.join(";"));
+      console.log('Scan complete:', fullScanData.join(';'))
       if (this.formData.billNo == null && this.formDataVisible.scanType != 1) {
         this.enterBillNoKey(fullScanData[0])
-        return;
+        return
       }
       let params = {
-        codeList: fullScanData,
-      };
+        codeList: fullScanData
+      }
       if (this.formData.billNo == null) {
-        this.$message.error("请先选入单据！");
+        this.$message.error('请先选入单据！')
         return
       }
       this.batchVailCode(params)
@@ -1480,113 +1493,113 @@ export default {
 
     parseString(str) {
       // 1. 判断是否以 "MA" 开头
-      if (str.startsWith("MA")) {
-        return true;
+      if (str.startsWith('MA')) {
+        return true
       }
 
       // 2. 判断是否以 "01" 开头且长度大于等于 18
-      if (str.startsWith("01") && str.length >= 18) {
-        return true;
+      if (str.startsWith('01') && str.length >= 18) {
+        return true
       }
 
       // 3. 判断是否以 "#" 开头且 "#" 的个数大于等于 4
-      if (str.startsWith("#") && (str.match(/#/g) || []).length >= 4) {
-        return true;
+      if (str.startsWith('#') && (str.match(/#/g) || []).length >= 4) {
+        return true
       }
 
       // 4. 判断是否以 "8" 开头且长度为 20 位
-      if (str.startsWith("8") && str.length === 20) {
-        return true;
+      if (str.startsWith('8') && str.length === 20) {
+        return true
       }
 
       // 5. 判断是否以 "11", "17", "21", 或 "10" 开头
-      const prefixes = ["11", "17", "21", "10"];
+      const prefixes = ['11', '17', '21', '10']
       if (prefixes.some(prefix => str.startsWith(prefix))) {
-        return true;
+        return true
       }
       // 如果没有任何条件满足，返回 false
-      return false;
+      return false
     },
     socketListener() {
-      let lastScanTime = Date.now();
-      let scanBuffer = [];
-      let scanTimeout = null;
-      const SCAN_TIMEOUT = 1000; // 1秒间隔，表示扫码结束的判定标准
-      const self = this;
-      console.log("启用监听")
-      this.ws.onmessage = function (event) {
-        let scanData = event.data; // 获取扫码数据
-        let currentTime = Date.now();
+      let lastScanTime = Date.now()
+      let scanBuffer = []
+      let scanTimeout = null
+      const SCAN_TIMEOUT = 1000 // 1秒间隔，表示扫码结束的判定标准
+      const self = this
+      console.log('启用监听')
+      this.ws.onmessage = function(event) {
+        let scanData = event.data // 获取扫码数据
+        let currentTime = Date.now()
         console.log(scanData)
         // 如果时间间隔超过预设的阈值，表示这是一次新的扫码
         if (currentTime - lastScanTime > SCAN_TIMEOUT) {
           // 处理上一次完整的扫码数据
           if (scanBuffer.length > 0) {
-            self.handleScanComplete(scanBuffer);
+            self.handleScanComplete(scanBuffer)
           }
           // 清空缓冲区，开始新的扫码
-          scanBuffer = [];
+          scanBuffer = []
         }
         // 重置上一次扫码的时间
-        lastScanTime = currentTime;
+        lastScanTime = currentTime
         // 将数据添加到缓冲区
-        scanBuffer.push(scanData);
+        scanBuffer.push(scanData)
 
         // 如果已经有一个定时器在等待，可以清除它
         if (scanTimeout) {
-          clearTimeout(scanTimeout);
+          clearTimeout(scanTimeout)
         }
         // 设置新的定时器，等待指定的时间后执行扫码结束处理
         scanTimeout = setTimeout(() => {
           // 定时器到时，处理扫码结束
-          self.handleScanComplete(scanBuffer);
-          scanBuffer = [];
-        }, SCAN_TIMEOUT);
-      };
+          self.handleScanComplete(scanBuffer)
+          scanBuffer = []
+        }, SCAN_TIMEOUT)
+      }
     },
     handleVisibilityChange() {
       if (document.visibilityState === 'visible') {
-        console.log('用户切回到了处理页面');
+        console.log('用户切回到了处理页面')
         if (this.ws == null || this.ws.readyState === WebSocket.CLOSED) {
-          this.ws = new WebSocket("ws://127.0.0.1:9988");
-          const self = this;
-          this.ws.onopen = function (evt) {
-            console.log("处理单据WebSocket 连接中 ...");
+          this.ws = new WebSocket('ws://127.0.0.1:9988')
+          const self = this
+          this.ws.onopen = function(evt) {
+            console.log('处理单据WebSocket 连接中 ...')
             self.socketListener()
-          };
+          }
 
         }
       } else {
         if (this.ws && this.ws.readyState === WebSocket.OPEN) {
-          this.ws.close();
-          console.log("关闭处理单据websocket成功")
+          this.ws.close()
+          console.log('关闭处理单据websocket成功')
         }
       }
     },
 
     //扫码剔除操作
     deleteCode() {
-      this.scanTip = "扫码剔除:"
+      this.scanTip = '扫码剔除:'
       this.labelName = 2
-      this.placeholder = "请点击输入框进行扫码剔除"
+      this.placeholder = '请点击输入框进行扫码剔除'
       this.scanStatus = 1
     },
     overdeleteCode() {
       this.labelName = 1
       this.scanStatus = null
-      this.scanTip = "扫码录入:"
+      this.scanTip = '扫码录入:'
       this.placeholder = '请点击输入框进行选扫码'
-    },
+    }
   },
   mounted() {
-    this.$refs.inputRef.focus();
+    this.$refs.inputRef.focus()
     //环境判断
-    if (window.navigator.userAgent.indexOf("GLXP_PC") != -1) {
-      this.scanDisabled = true;
-      window.removeEventListener('djcl', this.handleRecCodesEvent);
-      window.addEventListener('djcl', this.handleRecCodesEvent);
+    if (window.navigator.userAgent.indexOf('GLXP_PC') != -1) {
+      this.scanDisabled = true
+      window.removeEventListener('djcl', this.handleRecCodesEvent)
+      window.addEventListener('djcl', this.handleRecCodesEvent)
     }
-    document.addEventListener('visibilitychange', this.handleVisibilityChange);
+    document.addEventListener('visibilitychange', this.handleVisibilityChange)
     // window.addEventListener('storage', (event) => {
     //   if (document.visibilityState == 'hidden') {
     //     console.log("关闭处理单据websocket")
@@ -1607,27 +1620,26 @@ export default {
 
   },
 
-
   beforeDestroy() {
-    window.removeEventListener('djcl', this.handleRecCodesEvent);
-    document.removeEventListener('visibilitychange', this.handleVisibilityChange);
+    window.removeEventListener('djcl', this.handleRecCodesEvent)
+    document.removeEventListener('visibilitychange', this.handleVisibilityChange)
 
-    this.ws.close();
-    this.ws.onclose = function (evt) {
-      console.log("处理单据 Connection closed.");
-    };
+    this.ws.close()
+    this.ws.onclose = function(evt) {
+      console.log('处理单据 Connection closed.')
+    }
   },
   created() {
-    getHead("prescribeTagCodeDeal", "1").then((re) => {
+    getHead('prescribeTagCodeDeal', '1').then((re) => {
       // 处理返回的数据
-      this.tableObj = re.data;
-      this.tableHeader = re.data.tableList;
-      this.queryList = re.data.queryList;
-      this.fromList = re.data.fromList;
-    });
-    this.findCurWorkPlaces();
-
-    this.formData.invCode = this.$store.getters.locInvCode;
+      this.tableObj = re.data
+      this.tableHeader = re.data.tableList
+      this.queryList = re.data.queryList
+      this.fromList = re.data.fromList
+    })
+    this.findCurWorkPlaces()
+
+    this.formData.invCode = this.$store.getters.locInvCode
     if (this.$route.query.billNo != null) {
       this.formData.billNo = this.$route.query.billNo
     }
@@ -1637,9 +1649,9 @@ export default {
         // this.selectBusTypeDisabled = true
       }
       this.corpOrderIdDisabled = true
-      this.workplaceId = Number(this.$route.query.workplaceId);
-      this.formData.workPlaceCode = Number(this.$route.query.workplaceId);
-      this.getWorkBindBusTypes(this.formData.workPlaceCode);
+      this.workplaceId = Number(this.$route.query.workplaceId)
+      this.formData.workPlaceCode = Number(this.$route.query.workplaceId)
+      this.getWorkBindBusTypes(this.formData.workPlaceCode)
     }
   }
 
diff --git a/src/views/inoutDrug/DialogSelectInvProduct.vue b/src/views/inoutDrug/DialogSelectInvProduct.vue
index 989d8c90..26d79ab2 100644
--- a/src/views/inoutDrug/DialogSelectInvProduct.vue
+++ b/src/views/inoutDrug/DialogSelectInvProduct.vue
@@ -149,6 +149,7 @@ export default {
         supId: null,
         unitFk: null,
         invCode: this.invQueryData.invCode,
+        productsType:2,
       },
       detailQuery: {
         code: null,
@@ -191,6 +192,7 @@ export default {
         supId: null,
         page: 1,
         limit: 10,
+        productsType:2
       };
       this.getList();
     },
diff --git a/src/views/inoutDrug/PanelCreateOrderBizDrug.vue b/src/views/inoutDrug/PanelCreateOrderBizDrug.vue
index 72d49f71..e92762cb 100644
--- a/src/views/inoutDrug/PanelCreateOrderBizDrug.vue
+++ b/src/views/inoutDrug/PanelCreateOrderBizDrug.vue
@@ -159,7 +159,7 @@
       ></stockOrderNewSelectProduct>
     </el-dialog>
     <el-dialog
-      title="库存物资录入"
+      title="库存药品录入"
       :visible.sync="selectInvProductVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"