From 80bf28e6ed5c38688c8f8f021bc197966b5aac54 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Tue, 14 Nov 2023 08:51:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/spc/itembasic/index.ts                |  77 ++++
 src/components/BasicForm/src/BasicForm.vue    | 160 ++------
 src/components/Detail/src/Detail.vue          |  71 ++--
 src/components/Form/src/Form.vue              |  75 ++--
 src/components/ImportForm/src/ImportForm.vue  |  34 +-
 src/components/SearchHigh/src/SearchHigh.vue  |  56 ++-
 .../SearchTable/src/SearchTable.vue           |  67 +++-
 src/components/TableForm/src/TableForm.vue    |   9 +-
 src/components/TableHead/src/TableHead.vue    |  49 +--
 src/components/XButton/src/ButtonBase.vue     | 119 ++++--
 src/components/rowDrop/index.vue              |  69 +++-
 src/views/spc/itembasic/index.vue             | 228 +++++++++++
 src/views/spc/itembasic/itembasic.data.ts     | 355 ++++++++++++++++++
 13 files changed, 1067 insertions(+), 302 deletions(-)
 create mode 100644 src/api/spc/itembasic/index.ts
 create mode 100644 src/views/spc/itembasic/index.vue
 create mode 100644 src/views/spc/itembasic/itembasic.data.ts

diff --git a/src/api/spc/itembasic/index.ts b/src/api/spc/itembasic/index.ts
new file mode 100644
index 0000000..2e0fe48
--- /dev/null
+++ b/src/api/spc/itembasic/index.ts
@@ -0,0 +1,77 @@
+import request from '@/config/axios'
+
+export interface ItembasicVO {
+  code: string
+  name: string
+  desc1: string
+  desc2: string
+  status: string
+  uom: string
+  altUom: string
+  isStdPack: string
+  enableBuy: string
+  enableMake: string
+  enableOutsourcing: string
+  isRecycled: string
+  isPhantom: string
+  abcClass: string
+  type: string
+  category: string
+  itemGroup: string
+  color: string
+  configuration: string
+  project: string
+  eqLevel: string
+  validityDays: number
+  userGroupCode: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: string
+  siteId: string
+}
+
+// 查询物品基本信息列表
+export const getItembasicPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/spc/itembasic/senior', data })
+  } else {
+    return await request.get({ url: `/spc/itembasic/page`, params })
+  }
+}
+
+// 查询物品基本信息详情
+export const getItembasic = async (id: number) => {
+  return await request.get({ url: `/spc/itembasic/get?id=` + id })
+}
+
+// 新增物品基本信息
+export const createItembasic = async (data: ItembasicVO) => {
+  return await request.post({ url: `/spc/itembasic/create`, data })
+}
+
+// 修改物品基本信息
+export const updateItembasic = async (data: ItembasicVO) => {
+  return await request.put({ url: `/spc/itembasic/update`, data })
+}
+
+// 删除物品基本信息
+export const deleteItembasic = async (id: number) => {
+  return await request.delete({ url: `/spc/itembasic/delete?id=` + id })
+}
+
+// 导出物品基本信息 Excel
+export const exportItembasic = async (params) => {
+  return await request.download({ url: `/spc/itembasic/export-excel`, params })
+}
+
+// 下载导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/spc/itembasic/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 5e4d26b..26def83 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -1,110 +1,13 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" :width="isBusiness?'60%':'40%'">
-    <Form ref="formRef" v-loading="formLoading" :rules="rules" :schema="formSchema" :is-col="true" >
-      <!-- <template #productItemCode="form">
-        <slot name="productItemCode" :param="form"></slot>
-      </template> -->
-      <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>
-      </template>
-      <template #productItemCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'productItemCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['productItemCode']" :placeholder="'请选择物料代码'" @click="opensearchTable('productItemCode', 'code')" />
-        </div>
-      </template>
-      <template #componentItemCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'componentItemCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['componentItemCode']" :placeholder="'请选择物料代码'" @click="opensearchTable('componentItemCode', 'code')" />
-        </div>
-      </template>
-      <template #supplierCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'supplierCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['supplierCode']" :placeholder="'请选择供应商代码'" @click="opensearchTable('supplierCode', 'code')" />
-        </div>
-      </template>
-      <template #productionLineCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'productionLineCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['productionLineCode']" :placeholder="'请选择生产线代码'" @click="opensearchTable('productionLineCode', 'code')" />
-        </div>
-      </template>
-      <template #fgLocationCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'fgLocationCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['fgLocationCode']" :placeholder="'请选择库位代码'" @click="opensearchTable('fgLocationCode', 'code')" />
-        </div>
-      </template>
-      <template #defaultWarehouseCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'defaultWarehouseCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['defaultWarehouseCode']" :placeholder="'请选择仓库代码'" @click="opensearchTable('defaultWarehouseCode', 'code')" />
-        </div>
-      </template>
-      <template #defaultLocationCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'defaultLocationCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['defaultLocationCode']" :placeholder="'请选择库位代码'" @click="opensearchTable('defaultLocationCode', 'code')" />
-        </div>
-      </template>
-      <template #customerCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'customerCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['customerCode']" :placeholder="'请选择客户代码'" @click="opensearchTable('customerCode', 'code')" />
-        </div>
-      </template>
-      <template #warehouseCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'warehouseCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['warehouseCode']" :placeholder="'请选择仓库代码'" @click="opensearchTable('warehouseCode', 'code')" />
-        </div>
-      </template>
-      <template #areaCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'areaCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['areaCode']" :placeholder="'请选择库区代码'" @click="opensearchTable('areaCode', 'code')" />
-        </div>
-      </template>
-      <template #locationGroupCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'locationGroupCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['locationGroupCode']" :placeholder="'请选择库位组代码'" @click="opensearchTable('locationGroupCode', 'code')" />
-        </div>
-      </template>
-      <template #rawLocationCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'rawLocationCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['rawLocationCode']" :placeholder="'请选择库位代码'" @click="opensearchTable('rawLocationCode', 'code')" />
-        </div>
-      </template>
-      <template #workshopCode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'workshopCode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['workshopCode']" :placeholder="'请选择车间代码'" @click="opensearchTable('workshopCode', 'code')" />
-        </div>
-      </template>
-      <template #outAreaCodes="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'outAreaCodes'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['outAreaCodes']" :placeholder="'请选择库区代码'" @click="opensearchTable('outAreaCodes', 'code')" />
-        </div>
-      </template>
-      <template #inAreaCodes="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'inAreaCodes'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['inAreaCodes']" :placeholder="'请选择库区代码'" @click="opensearchTable('inAreaCodes', 'code')" />
-        </div>
-      </template>
-      <template #customercode="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'customercode'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['customercode']" :placeholder="'请选择客户代码'" @click="opensearchTable('customercode', 'code')" />
-        </div>
-      </template>
-      <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>
-      </template>
-      <template #asnNumber="form" v-if="props.searchTableParams?.find((item:any) => (item.formField == 'asnNumber'))">
-        <div class="w-[100%] flex">
-          <el-input v-model="form['asnNumber']" :placeholder="'请选择发货单号'" @click="opensearchTable('asnNumber', 'asnNumber')" />
-        </div>
-      </template>
-            <template #poNumber="form" v-if="props.searchTableParams?.find((item: any) => (item.formField == 'poNumber'))">
-          <div class="w-[100%] flex">
-            <el-input v-model="form['poNumber']" :placeholder="'请选择发货单号'" @click="opensearchTable('poNumber', 'poNumber')" />
-          </div>
-        </template>
-    </Form>
+    <Form 
+      ref="formRef" 
+      v-loading="formLoading" 
+      :rules="rules" 
+      :schema="formSchema" 
+      :is-col="true"
+      @opensearchTable="opensearchTable"
+    />
     <div class="table" v-if="isBusiness && formType == 'create'">
       <TableForm ref="tableFormRef" 
         class="w-[100%]" 
