From 39e9eeae0501cd43718a8f61ffb938fe9d305f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 8 Oct 2021 00:54:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=A2=9E=E5=8A=A0=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/mixins/BillModalMixin.js      | 12 ++++++++++++
 .../src/views/bill/modules/PurchaseInModal.vue   | 16 +++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 32db83d5..9bc519be 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -22,6 +22,8 @@ export const BillModalMixin = {
       accountIdList: [],
       accountMoneyList: [],
       billUnitPirce: '',
+      scanBarCode: '',
+      scanStatus: true,
       spans: {
         labelCol1: {span: 2},
         wrapperCol1: {span: 22},
@@ -505,6 +507,16 @@ export const BillModalMixin = {
       this.$nextTick(() => {
         this.form.setFieldsValue({'debt':debtNew})
       });
+    },
+    scanEnter() {
+      this.scanStatus = false
+    },
+    scanPressEnter() {
+      console.log(this.scanBarCode)
+    },
+    stopScan() {
+      this.scanStatus = true
+      this.scanBarCode = ''
     }
   }
 }
\ No newline at end of file
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 4755f85d..8034b0b0 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -52,7 +52,21 @@
           :actionButton="true"
           @valueChange="onValueChange"
           @added="onAdded"
-          @deleted="onDeleted" />
+          @deleted="onDeleted">
+          <template #buttonAfter>
+            <a-row :gutter="24">
+              <a-col v-if="scanStatus" :md="6" :sm="24">
+                <a-button @click="scanEnter">扫码录入</a-button>
+              </a-col>
+              <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 6px 0 12px">
+                <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" />
+              </a-col>
+              <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px">
+                <a-button @click="stopScan">收起扫码</a-button>
+              </a-col>
+            </a-row>
+          </template>
+        </j-editable-table>
         <a-row class="form-row" :gutter="24">
           <a-col :lg="24" :md="24" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">