From 2a1ecf173eacc963309bb45f7dfb7741fd7062ad Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 15 Apr 2025 14:05:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=BC=80=E7=A5=A8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=A7=E6=95=B0=E6=8D=AE=E9=87=8F=E7=9A=84=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E7=BB=84=E4=BB=B6=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/index.ts             |    3 +-
 src/components/BasicForm/src/BasicFormV3.vue  | 1320 +++++++++++++++++
 src/components/SearchTableV3/index.ts         |    3 +
 .../SearchTableV3/src/SearchTable.vue         |  324 ++++
 src/components/Table/src/TableV2.vue          |  226 +++
 .../supplierinvoiceRequestMain/index.vue      |    6 +-
 6 files changed, 1879 insertions(+), 3 deletions(-)
 create mode 100644 src/components/BasicForm/src/BasicFormV3.vue
 create mode 100644 src/components/SearchTableV3/index.ts
 create mode 100644 src/components/SearchTableV3/src/SearchTable.vue
 create mode 100644 src/components/Table/src/TableV2.vue

diff --git a/src/components/BasicForm/index.ts b/src/components/BasicForm/index.ts
index 131ef9dc5..184d587b2 100644
--- a/src/components/BasicForm/index.ts
+++ b/src/components/BasicForm/index.ts
@@ -1,3 +1,4 @@
 import BasicForm from './src/BasicForm.vue'
+import BasicFormV3 from './src/BasicFormV3.vue'
 