@@ -132,7 +35,6 @@ import { SearchTable } from '@/components/SearchTable';
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
 import TableForm from '@/components/TableForm/src/TableForm.vue'
-import { string } from 'vue-types';
 
 const props = defineProps({
   // 校验rules 
@@ -165,11 +67,11 @@ const props = defineProps({
     default: null
   },
   // 查询参数
-  searchTableParams: {
-    type: Array,
-    required: false,
-    default: null
-  },
+  // searchTableParams: {
+  //   type: Array,
+  //   required: false,
+  //   default: null
+  // },
   // API——Vo
   apiVo: {
     type: Object,
@@ -219,18 +121,29 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formRef = ref() // 表单 Ref
 const formSchema = ref(props.formAllSchemas?.formSchema)
 
-
 /** 弹层操作 */
 // formField form表单中的字段
 // searchField 查询列表中的字段 
 // type 发起事件位置 type=tableForm 是明细中发起的 否则 为主表发起的 
+// searchCondition 查询条件
 const searchTableRef = ref()
-const opensearchTable = (formField, searchField, type, row) => {
-  const _searchTableParamsObject:any = props.searchTableParams.find((item:any) => (item.formField == formField))
-  const _searchTableTitle = _searchTableParamsObject.searchTableTitle
-  const _searchTableAllSchemas = _searchTableParamsObject.searchTableAllSchemas
-  const _searchTablePage = _searchTableParamsObject.searchTablePage
-  searchTableRef.value.open(_searchTableTitle, _searchTableAllSchemas, _searchTablePage, formField, searchField, type, row)
+const opensearchTable = (formField, searchField, searchTitle, searchAllSchemas, searchPage, type, row, searchCondition) => {
+  const _searchCondition = {}
+  // 判断查询条件中，是否存在指向主表的数据
+  if (searchCondition && searchCondition.length > 0) {
+    searchCondition.forEach(item => {
+      // 查询条件为主表某字段，需要赋值主表数据
+      if (item.isMainValue) {
+        _searchCondition[item.key] = formRef.value.formModel[item.value]
+      } else {
+        _searchCondition[item.key] = item.value
+      }
+    })
+  }
+  const _searchTableTitle = searchTitle
+  const _searchTableAllSchemas = searchAllSchemas
+  const _searchTablePage = searchPage
+  searchTableRef.value.open(_searchTableTitle, _searchTableAllSchemas, _searchTablePage, formField, searchField, type, row, _searchCondition)
 }
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
@@ -394,7 +307,16 @@ 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,
+    headerItem.tableForm.searchCondition
+  )
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 9066457..2e9c3d8 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -35,7 +35,7 @@
           v-model:pageSize="tableObject.pageSize"
           v-model:currentPage="tableObject.currentPage" >
           <template #action="{ row }">
-            <ButtonBase :Butttondata="buttondata(row)" @button-base-click="buttonTableClick($event, row)" />
+            <ButtonBase :Butttondata="buttondata" @button-base-click="buttonTableClick($event, row)" />
           </template>
         </Table>
       </ContentWrap>
@@ -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: {
@@ -221,6 +214,11 @@ const masterParmas=ref({
   status: '',//主表状态 用于控制子表新增编辑按钮显示情况
 })
 
+// 列表头部按钮
+const HeadButttondata = ref()
+// 列表-操作按钮
+const buttondata = ref()
+
 /** 打开弹窗 */
 const titleNameRef = ref()
 const titleValueRef = ref()
@@ -250,7 +248,16 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
       getRemarkList()
       getFileList()
       getChangeRecordList()
-
+      // 判断详情新增按钮是否显示
+      HeadButttondata.value = [
+        defaultButtons.defaultAddBtn({hide:isShowMainButton(row,['1','1','PLAN_PURCHASE_READY','1'])}), // 新增
+        defaultButtons.defaultFilterBtn(null), // 筛选
+      ]
+      // 动态显示操作列按钮
+      buttondata.value = [
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1','1','PLAN_PURCHASE_READY','1'])}), // 编辑
+        defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1','1','PLAN_PURCHASE_READY','1'])}), // 删除
+      ]
     } finally {
       detailLoading.value = false
     }
@@ -281,13 +288,20 @@ const getChangeRecordList = async () => {
 const { tableObject, tableMethods } = useTable({
   getListApi: props.apiPage // 分页接口
 })
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+
 // 获得表格的各种操作
 const { getList } = tableMethods
-// 列表头部按钮
-const HeadButttondata = ref([
-  defaultButtons.defaultAddBtn(null), // 新增
-  defaultButtons.defaultFilterBtn(null), // 筛选
-])
+
 // 头部按钮事件 
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
@@ -308,13 +322,7 @@ const buttonBaseClick = (val, item) => {
 // const updataTableColumns = (val) => {
 //   detailAllSchemas.tableColumns.value = val
 // }
-// 列表-操作按钮
-const buttondata = (row) => {
-  return [
-  defaultButtons.mainListEditBtn({ hide: masterParmas.value.status=='REQUEST_NEW'?false:true, hasPermi: 'wms:purchaseclaim-request-main:update' }), // 编辑
-    defaultButtons.mainListDeleteBtn({ hide: masterParmas.value.status=='REQUEST_NEW'?false:true, hasPermi: 'wms:purchaseclaim-request-main:delete' }), // 删除
-  ]
-}
+
 // 列表-操作按钮事件 
 const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
@@ -329,20 +337,13 @@ const openForm = async (type: string, row?: number) => {
   formRef.value.open(type, row, masterParmas.value)
 }
 // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-  nextTick(() => {
-    if (type == 'tableForm') {
-    } else {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      console.log(formField);
-      props.Echo.forEach((item)=>{
-        setV[item] = val[0][item]
-      })
-      formRef.setValues(setV)
-    }
-  })
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
 }
+// 传递给父类
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
@@ -359,7 +360,7 @@ const handleDelete = async (id: number) => {
 const searchFormClick = (searchData) => {
   tableObject.params = {
     isSearch: true,
-    filters: searchData.filters
+    filters: searchData.filters?searchData.filters:[{column: "masterId", action: "==", value: masterParmas.value.masterId}]
   }
   getList() // 刷新当前列表
 }
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 78b8fb2..d9430ac 100644
--- a/src/components/Form/src/Form.vue
+++ b/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,10 @@ export default defineComponent({
       return unref(elFormRef) as ComponentRef<typeof ElForm>
     }
 
+    const opensearchTable = (field, searchField,searchTitle,searchAllSchemas, searchPage, searchCondition) => {
+      emit('opensearchTable',field, searchField, searchTitle, searchAllSchemas, searchPage, searchCondition)
+    }
+
     expose({
       setValues,
       formModel,
@@ -126,7 +131,8 @@ export default defineComponent({
       delSchema,
       addSchema,
       setSchema,
-      getElFormRef
+      getElFormRef,
+      opensearchTable
     })
 
     // 监听表单结构化数组，重新生成formModel
@@ -213,6 +219,26 @@ export default defineComponent({
           )
         }
       }
+      
+      // 如果有 isSearchList: true ，使用查询弹层列表
+      const formItemSlotsSearchList: Recordable = setFormItemSlots(slots, item.field)
+      if (item?.componentProps?.isSearchList) {
+        formItemSlotsSearchList[item.field] = () => {
+          return (
+            <>
+            <ElInput class={'myInput'} v-model={formModel.value[item.field]} placeholder={item?.componentProps?.searchListPlaceholder} disabled={true} />
+            <ElButton icon={Search} onClick={()=>{
+              opensearchTable(
+                item.field, item?.componentProps?.searchField,
+                item?.componentProps?.searchTitle, 
+                item?.componentProps?.searchAllSchemas, 
+                item?.componentProps?.searchPage,
+                item?.componentProps?.searchCondition
+              )}}/>
+            </>
+          )
+        }
+      }
       return (
         <ElFormItem {...(item.formItemProps || {})} prop={item.field} label={item.label || ''}>
           {{
@@ -221,26 +247,27 @@ export default defineComponent({
               const Com = componentMap[item.component as string] as ReturnType<
                 typeof defineComponent
               >
-
               const { autoSetPlaceholder } = unref(getProps)
-
-              return slots[item.field] ? (
-                getSlot(slots, item.field, formModel.value)
-              ) : (
-                <Com
-                  vModel={formModel.value[item.field]}
-                  {...(autoSetPlaceholder && setTextPlaceholder(item))}
-                  {...setComponentProps(item)}
-                  style={item.componentProps?.style}
-                  {...(notRenderOptions.includes(item?.component as string) &&
-                  item?.componentProps?.options
-                    ? { options: item?.componentProps?.options || [] }
-                    : {})}
-                >
-                  {{ ...slotsMap }}
-                </Com>
-              )
-            }
+              // 查询弹层列表定义的插槽
+              return formItemSlotsSearchList[item.field] ? 
+                (getSlot(formItemSlotsSearchList, item.field, formModel.value)) : 
+                slots[item.field] ? (
+                    getSlot(slots, item.field, formModel.value)
+                  ) : (
+                    <Com
+                      vModel={formModel.value[item.field]}
+                      {...(autoSetPlaceholder && setTextPlaceholder(item))}
+                      {...setComponentProps(item)}
+                      style={item.componentProps?.style}
+                      {...(notRenderOptions.includes(item?.component as string) &&
+                      item?.componentProps?.options
+                        ? { options: item?.componentProps?.options || [] }
+                        : {})}
+                    >
+                      {{ ...slotsMap }}
+                    </Com>
+                  )
+            },
           }}
         </ElFormItem>
       )
@@ -296,12 +323,16 @@ export default defineComponent({
           }
         }}
       </ElForm>
+      
     )
   }
 })
 </script>
 
 <style lang="scss" scoped>
+.myInput{
+  width: calc(100% - 46px);
+}
 .#{$elNamespace}-form.#{$namespace}-form .#{$elNamespace}-row {
   margin-right: 0 !important;
   margin-left: 0 !important;
diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
index a2bfd46..a1561eb 100644
--- a/src/components/ImportForm/src/ImportForm.vue
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -1,16 +1,16 @@
 <!-- 导入组件 -->
 <template>
   <Dialog v-model="dialogVisible" title="导入" width="600">
-      <el-upload ref="uploadRef"  v-model:file-list="fileList" :action="importUrl + '?mode=' + mode + '&file=' + file + '&updatePart=' + updatePart"
+      <el-upload ref="uploadRef"  v-model:file-list="fileList" :action="importUrl + '?mode=' + mode + '&file=' + file + '&updatePart=' + updatePart + '&outFile=' + outFile"
       :auto-upload="false" :disabled="formLoading" :headers="uploadHeaders" :limit="1" :on-error="submitFormError"
       :on-exceed="handleExceed" :on-success="submitFormSuccess" :accept="accept" drag
       style="width:300px;margin:0 auto">
       <Icon icon="ep:upload-filled" color="#c0c4cc" size="60" />
       <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
       <template #tip>
-        <div class="el-upload__tip ml--80px mr--80px">
+        <div class="el-upload__tip ml--126px mr--80px">
           <div class="flex">
-            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px" style="line-height:32px">导入模式</div>
+            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px  w-100px text-right" style="line-height:32px">导入模式</div>
             <div class="">
               <div class="radio">
                 <el-radio-group v-model="mode">
@@ -28,18 +28,25 @@
             </div>
           </div>
           <div class="flex mt-16px">
-            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px" style="line-height:32px">部分保存</div>
+            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right" style="line-height:32px">部分保存</div>
             <div class="">
               <div class="switch">
                 <el-switch v-model="updatePart" />
               </div>
-
               <div class="tips color-#acaeb3 font-size-14px">
                 <div class="mt-2">部分保存：如存在错误数据，正确数据正常导入</div>
                 <div class="mt-2">全部保存：全部数据正确，才能导入</div>
               </div>
             </div>
           </div>
+          <div class="flex mt-16px" v-if="isShowOut">
+            <div class="label h-32px mr-26px color-#acaeb3 font-size-14px w-100px text-right" style="line-height:32px">是否外部资源</div>
+            <div class="">
+              <div class="switch">
+                <el-switch v-model="outFile" />
+              </div>
+            </div>
+          </div>
         </div>
       </template>
     </el-upload>
@@ -54,7 +61,6 @@
         <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="dialogVisible = false">取 消</el-button>
       </div>
-
     </template>
   </Dialog>
 </template>
@@ -114,12 +120,23 @@ const file = ref('')
   updatePart: {
     type: Boolean,
     required: false,
-    default: true
+    default: false
   },
   url:{
     type: String,
     required: false,
-  }
+  },
+  // 显示是否外部资源
+  isShowOut: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  outFile: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
 })
 const importTemplateData= ref(props.importTemplateData)
 const  accept= ref(props.accept)
