给部分出库的单据增加序列号的扫描支持

jshERP-web/src/views/bill/mixins/BillModalMixin.js

@@ -736,12 +736,12 @@ export const BillModalMixin = {
               if(!hasFinished) {
                 //将扫码的条码对应的商品加入列表
                 let item = {}
-                item.barCode = this.scanBarCode
                 let mList = res.data
                 if(mList && mList.length>0) {
                   let mInfo = mList[0]
                   this.changeColumnShow(mInfo)
                   item.depotId = mInfo.depotId
+                  item.barCode = mInfo.mBarCode
                   item.name = mInfo.name
                   item.standard = mInfo.standard
                   item.model = mInfo.model
@@ -750,6 +750,12 @@ export const BillModalMixin = {
                   item.stock = mInfo.stock
                   item.unit = mInfo.commodityUnit
                   item.sku = mInfo.sku
+                  if(mInfo.mBarCode !== this.scanBarCode) {
+                    if(this.prefixNo ==='LSCK' || this.prefixNo ==='CGTH' || this.prefixNo ==='XSCK' || this.prefixNo ==='QTCK') {
+                      //此时给序列号赋值
+                      item.snList = this.scanBarCode
+                    }
+                  }
                   item.operNumber = 1
                   item.unitPrice = mInfo.billPrice
                   item.allPrice = mInfo.billPrice

jshERP-web/src/views/bill/modules/AllocationOutModal.vue

@@ -52,7 +52,7 @@
                 <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" ref="scanBarCode"/>
+                <a-input placeholder="请扫描商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
               </a-col>
               <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px">
                 <a-button @click="stopScan">收起扫码</a-button>

jshERP-web/src/views/bill/modules/AssembleModal.vue

@@ -51,7 +51,7 @@
                 <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" ref="scanBarCode"/>
+                <a-input placeholder="请扫描商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
               </a-col>
               <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px">
                 <a-button @click="stopScan">收起扫码</a-button>

jshERP-web/src/views/bill/modules/DisassembleModal.vue

@@ -51,7 +51,7 @@
                 <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" ref="scanBarCode"/>
+                <a-input placeholder="请扫描商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
               </a-col>
               <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px">
                 <a-button @click="stopScan">收起扫码</a-button>

jshERP-web/src/views/bill/modules/OtherInModal.vue

@@ -67,9 +67,9 @@
                 <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" ref="scanBarCode"/>
+                <a-input placeholder="请扫描商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
               </a-col>
-              <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px">
+              <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 24px 0 0">
                 <a-button @click="stopScan">收起扫码</a-button>
               </a-col>
             </a-row>

jshERP-web/src/views/bill/modules/OtherOutModal.vue

@@ -67,9 +67,9 @@
                 <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" ref="scanBarCode"/>
+                <a-input placeholder="请扫条码或序列号并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
               </a-col>
-              <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px">
+              <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 24px 0 0">
                 <a-button @click="stopScan">收起扫码</a-button>
               </a-col>
             </a-row>

jshERP-web/src/views/bill/modules/PurchaseBackModal.vue

@@ -71,7 +71,7 @@
                 <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</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" ref="scanBarCode"/>
+                <a-input placeholder="请扫条码或序列号并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
               </a-col>
               <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 12px 0 0">
                 <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>

jshERP-web/src/views/bill/modules/PurchaseInModal.vue

@@ -78,7 +78,7 @@
                 <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
               </a-col>
               <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 8px 0 12px">
-                <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
+                <a-input placeholder="请扫描商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
               </a-col>
               <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 24px 0 0">
                 <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>

jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue

@@ -78,7 +78,7 @@
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
               <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 8px 0 12px">
-                <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
+                <a-input placeholder="请扫描商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
               </a-col>
               <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 12px 0 0">
                 <a-button @click="stopScan">收起扫码</a-button>

jshERP-web/src/views/bill/modules/RetailBackModal.vue

@@ -73,7 +73,7 @@
                     <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</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" ref="scanBarCode"/>
+                    <a-input placeholder="请扫描商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
                   </a-col>
                   <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 18px 0 0">
                     <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>

jshERP-web/src/views/bill/modules/RetailOutModal.vue

@@ -83,7 +83,7 @@
                     <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" ref="scanBarCode"/>
+                    <a-input placeholder="请扫条码或序列号并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
                   </a-col>
                   <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 18px 0 0">
                     <a-button @click="stopScan">收起扫码</a-button>

jshERP-web/src/views/bill/modules/SaleBackModal.vue

@@ -71,7 +71,7 @@
                 <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
               </a-col>
               <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 8px 0 12px">
-                <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
+                <a-input placeholder="请扫描商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
               </a-col>
               <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 24px 0 0">
                 <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>

jshERP-web/src/views/bill/modules/SaleOrderModal.vue

@@ -78,7 +78,7 @@
                 <a-button @click="scanEnter">扫码录入</a-button>
               </a-col>
               <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 8px 0 12px">
-                <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
+                <a-input placeholder="请扫描商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
               </a-col>
               <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 18px 0 0">
                 <a-button @click="stopScan">收起扫码</a-button>

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -79,7 +79,7 @@
                 <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
               </a-col>
               <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 8px 0 12px">
-                <a-input placeholder="请扫码商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
+                <a-input placeholder="请扫条码或序列号并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
               </a-col>
               <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 24px 0 0">
                 <a-button @click="stopScan" style="margin-right: 8px">收起扫码</a-button>