From 8454c5d352824e8362e0e9f942f744a641dcf376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 10 Oct 2021 18:01:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E8=B0=83=E5=8F=96=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E8=83=BD=E5=B1=95=E7=A4=BA=E6=89=B9?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E5=BA=8F=E5=88=97=E5=8F=B7=E7=AD=89=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/mixins/BillModalMixin.js  | 13 +++++++++++++
 .../src/views/bill/modules/PurchaseBackModal.vue    |  1 +
 .../src/views/bill/modules/PurchaseInModal.vue      |  1 +
 jshERP-web/src/views/bill/modules/SaleBackModal.vue |  1 +
 jshERP-web/src/views/bill/modules/SaleOutModal.vue  |  1 +
 5 files changed, 17 insertions(+)

diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 2d83d287..96723165 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -436,6 +436,19 @@ export const BillModalMixin = {
         taxLastMoney: mInfo.billPrice
       }
     },
+    //控制sku、序列号、批号输入框的显示和隐藏状态
+    changeColumnShowOrHide(info) {
+      if(info.sku) {
+        this.changeFormTypes(this.materialTable.columns, 'sku', 1)
+      }
+      if(info.enableSerialNumber === "1") {
+        this.changeFormTypes(this.materialTable.columns, 'snList', 1)
+      }
+      if(info.enableBatchNumber === "1") {
+        this.changeFormTypes(this.materialTable.columns, 'batchNumber', 1)
+        this.changeFormTypes(this.materialTable.columns, 'expirationDate', 1)
+      }
+    },
     //删除一行或多行的时候触发
     onDeleted(ids, target) {
       target.recalcAllStatisticsColumns()
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 7ae39764..2db36538 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -348,6 +348,7 @@
               info.taxMoney = 0
               info.taxLastMoney = info.allPrice
               listEx.push(info)
+              this.changeColumnShowOrHide(info)
             }
             tab.dataSource = listEx
             typeof success === 'function' ? success(res) : ''
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 8034b0b0..ad2a5559 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -363,6 +363,7 @@
               info.taxMoney = 0
               info.taxLastMoney = info.allPrice
               listEx.push(info)
+              this.changeColumnShowOrHide(info)
             }
             tab.dataSource = listEx
             //给优惠后金额重新赋值
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index e5053c6e..bbe53f49 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -359,6 +359,7 @@
               info.taxMoney = 0
               info.taxLastMoney = info.allPrice
               listEx.push(info)
+              this.changeColumnShowOrHide(info)
             }
             tab.dataSource = listEx
             typeof success === 'function' ? success(res) : ''
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 97a4ff30..5dfc5f37 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -367,6 +367,7 @@
               info.taxMoney = 0
               info.taxLastMoney = info.allPrice
               listEx.push(info)
+              this.changeColumnShowOrHide(info)
             }
             tab.dataSource = listEx
             //给优惠后金额重新赋值