From 63703002ac4941d49c8e8693415e72afea2f449c 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, 5 Dec 2023 23:39:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E4=B8=AD=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8F=B7=E5=92=8C=E6=89=B9=E5=8F=B7=E7=9A=84=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9A=E5=A6=82=E6=9E=9C=E5=BC=80=E5=90=AF=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86=EF=BC=8C=E5=B9=B6=E4=B8=94=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=AD=89=E4=BA=8E=E9=87=87=E8=B4=AD=E3=80=81=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E9=80=80=E8=B4=A7=E3=80=81=E9=94=80=E5=94=AE=E3=80=81?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=EF=BC=8C=E5=88=99=E8=B7=B3?=
 =?UTF-8?q?=E8=BF=87=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/mixins/BillModalMixin.js      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 2be425fd..8b72b11c 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -594,11 +594,21 @@ export const BillModalMixin = {
         this.changeFormTypes(this.materialTable.columns, 'sku', 1)
       }
       if(info.enableSerialNumber === "1") {
-        this.changeFormTypes(this.materialTable.columns, 'snList', 1)
+        //如果开启出入库管理，并且类型等于采购、采购退货、销售、销售退货，则跳过
+        if(this.inOutManageFlag && (this.prefixNo === 'CGRK' || this.prefixNo === 'CGTH' || this.prefixNo === 'XSCK' || this.prefixNo === 'XSTH')) {
+          //跳过
+        } else {
+          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)
+        //如果开启出入库管理，并且类型等于采购、采购退货、销售、销售退货，则跳过
+        if(this.inOutManageFlag && (this.prefixNo === 'CGRK' || this.prefixNo === 'CGTH' || this.prefixNo === 'XSCK' || this.prefixNo === 'XSTH')) {
+          //跳过
+        } else {
+          this.changeFormTypes(this.materialTable.columns, 'batchNumber', 1)
+          this.changeFormTypes(this.materialTable.columns, 'expirationDate', 1)
+        }
       }
     },
     //删除一行或多行的时候触发