From 13655f62df47008c6268acb00d313f0bfebb00ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 31 May 2022 21:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=EF=BC=9A=E7=82=B9?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=8C=E7=9A=84=E6=97=B6=E5=80=99=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E8=A6=81=E8=87=AA=E5=8A=A8=E9=BB=98=E8=AE=A4=E4=B8=BA?=
 =?UTF-8?q?0=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=BC=B9=E5=87=BA=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/components/jeecg/JEditableTable.vue       | 6 +++---
 jshERP-web/src/components/jeecgbiz/JSelectList.vue       | 2 +-
 jshERP-web/src/views/bill/mixins/BillModalMixin.js       | 3 ++-
 jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue | 1 +
 jshERP-web/src/views/bill/modules/SaleOrderModal.vue     | 1 +
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/jshERP-web/src/components/jeecg/JEditableTable.vue b/jshERP-web/src/components/jeecg/JEditableTable.vue
index d41cf3f3..12aa508c 100644
--- a/jshERP-web/src/components/jeecg/JEditableTable.vue
+++ b/jshERP-web/src/components/jeecg/JEditableTable.vue
@@ -2781,11 +2781,11 @@
         })
       },
       /** 自动选中特殊的key **/
-      autoSelectBySpecialKey(specialKey) {
+      autoSelectBySpecialKey(specialKey, orderNum) {
         let trs = this.getElement('tbody').getElementsByClassName('tr')
         let trEls = []
-        for (let tr of trs) {
-          trEls.push(tr)
+        if(trs && trs.length && orderNum>=1) {
+          trEls.push(trs[orderNum-1])
         }
         trEls.forEach(tr => {
           let { idx } = tr.dataset
diff --git a/jshERP-web/src/components/jeecgbiz/JSelectList.vue b/jshERP-web/src/components/jeecgbiz/JSelectList.vue
index d5ea04e9..1101e63c 100644
--- a/jshERP-web/src/components/jeecgbiz/JSelectList.vue
+++ b/jshERP-web/src/components/jeecgbiz/JSelectList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-input-search v-if="kind === 'material'" v-model="names" placeholder="请选择" @pressEnter="onPressEnter" @search="onSearch"></a-input-search>
+    <a-input-search v-if="kind === 'material'" v-model="names" placeholder="条码或名称" @pressEnter="onPressEnter" @search="onSearch"></a-input-search>
     <a-input-search v-if="kind === 'batch'||kind === 'sn'" v-model="names" placeholder="请选择" readOnly @search="onSearch"></a-input-search>
     <j-select-material-modal v-if="kind === 'material'" ref="selectModal" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
     <j-select-batch-modal v-if="kind === 'batch'" ref="selectModal" :rows="rows" :multi="multi" :bar-code="value" @ok="selectOK" @initComp="initComp"/>
diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 94319bd4..0bf5a2ba 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -319,6 +319,7 @@ export const BillModalMixin = {
     },
     onAdded(event) {
       const { row, target } = event
+      target.setValues([{rowKey: row.id, values: {operNumber:0}}])
       getAction('/depot/findDepotByCurrentUser').then((res) => {
         if (res.code === 200) {
           let arr = res.data
@@ -394,7 +395,7 @@ export const BillModalMixin = {
                     target.setValues(mArr);
                     target.recalcAllStatisticsColumns()
                     that.autoChangePrice(target)
-                    target.autoSelectBySpecialKey('operNumber')
+                    target.autoSelectBySpecialKey('operNumber', row.orderNum)
                   }
                 })
               }
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 9e8b0269..1d2d579d 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -69,6 +69,7 @@
           :actionButton="rowCanEdit"
           :dragSort="rowCanEdit"
           @valueChange="onValueChange"
+          @added="onAdded"
           @deleted="onDeleted">
           <template #buttonAfter>
             <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index 6bfe8ca6..df36c601 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -69,6 +69,7 @@
           :actionButton="true"
           :dragSort="true"
           @valueChange="onValueChange"
+          @added="onAdded"
           @deleted="onDeleted">
           <template #buttonAfter>
             <a-row :gutter="24" style="float:left;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">