@@ -128,6 +145,7 @@ const updateIsDisable = ref(props.updateIsDisable)//更新是否禁用,默认值
 const appendIsDisable = ref(props.appendIsDisable)//追加是否禁用,默认值不禁用
 const coverIsDisable = ref(props.coverIsDisable)//覆盖是否禁用,默认值不禁用
 const updatePart = ref(props.updatePart)//是否部门保存
+const outFile = ref(props.outFile)//是否引入外部资源
 
 const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + props.url
diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
index d93afba..7f5d73a 100644
--- a/src/components/SearchHigh/src/SearchHigh.vue
+++ b/src/components/SearchHigh/src/SearchHigh.vue
@@ -23,20 +23,20 @@
           <!-- 数字输入框 -->
           <el-input-number v-else-if="getInputType(item.column) == 'inputNumber'" v-model="item.value" :precision="6"  :disabled="item.disabled"/>
           <!-- 下拉框 -->
-          <el-select v-else-if="getInputType(item.column) == 'select'" v-model="item.value" placeholder="请选择内容" :filterable="true" clearable :disabled="item.disabled">
+          <el-select v-else-if="getInputType(item.column) == 'select'" v-model="item.value1" placeholder="请选择内容" :filterable="true" clearable :disabled="item.disabled" :multiple="item.action=='in' || item.action=='notIn' ? true : false" collapse-tags collapse-tags-tooltip :key="item.action">
             <el-option v-for="dict in initSelectOptions(item.column)" :key="dict.value" :label="dict.label"
             :value="dict.value" />
             <!-- <el-option v-for="(op, index) in initSelectOptions(item.column)" :label="op[item.optionsLabel] || op.label"
               :value="op[item.optionsValue] || op.value" :key="index" /> -->
           </el-select>
           <!-- 时间 -->
