From bcc4aa12e069447d50a40f54bfe892cb2a84b950 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 4 Dec 2024 16:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=BB=A5=E5=90=8C=E4=BA=8B=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=B8=A4=E7=A7=8D=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue                | 1 -
 .../unplannedreceiptRequestMain/index.vue                 | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index bf355fdd1..f24522097 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -627,7 +627,6 @@ const handleTableSelect = (row, column, event) => {
 
 // 某个item是否禁用
 const itemIsDisabled = (colum, row) => {
-  console.log(row['disabled_' + colum.field])
   if (row['disabled_' + colum.field] === true || row['disabled_' + colum.field] === false) {
     return Boolean(row['disabled_' + colum.field]) 
   }
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index b475abf6e..1c12643de 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -280,6 +280,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
           tfk['itemCode'] = item['code']
           tfk['uom'] = item['uom']
           tfk['validityDays'] = item['validityDays']
+          tfk['isEnableBuy'] =  val[0]['enableBuy']
           tableData.value.push(tfk)
         })
       } else if (formField === 'costcentreCode') {
@@ -855,6 +856,13 @@ const submitForm = async (formType, submitData) => {
       : ''
   })
   try {
+    let newVal = data.subList.some((item) => item.isEnableBuy == 'TRUE')
+    let newVal1 = data.subList.some((item) => item.isEnableBuy == 'FALSE')
+    console.log(newVal,newVal1)
+    if (newVal && newVal1) {
+      message.warning('不能同时选择可制造和可采购的物料')
+      return
+    }
     if (formType === 'create') {
       console.log('【计划外入库子列表】', data.subList)
       if (data.subList.length == 0) {