基础数据管理修改查询弹窗组件

src/components/BasicForm/src/BasicForm.vue

@@ -1,10 +1,17 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" :width="isBusiness?'60%':'40%'">
-    <Form ref="formRef" v-loading="formLoading" :rules="rules" :schema="formSchema" :is-col="true" >
+    <Form 
+      ref="formRef" 
+      v-loading="formLoading" 
+      :rules="rules" 
+      :schema="formSchema" 
+      :is-col="true"
+      @opensearchTable="opensearchTable"
+      >
       <!-- <template #productItemCode="form">
         <slot name="productItemCode" :param="form"></slot>
       </template> -->
-      <template #itemCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'itemCode'))">
+      <!-- <template #itemCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'itemCode'))">
         <div class="w-[100%] flex">
           <el-input v-model="form['itemCode']" :placeholder="'请选择物料代码'" @click="opensearchTable('itemCode', 'code')" />
         </div>
@@ -113,7 +120,7 @@
         <div class="w-[100%] flex">
           <el-input v-model="form['carrierCode']" :placeholder="'请选择承运商代码'" @click="opensearchTable('carrierCode', 'code')" />
         </div>
-      </template>
+      </template> -->
     </Form>
     <div class="table" v-if="isBusiness && formType == 'create'">
       <TableForm ref="tableFormRef" 
@@ -175,11 +182,11 @@ const props = defineProps({
     default: null
   },
   // 查询参数
-  searchTableParams: {
+  // searchTableParams: {
-    type: Array,
+  //   type: Array,
-    required: false,
+  //   required: false,
-    default: null
+  //   default: null
-  },
+  // },
   // API——Vo
   apiVo: {
     type: Object,
@@ -229,17 +236,15 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formRef = ref() // 表单 Ref
 const formSchema = ref(props.formAllSchemas?.formSchema)
 
-
 /** 弹层操作 */
 // formField form表单中的字段
 // searchField 查询列表中的字段 
 // type 发起事件位置 type=tableForm 是明细中发起的 否则 为主表发起的 
 const searchTableRef = ref()
-const opensearchTable = (formField, searchField, type, row) => {
+const opensearchTable = (formField, searchField, searchTitle, searchAllSchemas, searchPage, type, row) => {
-  const _searchTableParamsObject:any = props.searchTableParams.find((item:any) => (item.formField == formField))
+  const _searchTableTitle = searchTitle
-  const _searchTableTitle = _searchTableParamsObject.searchTableTitle
+  const _searchTableAllSchemas = searchAllSchemas
-  const _searchTableAllSchemas = _searchTableParamsObject.searchTableAllSchemas
+  const _searchTablePage = searchPage
-  const _searchTablePage = _searchTableParamsObject.searchTablePage
   searchTableRef.value.open(_searchTableTitle, _searchTableAllSchemas, _searchTablePage, formField, searchField, type, row)
 }
 // 弹层确定返回所选数据
@@ -404,7 +409,15 @@ const handleAddTable = () => {
 }
 // 输入框聚焦
 const inpuFocus = (headerItem, row, index) => {
-  opensearchTable(headerItem.field, 'poNumber', 'tableForm', row)
+  opensearchTable(
+    headerItem.field, 
+    headerItem.tableForm.searchField, 
+    headerItem.tableForm.searchTitle, 
+    headerItem.tableForm.searchAllSchemas, 
+    headerItem.tableForm.searchPage, 
+    'tableForm',
+    row
+  )
 }
 </script>
 <style lang="scss" scoped>

src/components/Detail/src/Detail.vue

@@ -56,7 +56,6 @@
     @success="getList" 
     :rules="detailAllSchemasRules" 
     :formAllSchemas="detailAllSchemas"
-    :searchTableParams="searchTableParams"
     :isBusiness="false"
     :apiUpdate="apiUpdate"
     :apiCreate="apiCreate"
@@ -116,12 +115,6 @@ const props = defineProps({
     type: Object,
     required: true,
     default: null
-  },
-   //  明细查询
-  searchTableParams: {
-    type: Array,
-    required: true,
-    default: null
   },
   // 子表新增API
   apiCreate: {
@@ -344,19 +337,13 @@ const openForm = async (type: string, row?: number) => {
   formRef.value.open(type, row, masterParmas.value)
 }
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
-    if (type == 'tableForm') {
-    } else {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      props.Echo.forEach((item)=>{
-        setV[item] = val[0][item]
-      })
-      formRef.setValues(setV)
-    }
-  })
 }
+// 传递给父类
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {

src/components/Form/src/Form.vue

@@ -1,6 +1,6 @@
 <script lang="tsx">
 import { computed, defineComponent, onMounted, PropType, ref, unref, watch } from 'vue'
-import { ElCol, ElForm, ElFormItem, ElRow, ElTooltip } from 'element-plus'
+import { ElButton, ElCol, ElForm, ElFormItem, ElInput, ElRow, ElTooltip } from 'element-plus'
 import { componentMap } from './componentMap'
 import { propTypes } from '@/utils/propTypes'
 import { getSlot } from '@/utils/tsxHelper'
@@ -21,6 +21,7 @@ import { set } from 'lodash-es'
 import { FormProps } from './types'
 import { Icon } from '@/components/Icon'
 import { FormSchema, FormSetPropsType } from '@/types/form'
+import { Search } from '@element-plus/icons-vue'
 
 const { getPrefixCls } = useDesign()
 
@@ -53,7 +54,7 @@ export default defineComponent({
     vLoading: propTypes.bool.def(false),
     labelPosition: propTypes.string.def('left'),
   },
-  emits: ['register'],
+  emits: ['register','opensearchTable'],
   setup(props, { slots, expose, emit }) {
     // element form 实例
     const elFormRef = ref<ComponentRef<typeof ElForm>>()
@@ -119,6 +120,11 @@ export default defineComponent({
       return unref(elFormRef) as ComponentRef<typeof ElForm>
     }
 
+    const opensearchTable = (field, searchField,searchTitle,searchAllSchemas, searchPage) => {
+      console.log(124, field)
+      emit('opensearchTable',field, searchField, searchTitle, searchAllSchemas, searchPage)
+    }
+
     expose({
       setValues,
       formModel,
@@ -126,7 +132,8 @@ export default defineComponent({
       delSchema,
       addSchema,
       setSchema,
-      getElFormRef
+      getElFormRef,
+      opensearchTable
     })
 
     // 监听表单结构化数组，重新生成formModel
@@ -213,6 +220,27 @@ export default defineComponent({
           )
         }
       }
+      
+      // 如果有 isSearchList: true ，使用查询弹层列表
+      const formItemSlotsSearchList: Recordable = setFormItemSlots(slots, item.field)
+      if (item?.componentProps?.isSearchList) {
+        formItemSlotsSearchList[item.field] = () => {
+          return (
+            <>
+            <ElInput v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} onClick={()=>{
+              opensearchTable(
+                item.field, item?.componentProps?.searchField,
+                item?.componentProps?.searchTitle, 
+                item?.componentProps?.searchAllSchemas, 
+                item?.componentProps?.searchPage
+              )}}>
+              {/* <template v-slot:append >.com</template> */}
+            </ElInput>
+            {/* <ElButton >ddd</ElButton> */}
+            </>
+          )
+        }
+      }
       return (
         <ElFormItem {...(item.formItemProps || {})} prop={item.field} label={item.label || ''}>
           {{
@@ -221,26 +249,27 @@ export default defineComponent({
               const Com = componentMap[item.component as string] as ReturnType<
                 typeof defineComponent
               >
-
               const { autoSetPlaceholder } = unref(getProps)
-
+              // 查询弹层列表定义的插槽
-              return slots[item.field] ? (
+              return formItemSlotsSearchList[item.field] ? 
-                getSlot(slots, item.field, formModel.value)
+                (getSlot(formItemSlotsSearchList, item.field, formModel.value)) : 
-              ) : (
+                slots[item.field] ? (
-                <Com
+                    getSlot(slots, item.field, formModel.value)
-                  vModel={formModel.value[item.field]}
+                  ) : (
-                  {...(autoSetPlaceholder && setTextPlaceholder(item))}
+                    <Com
-                  {...setComponentProps(item)}
+                      vModel={formModel.value[item.field]}
-                  style={item.componentProps?.style}
+                      {...(autoSetPlaceholder && setTextPlaceholder(item))}
-                  {...(notRenderOptions.includes(item?.component as string) &&
+                      {...setComponentProps(item)}
-                  item?.componentProps?.options
+                      style={item.componentProps?.style}
-                    ? { options: item?.componentProps?.options || [] }
+                      {...(notRenderOptions.includes(item?.component as string) &&
-                    : {})}
+                      item?.componentProps?.options
-                >
+                        ? { options: item?.componentProps?.options || [] }
-                  {{ ...slotsMap }}
+                        : {})}
-                </Com>
+                    >
-              )
+                      {{ ...slotsMap }}
-            }
+                    </Com>
+                  )
+            },
           }}
         </ElFormItem>
       )
@@ -296,6 +325,7 @@ export default defineComponent({
           }
         }}
       </ElForm>
+      
     )
   }
 })

src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts

@@ -1,5 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -83,6 +87,17 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '入库库区范围',
@@ -91,6 +106,17 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '出库库存状态范围',

src/views/wms/basicDataManage/documentSetting/businesstype/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="BusinesstypeRules" 
     :formAllSchemas="Businesstype.allSchemas" 
-    :searchTableParams="searchTableParams"
     :apiUpdate="BusinesstypeApi.updateBusinesstype"
     :apiCreate="BusinesstypeApi.createBusinesstype"
     @searchTableSuccess="searchTableSuccess"
@@ -61,9 +60,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as BusinesstypeApi from '@/api/wms/businesstype'
-import * as AreaApi from '@/api/wms/areabasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Area } from '../../factoryModeling/areabasic/areabasic.data'
 import { Businesstype, BusinesstypeRules } from './businesstype.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
@@ -85,19 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'outAreaCodes',
-  searchTableTitle: '库区信息',
-  searchTableAllSchemas: Area.allSchemas,
-  searchTablePage: AreaApi.getAreaPage
-},{
-  formField: 'inAreaCodes',
-  searchTableTitle: '库区信息',
-  searchTableAllSchemas: Area.allSchemas,
-  searchTablePage: AreaApi.getAreaPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: BusinesstypeApi.getBusinesstypePage // 分页接口
 })