-          <el-time-picker v-else-if="getInputType(item.column) == 'time'" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" v-model="item.time"  style="width: 340px;margin-right: 20px;" :disabled="item.disabled"/>
+          <el-time-picker v-else-if="getInputType(item.column) == 'time'" range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" v-model="item.value1"  style="width:  calc(100% - 20px);margin-right: 10px;" :disabled="item.disabled"/>
           <!-- 日期 -->
-          <el-date-picker v-else-if="getInputType(item.column) == 'date'" v-model="item.time" type="daterange"
-           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 340px;margin-right: 20px;" @change="changeDateTimePicker($event, item,'daterange')" value-format="YYYY-MM-DD"  format="YYYY/MM/DD" :disabled="item.disabled"/>
+          <el-date-picker v-else-if="getInputType(item.column) == 'date'" v-model="item.value1" type="daterange"
+           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" style="width:  calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item,'daterange')" value-format="YYYY-MM-DD"  format="YYYY/MM/DD" :disabled="item.disabled"/>
           <!-- 日期时间 -->
-          <el-date-picker v-else-if="getInputType(item.column) == 'datePicker'" v-model="item.time" type="datetimerange"
-            range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间"  style="width: 340px;" @change="changeDateTimePicker($event, item, 'datetimerange')" value-format="x"  format="YYYY/MM/DD HH:mm:ss" :disabled="item.disabled"/>
+          <el-date-picker v-else-if="getInputType(item.column) == 'datePicker'" v-model="item.value1" type="datetimerange"
+            range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间"  style="width: calc(100% - 20px);margin-right: 10px;" @change="changeDateTimePicker($event, item, 'datetimerange')" value-format="x"  format="YYYY/MM/DD HH:mm:ss" :disabled="item.disabled"/>
         </div>
         <!-- 删除条件按钮 -->
         <el-button type="danger" :icon="Minus" circle size="small"
