基础数据——物料管理——物料库区配置管理——详情——新增功能

src/components/Detail/src/Detail.vue

@@ -117,6 +117,8 @@
         </ContentWrap>
       </div>
     </el-drawer>
+    <!-- 表格弹窗 -->
+    <SearchTable ref="searchTableRef" :isOpenSearchTable="isOpenSearchTable" @search-table-success="searchTableSuccess1" />
     <!-- 表单弹窗：添加/修改 -->
     <BasicForm
       ref="formRef"
@@ -152,6 +154,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
+import { SearchTable } from '@/components/SearchTable'
 
 defineOptions({ name: 'Detail' })
 
@@ -298,7 +301,13 @@ const props = defineProps({
     type: Boolean,
     required: false,
     default: true
-  }
+  },
+  //是否直接展示搜索表单
+  isOpenSearchTable:{
+    type: Boolean,
+    required: false,
+    default: false
+  },
 })
 const isShowDrawer = ref(false)
 const detailLoading = ref(false)
@@ -380,6 +389,29 @@ const HeadButttondata = ref()
 // 列表-操作按钮
 const buttondata = ref()
 
+/** 表格弹窗 */
+const initModel = (schema: FormSchema[], formModel: Recordable) => {
+  const model: Recordable = { ...formModel }
+  schema.map((v) => {
+    // 如果是hidden，就删除对应的值
+    if (v.hidden) {
+      delete model[v.field]
+    } else if (v.component && v.component !== 'Divider') {
+      const hasField = Reflect.has(model, v.field)
+      // 如果先前已经有值存在，则不进行重新赋值，而是采用现有的值
+      model[v.field] = hasField ? model[v.field] : v.value !== void 0 ? v.value : ''
+    }
+  })
+  return model
+}
+const searchTableRef = ref()
+// 如果需要直接打开表格数据表单数据
+const searchTableFormModel = ref<Recordable>({})
+if(props.isOpenSearchTable){
+  searchTableFormModel.value = initModel(props.detailAllSchemas.formSchema, unref(searchTableFormModel))
+}
+const searchTableFormType = ref('') // 表单的类型：create - 新增；update - 修改
+
 /** 打开弹窗 */
 const formRef = ref()
 const titleNameRef = ref()
@@ -511,7 +543,26 @@ const { getList } = tableMethodsRef.value
 const buttonBaseClick = (val, item) => {
   if (val == 'add') {
     // 新增
+    if(props.isOpenSearchTable){
+      searchTableFormType.value = 'create'
+      // 如果需要直接打开表格数据
+      searchTableFormModel.value = Object.assign(unref(searchTableFormModel), {
+        masterId: masterParmas.value.masterId,
+        number: masterParmas.value.number
+      })
+      const item = props.detailAllSchemas.formSchema[0]
+      opensearchTable(
+          item.field, item?.componentProps?.searchField,
+          item?.componentProps?.searchTitle, 
+          item?.componentProps?.searchAllSchemas, 
+          item?.componentProps?.searchPage,
+          item?.componentProps?.searchCondition,
+          item?.componentProps?.multiple,
+          undefined,undefined
+      )
+    }else{
       openForm('create')
+    }
   } else if (val == 'import') {
     // 导入
     handleImport()
@@ -529,6 +580,48 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 直接打开表格数据 --> 对应：isOpenSearchTable === true
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row
+) => {
+  const _searchCondition = {}
+  // 判断查询条件中，是否存在指向主表的数据
+  if (searchCondition && searchCondition.length > 0) {
+    // 转换筛选条件所需
+    for (var i=0; i< searchCondition.length; i++ ) {
+      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
+      if (searchCondition[i].isMainValue) {
+        _searchCondition[searchCondition[i].key] = detailData
+          ? detailData.value[searchCondition[i].value]
+          : ''
+      }else{
+        _searchCondition[searchCondition[i].key] = searchCondition[i].value
+      }
+    }
+  }
+  console.log(searchCondition)
+  console.log(_searchCondition)
+  searchTableRef.value.open(
+    searchTitle,
+    searchAllSchemas,
+    searchPage,
+    formField,
+    searchField,
+    multiple,
+    type,
+    row,
+    _searchCondition
+  )
+}
+
 // 字段设置 更新主列表字段
 // const updataTableColumns = (val) => {
 //   detailAllSchemas.tableColumns.value = val
@@ -538,7 +631,24 @@ const buttonBaseClick = (val, item) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') {
     // 编辑
+    if(props.isOpenSearchTable){
+      searchTableFormType.value = 'update'
+      if (row?.id || row?.masterId) {
+        searchTableFormModel.value = Object.assign(unref(searchTableFormModel), row)
+      }
+      const item = props.detailAllSchemas.formSchema[0]
+      opensearchTable(
+          item.field, item?.componentProps?.searchField,
+          item?.componentProps?.searchTitle, 
+          item?.componentProps?.searchAllSchemas, 
+          item?.componentProps?.searchPage,
+          item?.componentProps?.searchCondition,
+          item?.componentProps?.multiple,
+          undefined,undefined
+      )
+    }else{
       openForm('update', row)
+    }
   } else if (val == 'delete') {
     // 删除
     handleDelete(row.id)
@@ -573,6 +683,13 @@ const submitForm = async (formType, data) => {
   }
 }
 
+
+const searchTableSuccess1 = (formField, searchField, val, formRef) => {
+  searchTableFormModel.value[formField] = val.map(item=>item[searchField]).join(',')
+  console.log('searchTableSuccess1',searchTableFormModel)
+  submitForm(searchTableFormType.value,searchTableFormModel.value)
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   emit('searchTableSuccessDetail', formField, searchField, val, formRef)

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

@@ -63,6 +63,7 @@
   <!-- 详情 -->
   <Detail
     ref="detailRef"
+    :isOpenSearchTable="true"
     :isBasic="false"
     :allSchemas="Itemarea.allSchemas"
     :detailAllSchemas="ItemareaDetail.allSchemas"
@@ -74,6 +75,7 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailButtonIsShowAdd="true"
     :detailButtonIsShowDelete="true"
+    :detailButtonIsShowEdit="false"
     @detailOpenForm="detailOpenForm"
   />
 
@@ -145,7 +147,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+    formRef?.setValues(setV)
   })
 }
 

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

@@ -690,6 +690,7 @@ export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
+        multiple:true,//多选
         searchListPlaceholder: '请选择库位代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库位基础信息', // 查询弹窗标题