From baac26c58637f737ca90231b24568e395cace503 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 14 Sep 2024 19:41:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/workplace/addBusTypeDialog.vue      | 12 ++++++------
 src/views/collect/DealOrder.vue               | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/views/basic/workplace/addBusTypeDialog.vue b/src/views/basic/workplace/addBusTypeDialog.vue
index 9af06b8f..e20f0ef2 100644
--- a/src/views/basic/workplace/addBusTypeDialog.vue
+++ b/src/views/basic/workplace/addBusTypeDialog.vue
@@ -64,8 +64,8 @@
         </el-col>
 
         <el-col :span="12" class="el-col">
-          <el-form-item label="独占工位库存:" prop="monopoly" class="query-form-item">
-            <el-select v-model="formData.monopoly" style="width: 80%" placeholder="独占工位库存"
+          <el-form-item label="独占库存:" prop="monopoly" class="query-form-item">
+            <el-select v-model="formData.monopoly" style="width: 80%" placeholder="独占库存"
                        :disabled="formData.autoTag == 0">
               <el-option label="否" :value="0"></el-option>
               <el-option label="是" :value="1"></el-option>
@@ -75,7 +75,7 @@
       </el-row>
       <el-row :gutter="24" class="el-row">
         <el-col :span="12" class="el-col">
-          <el-form-item label="常用业务名称:" prop="isPopular" class="query-form-item">
+          <el-form-item label="常用业务:" prop="isPopular" class="query-form-item">
             <el-select v-model="formData.isPopular" style="width: 80%" placeholder="业务类型是否常用">
               <el-option label="是" :value="1"></el-option>
               <el-option label="否" :value="0"></el-option>
@@ -498,17 +498,17 @@ export default {
         this.formData.checkInsert = 2
       }
     },
-    changeShipper(){
+    changeShipper() {
       if (this.formData.shipper == 1) {
         this.formData.consignee = 1
       } else {
         this.formData.consignee = 2
       }
     },
-    changeConsignee(){
+    changeConsignee() {
       if (this.formData.consignee == 1) {
         this.formData.shipper = 1
-      } else if(this.formData.consignee == 2) {
+      } else if (this.formData.consignee == 2) {
         this.formData.shipper = 2
       }
     }
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 7dc0cc40..e4dd99b2 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -176,6 +176,10 @@
                   style="margin-left: 15px"
                 >
                 </el-button>
+
+                <el-button type="primary"
+                           :disabled="!formData.billNo" @click="addGs">ALT+29
+                </el-button>
                 <el-button
                   type="primary"
                   size="mini"
@@ -1237,6 +1241,21 @@ export default {
 
     },
 
+    //扫码校验
+    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);
+      this.$nextTick(() => {
+        this.focus = true;
+        input.selectionStart = input.selectionEnd = start + textToInsert.length;
+        this.$refs.inputRef.focus();
+      });
+    }
+    ,
+
     parseString(str) {
       // 1. 判断是否以 "MA" 开头
       if (str.startsWith("MA")) {