src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue

@@ -44,9 +44,6 @@
     @success="getList" 
     :rules="DocumentsettingRules" 
     :formAllSchemas="Documentsetting.allSchemas" 
-    searchTableTitle="物料基础信息"
-    :searchTableAllSchemas="Itembasic.allSchemas"
-    :searchTablePage="ItembasicApi.getItembasicPage"
     :apiUpdate="DocumentsettingApi.updateDocumentsetting"
     :apiCreate="DocumentsettingApi.createDocumentsetting"
     :isBusiness="false"
@@ -62,9 +59,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as DocumentsettingApi from '@/api/wms/documentsetting'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Documentsetting, DocumentsettingRules } from './documentsetting.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue

@@ -44,9 +44,6 @@
     @success="getList" 
     :rules="RecordsettingRules" 
     :formAllSchemas="Recordsetting.allSchemas" 
-    searchTableTitle="物料基础信息"
-    :searchTableAllSchemas="Itembasic.allSchemas"
-    :searchTablePage="ItembasicApi.getItembasicPage"
     :apiUpdate="RecordsettingApi.updateRecordsetting"
     :apiCreate="RecordsettingApi.createRecordsetting"
     :isBusiness="false"
@@ -62,9 +59,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as RecordsettingApi from '@/api/wms/recordsetting'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Recordsetting, RecordsettingRules } from './recordsetting.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue

@@ -44,9 +44,6 @@
     @success="getList" 
     :rules="RequestsettingRules" 
     :formAllSchemas="Requestsetting.allSchemas" 
-    searchTableTitle="物料基础信息"
-    :searchTableAllSchemas="Itembasic.allSchemas"
-    :searchTablePage="ItembasicApi.getItembasicPage"
     :apiUpdate="RequestsettingApi.updateRequestsetting"
     :apiCreate="RequestsettingApi.createRequestsetting"
     :isBusiness="false"
