From 6a02d51157632cea4830a15d9da80cb66afd5eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 3 Jan 2024 11:15:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                  | 7 +++++++
 .../productionreturn/productionreturnRequestMain/index.vue | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 83a2e251b..a51323c2d 100644
--- a/README.md
+++ b/README.md
@@ -34,5 +34,12 @@ tableForm:{
     key: 'available', // 查询列表中字段
     value: 'TRUE', // 指查询具体值
     isMainValue: false // 表示查询条件不是主表的字段的值
+  },
+  {
+    key: 'available', // 查询列表中字段
+    value: 'TRUE', // 指查询具体值
+    action: '==', // 查询拼接条件
+    isSearch: true, // 使用自定义拼接条件
+    isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
   }]
 },
\ No newline at end of file
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index aab0303db..13d4717c2 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -135,7 +135,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['qty'] = val[0]['qty']
         // 修改 tableform 属性 数量最大值设置为库存余额中数量
         ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => {
-          if(item.field == 'qty') {
+          if(item.field == 'qty' && val[0]['qty'] > 0) {
             item.tableForm.max = val[0]['qty']
           }
         })
@@ -165,7 +165,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['qty'] = val[0]['qty']
       // 修改 tableform 属性 数量最大值设置为库存余额中数量
       ProductionreturnRequestDetail.allSchemas.tableFormColumns.map(item => {
-        if(item.field == 'qty') {
+        if(item.field == 'qty' && val[0]['qty'] > 0) {
           item.tableForm.max = val[0]['qty']
         }
       })