-export { BasicForm }
+export { BasicForm,BasicFormV3 }
diff --git a/src/components/BasicForm/src/BasicFormV3.vue b/src/components/BasicForm/src/BasicFormV3.vue
new file mode 100644
index 000000000..ea5ebfad7
--- /dev/null
+++ b/src/components/BasicForm/src/BasicFormV3.vue
@@ -0,0 +1,1320 @@
+<template>
+  <Dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    :width="dialogWidth"
+    :close-on-click-modal="false"
+    :vLoading="formLoading"
+    @updateFullscreen="updateFullscreen"
+  >
+    <div style="overflow-y: auto" :style="formHeight">
+      <Form :class="{'is-full-input-number': isFullInputNumber}"
+        ref="formRef"
+        :rules="rules"
+        :schema="formSchema"
+        :is-col="true"
+        @opensearchTable="opensearchTable"
+        @hiddenFilterButton="hiddenSearchTableFilterButton"
+        @changeDialogWidth="changeDialogWidth"
+        @clearSearchInput="clearSearchInput"
+        @onChange="onChange"
+        @onBlur="onBlur"
+        @onEnter="onEnter"
+        @onFocus="onFocus"
+      >
+        <template v-for="name in Object.keys($slots)" :key="name" #[name]>
+          <slot :name="name"></slot>
+        </template>
+        <template #crontab="formSchema1" v-if="fromeWhere == 'countPlan'">
+          <crontab
+            v-model="formSchema1.crontab"
+            :disabled="
+              formSchema?.find((item) => item.field == 'crontab')?.componentProps?.disabled
+            "
+          />
+        </template>
+        <template #type="formSchema" v-if="fromeWhere == 'countPlan'">
+          <el-select
+            v-model="formSchema.type"
+            placeholder="选择盘点类型"
+            @change="selectChange('type', $event)"
+            v-if="!isDetail"
+          >
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+          <el-select
+            v-model="formSchema.type"
+            placeholder="选择盘点范围类型"
+            @change="selectChangeDetail('type', $event, formSchema)"
+            v-if="isDetail"
+          >
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </template>
+        <template #value="formSchema" v-if="fromeWhere == 'countPlan'">
+          <el-select
+            v-model="formSchema.value"
+            placeholder="选择盘点范围值"
+            multiple
+            v-if="isDetail && formTypeDetail == 'Select'"
+          >
+            <el-option
+              v-for="dict in countPlanAllList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+          <el-input v-model="formSchema.value" v-if="isDetail && formTypeDetail == 'InputString'" />
+        </template>
+      </Form>
+      <Tabs ref="tabRef" v-if="includeCollectionTable&&formType=='create'&&tableAllSchemas&&tableAllSchemas.tableFormColumns.find(item=>item.field == 'itemCode')" :tabsList="[{
+        label: '明细',
+        prop: 'TableForm'
+      },{
+        label: '汇总',
+        prop: 'CollectionTable'
+      }]" v-model="tabSheet" @change="tabChange"/>
+      <slot name="TableFormHead"></slot>
+      <div class="table" v-if="tableAllSchemas&&tableAllSchemas.tableFormColumns&& fromeWhere != 'countPlan'" v-show="(tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere != 'countPlan')||(tabSheet=='TableForm'&&isBusiness && formType == 'update' && updateTypeEdiltSubList && fromeWhere != 'countPlan')">
+        <TableForm
+          ref="tableFormRef"
+          class="w-[100%]"
+          :fixedScrollHieght="fixedScrollHieght"
+          :maxHeight="fixedScrollHieght?'auto':490"
+          :tableFields="tableAllSchemas.tableFormColumns"
+          :tableData="showTypeList.length>0&&!showTypeList.includes('')?tableData.filter(aItem => showTypeList.some(bItem => aItem.invoiceType === bItem)):tableData"
+          :tableFormRules="tableFormRules"
+          :isShowButton="isShowButton"
+          :isShowReduceButton="isShowReduceButton"
+          :isShowReduceButtonSelection="isShowReduceButtonSelection"
+          @handleAddTable="handleAddTable"
+          @handleDeleteTable="handleDeleteTable"
+          @tableSelectionChange="tableSelectionChange"
+          @tableSelectionDelete="tableSelectionDelete"
+          @extendedButtonsClick="extendedButtonsClick"
+          @formSelectChange="formSelectChange"
+          @formSelectvVisibleChange="formSelectvVisibleChange"
+          @tableSortChange="tableSortChange"
+          @selectCallback="selectCallback"
+          @handleTableSelect="handleTableSelect"
+          @inpuFocus="inpuFocus"
+          @buttonOperationClick="buttonOperationClick"
+          @inputStringBlur="inputStringBlur"
+          @inputNumberChange="inputNumberChange"
+          @tableFormSelectOnBlur="tableFormSelectOnBlur"
+          @formFormDateChange="formFormDateChange"
+          @clearInput="clearInput"
+          @batchAdd="batchAdd"
+          :routeName="routeName"
+          @visibleChange="visibleChange"
+          @inputStringFcous='inputStringFcous'
+          :sureDisabled="sureDisabled"
+        >
+          <template v-slot="{ row }">
+            <slot :row="row"></slot>
+          </template>
+        </TableForm>
+      </div>
+      <div v-if="tableAllSchemas&&tableAllSchemas.tableFormColumns&& fromeWhere == 'countPlan'" v-show="tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
+        <TableFormCountPlan
+          :tableFields="tableAllSchemas.tableFormColumns"
+          :tableData="tableData"
+          :countScopeType="countScopeType"
+          :tableFormRules="tableFormRules"
+          ref="tableFormRef"
+          @tableFormChange="tableFormChange"
+          @handleAddTable="handleAddTable"
+          @handleDeleteTable="handleDeleteTable"
+        />
+      </div>
+      <div v-if="includeCollectionTable&&formType=='create'&&tableAllSchemas&&tableAllSchemas.tableFormColumns.find(item=>item.field == 'itemCode')" v-show="tabSheet=='CollectionTable'">
+        <CollectionTable
+        :fixedScrollHieght="fixedScrollHieght"
+        :tableFields="tableAllSchemas?tableAllSchemas.tableFormColumns:[]"
+        :tableData="tableData"
+        ></CollectionTable>
+      </div>
+      
+      <slot name="table"></slot>
+    </div>
+    <template #footer>
+      <slot name="foorter"></slot>
+      <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" :key="count" />
+    </template>
+  </Dialog>
+  <SearchTableV3
+    ref="searchTableRef3"
+    :showSearchTableQueryFields="showSearchTableQueryFields"
+    :hiddenFilterBtnFields="hiddenFilterBtnFields"
+    :isCheckStrictly="isCheckStrictly"
+    @searchTableSuccess="searchTableSuccess"
+  >
+    <template v-for="name in Object.keys($slots)" :key="name" #[name]="{ selections }">
+      <slot :name="name" :selections="selections"></slot>
+    </template>
+  </SearchTableV3>
+  <SearchTable
+    ref="searchTableRef"
+    :showSearchTableQueryFields="showSearchTableQueryFields"
+    :hiddenFilterBtnFields="hiddenFilterBtnFields"
+    :isCheckStrictly="isCheckStrictly"
+    @searchTableSuccess="searchTableSuccess"
+  >
+    <template v-for="name in Object.keys($slots)" :key="name" #[name]="{ selections }">
+      <slot :name="name" :selections="selections"></slot>
+    </template>
+  </SearchTable>
+  
+</template>
+<script setup lang="ts">
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { SearchTable } from '@/components/SearchTable'
+import { SearchTableV3 } from '@/components/SearchTableV3'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
+import TableForm from '@/components/TableForm/src/TableForm.vue'
+import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/inputBlur'
+import CollectionTable from '@/components/CollectionTable/src/CollectionTable.vue'
+import { isString } from 'min-dash'
+const { wsCache } = useCache()
+const count = ref(0)
+
+const props = defineProps({
+  searchTableVirtualized: {
+    type: Array,
+    required: true,
+    default: []
+  },
+  isFullInputNumber: {
+    type: Boolean,
+    default: true
+  },
+  // 显示窗口宽度设置
+  basicFormWidth: {
+    type: String,
+    default: ''
+  },
+  // 是否显示TableForm 新增/删除按钮
+  isShowButton: {
+    type: Boolean,
+    default: true
+  },
+  // 是否显示删除按钮--多选
+  isShowReduceButtonSelection: {
+    type: Boolean,
+    default: false
+  },
+  // 是否显示tableForm 删除按钮
+  isShowReduceButton: {
+    type: Boolean,
+    default: true
+  },
+  // 校验rules
+  rules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 表单，列表 相关信息
+  formAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 列表 相关信息
+  tableAllSchemas: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  // 列表数据
+  tableData: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  tableFormRules: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  // 查询参数
+  // searchTableParams: {
+  //   type: Array,
+  //   required: false,
+  //   default: null
+  // },
+  // API——Vo
+  apiVo: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  API——创建
+  apiCreate: {
+    type: Function,
+    required: true,
+    default: null
+  },
+  //  API——编辑
+  apiUpdate: {
+    type: Function,
+    required: true,
+    default: null
+  },
+  // 是否是业务表单（区分是不显示tableForm）
+  isBusiness: {
+    type: Boolean,
+    required: true,
+    default: true
+  },
+  // 表单form
+  form: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 详情数据
+  detailData: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // // 主表参数
+  // masterParmas: {
+  //   type: Object,
+  //   required: false,
+  //   default: null
+  // },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  //是否可以编辑子表
+  updateTypeEdiltSubList: {
+    type: String,
+    required: false,
+    default: false
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 是否从详情进入
+  isDetail: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+  formTypeDetail: {
+    type: String,
+    required: false,
+    default: 'InputString'
+  },
+  //盘点详情子表新增的时候判断盘点范围值的下拉列表
+  countPlanAllList: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 窗体底部按钮 显示or隐藏：保存，关闭
+  isShowFooterButtton: {
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 明细数据长度校验
+  tableFormDataLength: {
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 底部按钮集合
+  footButttondata: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  //是否直接展示搜索表单
+  isOpenSearchTable: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+
+  fieldTableColumn: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  //表单中展示的数据，需要用searchTable中字段计算
+  /***[{
+    formField:form中对应的field,
+    tableField:searchtable中对应的field,
+  }]*/
+  sumFormDataField: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  sumFormDataByForm: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  sumFormDataByTableCustom: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  showSearchTableQueryFields: {
+    type: Array,
+    required: false,
+    default: []
+  },
+  hiddenFilterBtnFields:{
+    type: Array,
+    required: false,
+    default: []
+  },
+  // 失去焦点之后是否进行校验，
+  isJiaoyan: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // true 取消父子关联; false 关联
+  isCheckStrictly:{
+    type:Boolean,
+    default:false
+  },
+  // true 展示汇总功能组件; false 不展示
+  includeCollectionTable:{
+    type:Boolean,
+    default:false
+  },
+  //滚动高度
+  fixedScrollHieght:{
+    type:Boolean,
+    default:false
+  },
+  // 默认不显示包装号，采购收货记录显示包装号
+  isShowPackNumber:{
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 子表显示某种类型数据
+  showTypeList:{
+    type: Array,
+    required: false,
+    default: []
+  },
+})
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const dialogWidth = ref()
+if (props.basicFormWidth) {
+  dialogWidth.value = props.basicFormWidth + '%'
+} else {
+  dialogWidth.value = props.isBusiness ? '60%' : '40%'
+}
+
+const collectionRef = ref()
+const updateFullscreen = (isFullscreen) => {
+  if(props.fixedScrollHieght){
+    formHeight.value.height = isFullscreen ? 'auto' : '60vh'
+    nextTick(()=>{
+      tableFormRef.value?.reloadFullscreen(isFullscreen)
+      collectionRef.value?.reloadFullscreen(isFullscreen)
+    })
+  }else{
+    if(isFullscreen){
+      formHeight.value = {
+        'max-height':'100%',
+      }
+    }else{
+      formHeight.value = {
+        'max-height': '60vh'
+      }
+    }
+    
+  }
+}
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+
+const formRef = ref() // 表单 Ref
+const formSchema = ref(props.formAllSchemas?.formSchema)
+const rules = ref(props.rules)
+const tableAllSchemas = ref(props.tableAllSchemas)
+const tableFormRules = ref(props.tableFormRules)
+const route = useRoute() // 路由信息
+const routeName = ref('')
+const sureDisabled = ref(false)
+const tabSheet = ref('TableForm')
+
+routeName.value = route.name
+const formHeight = ref({})
+if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
+  if (formSchema.value) {
+      formSchema.value = formSchema.value.filter(item => item.field != 'packingNumber' &&  item.field != 'fromPackingNumber')
+  }
+  if (rules.value && rules.value.packingNumber) {
+      delete rules.value.packingNumber
+  }
+  if (rules.value && rules.value.fromPackingNumber) {
+      delete rules.value.fromPackingNumber
+  }
+  if (props.tableAllSchemas) {
+    tableAllSchemas.value.tableFormColumns =tableAllSchemas.value.tableFormColumns.filter(item => item.field != 'packingNumber' &&  item.field != 'fromPackingNumber')
+    if (tableFormRules.value && tableFormRules.value.packingNumber) {
+      delete tableFormRules.value.packingNumber
+    }
+     if (tableFormRules.value && tableFormRules.value.fromPackingNumber) {
+      delete tableFormRules.value.fromPackingNumber
+    }
+  }
+
+}
+
+const tabChange = (item) => {
+  tabSheet.value = item.prop
+}
+
+// 列表-按钮
+// const buttondata = [
+//   defaultButtons.mainListEditBtn(null), // 编辑
+//   defaultButtons.mainListDeleteBtn(null)
+// ]
+// // 列表-操作按钮事件
+// const buttonTableClick = async (val, row) => {
+//   if (val == 'edit') {
+
+//   } else if (val == 'delete') {
+
+//   } else {
+//   }
+// }
+
+/** 弹层操作 */
+// formField form表单中的字段
+// searchField 查询列表中的字段
+// type 发起事件位置 type=tableForm 是明细中发起的 否则 为主表发起的
+// searchCondition 查询条件
+const searchTableRef = ref()
+const searchTableRef3 = ref()
+
+const opensearchTable = (
+  formField,
+  searchField,
+  searchTitle,
+  searchAllSchemas,
+  searchPage,
+  searchCondition,
+  multiple,
+  type,
+  row,
+  isConcatDetailSchemas = false,
+  searchDetailSchemas: any
+) => {
+  const _searchCondition = {}
+  // 判断查询条件中，是否存在指向主表的数据
+  if (searchCondition && searchCondition.length > 0) {
+    // 转换筛选条件所需
+    let filters: any[] = []
+    for (var i = 0; i < searchCondition.length; i++) {
+      // searchCondition.forEach((item) => {
+      // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取
+      if (searchCondition[i].isMainValue) {
+          console.log(99,searchCondition[i].paramsFrom)
+        if (searchCondition[i].isFilterValue) {
+          //后端接口需要拼入到filters中
+          filters.push({
+            action: searchCondition[i].action,
+            column: searchCondition[i].key,
+            value:
+              searchCondition[i].paramsFrom == 'form'
+              ? formRef.value.formModel[searchCondition[i].value]
+              : searchCondition[i].paramsFrom == 'detailData'
+              ? props.detailData[searchCondition[i].value]
+              : searchCondition[i].paramsFrom == 'tableForm'
+              ? row[searchCondition[i].value]
+              : formRef.value.formModel[searchCondition[i].value]
+              ? formRef.value.formModel[searchCondition[i].value]
+              : props.detailData
+              ? props.detailData[searchCondition[i].value]
+              : row
+              ? row[searchCondition[i].value]
+              : ''
+          })
+        } else {
+          _searchCondition[searchCondition[i].key] =
+          searchCondition[i].paramsFrom == 'form'
+              ? formRef.value.formModel[searchCondition[i].value]
+              : searchCondition[i].paramsFrom == 'detailData'
+              ? props.detailData[searchCondition[i].value]
+              : searchCondition[i].paramsFrom == 'tableForm'
+              ? row[searchCondition[i].value]
+            :formRef.value.formModel[ searchCondition[i].value]
+            ? formRef.value.formModel[searchCondition[i].value]
+            : props.detailData
+            ? props.detailData[searchCondition[i].value]
+            : row
+            ? row[searchCondition[i].value]
+            : ''
+          // 是否含有空参数情况
+          let isNull = false
+          if (
+            _searchCondition[searchCondition[i].key] == '' ||
+            _searchCondition[searchCondition[i].key] == undefined
+          ) {
+            if(!searchCondition[i].isOptional){ // 添加参数可选可空的判断
+              isNull = true
+            }
+          }
+          if (isNull) {
+            message.warning(
+              searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+            )
+            return
+          }
+          if(searchCondition[i].isRemoveParams){
+            //有校验，但是不传参
+            _searchCondition[searchCondition[i].key] = ''
+          } 
+          
+        }
+      } else if (searchCondition[i].isTableRowValue) {
+        if (searchCondition[i].required) {
+          if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) {
+            message.warning(
+              searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+            )
+            return
+          }
+        }
+        row[searchCondition[i].value]
+        //查询当前table表数据的值
+        _searchCondition[searchCondition[i].key] = row[searchCondition[i].value]
+      } else {
+        // 扩展 转换为筛选条件进行查询
+        if (searchCondition[i].isSearch) {
+          if (searchCondition[i].isFormModel) {
+            //用formModel中的值
+            if (searchCondition[i].required) {
+              if (
+                formRef.value.formModel[searchCondition[i].value] == '' ||
+                formRef.value.formModel[searchCondition[i].value] == undefined
+              ) {
+                if(!searchCondition[i].isOptional){ // 添加参数可选可空的判断
+                  message.warning(
+                    searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！'
+                  )
+                  return
+                }
+              }
+            }
+            if(formRef.value.formModel[searchCondition[i].value]){
+              filters.push({
+                action: searchCondition[i].action,
+                column: searchCondition[i].key,
+                value: formRef.value.formModel[searchCondition[i].value]
+              })
+            }
+            
+          } else {
+            filters.push({
+              action: searchCondition[i].action,
+              column: searchCondition[i].key,
+              value: searchCondition[i].value
+            })
+          }
+        } else {
+          _searchCondition[searchCondition[i].key] = searchCondition[i].value
+        }
+      }
+    }
+    if (filters.length > 0) {
+      _searchCondition.isSearch = true
+      _searchCondition.filters = filters
+    }
+  }
+  const _searchTableTitle = searchTitle
+  const _searchTableAllSchemas = searchAllSchemas
+  const _searchTablePage = searchPage
+  if(props.searchTableVirtualized.includes(formField)){
+    searchTableRef3.value.open(
+      _searchTableTitle,
+      _searchTableAllSchemas,
+      _searchTablePage,
+      formField,
+      searchField,
+      multiple,
+      type,
+      row,
+      _searchCondition,
+      undefined,
+      isConcatDetailSchemas,
+      searchDetailSchemas
+    )
+  }else{
+    searchTableRef.value.open(
+      _searchTableTitle,
+      _searchTableAllSchemas,
+      _searchTablePage,
+      formField,
+      searchField,
+      multiple,
+      type,
+      row,
+      _searchCondition,
+      undefined,
+      isConcatDetailSchemas,
+      searchDetailSchemas
+    )
+  }
+  
+}
+
+//修改 searchTable 弹窗宽度
+const changeDialogWidth = (width) => {
+  searchTableRef.value.changeDialogWidth(width)
+  
+}
+const hiddenSearchTableFilterButton = () => {
+  
+  searchTableRef.value.hiddenFilterButton()
+  
+}
+const clearSearchInput = (field) => {
+  emit('clearSearchInput', field)
+}
+const sumFormDataByTable = () => {
+  if (props.sumFormDataField) {
+    const sumObject = {}
+    props.sumFormDataField.forEach((sumItem) => {
+      sumObject[sumItem?.formField] = props.tableData.reduce(
+        (prev, item) => prev + item[sumItem?.tableField],
+        0
+      )
+    })
+    nextTick(() => {
+      formRef.value.setValues(sumObject)
+    })
+  }
+}
+watch(
+  () => props.tableData,
+  () => {
+    sumFormDataByTable()
+    if (props?.sumFormDataByTableCustom && unref(formRef)?.formModel && props.tableData) {
+      props?.sumFormDataByTableCustom(formRef, unref(formRef)?.formModel, props.tableData)
+    }
+  },
+  {
+    deep: true
+  }
+)
+watch(
+  () => props.formAllSchemas,
+  (val) => {
+    formSchema.value = val.formSchema
+  },
+  {
+    deep: true
+  }
+)
+let originFormModel = {}
+const updateOriginFormModel = (data) => {
+  originFormModel = JSON.parse(JSON.stringify(data))
+}
+const sumFormDataHandle1 = () => {
+  emit(
+    'sumFormDataHandle',
+    formRef,
+    unref(formRef)?.formModel,
+    props.tableData,
+    formType.value,
+    originFormModel,
+    updateOriginFormModel
+  )
+}
+
+watch(
+  () => unref(formRef)?.formModel,
+  async () => {
+    if (props?.sumFormDataByForm && unref(formRef)?.formModel) {
+      props?.sumFormDataByForm(
+        formRef,
+        unref(formRef)?.formModel,
+        props.tableData,
+        formType.value,
+        originFormModel,
+        updateOriginFormModel,
+        sumFormDataHandle1
+      )
+    }
+  },
+  {
+    deep: true
+  }
+)
+
+// 弹层确定返回所选数据
+// val ： 弹层列表row 数据
+const searchTableSuccess = (formField, searchField, val, type, row) => {
+  emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+}
+
+/** 打开弹窗 */
+const open = async (
+  type: string,
+  row?: any,
+  masterParmas?: any,
+  titleName?: any,
+  alltitleName?: any
+) => {
+  tabSheet.value = "TableForm"
+  dialogVisible.value = true
+  if (alltitleName) {
+    dialogTitle.value = alltitleName
+  } else if (titleName) {
+    dialogTitle.value = t('action.' + titleName)
+  } else {
+    dialogTitle.value = t('action.' + type)
+  }
+  formType.value = type
+  
+  if(props.fixedScrollHieght){
+    if(!props.tableAllSchemas||formType.value!='create'){
+      formHeight.value = {
+        height:'auto'
+      }
+    }else{
+      formHeight.value = {
+        height:'70vh'
+      }
+    }
+  }else{
+    formHeight.value = {
+      'max-height': '60vh'
+    }
+  }
+
+  
+  resetForm()
+  count.value = 0
+  // 修改时，设置数据
+  // 如果是从主表的详情页面进图添加子表，需要添加masterId，number参数
+  if (masterParmas) {
+    if (!row) {
+      row = {
+        masterId: masterParmas.masterId,
+        number: masterParmas.number
+      }
+    }
+  }
+  
+  if (row?.id || row?.masterId) {
+    formLoading.value = true
+    try {
+      nextTick(() => {
+        formRef.value.setValues(row)
+      })
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+// 添加数据
+const handleAddTable = () => {
+  if (props.isOpenSearchTable) {
+    const tableFormKeys = {}
+    tableAllSchemas.value.tableFormColumns.forEach((item) => {
+      tableFormKeys[item.field] = item.default ? item.default : ''
+    })
+    if (props.fieldTableColumn != '') {
+      inpuFocus(
+        tableAllSchemas.value.tableFormColumns.find((item) => item.field == props.fieldTableColumn),
+        tableFormKeys,
+        0
+      )
+    }
+  } else {
+    emit('handleAddTable')
+  }
+}
+
+/** 弹窗按钮 */
+let Butttondata: any = []
+if (props.isShowFooterButtton) {
+  Butttondata = [
+    defaultButtons.formSaveBtn(null), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+}
+if (props.footButttondata) {
+  Butttondata = props.footButttondata
+}
+
+/** 按钮事件 */
+const buttonBaseClick = (val) => {
+  // 扩展 按钮事件回调
+  if (props.footButttondata) {
+    emit('footButtonClick', val)
+  }
+  // 保存
+  else if (val == 'save') {
+    submitForm()
+  }
+  // 关闭
+  else if (val == 'close') {
+    dialogVisible.value = false
+  }
+}
+
+/** 提交表单 */
+// const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+
+const tableFormRef = ref()
+const submitForm = async () => {
+  const elForm = unref(formRef)?.getElFormRef()
+  // 校验表单
+  if (!elForm) return
+  const valid = await elForm.validate()
+  if (!valid) return
+ 
+  // 针对主子表 明细校验
+  if (props.isBusiness) {
+    // formLoading.value = true
+    if (formType.value == 'create') {
+      const validateForm = await tableFormRef.value.validateForm()
+      if (!validateForm && props.tableFormDataLength) {
+        if (props.tableData.length == 0) {
+          message.warning('请填写明细信息！')
+          formLoading.value = false
+          return
+        }
+        formLoading.value = false
+        return
+      }
+      // 主子表——提交请求
+      try {
+        const data = unref(formRef)?.formModel
+          if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
+          data.packingNumber=''
+          data.fromPackingNumber=''
+        }
+        emit('submitForm', formType.value, data)
+      } finally {
+        // formLoading.value = false
+      }
+    } else {
+      // 编辑
+      try {
+        const data = unref(formRef)?.formModel
+        if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
+          data.packingNumber=''
+          data.fromPackingNumber=''
+        }
+        console.log(data);
+        
+        emit('submitForm', formType.value, data)
+      } finally {
+        // formLoading.value = false
+      }
+    }
+  } else {
+    // 基础数据单表——提交请求
+    // formLoading.value = true
+    try {
+      const data = unref(formRef)?.formModel
+      // 清空包装号
+       if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
+          data.packingNumber=''
+          data.fromPackingNumber=''
+        }
+      emit('success', formType.value, data)
+    } finally {
+      // formLoading.value = false
+    }
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  unref(formRef)?.resetFields()
+}
+
+// 传递给父类
+const emit = defineEmits([
+  'success',
+  'tableSelectionChange',
+  'tableSelectionDelete',
+  'tableFormSelectOnBlur',
+  'extendedButtonsClick',
+  'formSelectChange',
+  'formSelectvVisibleChange',
+  'tableSortChange',
+  'selectCallback',
+  'handleTableSelect',
+  'handleDeleteTable',
+  'handleAddTable',
+  'inpuFocus',
+  'searchTableSuccess',
+  'opensearchTable',
+  'submitForm',
+  'selectChange',
+  'selectChangeDetail',
+  'tableFormChange',
+  'buttonOperationClick',
+  'inputStringBlur',
+  'onChange',
+  'onBlur',
+  'onEnter',
+  'inputNumberChange',
+  'formFormDateChange',
+  'footButtonClick',
+  'clearSearchInput',
+  'clearInput',
+  'sumFormDataHandle',
+  'visibleChange'
+])
+const visibleChange = (field, val, row, index) => {
+  emit('visibleChange', field, val, row, index)
+}
+//普通下拉改变事件
+const formSelectChange = (field, val, row) => {
+  emit('formSelectChange', field, val, row)
+}
+// 日期改变事件
+const formFormDateChange = (field, val, row, index) => {
+  emit('formFormDateChange', field, val, row, index)
+}
+const formSelectvVisibleChange = (field, val, row) => {
+  emit('formSelectvVisibleChange', field, val, row)
+}
+// 点击selection框
+const tableSelectionChange = (val) => {
+  emit('tableSelectionChange', val)
+}
+const tableSelectionDelete = (val) => {
+  emit('tableSelectionDelete', val)
+}
+// tableform select bulr
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  emit('tableFormSelectOnBlur', field, val, row, index)
+}
+// 列表排序
+const tableSortChange = (column, prop, order) => {
+  emit('tableSortChange', column, prop, order)
+}
+
+// 数字输入-改变事件
+const inputNumberChange = (field, index, row, val) => {
+  emit('inputNumberChange', field, index, row, val)
+}
+//下拉框回显方法
+// const showSelect = (val, statusID) => {
+//   return getDictForStatusID(val, statusID)
+// }
+
+// 行点击
+const handleTableSelect = (row, column, event) => {
+  emit('handleTableSelect', row, column, event)
+}
+
+// 删除数据
+const handleDeleteTable = (row, index) => {
+  emit('handleDeleteTable', row, index, formRef.value)
+}
+
+// 输入框聚焦
+const inpuFocus = (headerItem, row, index) => {
+  emit('inpuFocus', headerItem, row, index)
+  opensearchTable(
+    headerItem.field,
+    headerItem.tableForm.searchField,
+    headerItem.tableForm.searchTitle,
+    headerItem.tableForm.searchAllSchemas,
+    headerItem.tableForm.searchPage,
+    headerItem.tableForm.searchCondition,
+    headerItem.tableForm.multiple,
+    'tableForm',
+    row,
+    headerItem.tableForm?.isConcatDetailSchemas,
+    headerItem.tableForm?.searchDetailSchemas
+  )
+}
+const clearInput = (field, row, index) => {
+  emit('clearInput', field, row, index)
+}
+/**
+ * 监听改变事件
+ * @param field 当前操作字段
+ * @param cur 改变后值
+ */
+const onChange = (field, cur) => {
+  emit('onChange', field, cur, formRef)
+}
+
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e
+ */
+const isOnBlur = ref(true)
+const onBlur = async (field, e) => {
+  // isOnBlur是false的时候证明先走了回车事件，可以不走失去焦点方法，true的时候直接走失去焦点事件
+  if (isOnBlur.value) {//同时走失去焦点方法bug
+    let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
+    if (formSchemaObj?.enterSearch) {
+      await FormBlur(
+        field,
+        e,
+        routeName.value,
+        formRef.value,
+        props.detailData,
+        formSchemaObj,
+        (list) => {
+          emit('searchTableSuccess', field, formSchemaObj.searchField, list, formRef.value, 'form')
+        }
+      )
+
+      if (props.isShowFooterButtton && !props.footButttondata) {
+        Butttondata = [
+          defaultButtons.formSaveBtn(null), // 保存
+          defaultButtons.formCloseBtn(null) // 关闭
+        ]
+        count.value++
+      }
+        sureDisabled.value= false
+    } else {
+      emit('onBlur', field, e)
+    }
+  }
+
+}
+
+// 批量增加
+const batchAdd = async (val) => {
+  const row = {}
+  tableAllSchemas.value.tableFormColumns.forEach((item) => {
+    row[item.field] = item.default ? item.default : ''
+  })
+  const headerItem = tableAllSchemas.value.tableColumns.find(
+    (item) => item.field == props.fieldTableColumn
+  )
+
+  await getListByBottonInput(
+    headerItem,
+    val,
+    row,
+    routeName.value,
+    formRef.value,
+    props.detailData,
+    props.tableData,
+    (list) => {
+      emit(
+        'searchTableSuccess',
+        headerItem.field,
+        headerItem.tableForm.searchField,
+        list,
+        formRef.value,
+        'tableForm',
+        row
+      )
+    }
+  )
+ 
+}
+
+const inputStringBlur = async (headerItem, val, row, index) => {
+  await tableFormBlurVer(
+    headerItem,
+    val,
+    row,
+    index,
+    routeName.value,
+    formRef.value,
+    props.detailData,
+    props.tableData,
+    (list) => {
+      emit(
+        'searchTableSuccess',
+        headerItem.field,
+        headerItem.tableForm.searchField,
+        list,
+        formRef.value,
+        'tableForm',
+        row,
+        'blur',
+        index
+      )
+    }
+  )
+    if (props.isShowFooterButtton && !props.footButttondata) {
+      Butttondata = [
+        defaultButtons.formSaveBtn(null), // 保存
+        defaultButtons.formCloseBtn(null) // 关闭
+      ]
+      count.value++
+  }
+    
+      sureDisabled.value= false
+}
+// 聚焦
+const onFocus = (field) => {
+  let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
+  if (formSchemaObj?.enterSearch) {
+    if (props.isShowFooterButtton && !props.footButttondata) {
+      Butttondata = [
+        defaultButtons.formSaveBtn({ disabled: true }), // 保存
+        defaultButtons.formCloseBtn(null) // 关闭
+      ]
+    }
+    count.value++
+    sureDisabled.value= true
+  }
+}
+const inputStringFcous= (headerItem) => {
+ if (headerItem?.tableForm?.searchPage && headerItem?.tableForm?.verificationParams) {
+    if (props.isShowFooterButtton && !props.footButttondata) {
+      Butttondata = [
+        defaultButtons.formSaveBtn({ disabled: true }), // 保存
+        defaultButtons.formCloseBtn(null) // 关闭
+      ]
+    }
+    count.value++
+    sureDisabled.value= true
+  }
+}
+/**
+ * 回车事件
+ * @param field 当前操作字段
+ * @param e
+ */
+const onEnter = async (field, value, e) => {
+  let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps
+  if (formSchemaObj?.enterSearch && formSchemaObj?.isEnter) {
+    isOnBlur.value = false//解决回车事件和失去焦点同时调用bug
+    await FormBlur(
+      field,
+      value,
+      routeName.value,
+      formRef.value,
+      props.detailData,
+      formSchemaObj,
+      (list) => {
+        isOnBlur.value = true
+        if (list.length != 0) {
+         emit('onEnter', field, value, e)
+        }
+      }
+    )
+  } else {
+    emit('onEnter', field, value, e)
+  }
+}
+
+// 修改盘点类型
+const selectChange = (field, val) => {
+  emit('selectChange', field, val)
+}
+// 修改盘点范围类型
+const selectChangeDetail = (field, val, formSchema) => {
+  formSchema.value = ''
+  emit('selectChangeDetail', field, val)
+}
+
+const tableFormChange = (field, val, row) => {
+  emit('tableFormChange', field, val, row)
+}
+
+const buttonOperationClick = (row, label, index) => {
+  emit('buttonOperationClick', row, label, index)
+}
+
+defineExpose({
+  open,
+  formRef,
+  opensearchTable,
+  dialogVisible,
+  formLoading,
+  handleAddTable,
+  changeDialogWidth,
+  searchTableRef,
+  tableFormRef
+}) // 提供 open 方法，用于打开弹窗
+</script>
+<style lang="scss" scoped>
+.table {
+  border: 1px solid #dedede;
+  border-radius: 8px;
+  padding: 10px;
+  width: calc(100% - 32px);
+  display: flex;
+  ::v-deep(.el-table__body) {
+    padding: 10px 0px;
+  }
+  ::v-deep(.el-table--default .el-table__cell) {
+    padding: 2px 0px;
+    border: none;
+  }
+
+  ::v-deep(.el-table td.el-table__cell .el-form-item__content) {
+    display: flex !important;
+    align-items: center !important;
+    justify-content: center !important;
+  }
+  ::v-deep(.el-table td.el-table__cell div) {
+    overflow: visible;
+  }
+
+  ::v-deep(.el-icon) {
+    display: block;
+  }
+}
+button .button {
+  > div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    > div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+}
+.is-full-input-number{
+  ::v-deep(.el-input-number) {
+    width: 100% !important;
+  }
+}
+</style>
diff --git a/src/components/SearchTableV3/index.ts b/src/components/SearchTableV3/index.ts
new file mode 100644
index 000000000..1c2bc8047
--- /dev/null
+++ b/src/components/SearchTableV3/index.ts
@@ -0,0 +1,3 @@
+import SearchTableV3 from './src/SearchTable.vue'
+
+export { SearchTableV3}
diff --git a/src/components/SearchTableV3/src/SearchTable.vue b/src/components/SearchTableV3/src/SearchTable.vue
new file mode 100644
index 000000000..b93152e0c
--- /dev/null
+++ b/src/components/SearchTableV3/src/SearchTable.vue
@@ -0,0 +1,324 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="dialogWidth">
+    <!-- 搜索工作栏 -->
+    <slot :name="'searchQuery'+formFieldRef"></slot>
+    <ContentWrap v-if="searchQuery">
+      <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" />
+    </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      :routeName="routeName"
+      @searchFormClick="searchFormClick"
+      @buttonBaseClick="buttonBaseClick"
+      :allSchemas="allSchemasRef"
+    />
+    <ContentWrap>
+      <TableV2
+        v-clientSearchTable
+        ref="searchTableRef"
+        :isCheckStrictly="isCheckStrictly"
+        :columns="tableColumns"
+        :data="tableObjectRef.tableList"
+        :loading="tableObjectRef.loading"
+        :total="tableObjectRef.total"
+        v-model:pageSize="tableObjectRef.pageSize"
+        v-model:currentPage="tableObjectRef.currentPage"
+        v-model:sort="tableObjectRef.sort"
+        :searchTableSelectionsList="searchTableSelectionsList"
+        :selection="true"
+        :selectionTotal="multipleBol"
+        :reserveSelection="true"
+        row-key="id"
+        @rowClick="rowClick"
+      />
+      <!-- <el-table-v2 style="border: 1px solid red;"
+        :height="700"
+        ref="searchTableRef"
+        v-clientSearchTable
+        :columns="tableColumns"
+        :data="tableObjectRef.tableList"
+        fixed></el-table-v2> -->
+    </ContentWrap>
+    <template #footer>
+      <div class="flex items-center">
+        <slot :name="'selectionsActions'+formFieldRef" :selections="searchTableRef?searchTableRef.selections:[]"></slot>
+        <el-button @click="submitForm" type="primary" :disabled="formLoading">{{ sureText }}</el-button>
+        <slot name="actionsOther"></slot>
+        <el-button @click="searchDialogVisible = false">取 消</el-button>
+
+        <slot name="actions"></slot>
+      </div>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+const props = defineProps({
+  showSearchTableQueryFields: {
+    type: Array,
+    required: false,
+    default: []
+  },
+  hiddenFilterBtnFields:{
+    type: Array,
+    required: false,
+    default: []
+  },
+  // true 取消父子关联; false 关联
+  isCheckStrictly:{
+    type:Boolean,
+    default:false
+  },
+  sureText:{
+    type: String,
+    required: false,
+    default:'确 定'
+  }
+})
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+
+const searchDialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const multipleBol = ref(false)
+
+// 列表头部按钮
+const HeadButttondata = ref(
+  multipleBol.value
+    ? [
+        defaultButtons.defaultWhenPageBtn(null), // 选择当页
+        defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+        // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+        defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+    : [
+        defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+)
+
+/** 打开弹窗 */
+const getListRef = ref()
+const setSearchParamsRef = ref()
+const tableObjectRef = ref()
+const getPage: any = ref()
+const searchSchema = ref()
+const tableColumns = ref()
+const formFieldRef = ref('')
+const searchFieldRef = ref()
+const typeRef = ref()
+const rowRef = ref()
+const allSchemasRef = ref()
+const searchConditionRef = ref()
+const searchTableSelectionsList = ref() //表格弹窗回显的列表
+const searchQuery = ref(false)
+const hiddenFilterBtn = ref(false)
+const updateData = (list:any)=>{
+  tableObjectRef.value.tableList = list
+  searchTableRef.value.clearSelection()
+}
+const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => {
+  dialogWidth.value = '80%'
+  multipleBol.value = multiple
+  HeadButttondata.value = multiple
+    ? [
+        defaultButtons.defaultWhenPageBtn(null), // 选择当页
+        defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+        // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+        // defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+    : [
+        // defaultButtons.defaultFilterBtn(null) // 筛选
+      ]
+  dialogTitle.value = t(`ts.${titleName}`).replace('ts.', '')
+  tableObjectRef.value = tableObject
+  searchDialogVisible.value = true
+  allSchemasRef.value = allSchemas
+  searchSchema.value = allSchemas.searchSchema
+  tableColumns.value = allSchemas.tableColumns
+}
+const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any, searchTableSelections:any) => {
+  searchQuery.value = props.showSearchTableQueryFields.find(item=>item==formField)?true:false
+  hiddenFilterBtn.value = props.hiddenFilterBtnFields.find(item=>item==formField)?true:false
+  
+  dialogWidth.value = '80%'
+  multipleBol.value = multiple
+   
+  const filterBtns = hiddenFilterBtn.value?[]:[defaultButtons.defaultFilterBtn(null)]
+  
+  HeadButttondata.value = multiple?[
+    defaultButtons.defaultWhenPageBtn(null), // 选择当页
+    defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+    // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+    ...filterBtns, // 筛选
+  ]:
+  [
+    ...filterBtns, // 筛选
+  ]
+  searchDialogVisible.value = true
+  formFieldRef.value = formField
+  searchFieldRef.value = searchField
+  allSchemasRef.value = allSchemas
+  searchSchema.value = allSchemas.searchSchema
+  if (isConcatDetailSchemas) {
+    //主子表合并
+    console.log('detailSchemas', detailSchemas)
+    tableColumns.value = [...allSchemas?.tableColumns, ...detailSchemas?.tableMainColumns].filter(
+      (item) => item.field !== 'action'
+    )
+  } else {
+    tableColumns.value = allSchemas?.tableColumns.filter((item) => item.field !== 'action')
+  }
+  getPage.value = getApiPage
+  typeRef.value = type
+  rowRef.value = row
+  // dialogTitle.value = t('action.' + type)
+  dialogTitle.value = t(`ts.${titleName}`).replace('ts.', '')
+  searchTableSelectionsList.value = searchTableSelections
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: getPage.value // 分页接口
+  })
+  tableObject.pageSize = 20
+  tableObjectRef.value = tableObject
+  searchConditionRef.value = searchCondition
+  if (searchCondition) tableObjectRef.value.params = searchCondition
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+  setSearchParamsRef.value = setSearchParams
+  getListRef.value = getList
+  getList()
+}
+const dialogWidth = ref('80%')
+const changeDialogWidth = (width: any) => {
+  dialogWidth.value = width
+}
+const hiddenFilterButton = () => {
+  HeadButttondata.value = []
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  console.log(99, rowRef.value)
+  console.log(100, searchData)
+  console.log(101, searchConditionRef.value)
+  // 20240104 修改 判断 当前弹窗 是否有条件 如果有条件 需拼接到 筛选中 searchData.filters
+  // 20240321 修改 判断 searchData 是否有条件 如果有 拼接
+  if (searchData.filters) {
+    if (searchConditionRef.value&&searchConditionRef.value.filters) {
+      Object.keys(searchConditionRef.value.filters).forEach((key) => {
+        searchData.filters.push(searchConditionRef.value.filters[key])
+      })
+    } else if(searchConditionRef.value){
+      Object.keys(searchConditionRef.value).forEach((key) => {
+        searchData.filters.push({
+          action: '==',
+          column: key,
+          value: searchConditionRef.value[key]
+        })
+      })
+    }
+  } else {
+    if (searchConditionRef.value.filters) {
+      searchData.filters = searchConditionRef.value.filters
+    } else if(searchConditionRef.value){
+      searchData.filters = []
+      Object.keys(searchConditionRef.value).forEach((key) => {
+        searchData.filters.push({
+          action: '==',
+          column: key,
+          value: searchConditionRef.value[key]
+        })
+      })
+    }
+  }
+  tableObjectRef.value.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getListRef.value() // 刷新当前列表
+}
+const buttonBaseClick = (val, item) => {
+  // 设置按钮
+  if (val == 'DeselectAll') {
+    // 取消全选
+    searchTableRef.value.clearSelection()
+  } else if (val == 'UnselectPage') {
+    // 反选当页
+    searchTableRef.value.togglePageSelection()
+  } else if (val == 'WhenPage') {
+    // 选择当页
+    searchTableRef.value.toggleAllSelection(true)
+  }
+}
+
+
+defineExpose({ open,openData,updateData,hiddenFilterButton ,changeDialogWidth,searchFormClick}) // 提供 open 方法，用于打开弹窗
+
+// Table 组件 ref
+const searchTableRef = ref()
+
+/** 提交表单 */
+const emit = defineEmits(['searchTableSuccess']) // 定义 searchTableSuccess 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  const selections = searchTableRef.value.selections
+  // 如果不是多选的
+  if (!multipleBol.value) {
+    if (selections.length > 1 || selections.length == 0) {
+      message.warning('请选择一条数据！')
+      formLoading.value = false
+      return
+    }
+    // 多选
+  } else {
+    if (selections.length == 0) {
+      message.warning('至少选择一条数据！')
+      formLoading.value = false
+      return
+    }
+  }
+
+  try {
+    searchDialogVisible.value = false
+    // 发送操作成功的事件
+    emit(
+      'searchTableSuccess',
+      formFieldRef.value,
+      searchFieldRef.value,
+      selections,
+      typeRef.value,
+      rowRef.value
+    )
+  } finally {
+    formLoading.value = false
+  }
+}
+const rowClick = (row: any, column: any, event: Event) => {
+
+  const selected = searchTableRef.value?.elTableRef
+    ?.getSelectionRows()
+    .some((item) => item.id === row.id)
+  if (!selected) {
+    searchTableRef.value?.elTableRef?.toggleRowSelection(row, true)
+    if(props.isCheckStrictly&&row.children){//取消关联
+      row.children.forEach(item => {
+        searchTableRef.value?.elTableRef?.toggleRowSelection(item, false)
+      });
+    }
+  } else {
+    // 取消
+    searchTableRef.value?.elTableRef?.toggleRowSelection(row, false)
+  }
+}
+</script>
+<style scoped lang="scss">
+</style>
\ No newline at end of file
diff --git a/src/components/Table/src/TableV2.vue b/src/components/Table/src/TableV2.vue
new file mode 100644
index 000000000..de3cb01c1
--- /dev/null
+++ b/src/components/Table/src/TableV2.vue
@@ -0,0 +1,226 @@
+
+<template>
+  <div style="height: 400px" v-loading="loading">
+    <el-auto-resizer>
+      <template #default="{ height, width }">
+        <el-table-v2 
+        class="table-v2-container"
+        row-key="id"
+        :columns="[selectionColumn,...mColumns]"
+        :data="mData"
+        :width="width"
+        :height="height"
+        fixed
+      />
+      </template>
+    </el-auto-resizer>
+    <div class="mt-15px float-left" style='height:32px;line-height:32px'>已选{{ selections.length }}条数据</div>
+    <el-pagination  v-model:current-page="currentPageRef" v-model:page-size="pageSizeRef" class="float-right mt-15px" layout="total, sizes, prev, pager, next, jumper" :total="total" :page-sizes="[200,500,1000,2000]"/>
+
+  </div>
+</template>
+<script lang="tsx" setup>
+import { ref, unref } from 'vue'
+import { ElCheckbox } from 'element-plus'
+import type { FunctionalComponent } from 'vue'
+import type { CheckboxValueType, Column } from 'element-plus'
+import {formatDate } from '@/utils/formatTime'
+
+
+const props = defineProps({
+  // 表头
+  columns: {
+    type: Array as PropType<TableColumn[]>,
+    default: () => []
+  },
+  data: {
+    type: Array as PropType<Recordable[]>,
+    default: () => []
+  },
+  currentPage: {
+    type: Number,
+    default: 1
+  },
+  pageSize: {
+    type: Number,
+    default: 200
+  },
+  total: {
+    type: Number,
+    default: 0
+  },
+  // 加载状态
+  loading: {
+    type: Boolean,
+    default: false
+  },
+})
+const pageSizeRef = ref(props.pageSize)
+const currentPageRef = ref(props.currentPage)
+watch(
+  () => props.currentPage,
+  (val: number) => {
+    currentPageRef.value = val
+  }
+)
+watch(
+  () => props.pageSize,
+  (val: number) => {
+    pageSizeRef.value = val
+  }
+)
+watch(
+  () => pageSizeRef.value,
+  (val: number) => {
+    emit('update:pageSize', val)
+  }
+)
+watch(
+  () => currentPageRef.value,
+  (val: number) => {
+    emit('update:currentPage', val)
+  }
+)
+console.log('columns====',props.columns)
+type SelectionCellProps = {
+  value: boolean
+  intermediate?: boolean
+  onChange: (value: CheckboxValueType) => void
+}
+const SelectionCell: FunctionalComponent<SelectionCellProps> = ({
+  value,
+  intermediate = false,
+  onChange,
+}) => {
+  return (
+    <ElCheckbox
+      onChange={onChange}
+      modelValue={value}
+      indeterminate={intermediate}
+    />
+  )
+}
+const selectionColumn = ref({
+  key: 'selection',
+  width: 50,
+  align:'center',
+  cellRenderer: ({ rowData,rowIndex }) => {
+    const onChange = (value: CheckboxValueType) => {
+      console.log('onChange', value)
+      rowData.checked = value
+      selections.value = selections.value.filter(item=>item.id!=rowData.id)
+      if (value) {
+        selections.value.push(rowData)
+      }
+    }
+    return <SelectionCell value={rowData.checked} onChange={onChange} />
+  },
+
+  headerCellRenderer: () => {
+    const _data = unref(mData)
+    const onChange = (value: CheckboxValueType) =>
+    {
+      mData.value = _data.map((row) => {
+        row.checked = value
+        return row
+      })
+      selections.value = selections.value.filter(item=>mData.value.findIndex(item1=>item1.id==item.id)==-1)
+      if(value){
+        selections.value = [...selections.value,...mData.value]
+      }
+    }
+    const allSelected = _data.every((row) => row.checked)
+    const containsChecked = _data.some((row) => row.checked)
+    
+    return (
+      <SelectionCell
+        value={allSelected}
+        intermediate={containsChecked && !allSelected}
+        onChange={onChange}
+      />
+    )
+  },
+})
+const mColumns = ref(props.columns.map(item=>({
+  key: 'id',
+  dataKey: item['field'],
+  title: item['label'],
+  width: 140,
+})))
+
+const mData = ref([])
+watch(()=>props.data,()=>{
+  console.log('selections',selections.value  )
+  mData.value = props.data.map(item=>({
+    ...item,
+    checked: selections.value.find(item1=>item1.id==item.id)?true:false,
+    createTime:formatDate(item.createTime)
+  }))
+  console.log('mData',mData.value)
+
+})
+
+const rowEventHandlers = ({onClick})=>{
+
+}
+
+const selections = ref([])
+// const selections = computed(()=>mData.value.filter(item=>item.checked))
+// 切换全选/不全选
+const toggleAllSelection = (isAll)=>{
+  if(isAll){
+    //全选
+     mData.value.forEach((row) => {
+      row.checked = isAll
+    })
+  }
+}
+
+const togglePageSelection = (isAll)=>{
+  mData.value.forEach((row) => {
+    row.checked = !row.checked
+  })
+}
+
+
+defineExpose({ selections,toggleAllSelection,togglePageSelection }) 
+
+const emit = defineEmits(['update:pageSize','update:currentPage'])
+
+console.log('props.data',props.data)
+console.log('mData',mData.value)
+// const columns = generateColumns(10)
+// const data = generateData(columns, 200)
+
+</script>   
+<style lang="scss" scoped>
+.table-v2-container {
+  border: 1px solid #ebeef5;
+  ::v-deep(.el-table-v2__header-cell) {
+    border-right: 1px solid #ebeef5;
+    text-align: center;
+    &:last-child{
+      border-right: none;
+    }
+  }
+  
+  ::v-deep(.el-table-v2__header-cell-text) {
+    width: 100%;
+  }
+  ::v-deep(.el-table-v2__row-cell) {
+    text-align: center;
+    border-right: 1px solid #ebeef5;
+    &:last-child{
+      border-right: none;
+    }
+  }
+  ::v-deep(.el-table-v2__cell-text) {
+    width: 100%;
+  }
+  
+  
+  
+}
+
+
+</style>
\ No newline at end of file
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 51f9c6225..3ba6f2e08 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -56,10 +56,12 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
+  <BasicFormV3
     ref="formRef"
     @success="getList"
     :isOpenSearchTable="true"
+    :searchTableVirtualized="['poLine']"
+    :isFullInputNumber="true"
     fieldTableColumn="poLine"
     :showSearchTableQueryFields="['poLine']"
     :rules="SupplierinvoiceRequestMainRules"
@@ -288,7 +290,7 @@
         </div>
       </div>
     </template>
-  </BasicForm>
+  </BasicFormV3>
 
   <!-- 财务通过窗口 finance_mainPlanSub -->
   <BasicForm