@@ -62,9 +59,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as RequestsettingApi from '@/api/wms/requestsetting'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Requestsetting, RequestsettingRules } from './requestsetting.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue

@@ -44,9 +44,6 @@
     @success="getList" 
     :rules="TransactiontypeRules" 
     :formAllSchemas="Transactiontype.allSchemas" 
-    searchTableTitle="物料基础信息"
-    :searchTableAllSchemas="Itembasic.allSchemas"
-    :searchTablePage="ItembasicApi.getItembasicPage"
     :apiUpdate="TransactiontypeApi.updateTransactiontype"
     :apiCreate="TransactiontypeApi.createTransactiontype"
     :isBusiness="false"
@@ -62,9 +59,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as TransactiontypeApi from '@/api/wms/transactiontype'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Transactiontype, TransactiontypeRules } from './transactiontype.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts

@@ -1,5 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -31,6 +35,17 @@ export const Area = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '类型',

src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="AreaRules" 
     :formAllSchemas="Area.allSchemas"
-    :searchTableParams="searchTableParams"
     :apiUpdate="AreaApi.updateArea"
     :apiCreate="AreaApi.createArea"
     @searchTableSuccess="searchTableSuccess"
@@ -61,10 +60,8 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as AreaApi from '@/api/wms/areabasic'
-import * as WarehouseApi from '@/api/wms/warehouse'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Area, AreaRules } from './areabasic.data'
-import { Warehouse } from '../warehouse/warehouse.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: 'warehouseCode',
-  searchTableTitle: '仓库信息',
-  searchTableAllSchemas: Warehouse.allSchemas,
-  searchTablePage: WarehouseApi.getWarehousePage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: AreaApi.getAreaPage // 分页接口
 })

src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts

@@ -1,5 +1,12 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -60,6 +67,17 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '默认库位代码',
@@ -68,6 +86,17 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '联系人姓名',

src/views/wms/basicDataManage/factoryModeling/dock/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="DockRules" 
     :formAllSchemas="Dock.allSchemas"
-    :searchTableParams="searchTableParams"
     :apiUpdate="DockApi.updateDock"
     :apiCreate="DockApi.createDock"
     @searchTableSuccess="searchTableSuccess"
@@ -61,12 +60,8 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as DockApi from '@/api/wms/dock'
-import * as WarehouseApi from '@/api/wms/warehouse'
-import * as LocationApi from '@/api/wms/location'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Dock, DockRules } from './dock.data'
-import { Location } from '../location/location.data'
-import { Warehouse } from '../warehouse/warehouse.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: 'warehouseCode',
-  searchTableTitle: '仓库信息',
-  searchTableAllSchemas: Warehouse.allSchemas,
-  searchTablePage: WarehouseApi.getWarehousePage
-},{
-  formField: 'defaultLocationCode',
-  searchTableTitle: '库位信息',
-  searchTableAllSchemas: Location.allSchemas,
-  searchTablePage: LocationApi.getLocationPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: DockApi.getDockPage // 分页接口
 })

src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue

@@ -43,7 +43,6 @@
     @success="getList" 
     :rules="EnterpriseRules" 
     :formAllSchemas="Enterprise.allSchemas" 
-    :searchTableParams="searchTableParams"
     :apiUpdate="EnterpriseApi.updateEnterprise"
     :apiCreate="EnterpriseApi.createEnterprise"
     @searchTableSuccess="searchTableSuccess"