@@ -178,7 +178,7 @@ const moreListPush = () => {
     column: '',
     action: "==",
     value: "",
-    time:''
+    value1 :""
   }
   moreListData.value.filters.push(data)
 }
@@ -187,13 +187,13 @@ const moreListPush = () => {
 const resetSelect = (val) => {
    if (getInputType(val.column) == 'datePicker' || getInputType(val.column) == 'date') {
     val.action = 'betweeen'
-    val.value = ""
     val.disabled = false
   }else{
     val.action = '=='
-    val.value = ""
     val.disabled = false
   }
+  val.value1 = ""
+  val.value = ""
 }
 // 范围改变
 const actionSelect = (val)=>{
@@ -202,6 +202,12 @@ const actionSelect = (val)=>{
   }else{
     val.disabled = false
   }
+  val.value1 = undefined
+  nextTick(()=>{
+    val.value1 =[]
+    val.value = ''
+  })
+  
 }
 
 // 查询 重置按钮事件
@@ -209,11 +215,21 @@ const buttonBaseClick = (val) => {
   if (val == 'search') { // 查询
     let data = []
     moreListData.value.filters.forEach(item => {
-      let obj = {
-        column: item.column,
-        action: item.action,
-        value: item.value,
+      let obj = {}
+      if(item.value1&&item.value1.length>0){
+        obj = {
+          column: item.column,
+          action: item.action,
+          value:Array.isArray(item.value1)?item.value1.join(','):item.value1,
+        }
+      }else{
+        obj = {
+          column: item.column,
+          action: item.action,
+          value:item.value,
+        }
       }
+      
       data.push(obj)
     })
     if (props.masterId){
@@ -229,6 +245,8 @@ const buttonBaseClick = (val) => {
   } else if (val == 'searchReset') { // 重置
     moreListData.value = {filters:[]}
     moreListPush()
+    // 重置筛选项及数据列表同时关闭筛选框
+    emit('searchFormClick', {})
   }
 }
 
@@ -281,19 +299,19 @@ defineExpose({
    }
 
    .rowInnerItem {
-     margin-right: 20px;
-     width: 220px;
+     margin-right: 10px;
+     width: 20%;
 
      .el-input__wrapper {
-       width: 220px;
+       width:100%;
      }
    }
    .rowInnerItem1{
-    margin-right: 20px;
-     width: 360px;
+    margin-right: 10px;
+     width: 50%;
 
      .el-input__wrapper {
-       width: 340px;
+       width:100%;
      }
    }
    .moreListBaseBts {
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 139627b..1575a41 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -1,20 +1,30 @@
 <template>
   <Dialog :title="dialogTitle" v-model="searchDialogVisible" :width="'80%'">
-      <!-- 搜索工作栏 -->
-    <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" />
-    <Table
-      ref="searchTableRef"
-      :columns="tableColumns"
-      :data="tableObjectRef.tableList"
-      :loading="tableObjectRef.loading"
-      :pagination="{
-        total: tableObjectRef.total
-      }"
-      v-model:pageSize="tableObjectRef.pageSize"
-      v-model:currentPage="tableObjectRef.currentPage"
-      v-model:sort="tableObjectRef.sort"
-      :selection="true"
+    <!-- 搜索工作栏 -->
+    <!-- <Search :schema="searchSchema" @search="setSearchParamsRef" @reset="setSearchParamsRef" /> -->
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      :routeName="routeName"
+      @searchFormClick="searchFormClick"
+      :allSchemas="allSchemasRef"
     />
+    <ContentWrap>
+      <Table
+        ref="searchTableRef"
+        :columns="tableColumns"
+        :data="tableObjectRef.tableList"
+        :loading="tableObjectRef.loading"
+        :pagination="{
+          total: tableObjectRef.total
+        }"
+        v-model:pageSize="tableObjectRef.pageSize"
+        v-model:currentPage="tableObjectRef.currentPage"
+        v-model:sort="tableObjectRef.sort"
+        :selection="true"
+      />
+    </ContentWrap>
     <template #footer>
       <div class="flex items-center">
         <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -24,14 +34,26 @@
   </Dialog>
 </template>
 <script setup lang="ts">
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
 // 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 HeadButttondata = [
+  defaultButtons.defaultFilterBtn(null), // 筛选
+]
+
 /** 打开弹窗 */
+const getListRef = ref()
 const setSearchParamsRef = ref()
 const tableObjectRef = ref()
 const getPage:any = ref()
@@ -41,12 +63,14 @@ const formFieldRef = ref()
 const searchFieldRef = ref()
 const typeRef = ref()
 const rowRef = ref()
-const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any, type: any, row: any ) => {
+const allSchemasRef = ref()
+const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any, type: any, row: any, searchCondition:any ) => {
   searchDialogVisible.value = true
   formFieldRef.value = formField
   searchFieldRef.value = searchField
+  allSchemasRef.value = allSchemas
   searchSchema.value = allSchemas.searchSchema
-  tableColumns.value = allSchemas.tableColumns
+  tableColumns.value = allSchemas.tableColumns.filter(item => (item.field !== 'action'))
   getPage.value = getApiPage
   typeRef.value = type
   rowRef.value = row
@@ -56,12 +80,23 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
     getListApi: getPage.value // 分页接口
   })
   tableObjectRef.value = tableObject
+  if (searchCondition) tableObjectRef.value.params = searchCondition
   // 获得表格的各种操作
   const { getList, setSearchParams } = tableMethods
   setSearchParamsRef.value = setSearchParams
+  getListRef.value = getList
   getList()
 }
 
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObjectRef.value.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getListRef.value() // 刷新当前列表
+}
+
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 // Table 组件 ref
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 13528fd..0616da1 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -57,16 +57,16 @@
           <!-- 字符串输入框 -->
           <el-form-item 
             v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'"
