From 9d569f4330dd80db890504b9fca2defbb322f6f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com>
Date: Mon, 27 Nov 2023 17:17:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A8=A1=E5=9D=97=E5=BC=B9?=
 =?UTF-8?q?=E5=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerdock/customerdock.data.ts         | 64 +++++++++++++++++++
 .../customerManage/customerdock/index.vue     | 27 +-------
 .../customeritem/customeritem.data.ts         | 14 +++-
 .../customerManage/project/index.vue          | 13 +---
 .../customerManage/project/project.data.ts    | 30 ++++++---
 .../customerManage/saleprice/index.vue        | 20 +-----
 .../saleprice/saleprice.data.ts               | 48 +++++++++++++-
 7 files changed, 145 insertions(+), 71 deletions(-)

diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
index 7bc1bca78..227504c81 100644
--- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
@@ -1,5 +1,15 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '../customer/customer.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '../../factoryModeling/warehouse/warehouse.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '../../factoryModeling/location/location.data'
+
 const { t } = useI18n() // 国际化
 
 import {validateHanset,validateYS} from '@/utils/validator'
@@ -73,6 +83,24 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户基础信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
     }
   },
   {
@@ -82,6 +110,24 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库基础信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '默认库位',
@@ -90,6 +136,24 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位基础信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '是否可用',
diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
index c0250c886..53c842aab 100644
--- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue
@@ -43,8 +43,7 @@
     ref="basicFormRef" 
     @success="formsSuccess" 
     :rules="CustomerdockRules" 
-    :formAllSchemas="Customerdock.allSchemas" 
-    :searchTableParams="searchTableParams"
+    :formAllSchemas="Customerdock.allSchemas"
     :apiUpdate="CustomerdockApi.updateCustomerdock"
     :apiCreate="CustomerdockApi.createCustomerdock"
     @searchTableSuccess="searchTableSuccess"
@@ -61,13 +60,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as CustomerdockApi from '@/api/wms/customerdock'
-import * as CustomerApi from '@/api/wms/customer'
-import * as WarehouseApi from '@/api/wms/warehouse'
-import * as LocationApi from '@/api/wms/location'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Warehouse } from '../../factoryModeling/warehouse/warehouse.data'
-import { Location } from '../../factoryModeling/location/location.data'
-import { Customer } from '../customer/customer.data'
 import { Customerdock, CustomerdockRules } from './customerdock.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
@@ -89,24 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'customerCode',
-  searchTableTitle: '客户信息',
-  searchTableAllSchemas: Customer.allSchemas,
-  searchTablePage: CustomerApi.getCustomerPage
-},{
-  formField: 'warehouseCode',
-  searchTableTitle: '仓库信息',
-  searchTableAllSchemas: Warehouse.allSchemas,
-  searchTablePage: WarehouseApi.getWarehousePage
-},{
-  formField: 'defaultLocationCode',
-  searchTableTitle: '库位信息',
-  searchTableAllSchemas: Location.allSchemas,
-  searchTablePage: LocationApi.getLocationPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: CustomerdockApi.getCustomerdockPage // 分页接口
 })
diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
index d527f3b66..84c229f94 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
@@ -31,7 +31,12 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '客户信息', // 查询弹窗标题
         searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
-        searchPage: CustomerApi.getCustomerPage // 查询弹窗所需分页方法
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     },
     isSearch: true
@@ -51,7 +56,12 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物品基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     },
     isSearch: true
diff --git a/src/views/wms/basicDataManage/customerManage/project/index.vue b/src/views/wms/basicDataManage/customerManage/project/index.vue
index 7ee650162..403d8c6e0 100644
--- a/src/views/wms/basicDataManage/customerManage/project/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/project/index.vue
@@ -43,8 +43,7 @@
     ref="basicFormRef" 
     @success="formsSuccess" 
     :rules="ProjectRules" 
-    :formAllSchemas="Project.allSchemas" 
-    :searchTableParams="searchTableParams"
+    :formAllSchemas="Project.allSchemas"
     :apiUpdate="ProjectApi.updateProject"
     :apiCreate="ProjectApi.createProject"
     @searchTableSuccess="searchTableSuccess"
