From 5bb8002816f65f7eb35cde3cbf1ea4c99f313710 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 30 Nov 2023 19:19:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86bug=EF=BC=8C?=
 =?UTF-8?q?=E9=BC=A0=E6=A0=87=E6=82=AC=E5=81=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue    |  2 +-
 src/components/Form/src/Form.vue              | 52 +++++++++++++------
 .../inspect/inspectRequestMain/index.vue      |  4 +-
 .../putaway/putawayRequestMain/index.vue      |  4 +-
 4 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 91fe34606..4dc22efb4 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" :width="isBusiness ? '60%' : '40%'">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" :width="isBusiness ? '60%' : '40%'" :close-on-click-modal="false">
     <Form
       ref="formRef"
       v-loading="formLoading"
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 7fb04d062..ecd52eca9 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -223,23 +223,43 @@ export default defineComponent({
       // 如果有 isSearchList: true ，使用查询弹层列表
       const formItemSlotsSearchList: Recordable = setFormItemSlots(slots, item.field)
       if (item?.componentProps?.isSearchList) {
-        formItemSlotsSearchList[item.field] = () => {
+        if(item?.componentProps?.multiple){
+
+          formItemSlotsSearchList[item.field] = () => {
           return (
             <>
-             
-             <ElTooltip placement="top"  content={formModel.value[item.field]}>
-            <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={true}  /></ElTooltip>
-            <ElButton icon={Search} onClick={()=>{
-              opensearchTable(
-                item.field, item?.componentProps?.searchField,
-                item?.componentProps?.searchTitle, 
-                item?.componentProps?.searchAllSchemas, 
-                item?.componentProps?.searchPage,
-                item?.componentProps?.searchCondition,
-                item?.componentProps?.multiple,
-              )}}/>
-            </>
-          )
+              <ElTooltip placement="top"  content={formModel.value[item.field]} visible={formModel.value[item.field]}>
+                <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={true}  />
+              </ElTooltip>
+              <ElButton icon={Search} onClick={()=>{
+                opensearchTable(
+                  item.field, item?.componentProps?.searchField,
+                  item?.componentProps?.searchTitle, 
+                  item?.componentProps?.searchAllSchemas, 
+                  item?.componentProps?.searchPage,
+                  item?.componentProps?.searchCondition,
+                  item?.componentProps?.multiple,
+                )}}/>
+              </>
+            )
+          }
+        }else{
+          formItemSlotsSearchList[item.field] = () => {
+          return (
+            <>
+              <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={true}  />
+              <ElButton icon={Search} onClick={()=>{
+                opensearchTable(
+                  item.field, item?.componentProps?.searchField,
+                  item?.componentProps?.searchTitle, 
+                  item?.componentProps?.searchAllSchemas, 
+                  item?.componentProps?.searchPage,
+                  item?.componentProps?.searchCondition,
+                  item?.componentProps?.multiple,
+                )}}/>
+              </>
+            )
+          }
         }
       }
       return (
@@ -333,7 +353,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.myInput{
+.myInput {
   width: calc(100% - 46px);
 }
 .#{$elNamespace}-form.#{$namespace}-form .#{$elNamespace}-row {
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
index c812c24ff..986cdf661 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -141,8 +141,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:inspect-request-main:create'}), // 新增——需要手动修改下权限
-  defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), // 导入
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:inspect-request-main:create'}), // 新增——需要手动修改下权限
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:inspect-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index e784ac180..1c9116028 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -141,8 +141,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // 新增——需要手动修改下权限
-  defaultButtons.defaultImportBtn({hasPermi:'wms:putaway-request-main:import'}), // 导入
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // 新增——需要手动修改下权限
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:putaway-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选