-            :prop="headerItem.field">
+            :prop="headerItem.field" style="display: flex;align-items: center;">
             <el-input 
               v-model="row[headerItem.field]"
               clearable
               :type="headerItem?.tableForm?.inputType"
               :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
-              :disabled="itemIsDisabled(headerItem, row)" 
-              style="width: 100%;" 
-              @click="inpuFocus(headerItem,row,index)"
+              :disabled="headerItem?.tableForm?.disabled ? true: headerItem?.tableForm?.isInpuFocusShow ? true : false" 
+              style="flex:1" 
             />
+            <el-button  v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
           </el-form-item>
           <!-- 金额输入框 -->
             <el-form-item 
@@ -91,6 +91,7 @@
               v-model="row[headerItem.field]" 
               :max="headerItem?.tableForm?.max"
               :min="headerItem?.tableForm?.min" 
+              :precision="headerItem?.tableForm?.precision" 
               :disabled="itemIsDisabled(headerItem, row)" 
             />
           </el-form-item>
diff --git a/src/components/TableHead/src/TableHead.vue b/src/components/TableHead/src/TableHead.vue
index 241d344..9fbe9fc 100644
--- a/src/components/TableHead/src/TableHead.vue
+++ b/src/components/TableHead/src/TableHead.vue
@@ -8,27 +8,19 @@
         />
       </div>
       <div class="tableNavRightBtns">
-        <!-- 快速搜索 -->
-        <!-- <SearchNormal 
-          ref="quicklySearchDom_Ref"
-          :vueName="vueName"
-          :quicklySearchOption="quicklySearchOption"
-          @searchNormalClick="quicklySearchClick"
-          @searchNormalClear="quicklySearchClear"
-          style="margin-right: 15px;"
-        ></SearchNormal> -->
         <!-- 右侧按钮 -->
-        <ButtonBase :Butttondata="buttonsRight" @button-base-click="buttonBaseClick" />
+        <ButtonBase :Butttondata="buttonsRight" @button-base-click="buttonBaseClick" @updata-table-columns="updataTableColumns"
+    :allSchemas="allSchemas" ref="rowDropRef"/>
       </div>
     </div>
     <slot></slot>
   </div>
   <!-- 字段设置弹窗 -->
-  <rowDrop 
+  <!-- <rowDrop 
     ref="rowDropRef"
     @updata-table-columns="updataTableColumns"
     :allSchemas="allSchemas"
-  />
+  /> -->
   <!-- 高级筛选 -->
   <SearchHigh
     ref="searchHigh_Ref"
@@ -83,6 +75,8 @@ import rowDrop from "@/components/rowDrop/index.vue"
   // const defaultButtons = inject('global').defaultButtons
   // 创建左右按钮数据
   const buttonsLeftOrRight = () => {
+    buttonsRight.value = []
+    buttonsLeft.value = []
     // 判断是否有筛选按钮(判断筛选按钮的逻辑位置，影响筛选按钮的位置)
     // let _primarySearchOption = primarySearch[props.vueName]
     // let _highSearchOption = highSearch[props.vueName]
@@ -100,12 +94,17 @@ import rowDrop from "@/components/rowDrop/index.vue"
   }
   buttonsLeftOrRight()
 
+watch(
+  () => props.HeadButttondata,
+  () => {
+    buttonsLeftOrRight()
+  }
+)
+
 
   // 传递给父类
   const emit = defineEmits([
     'buttonBaseClick',
-    'quicklySearchClick',
-    'quicklySearchClear',
     'updataTableColumns',
     'searchFormClick'
   ])
@@ -117,7 +116,7 @@ import rowDrop from "@/components/rowDrop/index.vue"
   const buttonBaseClick = (val, item) => {
     // 设置按钮 
     if (val == 'set') {
-      rowDropRef.value.popoverVisible = true
+      rowDropRef.value.popoverVisible = !rowDropRef.value.popoverVisible
     } else if (val == 'filtrate') {
       searchHigh_Ref.value.popoverVisible = true
     } else {
@@ -125,16 +124,6 @@ import rowDrop from "@/components/rowDrop/index.vue"
     }
   }
 
-  // 快速搜索事件
-  const quicklySearchClick = (val, option) => {
-    emit('quicklySearchClick', val, option)
-  }
-
-  // 快速搜索清空事件
-  const quicklySearchClear = (val, option) => {
-    emit('quicklySearchClear', val, option)
-  }
-
   const quicklySearchDom_Ref = ref()
 
   // 筛选组件
@@ -158,13 +147,15 @@ import rowDrop from "@/components/rowDrop/index.vue"
     display: flex;
     justify-content: space-between;
   }