@@ -61,10 +60,8 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as ProjectApi from '@/api/wms/project'
-import * as CustomerApi from '@/api/wms/customer'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Project, ProjectRules } from './project.data'
-import { Customer } from '../customer/customer.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -85,14 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'customerCode',
-  searchTableTitle: '客户信息',
-  searchTableAllSchemas: Customer.allSchemas,
-  searchTablePage: CustomerApi.getCustomerPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: ProjectApi.getProjectPage // 分页接口
 })
diff --git a/src/views/wms/basicDataManage/customerManage/project/project.data.ts b/src/views/wms/basicDataManage/customerManage/project/project.data.ts
index eae67c6fd..dd300c97a 100644
--- a/src/views/wms/basicDataManage/customerManage/project/project.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/project/project.data.ts
@@ -1,5 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '../customer/customer.data'
+
 const { t } = useI18n() // 国际化
 
 import {validateYS} from '@/utils/validator'
@@ -13,7 +17,6 @@ export const Project = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'code',
     sort: 'custom',
     table: {
-      width: 150,
       fixed: 'left'
     },
     isSearch: true,
@@ -22,19 +25,29 @@ export const Project = useCrudSchemas(reactive<CrudSchema[]>([
     label: '名称',
     field: 'name',
     sort: 'custom',
-    table: {
-      width: 150
-    },
     isSearch: true,
   },
   {
     label: '客户代码',
     field: 'customerCode',
     sort: 'custom',
-    table: {
-      width: 150
-    },
     isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
   },
   {
     label: '是否可用',
@@ -44,9 +57,6 @@ export const Project = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     isSearch: true,
     sort: 'custom',
-    table: {
-      width: 150
-    },
     form: {
       component: 'Switch',
       value: 'TRUE',
diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
index a5d107a3d..718a53e30 100644
--- a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue
@@ -43,8 +43,7 @@
     ref="basicFormRef" 
     @success="formsSuccess" 
     :rules="SalepriceRules" 
-    :formAllSchemas="Saleprice.allSchemas" 
-    :searchTableParams="searchTableParams"
+    :formAllSchemas="Saleprice.allSchemas"
     :apiUpdate="SalepriceApi.updateSaleprice"
     :apiCreate="SalepriceApi.createSaleprice"
     @searchTableSuccess="searchTableSuccess"
@@ -61,12 +60,8 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as SalepriceApi from '@/api/wms/saleprice'
-import * as ItembasicApi from '@/api/wms/itembasic'
-import * as CustomerApi from '@/api/wms/customer'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Saleprice, SalepriceRules } from './saleprice.data'
-import { Customer } from '../customer/customer.data'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -87,19 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'customerCode',
-  searchTableTitle: '客户信息',
-  searchTableAllSchemas: Customer.allSchemas,
-  searchTablePage: CustomerApi.getCustomerPage
-},{
-  formField: 'itemCode',
-  searchTableTitle: '物料信息',
-  searchTableAllSchemas: Itembasic.allSchemas,
-  searchTablePage: ItembasicApi.getItembasicPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: SalepriceApi.getSalepricePage // 分页接口
 })
diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
index c4c2244a0..a6f01e3c8 100644
--- a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts
@@ -1,5 +1,13 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as CustomeritemApi from '@/api/wms/customeritem'
+import { Customeritem } from '../customeritem/customeritem.data'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '../customer/customer.data'
+
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -14,7 +22,23 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
       fixed: 'left'
     },
-    isSearch: true
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
   },
   {
     label: '物料代码',
@@ -23,7 +47,27 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物品代码', // 输入框占位文本
+        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchTitle: '客户物品信息', // 查询弹窗标题
+        searchAllSchemas: Customeritem.allSchemas, // 查询弹窗所需类
+        searchPage: CustomeritemApi.getCustomeritemPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'customerCode',
+          value: 'customerCode',
+          isMainValue: true
+        }]
+      }
+    },
   },
   {
     label: '货币',