From 4754f59e9d4bf40e94c4509867db470c13d85d1a 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, 12 Nov 2021 00:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E6=8D=AEbug?=
 =?UTF-8?q?=EF=BC=9A=E9=9B=B6=E5=94=AE=E9=80=80=E8=B4=A7=E5=92=8C=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=95=86=E5=93=81=E7=9A=84=E6=97=B6=E5=80=99=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/mixins/BillModalMixin.js   | 31 ++++++++++---------
 .../views/bill/modules/RetailBackModal.vue    |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 6a538d48..a5164ba0 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -316,21 +316,24 @@ export const BillModalMixin = {
                 })
               } else {
                 //单个条码
-                let mArr = []
-                for (let i = 0; i < mList.length; i++) {
-                  let mInfo = mList[i]
-                  this.changeColumnShow(mInfo)
-                  let mObj = {
-                    rowKey: row.id,
-                    values: this.parseInfoToObj(mInfo)
+                findStockByDepotAndBarCode({ depotId: row.depotId, barCode: row.barCode }).then((res) => {
+                  if (res && res.code === 200) {
+                    let mArr = []
+                    let mInfo = mList[0]
+                    this.changeColumnShow(mInfo)
+                    let mInfoEx = this.parseInfoToObj(mInfo)
+                    mInfoEx.stock = res.data.stock
+                    let mObj = {
+                      rowKey: row.id,
+                      values: mInfoEx
+                    }
+                    mArr.push(mObj)
+                    target.setValues(mArr);
+                    target.recalcAllStatisticsColumns()
+                    that.autoChangePrice(target)
+                    target.autoSelectBySpecialKey('operNumber')
                   }
-                  mArr.push(mObj)
-                }
-                target.setValues(mArr);
-                that.getStockByDepotBarCode(row, target)
-                target.recalcAllStatisticsColumns()
-                that.autoChangePrice(target)
-                target.autoSelectBySpecialKey('operNumber')
+                })
               }
             }
           });
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index 97a9ca7b..05e4941a 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -323,7 +323,7 @@
         });
       },
       onSearchLinkNumber() {
-        this.$refs.linkBillList.show('出库', '零售', '会员', "0")
+        this.$refs.linkBillList.show('出库', '零售', '会员', "1")
         this.$refs.linkBillList.title = "选择零售出库"
       },
       linkBillListOk(selectBillRows) {