-
+.tableNavLeftBtns{
+  display: flex;
+  
+  margin-left: -5px;
+}
   .tableNavRightBtns{
     display: flex;
     margin-left: 10px;
-    .currenButton .el-button {
-      margin-left: 10px !important;
-    }
+    margin-right: -5px;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/components/XButton/src/ButtonBase.vue b/src/components/XButton/src/ButtonBase.vue
index 90ed9a2..490bae6 100644
--- a/src/components/XButton/src/ButtonBase.vue
+++ b/src/components/XButton/src/ButtonBase.vue
@@ -1,38 +1,95 @@
 <template>
-  <el-button 
-    v-for="(item, index) in Butttondata" :key="index"
-    v-show="!item.hide"
-    :type="item.type" 
-    :color="item.color"
-    :link = "item.link ? item.link : false" 
-    v-hasPermi="[item.hasPermi] || []"
-    @click="buttonBaseClick(item.name,item,$event)"
-  >
-  <Icon v-if="item.icon" :icon="item.icon" class="mr-1px" />
-  {{ item.label }}
-  </el-button>
+  <div v-for="(item, index) in Butttondata" :key="index" class="btn-div">
+    <el-button
+      v-show="!item.hide"
+      :type="item.type"
+      :color="item.color"
+      :link="item.link ? item.link : false"
+      v-hasPermi="[item.hasPermi] || []"
+      v-if="item.name != 'set'"
+      @click="buttonBaseClick(item.name, item, $event)"
+    >
+      <Icon v-if="item.icon" :icon="item.icon" class="mr-1px" />
+      {{ item.label }}
+    </el-button>
+    <!-- 设置按钮 -->
+    <el-popover
+      :visible="popoverVisible"
+      placement="bottom"
+      :width="300"
+      trigger="click"
+      v-if="item.name == 'set'&&!item.hide"
+    >
+      <rowDrop
+        ref="rowDropRef"
+        @updata-table-columns="updataTableColumns"
+        :allSchemas="allSchemas"
+        @closeRowDrop="closeRowDrop"
+        @updataTableColumns="updataTableColumns"
+      />
+      <template #reference>
+        <el-button
+          v-show="!item.hide"
+          :type="item.type"
+          :color="item.color"
+          :link="item.link ? item.link : false"
+          v-hasPermi="[item.hasPermi] || []"
+          @click="buttonBaseClick(item.name, item, $event)"
+        >
+          <Icon v-if="item.icon" :icon="item.icon" class="mr-1px" />
+          {{ item.label }}
+        </el-button>
+      </template>
+    </el-popover>
+  </div>
   <slot></slot>
 </template>
 <script setup>
- import { Plus } from '@element-plus/icons-vue'
- import { clearButtonBlurHandle } from '@/utils/index'
-  const props = defineProps({
-    Butttondata: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-  })
+import { Plus } from '@element-plus/icons-vue'
+import { clearButtonBlurHandle } from '@/utils/index'
+import rowDrop from '@/components/rowDrop/index.vue'
+const props = defineProps({
+  Butttondata: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  allSchemas: {
+    type: Object,
+    default: null
+  }
+})
+
+// 传递给父类
+const emit = defineEmits(['buttonBaseClick', 'updataTableColumns'])
 
-  // 传递给父类
-  const emit = defineEmits([
-    'buttonBaseClick',
-  ])
+const buttonBaseClick = (val, item, $event) => {
+  clearButtonBlurHandle($event) //解决el-button点击后颜色不恢复问题
+  emit('buttonBaseClick', val, item, $event)
+}
+const popoverVisible = ref(false)
+// 关闭页面
+const closeRowDrop = () => {
+  popoverVisible.value = false
+}
+defineExpose({
+  popoverVisible
+})
+// 更新主列表字段
+const updataTableColumns = (val) => {
+  emit('updataTableColumns', val)
+}
+</script>
+<style scoped lang="scss">
+.btn-div{
+  display: inline;
 
-  const buttonBaseClick = (val, item, $event) => {
-    clearButtonBlurHandle($event)//解决el-button点击后颜色不恢复问题
-    emit('buttonBaseClick', val, item, $event)
+  ::v-deep(.el-button){
+    margin: 0px 5px;
+  }
+  ::v-deep(.el-button.is-link){
+    margin: 0px;
   }
-  
-</script>
\ No newline at end of file
+}
+</style>
\ No newline at end of file
diff --git a/src/components/rowDrop/index.vue b/src/components/rowDrop/index.vue
index e75fb9d..6dafda5 100644
--- a/src/components/rowDrop/index.vue
+++ b/src/components/rowDrop/index.vue
@@ -1,20 +1,22 @@
 <template>
-  <Dialog title="字段设置"  width="270" v-model="popoverVisible" :scroll="true" :maxHeight="500">
+  <!-- <Dialog title="字段设置"  width="270" v-model="popoverVisible" :scroll="true" :maxHeight="500"> -->
     <div class="test_wrapper" @dragover="dragover($event)">
       <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handlecheckallchange">全部</el-checkbox>
-        <el-checkbox-group v-model="checkedDataList" @change="handlecheckedchange">
-          <draggable :list="allData" :force-fallback="true" chosen-class="chosen" animation="300" @end="dragend" @update="dragenter" >
-            <template #item="{element}">
-              <div><el-checkbox :key="element" :label="element">{{element}}</el-checkbox></div>
-            </template>
-          </draggable>
-        </el-checkbox-group>
+      <el-checkbox-group v-model="checkedDataList" @change="handlecheckedchange">
+        <draggable :list="allData" :force-fallback="true" chosen-class="chosen" animation="300" @end="dragend" @update="dragenter" >
+          <template #item="{element}">
+            <div><el-checkbox :key="element" :label="element">{{element}}</el-checkbox></div>
+          </template>
+        </draggable>
+      </el-checkbox-group>
     </div>
-    <template #footer>
+    <div class="footer">
+    <!-- <template #footer> -->
       <el-button size="small" @click="reset">重置</el-button>
       <el-button size="small" @click="closeRowDrop">关闭</el-button>
-    </template>
-  </Dialog>
+    <!-- </template> -->
+  </div>
+  <!-- </Dialog> -->
 </template>
 <script setup lang="ts">
 import { ElMessageBox } from 'element-plus'
@@ -68,7 +70,7 @@ const reset = () => {
 
 // 关闭页面
 const closeRowDrop = () => {
-  popoverVisible.value = false
+  emit('closeRowDrop')
 }
 
 // 保存
@@ -153,7 +155,20 @@ const initSelectSta = () => {
       })
       
       _showTableColumns.push(_myTableColumns[_myTableColumns.length-1])
+      if(checkedDataList.value.length>0){
+        if(allData.value?.length != checkedDataList.value.length){
+          isIndeterminate.value = true
+        }else{
+          isIndeterminate.value = false
+          checkAll.value = true
+        }
+      }else{
+        isIndeterminate.value = false
+        checkAll.value = false
+      }
+     
       updataTableColumns(_showTableColumns)
+     
     } else { // 无缓存
       checkedDataList.value = []
       allData.value = []
@@ -182,7 +197,8 @@ const updataTableColumns = (val) => {
 
 // 传递给父类
 const emit = defineEmits([
-  'updataTableColumns'
+  'updataTableColumns',
+  'closeRowDrop'
 ])
 
 /** 初始化 **/
@@ -196,10 +212,25 @@ defineExpose({
 
 </script>
 <style lang="scss" scoped>
-// .buttonsBox {
-//   text-align: center;
-//   margin: 0;
-//   padding: 15px;
-//   border-top: #eee solid 1px;
-// }
+.test_wrapper{
+  max-height: calc(100vh - 350px);
+  overflow-y: auto;
+}
+.footer{
+  margin-top: 10px;
+}
+.el-checkbox-group ::v-deep(.el-checkbox .el-checkbox__inner){
+  background: url(../../assets/imgs/Eyes-closed.png) no-repeat 0px 0px;
+  background-size: 16px;
+  width: 16px;
+  height: 16px;
+  border: none;
+}
+.el-checkbox-group ::v-deep(.el-checkbox .is-checked .el-checkbox__inner){
+  background: url(../../assets/imgs/eye.png) no-repeat 0px 0px;
+  background-size: 16px;
+  width: 16px;
+  height: 16px;
+  border: none;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/spc/itembasic/index.vue b/src/views/spc/itembasic/index.vue
new file mode 100644
index 0000000..1001036
--- /dev/null
+++ b/src/views/spc/itembasic/index.vue
@@ -0,0 +1,228 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Itembasic.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Itembasic.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="getList"
+    :rules="ItembasicRules"
+    :formAllSchemas="Itembasic.allSchemas"
+    :searchTableParams="searchTableParams"
+    :apiUpdate="ItembasicApi.updateItembasic"
+    :apiCreate="ItembasicApi.createItembasic"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Itembasic.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/spc/itembasic/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Itembasic,ItembasicRules } from './itembasic.data'
+import * as ItembasicApi from '@/api/spc/itembasic'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'Itembasic' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Itembasic.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ItembasicApi.getItembasicPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:itembasic:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:itembasic:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:itembasic:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:itembasic:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:itembasic:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicItembasic')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ItembasicApi.deleteItembasic(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ItembasicApi.exportItembasic(setSearchParams)
+    download.excel(data, '物品基本信息.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '物品基本信息导入模版.xls'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ItembasicApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/spc/itembasic/itembasic.data.ts b/src/views/spc/itembasic/itembasic.data.ts
new file mode 100644
index 0000000..0434d79
--- /dev/null
+++ b/src/views/spc/itembasic/itembasic.data.ts
@@ -0,0 +1,355 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ItembasicRules = reactive({
+  code: [required],
+  status: [required],
+  uom: [required],
+  isStdPack: [required],
+  enableBuy: [required],
+  enableMake: [required],
+  enableOutsourcing: [required],
+  isRecycled: [required],
+  isPhantom: [required],
+  abcClass: [required],
+  type: [required],
+  validityDays: [required],
+  available: [required]
+})
+
+export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '描述1',
+    field: 'desc1',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '描述2',
+    field: 'desc2',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+      dictType: DICT_TYPE.ITEM_STATUS,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '替代计量单位',
+    field: 'altUom',
+    sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '是否标包',
+    field: 'isStdPack',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '可采购',
+    field: 'enableBuy',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '可制造',
+    field: 'enableMake',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '可委外加工',
+    field: 'enableOutsourcing',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '回收件',
+    field: 'isRecycled',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '虚零件',
+    field: 'isPhantom',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: 'ABC类',
+    field: 'abcClass',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '种类',
+    field: 'category',
+    sort: 'custom',
+      dictType: DICT_TYPE.ITEM_CATEGORY,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '分组',
+    field: 'itemGroup',
+    sort: 'custom',
+      dictType: DICT_TYPE.ITEM_GROUP,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '颜色',
+    field: 'color',
+    sort: 'custom',
+      dictType: DICT_TYPE.ITEM_COLOR,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '配置',
+    field: 'configuration',
+    sort: 'custom',
+      dictType: DICT_TYPE.ITEM_CONFIGURATION,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '项目',
+    field: 'project',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '质量等级',
+    field: 'eqLevel',
+    sort: 'custom',
+      dictType: DICT_TYPE.EQ_LEVEL,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: true,
+                form: {
+                  component: 'SelectV2'
+                }
+  },
+  {
+    label: '有效天数',
+    field: 'validityDays',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '用户组代码',
+    field: 'userGroupCode',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    }
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    }
+  },
+  {
+    label: '删除者ID',
+    field: 'deleterId',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))