@@ -78,18 +77,8 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表页面参数设置
-const searchTableParams = ref([
-//{
-//  formField: 'productItemCode',
-//  searchTableTitle: '物料信息',
-//  searchTableAllSchemas: Itembasic.allSchemas,
-//  searchTablePage: ItembasicApi.getItembasicPage
-//}
-])
-
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val,  basicFormRef, type, row ) => {
+const searchTableSuccess = (formField, searchField, val,  basicFormRef ) => {
   nextTick(() => {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -138,15 +127,6 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
 // 列表-操作按钮
 const butttondata = [
   defaultButtons.mainListEditBtn({hasPermi:'wms:enterprise:update'}), // 编辑

src/views/wms/basicDataManage/factoryModeling/location/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="LocationRules" 
     :formAllSchemas="Location.allSchemas"
-    :searchTableParams="searchTableParams"
     :apiUpdate="LocationApi.updateLocation"
     :apiCreate="LocationApi.createLocation"
     @searchTableSuccess="searchTableSuccess"
@@ -61,14 +60,8 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as LocationApi from '@/api/wms/location'
-import * as WarehouseApi from '@/api/wms/warehouse'
-import * as AreaApi from '@/api/wms/areabasic'
-import * as LocationgroupApi from '@/api/wms/locationgroup'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Location, LocationRules } from './location.data'
-import { Locationgroup } from '../locationgroup/locationgroup.data'
-import { Area } from '../areabasic/areabasic.data'
-import { Warehouse } from '../warehouse/warehouse.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -89,24 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'warehouseCode',
-  searchTableTitle: '仓库信息',
-  searchTableAllSchemas: Warehouse.allSchemas,
-  searchTablePage: WarehouseApi.getWarehousePage
-},{
-  formField: 'areaCode',
-  searchTableTitle: '库区信息',
-  searchTableAllSchemas: Area.allSchemas,
-  searchTablePage: AreaApi.getAreaPage
-},{
-  formField: 'locationGroupCode',
-  searchTableTitle: '库位组信息',
-  searchTableAllSchemas: Locationgroup.allSchemas,
-  searchTablePage: LocationgroupApi.getLocationgroupPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: LocationApi.getLocationPage // 分页接口
 })

src/views/wms/basicDataManage/factoryModeling/location/location.data.ts

@@ -1,5 +1,14 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import * as LocationgroupApi from '@/api/wms/locationgroup'
+import { Locationgroup } from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data'
 const { t } = useI18n() // 国际化
 
 /**
@@ -31,14 +40,36 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
-    label: '区域代码',
+    label: '库区代码',
     field: 'areaCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '库位组代码',
@@ -47,6 +78,17 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区信息', // 查询弹窗标题
+        searchAllSchemas: Locationgroup.allSchemas, // 查询弹窗所需类
+        searchPage: LocationgroupApi.getLocationgroupPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: 'ERP库位代码',
@@ -58,7 +100,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 150
-    },
+    }
   },
   {
     label: '类型',

src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="LocationgroupRules" 
     :formAllSchemas="Locationgroup.allSchemas"
-    :searchTableParams="searchTableParams"
     :apiUpdate="LocationgroupApi.updateLocationgroup"
     :apiCreate="LocationgroupApi.createLocationgroup"
     @searchTableSuccess="searchTableSuccess"
@@ -61,12 +60,8 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as LocationgroupApi from '@/api/wms/locationgroup'
-import * as WarehouseApi from '@/api/wms/warehouse'
-import * as AreaApi from '@/api/wms/areabasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Locationgroup, LocationgroupRules } from './locationgroup.data'
-import { Area } from '../areabasic/areabasic.data'
-import { Warehouse } from '../warehouse/warehouse.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: 'warehouseCode',
-  searchTableTitle: '仓库信息',
-  searchTableAllSchemas: Warehouse.allSchemas,
-  searchTablePage: WarehouseApi.getWarehousePage
-},{
-  formField: 'areaCode',
-  searchTableTitle: '库区信息',
-  searchTableAllSchemas: Area.allSchemas,
-  searchTablePage: AreaApi.getAreaPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: LocationgroupApi.getLocationgroupPage // 分页接口
 })

src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts

@@ -1,5 +1,12 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -33,6 +40,17 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '区域代码',
@@ -41,6 +59,17 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '是否可用',

src/views/wms/basicDataManage/factoryModeling/process/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="ProcessRules" 
     :formAllSchemas="Process.allSchemas"
-    :searchTableParams="searchTableParams"
     :apiUpdate="ProcessApi.updateProcess"
     :apiCreate="ProcessApi.createProcess"
     @searchTableSuccess="searchTableSuccess"
@@ -61,12 +60,8 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as ProcessApi from '@/api/wms/process'
-import * as WorkshopApi from '@/api/wms/workshop'
-import * as ProductionlineApi from '@/api/wms/productionline'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Process, ProcessRules } from './process.data'
-import { Productionline } from '../productionline/productionline.data'
-import { Workshop } from '../workshop/workshop.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: 'workshopCode',
-  searchTableTitle: '车间信息',
-  searchTableAllSchemas: Workshop.allSchemas,
-  searchTablePage: WorkshopApi.getWorkshopPage
-},{
-  formField: 'productionLineCode',
-  searchTableTitle: '生产线信息',
-  searchTableAllSchemas: Productionline.allSchemas,
-  searchTablePage: ProductionlineApi.getProductionlinePage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: ProcessApi.getProcessPage // 分页接口
 })

src/views/wms/basicDataManage/factoryModeling/process/process.data.ts

@@ -1,5 +1,12 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -44,6 +51,17 @@ export const Process = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '生产线代码',
@@ -52,6 +70,17 @@ export const Process = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '是否可用',

src/views/wms/basicDataManage/factoryModeling/productionline/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="ProductionlineRules" 
     :formAllSchemas="Productionline.allSchemas"
-    :searchTableParams="searchTableParams"
     :apiUpdate="ProductionlineApi.updateProductionline"
     :apiCreate="ProductionlineApi.createProductionline"
     @searchTableSuccess="searchTableSuccess"
@@ -61,12 +60,8 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as ProductionlineApi from '@/api/wms/productionline'
-import * as WorkshopApi from '@/api/wms/workshop'
-import * as LocationApi from '@/api/wms/location'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Productionline, ProductionlineRules } from './productionline.data'
-import { Location } from '../location/location.data'
-import { Workshop } from '../workshop/workshop.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,24 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'workshopCode',
-  searchTableTitle: '车间信息',
-  searchTableAllSchemas: Workshop.allSchemas,
-  searchTablePage: WorkshopApi.getWorkshopPage
-},{
-  formField: 'rawLocationCode',
-  searchTableTitle: '库位信息',
-  searchTableAllSchemas: Location.allSchemas,
-  searchTablePage: LocationApi.getLocationPage
-},{
-  formField: 'fgLocationCode',
-  searchTableTitle: '库位信息',
-  searchTableAllSchemas: Location.allSchemas,
-  searchTablePage: LocationApi.getLocationPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: ProductionlineApi.getProductionlinePage // 分页接口
 })

src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts

@@ -1,5 +1,12 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -44,6 +51,17 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '原料库位',
@@ -52,6 +70,17 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '成品库位',
@@ -60,6 +89,17 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '是否可用',

src/views/wms/basicDataManage/factoryModeling/workstation/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="WorkstationRules" 
     :formAllSchemas="Workstation.allSchemas"
-    :searchTableParams="searchTableParams"
     :apiUpdate="WorkstationApi.updateWorkstation"
     :apiCreate="WorkstationApi.createWorkstation"
     @searchTableSuccess="searchTableSuccess"
@@ -61,13 +60,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as WorkstationApi from '@/api/wms/workstation'
-import * as LocationApi from '@/api/wms/location'
-import * as WorkshopApi from '@/api/wms/workshop'
-import * as ProductionlineApi from '@/api/wms/productionline'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Location } from '../location/location.data'
-import { Productionline } from '../productionline/productionline.data'
-import { Workshop } from '../workshop/workshop.data'
 import { Workstation, WorkstationRules } from './workstation.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
@@ -89,29 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'workshopCode',
-  searchTableTitle: '车间信息',
-  searchTableAllSchemas: Workshop.allSchemas,
-  searchTablePage: WorkshopApi.getWorkshopPage
-},{
-  formField: 'productionLineCode',
-  searchTableTitle: '生产线信息',
-  searchTableAllSchemas: Productionline.allSchemas,
-  searchTablePage: ProductionlineApi.getProductionlinePage
-},{
-  formField: 'rawLocationCode',
-  searchTableTitle: '库位信息',
-  searchTableAllSchemas: Location.allSchemas,
-  searchTablePage: LocationApi.getLocationPage
-},{
-  formField: 'fgLocationCode',
-  searchTableTitle: '库位信息',
-  searchTableAllSchemas: Location.allSchemas,
-  searchTablePage: LocationApi.getLocationPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: WorkstationApi.getWorkstationPage // 分页接口
 })

src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts

@@ -1,5 +1,15 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as ProductionlineApi from '@/api/wms/productionline'
+import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+
+import * as WorkshopApi from '@/api/wms/workshop'
+import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -44,6 +54,17 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '生产线代码',
@@ -52,6 +73,17 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '原料库位',
@@ -60,6 +92,17 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '成品库位',
@@ -68,6 +111,17 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '是否可用',

src/views/wms/basicDataManage/itemManage/bom/bom.data.ts

@@ -1,5 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from './../itembasic/itembasic.data'
+
 const { t } = useI18n() // 国际化
 
 /** 
@@ -14,6 +18,17 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
       fixed: 'left'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物品代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物品基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+      }
     }
   },
   {
@@ -23,6 +38,17 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物品代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物品基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+      }
     }
   },
   {

src/views/wms/basicDataManage/itemManage/bom/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="BomRules" 
     :formAllSchemas="Bom.allSchemas" 
-    :searchTableParams="searchTableParams"
     :apiUpdate="BomApi.updateBom"
     :apiCreate="BomApi.createBom"
     @searchTableSuccess="searchTableSuccess"
@@ -61,9 +60,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as BomApi from '@/api/wms/bom'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from './../itembasic/itembasic.data'
 import { Bom, BomRules } from './bom.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
@@ -85,19 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'productItemCode',
-  searchTableTitle: '物料信息',
-  searchTableAllSchemas: Itembasic.allSchemas,
-  searchTablePage: ItembasicApi.getItembasicPage
-},{
-  formField: 'componentItemCode',
-  searchTableTitle: '物料信息',
-  searchTableAllSchemas: Itembasic.allSchemas,
-  searchTablePage: ItembasicApi.getItembasicPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: BomApi.getBomPage // 分页接口
 })
@@ -164,10 +148,8 @@ const openForm = (type: string, row?: any) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  console.log(144, formField)
+  console.log(153, formField)
-  console.log(145, searchField)
+  console.log(153, searchField)
-  console.log(146, val)
-  console.log(147, formRef)
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]

src/views/wms/basicDataManage/itemManage/itempackaging/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="ItempackagingRules" 
     :formAllSchemas="Itempackaging.allSchemas" 
-    :searchTableParams="searchTableParams"
     :apiUpdate="ItempackagingApi.updateItempackaging"
     :apiCreate="ItempackagingApi.createItempackaging"
     @searchTableSuccess="searchTableSuccess"
@@ -61,9 +60,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as ItempackagingApi from '@/api/wms/itempackaging'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from './../itembasic/itembasic.data'
 import { Itempackaging, ItempackagingRules } from './itempackaging.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
@@ -85,14 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'itemCode',
-  searchTableTitle: '物料信息',
-  searchTableAllSchemas: Itembasic.allSchemas,
-  searchTablePage: ItembasicApi.getItembasicPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: ItempackagingApi.getItempackagingPage // 分页接口
 })

src/views/wms/basicDataManage/itemManage/itempackaging/itempackaging.data.ts

@@ -1,5 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from './../itembasic/itembasic.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -14,7 +17,18 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
       fixed: 'left'
-    } 
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物品代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物品基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '计量单位',

src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="ProductionlineitemRules" 
     :formAllSchemas="Productionlineitem.allSchemas" 
-    :searchTableParams="searchTableParams"
     :apiUpdate="ProductionlineitemApi.updateProductionlineitem"
     :apiCreate="ProductionlineitemApi.createProductionlineitem"
     @searchTableSuccess="searchTableSuccess"
@@ -60,15 +59,8 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import * as LocationApi from '@/api/wms/location'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
-import * as ItembasicApi from '@/api/wms/itembasic'
-import * as ProductionLineCodeApi from '@/api/wms/productionline'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-// import { Itembasic, Productionline, Location } from '@/utils/disposition/tableColumns'
-import { Itembasic } from './../itembasic/itembasic.data'
-import { Productionline } from './../../factoryModeling/productionline/productionline.data'
-import { Location } from './../../factoryModeling/location/location.data'
 import { Productionlineitem, ProductionlineitemRules } from './productionlineitem.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
@@ -90,24 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'fgLocationCode',
-  searchTableTitle: '库位信息',
-  searchTableAllSchemas: Location.allSchemas,
-  searchTablePage: LocationApi.getLocationPage
-},{
-  formField: 'itemCode',
-  searchTableTitle: '物料信息',
-  searchTableAllSchemas: Itembasic.allSchemas,
-  searchTablePage: ItembasicApi.getItembasicPage
-},{
-  formField: 'productionLineCode',
-  searchTableTitle: '生产线信息',
-  searchTableAllSchemas: Productionline.allSchemas,
-  searchTablePage: ProductionLineCodeApi.getProductionlinePage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: ProductionlineitemApi.getProductionlineitemPage // 分页接口
 })

src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts

@@ -1,5 +1,16 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from './../../factoryModeling/location/location.data'
+
+import * as ProductionLineCodeApi from '@/api/wms/productionline'
+import { Productionline } from './../../factoryModeling/productionline/productionline.data'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from './../itembasic/itembasic.data'
+
+import { ElButton, ElInput } from 'element-plus'
 const { t } = useI18n() // 国际化
 
 /**
@@ -14,6 +25,17 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
       fixed: 'left'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.getLocationPage
+      }
     }
   },
   {
@@ -23,6 +45,17 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线',
+        searchField: 'code',
+        searchTitle: '生产线信息',
+        searchAllSchemas: Productionline.allSchemas,
+        searchPage: ProductionLineCodeApi.getProductionlinePage
+      }
     }
   },
   {
@@ -32,6 +65,17 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择物品代码',
+        searchField: 'code',
+        searchTitle: '物品信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage
+      }
     }
   },
   {
@@ -97,7 +141,14 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label:'备注',
     field: 'remark',
-    isTable: false
+    isTable: false,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '备注22222222'
+      }
+    }
   },
   {
     label: '创建时间',

src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="StdcostpriceRules" 
     :formAllSchemas="Stdcostprice.allSchemas" 
-    :searchTableParams="searchTableParams"
     :apiUpdate="StdcostpriceApi.updateStdcostprice"
     :apiCreate="StdcostpriceApi.createStdcostprice"
     @searchTableSuccess="searchTableSuccess"
@@ -61,11 +60,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as StdcostpriceApi from '@/api/wms/stdcostprice'
-import * as SupplierApi from '@/api/wms/supplier'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from './../itembasic/itembasic.data'
-import { Supplier } from './../../supplierManage/supplier/supplier.data'
 import { Stdcostprice, StdcostpriceRules } from './stdcostprice.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
@@ -87,19 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置
-const searchTableParams = ref([{
-  formField: 'supplierCode',
-  searchTableTitle: '供应商信息',
-  searchTableAllSchemas: Supplier.allSchemas,
-  searchTablePage: SupplierApi.getSupplierPage
-},{
-  formField: 'itemCode',
-  searchTableTitle: '物料信息',
-  searchTableAllSchemas: Itembasic.allSchemas,
-  searchTablePage: ItembasicApi.getItembasicPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: StdcostpriceApi.getStdcostpricePage // 分页接口
 })

src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts

@@ -1,5 +1,12 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -14,6 +21,17 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
       fixed: 'left'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
     }
   },
   {
@@ -23,6 +41,17 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物品代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物品基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+      }
     }
   },
   {

src/views/wms/basicDataManage/orderManage/carrier/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="CarrierRules" 
     :formAllSchemas="Carrier.allSchemas"
-    :searchTableAllSchemas="Itembasic.allSchemas"
     :apiUpdate="CarrierApi.updateCarrier"
     :apiCreate="CarrierApi.createCarrier"
     :isBusiness="false"
@@ -61,7 +60,6 @@
 import download from '@/utils/download'
 import * as CarrierApi from '@/api/wms/carrier'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Carrier, CarrierRules } from './carrier.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/orderManage/owner/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="OwnerRules" 
     :formAllSchemas="Owner.allSchemas"
-    :searchTableAllSchemas="Itembasic.allSchemas"
     :apiUpdate="OwnerApi.updateOwner"
     :apiCreate="OwnerApi.createOwner"
     :isBusiness="false"
@@ -61,7 +60,6 @@
 import download from '@/utils/download'
 import * as OwnerApi from '@/api/wms/owner'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Owner, OwnerRules } from './owner.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/orderManage/shift/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="ShiftRules" 
     :formAllSchemas="Shift.allSchemas"
-    :searchTableAllSchemas="Itembasic.allSchemas"
     :apiUpdate="ShiftApi.updateShift"
     :apiCreate="ShiftApi.createShift"
     :isBusiness="false"
@@ -61,7 +60,6 @@
 import download from '@/utils/download'
 import * as ShiftApi from '@/api/wms/shift'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Shift, ShiftRules } from './shift.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/orderManage/team/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="TeamRules" 
     :formAllSchemas="Team.allSchemas"
-    :searchTableAllSchemas="Itembasic.allSchemas"
     :apiUpdate="TeamApi.updateTeam"
     :apiCreate="TeamApi.createTeam"
     :isBusiness="false"
@@ -61,7 +60,6 @@
 import download from '@/utils/download'
 import * as TeamApi from '@/api/wms/team'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Team, TeamRules } from './team.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/strategySetting/condition/index.vue

@@ -44,9 +44,6 @@
     @success="getList" 
     :rules="ConditionRules" 
     :formAllSchemas="Condition.allSchemas" 
-    searchTableTitle="物料基础信息"
-    :searchTableAllSchemas="Itembasic.allSchemas"
-    :searchTablePage="ItembasicApi.getItembasicPage"
     :apiUpdate="ConditionApi.updateCondition"
     :apiCreate="ConditionApi.createCondition"
     :isBusiness="false"
@@ -62,9 +59,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as ConditionApi from '@/api/wms/condition'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Condition, ConditionRules } from './condition.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/strategySetting/configuration/index.vue

@@ -44,9 +44,6 @@
     @success="getList" 
     :rules="ConfigurationRules" 
     :formAllSchemas="Configuration.allSchemas" 
-    searchTableTitle="物料基础信息"
-    :searchTableAllSchemas="Itembasic.allSchemas"
-    :searchTablePage="ItembasicApi.getItembasicPage"
     :apiUpdate="ConfigurationApi.updateConfiguration"
     :apiCreate="ConfigurationApi.createConfiguration"
     :isBusiness="false"
@@ -62,9 +59,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as ConfigurationApi from '@/api/wms/configuration'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Configuration, ConfigurationRules } from './configuration.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue

@@ -44,9 +44,6 @@
     @success="getList" 
     :rules="ConfigurationsettingRules" 
     :formAllSchemas="Configurationsetting.allSchemas" 
-    searchTableTitle="物料基础信息"
-    :searchTableAllSchemas="Itembasic.allSchemas"
-    :searchTablePage="ItembasicApi.getItembasicPage"
     :apiUpdate="ConfigurationsettingApi.updateConfigurationsetting"
     :apiCreate="ConfigurationsettingApi.createConfigurationsetting"
     :isBusiness="false"
@@ -62,9 +59,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as ConfigurationsettingApi from '@/api/wms/configurationsetting'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Configurationsetting, ConfigurationsettingRules } from './configurationsetting.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue

@@ -44,9 +44,6 @@
     @success="getList" 
     :rules="ParamsettingRules" 
     :formAllSchemas="Paramsetting.allSchemas" 
-    searchTableTitle="物料基础信息"
-    :searchTableAllSchemas="Itembasic.allSchemas"
-    :searchTablePage="ItembasicApi.getItembasicPage"
     :apiUpdate="ParamsettingApi.updateParamsetting"
     :apiCreate="ParamsettingApi.createParamsetting"
     :isBusiness="false"
@@ -62,9 +59,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as ParamsettingApi from '@/api/wms/paramsetting'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Paramsetting, ParamsettingRules } from './paramsetting.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/strategySetting/rule/index.vue

@@ -44,9 +44,6 @@
     @success="getList" 
     :rules="RuleRules" 
     :formAllSchemas="Rule.allSchemas" 
-    searchTableTitle="物料基础信息"
-    :searchTableAllSchemas="Itembasic.allSchemas"
-    :searchTablePage="ItembasicApi.getItembasicPage"
     :apiUpdate="RuleApi.updateRule"
     :apiCreate="RuleApi.createRule"
     :isBusiness="false"
@@ -62,9 +59,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as RuleApi from '@/api/wms/rule'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Rule, RuleRules } from './rule.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="PurchasepriceRules" 
     :formAllSchemas="Purchaseprice.allSchemas"
-    :searchTableParams="searchTableParams"
     :apiUpdate="PurchasepriceApi.updatePurchaseprice"
     :apiCreate="PurchasepriceApi.createPurchaseprice"
     @searchTableSuccess="searchTableSuccess"
@@ -61,11 +60,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as PurchasepriceApi from '@/api/wms/purchaseprice'
-import * as ItembasicApi from '@/api/wms/itembasic'
-import * as SupplierApi from '@/api/wms/supplier'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
-import { Supplier } from '../supplier/supplier.data'
 import { Purchaseprice, PurchasepriceRules } from './purchaseprice.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
@@ -87,19 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'supplierCode',
-  searchTableTitle: '供应商信息',
-  searchTableAllSchemas: Supplier.allSchemas,
-  searchTablePage: SupplierApi.getSupplierPage
-},{
-  formField: 'itemCode',
-  searchTableTitle: '物料信息',
-  searchTableAllSchemas: Itembasic.allSchemas,
-  searchTablePage: ItembasicApi.getItembasicPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: PurchasepriceApi.getPurchasepricePage // 分页接口
 })

src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts

@@ -1,5 +1,12 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -14,7 +21,18 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
       fixed: 'left'
     },
-    isSearch: true
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
     label: '物料代码',
@@ -23,6 +41,17 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     table: {
       width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物品代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物品基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+      }
     }
   },
   {

src/views/wms/basicDataManage/supplierManage/supplier/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="SupplierRules" 
     :formAllSchemas="Supplier.allSchemas"
-    :searchTableAllSchemas="Itembasic.allSchemas"
     :apiUpdate="SupplierApi.updateSupplier"
     :apiCreate="SupplierApi.createSupplier"
     :isBusiness="false"
@@ -61,7 +60,6 @@
 import download from '@/utils/download'
 import * as SupplierApi from '@/api/wms/supplier'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Supplier, SupplierRules } from './supplier.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="SupplieritemRules" 
     :formAllSchemas="Supplieritem.allSchemas"
-    :searchTableParams="searchTableParams"
     :apiUpdate="SupplieritemApi.updateSupplieritem"
     :apiCreate="SupplieritemApi.createSupplieritem"
     @searchTableSuccess="searchTableSuccess"
@@ -61,16 +60,8 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
-import * as ItembasicApi from '@/api/wms/itembasic'
-import * as SupplierApi from '@/api/wms/supplier'
-import * as LocationApi from '@/api/wms/location'
-import * as WarehouseApi from '@/api/wms/warehouse'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Supplieritem, SupplieritemRules } from './supplieritem.data'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
-import { Supplier } from '../supplier/supplier.data'
-import { Warehouse } from '../../factoryModeling/warehouse/warehouse.data'
-import { Location } from '../../factoryModeling/location/location.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -91,29 +82,6 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'supplierCode',
-  searchTableTitle: '供应商信息',
-  searchTableAllSchemas: Supplier.allSchemas,
-  searchTablePage: SupplierApi.getSupplierPage
-},{
-  formField: 'itemCode',
-  searchTableTitle: '物料信息',
-  searchTableAllSchemas: Itembasic.allSchemas,
-  searchTablePage: ItembasicApi.getItembasicPage
-},{
-  formField: 'defaultWarehouseCode',
-  searchTableTitle: '仓库信息',
-  searchTableAllSchemas: Warehouse.allSchemas,
-  searchTablePage: WarehouseApi.getWarehousePage
-},{
-  formField: 'defaultLocationCode',
-  searchTableTitle: '库位信息',
-  searchTableAllSchemas: Location.allSchemas,
-  searchTablePage: LocationApi.getLocationPage
-}])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: SupplieritemApi.getSupplieritemPage // 分页接口
 })

src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts

@@ -1,5 +1,18 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+
+import * as WarehouseApi from '@/api/wms/warehouse'
+import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
+
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
 const { t } = useI18n() // 国际化
 
 /**
@@ -13,6 +26,17 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150,
       fixed: 'left'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
     }
   },
   {
@@ -22,6 +46,17 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     table: {
       width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物品代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物品基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+      }
     }
   },
   {
@@ -116,6 +151,17 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '仓库信息', // 查询弹窗标题
+        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+        searchPage: WarehouseApi.getWarehousePage // 查询弹窗所需分页方法
+      }
     }
   },
   {
@@ -124,6 +170,17 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
+      }
     }
   },
   {

src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="AccountcalendarRules" 
     :formAllSchemas="Accountcalendar.allSchemas"
-    :searchTableAllSchemas="Itembasic.allSchemas"
     :apiUpdate="AccountcalendarApi.updateAccountcalendar"
     :apiCreate="AccountcalendarApi.createAccountcalendar"
     :isBusiness="false"
@@ -61,7 +60,6 @@
 import download from '@/utils/download'
 import * as AccountcalendarApi from '@/api/wms/accountcalendar'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Accountcalendar, AccountcalendarRules } from './accountcalendar.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="CurrencyexchangeRules" 
     :formAllSchemas="Currencyexchange.allSchemas"
-    :searchTableAllSchemas="Itembasic.allSchemas"
     :apiUpdate="CurrencyexchangeApi.updateCurrencyexchange"
     :apiCreate="CurrencyexchangeApi.createCurrencyexchange"
     :isBusiness="false"
@@ -61,7 +60,6 @@
 import download from '@/utils/download'
 import * as CurrencyexchangeApi from '@/api/wms/currencyexchange'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Currencyexchange, CurrencyexchangeRules } from './currencyexchange.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue

@@ -44,7 +44,6 @@
     @success="getList" 
     :rules="SystemcalendarRules" 
     :formAllSchemas="Systemcalendar.allSchemas"
-    :searchTableAllSchemas="Itembasic.allSchemas"
     :apiUpdate="SystemcalendarApi.updateSystemcalendar"
     :apiCreate="SystemcalendarApi.createSystemcalendar"
     :isBusiness="false"
@@ -61,7 +60,6 @@
 import download from '@/utils/download'
 import * as SystemcalendarApi from '@/api/wms/systemcalendar'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
 import { Systemcalendar, SystemcalendarRules } from './systemcalendar.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 

src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue

@@ -40,7 +40,6 @@
       @success="getList" 
       :rules="PurchaseclaimRequestMainRules" 
       :formAllSchemas="PurchaseclaimRequestMain.allSchemas" 
-      :searchTableParams="searchTableParams"
       :tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
       :tableFormRules="PurchaseclaimRequestDetailRules"
       :tableData="tableData"
@@ -60,12 +59,11 @@
     :allSchemas="PurchaseclaimRequestMain.allSchemas"
     :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas"
     :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
-    :searchTableParams="searchTableParams"
     :apiCreate="PurchaseclaimRequestDetailApi.createPurchaseclaimRequestDetail"
     :apiUpdate="PurchaseclaimRequestDetailApi.updatePurchaseclaimRequestDetail"
     :apiPage="PurchaseclaimRequestDetailApi.getPurchaseclaimRequestDetailPage"
     :apiDelete="PurchaseclaimRequestDetailApi.deletePurchaseclaimRequestDetail"
-    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
   <!-- 导入 -->
@@ -76,14 +74,12 @@
 import download from '@/utils/download'
 import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain'
 import * as PurchaseclaimRequestDetailApi from '@/api/wms/purchaseclaimRequestDetail'
-import * as supplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
-import * as supplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
-import { SupplierdeliverRecordMain, SupplierdeliverRecordDetail } from '@/utils/disposition/tableColumns'
 import { PurchaseclaimRequestMain, PurchaseclaimRequestMainRules, PurchaseclaimRequestDetail, PurchaseclaimRequestDetailRules } from './purchaseclaimRequestMain.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
 
+// 供应商索赔申请
 defineOptions({ name: 'PurchaseclaimRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -99,24 +95,11 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
-// 查询列表参数设置 
-const searchTableParams = ref([{
-  formField: 'asnNumber',
-  searchTableTitle: '供应商发货记录',
-  searchTableAllSchemas: SupplierdeliverRecordMain.allSchemas,
-  searchTablePage: supplierdeliverRecordMainApi.getSupplierdeliverRecordMainPage
-},{
-  formField: 'poNumber',
-  searchTableTitle: '供应商发货记录',
-  searchTableAllSchemas: SupplierdeliverRecordDetail.allSchemas,
-  searchTablePage: supplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailPage
-}])
-
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {
     if (type == 'tableForm') {
-      // 明细查询页赋值
+      // 子表查询页赋值
       row[formField] = val[0][searchField]
       row['poLine'] = val[0]['poLine']
       row['batch'] = val[0]['toBatch']
@@ -129,6 +112,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       row['qty'] = val[0]['qty']
       row['uom'] = val[0]['uom']
     } else {
+      // 主表查询页赋值
       const setV = {}
       setV[formField] = val[0][searchField]
       setV['ppNumber'] = val[0]['ppNumber']
@@ -137,11 +121,26 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     }
   })
 }
-// 子表新增的时候选择表格之后需要会显得字段
+// 查询页面返回——详情
-const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    setV['poLine'] = val[0]['poLine']
+    setV['batch'] = val[0]['toBatch']
+    setV['altBatch'] = val[0]['altBatch']
+    setV['itemCode'] = val[0]['itemCode']
+    setV['itemName'] = val[0]['itemName']
+    setV['itemDesc1'] = val[0]['itemDesc1']
+    setV['itemDesc2'] = val[0]['itemDesc2']
+    setV['projectCode'] = val[0]['projectCode']
+    setV['qty'] = val[0]['qty']
+    setV['uom'] = val[0]['uom']
+    formRef.setValues(setV)
+  })
+}
 
 const exportLoading = ref(false) // 导出的加载中
-
 const { tableObject, tableMethods } = useTable({
   getListApi: PurchaseclaimRequestMainApi.getPurchaseclaimRequestMainPage // 分页接口
 })

src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts

@@ -1,6 +1,14 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index.ts'
+
+import * as supplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
+import * as supplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
+import { SupplierdeliverRecordMain, SupplierdeliverRecordDetail } from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data'
+
+
+
+
 const { t } = useI18n() // 国际化
 
 // 获取当前操作人的部门
@@ -36,6 +44,17 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'asnNumber',
     table: {
       width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择发货单号', // 输入框占位文本
+        searchField: 'asnNumber', // 查询弹窗赋值字段
+        searchTitle: '供应商发货记录', // 查询弹窗标题
+        searchAllSchemas: SupplierdeliverRecordMain.allSchemas, // 查询弹窗所需类
+        searchPage: supplierdeliverRecordMainApi.getSupplierdeliverRecordMainPage // 查询弹窗所需分页方法
+      }
     }
   },
   {
@@ -315,11 +334,27 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '订单号',
     field: 'poNumber',
     tableForm:{
-      isInpuFocusShow: true
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'poNumber',
+      searchTitle: '供应商发货记录',
+      searchAllSchemas: SupplierdeliverRecordDetail.allSchemas,
+      searchPage: supplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailPage
     },
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'poNumber',
+        searchTitle: '供应商发货记录',
+        searchAllSchemas: SupplierdeliverRecordDetail.allSchemas,
+        searchPage: supplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailPage
+      }
+    }
   },
   {
     label: '订单行',