diff --git a/src/components/LowDesign/src/LowReport/index.vue b/src/components/LowDesign/src/LowReport/index.vue
index 4c16134..311f635 100644
--- a/src/components/LowDesign/src/LowReport/index.vue
+++ b/src/components/LowDesign/src/LowReport/index.vue
@@ -24,6 +24,7 @@
       @current-change="currentChange"
       @selection-change="selectionChange"
       @sort-change="sortChange"
+      @row-click="handleRowClick"
     >
     <template #search>
       <!--  <div v-if="isSearch" style="margin-bottom:6px">查询：</div>  -->
@@ -48,6 +49,14 @@
         </ElButton>
         <div ref="tableHeightRef"></div>
       </template>
+  
+
+      <template #expand="scope" v-if="reportCode === 'production_batch'" >
+      <!-- 这里写你自定义的展开内容 -->
+        <otherReport reportCode="material_info" @select-row-change="handleSelectRowChange" :row="scope.row" />
+        <otherReport ref="inventoryAccountRef" reportCode="inventory_account" v-if="selectRow.material_id" :row="selectRow" />
+
+      </template>
       <template  v-for="prop in searchReportSlots" :key="prop" #[`${prop}-search`]="scope" >
       <div>
         <el-select
@@ -209,6 +218,9 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import Avue from '@smallwei/avue'
 import { Console } from 'console'
 import { ruleLeng } from '../utils/util'
+import otherReport from './other.vue'
+const inventoryAccountRef=ref<any>({})
+const selectRow=ref<any>({})
 defineOptions({ name: 'LowReport' })
 
 interface Props {
@@ -242,6 +254,14 @@ const changeMonths=(val:any)=>{
   })
   
 }
+const handleSelectRowChange=(row:any)=>{
+  if(selectRow.value.material_id==row.material_id){
+    selectRow.value={}
+  }else{
+    selectRow.value=row
+    // inventoryAccountRef.value.getTableData()
+  }
+}
 const tableSaleInfo=ref<any>([])
 const tableSaleSearch=ref<any>({})
 const tableSalePage = ref<any>({ currentPage: 1, pageSize: 20, total: 0 })
@@ -315,6 +335,19 @@ const permissions =
 const selectIds = computed(() => {
   return tableSelect.value.map((item) => item['id'])
 })
+// 整行点击展开/收起
+const handleRowClick = (row) => {
+  if (props.reportCode !== 'production_batch') return
+
+  const currentKey = row.product_id
+
+  if (tableOption.value&&tableOption.value.expandRowKeys.length&&tableOption.value.expandRowKeys.includes(currentKey)) {
+    tableOption.value.expandRowKeys = [] // 关闭
+  } else if(tableOption.value) {
+    tableOption.value.expandRowKeys = [currentKey] // 只展开当前行
+    selectRow.value={}
+  }
+}
 const openSaleDetail=(row)=>{
   
   tableSalePage.value={
@@ -590,6 +623,10 @@ const initTable = async () => {
     // stripe: reportVo.tableConfig.includes('stripe'),
     showSummary:false,
     stripe:true,
+    expand:props.reportCode=='production_batch'?true:false,
+    expandWidth:1,
+    rowKey:props.reportCode=='production_batch'?'product_id':undefined,
+    expandRowKeys:[],
     searchShow:props.reportCode=='zhxs-hz'?false:true,
     searchShowBtn:props.reportCode=='zhxs-hz'?false:true,
     searchBtnText:'查询',
@@ -1166,6 +1203,8 @@ const getTableData = async (isLoading = true) => {
     } finally {
 
       if (isLoading) loading.value = false
+      selectRow.value={}
+      tableOption.value.expandRowKeys=[]
       resolve()
     }
   })
@@ -1278,6 +1317,7 @@ defineExpose({
   loading,
   clearSelection,
   resetChange:clearSearch,
+ 
   initTableLayout
 })
 </script>
diff --git a/src/components/LowDesign/src/LowReport/other.vue b/src/components/LowDesign/src/LowReport/other.vue
new file mode 100644
index 0000000..b9d1871
--- /dev/null
+++ b/src/components/LowDesign/src/LowReport/other.vue
@@ -0,0 +1,1375 @@
+<template>
+  <div
+    v-if="isInit"
+    class="low-reoprt"
+    :class="[`low-report__${reportCode}`, { summary: tableOption.showSummary }]"
+  >
+   
+    <avue-crud
+      ref="crudRef"
+      v-model:search="tableSearch"
+      :table-loading="loading"
+      :data="tableData"
+      :option="tableOption"
+      v-bind="crudBind"
+      :summary-method=summaryMethod1
+      :row-style="rowStyleMethod"
+      :span-method="reportCode=='zhxs-hz'? spanMethod:null"
+      :cell-class-name="cellClassNameMethod"
+      :header-cell-class-name="headerCellClassNameMethod"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @refresh-change="refreshChange"
+      @size-change="sizeChange"
+      @current-change="currentChange"
+      @selection-change="selectionChange"
+      @sort-change="sortChange"
+      @row-click="handleRowClick"
+    >
+
+    <template #search>
+      <!--  <div v-if="isSearch" style="margin-bottom:6px">查询：</div>  -->
+    </template>
+      <!-- 自定义表格头部操作 -->
+      <template #menu-left="{ size }">
+        <ElButton
+          type="primary"
+          :size="size"
+          :loading="exportLoading"
+          @click="exportTableData"
+          v-if="
+            tableInfo.isHideExport !== true &&
+            (!tableInfo.isPermi ||
+              permissions === false ||
+              (tableInfo.isPermi &&
+                permissions.includes(`lideeyunji:report-data:export:${reportCode}`)))
+          "
+        >
+          <Icon :size="14" icon="clarity:export-line"></Icon>
+          <span>{{ t('Avue.crud.excelBtn') }}</span>
+        </ElButton>
+        <div ref="tableHeightRef"></div>
+      </template>
+      <template  v-for="prop in searchReportSlots" :key="prop" #[`${prop}-search`]="scope" >
+      <div>
+        <el-select
+        v-model="tableSearch[prop]"
+        :multiple="scope.column.multiple"
+        filterable
+        remote
+        remote-show-suffix
+        clearable
+        :disabled="loading"
+        :collapse-tags="scope.column.collapseTags"
+        :collapse-tags-tooltip="scope.column.collapseTagsTooltip"
+        :placeholder="'请选择'+scope.column.label"
+        :remote-method="(query) => remoteMethod(query, scope.column)"
+      >
+        <el-option
+          v-for="(item,index) in scope.column.dicData"
+          :key="index"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+      </div>
+      </template>
+      <template v-for="prop in Object.keys(textAlignFiels)" :key="prop" #[`${prop}`]="scope">
+        <div  v-if="textAlignFiels[prop]" >
+          <span>
+            {{scope.row[prop]}}/
+            <div>{{scope.row[newProps[prop]]}}</div>
+          </span>
+        </div>
+        <div v-else>{{scope.row[prop]}}</div>
+      </template>
+      <template #stdGoodsName=scope>
+        
+        <span v-if="reportCode=='ZHXS_KD' || reportCode=='ZHXSQK'" @click="openSaleDetail(scope.row)" style="color: rgb(64, 158, 255);cursor: pointer;">{{scope.row.stdGoodsName}}</span> 
+        <span v-else> {{scope.row.stdGoodsName}}</span>
+      </template>
+
+      <template #customName=scope>
+        
+        <span v-if="reportCode=='ZHXS_KD' || reportCode=='ZHXSQK'" @click="openSaleDetail(scope.row)" style="color: rgb(64, 158, 255);cursor: pointer;">{{scope.row.customName}}</span> 
+        <span v-else> {{scope.row.customName}}</span>
+      </template>
+      <template v-if="reportCode=='ZHXSQK'||reportCode=='ZHXS_KD'" #zoneName=scope>
+        <span  @click="openSaleDetail(scope.row)" style="color: rgb(64, 158, 255);cursor: pointer;">{{scope.row.zoneName}}</span> 
+      </template>
+      <template #salerName=scope>
+         <span  @click="openSaleDetail(scope.row)" style="color: rgb(64, 158, 255);cursor: pointer;">{{scope.row.salerName}}</span> 
+      </template>
+      <template v-for="prop in numberRange" :key="prop" #[`${prop}-search`]="scope">
+        <InputNumberRange
+          v-model="tableSearch[prop]"
+          :size="scope.size"
+          :column="scope.column"
+        ></InputNumberRange>
+      </template>
+
+      <template v-for="prop in dateRange" :key="prop" #[`${prop}-search`]="scope">
+         <InputDateRange
+          v-model="tableSearch[prop]"
+          :size="scope.size"
+          :column="scope.column"
+        ></InputDateRange>
+      </template>
+      <template v-for="prop in yearRange" :key="prop" #[`${prop}-search`]="scope">
+        <div style="display:flex;align-items:center;flex-direction:row" v-if="scope.column"><el-date-picker
+          v-model="tableSearch['useYearMonthStart']"
+          type="month"
+          value-format="YYYY-MM"
+          format="YYYY-MM"
+          placeholder="选择开始年月"
+        />
+       <div class="px-5px">{{ t('Avue.control.to') }}</div>
+        <el-date-picker
+          v-model="tableSearch['useYearMonthEnd']"
+          type="month"
+          value-format="YYYY-MM"
+          format="YYYY-MM"
+          placeholder="选择结束年月"
+        /></div>
+      </template>
+      <template v-for="prop in monthRange" :key="prop" #[`${prop}-search`]="scope">
+        <div style="display:flex;align-items:center;flex-direction:row"> <el-select v-model="tableSearch['useMonthStart']">
+        <el-option v-for="(item,index) in scope.column.dicData" :key="index" :label="item.label" :value="item.value"></el-option>
+       </el-select>
+        <div class="px-5px">{{ t('Avue.control.to') }}</div>
+      <el-select v-model="tableSearch['useMonthEnd']">
+        <el-option v-for="(item,index) in scope.column.dicData" :key="index" :label="item.label" :value="item.value"></el-option>
+       </el-select></div>
+      
+      </template>
+      <template v-for="prop in dateTimeRange" :key="prop" #[`${prop}-search`]="scope">
+         <InputDateTimeRange
+          v-model="tableSearch[prop]"
+          :size="scope.size"
+          :column="scope.column"
+        ></InputDateTimeRange>
+      </template>
+      <template v-for="prop in timeRange" :key="prop" #[`${prop}-search`]="scope">
+         <InputTimeRange
+          v-model="tableSearch[prop]"
+          :size="scope.size"
+          :column="scope.column"
+        ></InputTimeRange>
+      </template>
+      <template #header v-if="Object.keys(dimensionFields)?.length||reportCode=='zhxs-hz'">
+        <div v-if="Object.keys(dimensionFields)?.length">
+            <div  style="display:flex;padding-top:10px;margin-bottom:10px;border-top:1px solid #eee;align-items:center;">
+        <span style="margin-right:10px;">维度：</span>
+         <el-checkbox-group
+@change="searchDimension" v-model="tableSearch['Group by']"
+                         placeholder="请选择内容">
+            <template  v-for="(item,key) in dimensionFields">
+              <el-checkbox
+                      v-if="1"
+                       :key="key"
+                       :value="key"
+                       :label="item.label"></el-checkbox>
+                       </template>
+              </el-checkbox-group>
+            </div>
+        </div>
+      
+      </template>
+      
+    </avue-crud>
+  </div>
+  <div v-else class="h-200px" v-loading="!isInit"></div>
+  
+</template>
+<script lang="ts" setup>
+import * as ReportApi from '@/api/design/report'
+import { InputNumberRange,InputDateRange ,InputDateTimeRange,InputTimeRange} from '../shareControl/index'
+import download from '@/utils/download'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { cloneDeep } from 'lodash-es'
+import { useWindowSize } from '@vueuse/core'
+import { assembleLengObj } from '@/utils/lowDesign'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import Avue from '@smallwei/avue'
+import { Console } from 'console'
+import { ruleLeng } from '../utils/util'
+defineOptions({ name: 'LowReport' })
+import { defineEmits } from 'vue'
+
+// 2. 定义要抛出的事件
+const emit = defineEmits(['selectRowChange'])
+
+interface Props {
+  reportCode: string
+  row: any
+  calcHeight?: number
+  fixedSearch?: object //固定报表搜索值（每次查询都会带上）
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  model: 'default',
+  fixedSearch: () => {
+    return {}
+  }
+})
+
+const newProps=ref<any>({
+  'monthprofit_yoy':'yoyMonthProfit',
+  'monthsamoney_yoy':'yoyMonthSaMoney',
+  'monthsaqty_yoy':'yoyMonthSaQty',
+  'saqty_yoy':'lastYearSaQty',
+  'samoney_yoy':'lastYearSaMoney',
+  'profit_yoy':'lastYearProfit'
+})
+const showMonths=ref<any>([])
+const changeMonths=(val:any)=>{
+  zhxsMonths.value.forEach((item:any)=>{
+    tableOption.value.column[item.value].hide=true
+  })
+  showMonths.value.forEach((item:any)=>{
+    tableOption.value.column[item].hide=false
+  })
+  
+}
+const tableSaleInfo=ref<any>([])
+const tableSaleSearch=ref<any>({})
+const tableSalePage = ref<any>({ currentPage: 1, pageSize: 20, total: 0 })
+const windowSize = useWindowSize()
+const { wsCache } = useCache()
+const route = useRoute()
+const message = useMessage() // 消息弹窗
+const { mergeLocaleMessage, t } = useI18n() // 国际化
+const defualtSearch=ref<any>({})
+const zhxsMonths=ref<any>([])
+const transferFields={
+      'zoneName':'salezonename',
+      'saleTypeName':'saletypename',
+      'salerName':'salername',
+      'goodsName':'goodsname',
+      'customName':'customname',
+      'dosageName':'dosagename',
+      'stdGoodsName':'stdGoodsIdName',
+      'effectName':'effectname',
+      'classname':'goodsclassname'
+    }
+const loading = ref(false) // 列表的加载中
+const isInit = ref(false)
+const isSearch = ref(false)
+const tableSaleOption = ref<any>({
+  menu: false,
+  addBtn: false,
+  border: true,
+  stripe:true,
+  index:false,
+  columnBtn:false,
+  searchBtnText:'查询',
+  column: {
+
+  }
+})
+const tableSaleData = ref<any>([])
+const tableHeightRef = ref<any>(null)
+const tableOption = ref<any>({})
+const tableData = ref<any>([])
+const tableSearch = ref({
+  'Group by':[]
+})
+const expandedRowKey = ref<any>(null)
+const tablePage = ref<any>({ currentPage: 1, pageSize: 50, total: 0 })
+const tableSelect = ref<any>([])
+const tableSort = ref({ column: '', order: '' })
+const tableInfo = ref<any>({})
+const timerObj = ref<any>({})
+const numberRange = ref<string[]>([])
+const dateRange=ref<string[]>([])
+const yearRange=ref<string[]>([])
+const monthRange=ref<string[]>([])
+const searchReportSlots=ref<string[]>([])
+const hideColumns=ref<string[]>([])
+const dateTimeRange=ref<string[]>([])
+const timeRange=ref<string[]>([])
+const amountFieds=ref<any>({})
+const amountObj=ref<any>({})
+const crudRef = ref()
+const dimensionFields=ref<any>({})
+const exportLoading = ref(false)
+const fieldList = ref<any[]>([]) // 添加fieldList引用
+const hideFeilds= ref<any>({}) 
+const hideCols=ref<any>([])
+const dictFieldList=ref<any>([])
+const textAlignFiels=ref<any>({})
+const dialogSaleDetail=ref(false)
+
+const permissions =
+  wsCache.get(CACHE_KEY.USER).lideeYunJipermissions?.[route.meta.menuDataId as string] || false
+const selectIds = computed(() => {
+  return tableSelect.value.map((item) => item['id'])
+})
+const openSaleDetail=(row)=>{
+  
+  tableSalePage.value={
+     currentPage: 1, pageSize: 50, total: 0
+  }
+  // const {useMonthEnd,useMonthStart,useYearEnd,useYearMonthEnd,useYearMonthStart,useYearStart}=tableSaleSearch.value
+  tableSaleSearch.value={
+    ...row
+  }
+  // if(useMonthEnd&&useMonthStart&&useYearEnd&&useYearMonthEnd&&useYearMonthStart&&useYearStart){
+  //   tableSaleSearch.value['ny']=useYearStart+'-'+(useYearMonthStart>10?'':'0')+useYearMonthStart+'~'+useYearMonthEnd+'-'+(useYearMonthEnd>10?'':'0')+useYearMonthEnd
+  // }
+  getSaleInfo(row)
+}
+
+// 第一列纵向合并的标记数组
+const rowMergeArr = ref([])
+const rowMergeArr1 = ref([])
+
+// 预处理：计算第一列相邻bk相同的纵向合并规则
+const initMerge = () => {
+  const list = tableData.value
+  const len = list.length
+  rowMergeArr.value = new Array(len).fill(1)
+  rowMergeArr1.value = new Array(len).fill(1)
+  // 遍历所有行，统计相邻bk相同的行数
+  let count = 1,count1=1
+  
+  for (let i = 1; i < len; i++) {
+    if (list[i].bk === list[i - 1].bk) {
+      // 相同bk，当前行标记为0（隐藏），累加计数
+      count++
+      rowMergeArr.value[i] = 0
+    } else {
+      // 不同bk，把之前的计数赋值给组内第一行
+      rowMergeArr.value[i - count] = count
+      count = 1
+    }
+    if (list[i].zone_name === list[i - 1].zone_name) {
+      // 相同bk，当前行标记为0（隐藏），累加计数
+      count1++
+      rowMergeArr1.value[i] = 0
+    } else {
+      // 不同bk，把之前的计数赋值给组内第一行
+      rowMergeArr1.value[i - count1] = count1
+      count1 = 1
+    }
+  }
+  // 处理最后一组数据
+  rowMergeArr.value[len - count] = count
+  rowMergeArr1.value[len - count1] = count1
+}
+
+// Avue 核心合并方法
+const spanMethod = ({ row, rowIndex, columnIndex }) => {
+  // ======================================
+  // 规则1：同一行 bk 和 zone_name 相同 → 横向合并前两列
+  // ======================================
+  const isSameRowField = row.bk === row.zone_name
+
+  if (isSameRowField) {
+    // 第一列：跨2列合并
+    if (columnIndex === 0) {
+      return { rowspan: 1, colspan: 2 }
+    }
+    // 第二列：隐藏当前单元格
+    if (columnIndex === 1) {
+      return { rowspan: 1, colspan: 0 }
+    }
+  }
+
+  // ======================================
+  // 规则2：第一列相邻bk相同 → 纵向合并行
+  // ======================================
+  if (columnIndex === 0) {
+    return {
+      rowspan: rowMergeArr.value[rowIndex],
+      colspan: 1
+    }
+  }else if(columnIndex===1){
+    return {
+      rowspan: rowMergeArr1.value[rowIndex],
+      colspan: 1
+    }
+  }
+
+  // ======================================
+  // 其他列：完全不合并，保持原样！
+  // ======================================
+  return { rowspan: 1, colspan: 1 }
+}
+const refreshSaleChange=()=>{
+  getSaleInfo()
+}
+const sizeSaleChange=(val)=>{
+  tablePage.value.pageSize=val
+  getSaleInfo(row)
+}
+const currentSaleChange=(val)=>{
+  tablePage.value.currentPage=val
+  getSaleInfo()
+}
+const getSaleInfo=async ()=>{
+  let res = await ReportApi.getTableInfo({
+    ...tableSaleSearch.value,
+    pageNo:tableSalePage.value.currentPage,
+    pageSize:tableSalePage.value.pageSize
+  })
+   tableSaleOption.value.height='calc(100vh - 160px)'
+   fieldList.value.forEach(item=>{
+    if(res.records[0]&&(res.records[0][item.fieldCode]||res.records[0][item.fieldCode]==0)){
+      let config={
+      prop:item.fieldCode,
+      label:item.fieldName,
+      width:item.width?item.width+'px':item.fieldName=='产品名称'?'200px':undefined,
+      align:'center',
+    }
+    tableSaleOption.value.column[item.fieldCode]=config
+    }
+   })
+    tableSaleInfo.value=res.records
+    tableSalePage.value.total=res.total
+    dialogSaleDetail.value=true
+}
+const remoteMethod= async(query,column)=>{
+  if(!query){
+    return
+  }
+  let params={
+    pageSize: 100,
+    pageNo:1,
+  }
+  params[transferFields[column.prop]?transferFields[column.prop]:column.prop]=query
+  
+  let data = await ReportApi.getTableList(column.reportCode,params)
+  column.dicData=column.formatterDic(data)
+}
+const crudBind = computed(() => {
+  const obj = {}
+  if (tableInfo.value.isPage) obj['page'] = tablePage.value
+  else{
+    tablePage.value={
+      currentPage: 1, pageSize: 999999, total: 0
+    }
+    obj['page'] = tablePage.value
+  }
+  return obj
+})
+
+function getElementToBodyTop(el) {
+  if (!el || !(el instanceof HTMLElement)) return 0;
+  
+  // 1. 获取元素相对于视口的位置（top是元素顶部到视口顶部的距离）
+  const rect = el.getBoundingClientRect();
+  // 2. 视口顶部到body顶部的距离 = 页面滚动的距离（window.scrollY）
+  // 最终距离 = 元素视口top + 页面滚动距离 - body的margin/padding（可选，根据场景）
+  const bodyTop = document.body.getBoundingClientRect().top; // body自身的偏移（通常为0）
+  return rect.top - bodyTop + window.scrollY;
+}
+const tableHeight=ref(0)
+watch(()=>tableHeightRef.value,()=>{
+  if(tableHeightRef.value){
+    setTimeout(()=>{
+      observeHeightChange(document.querySelector('.avue-crud__search'))
+      if(tableOption.value.showSummary&&(tableOption.value.index&&tableOption.value.selection||props.reportCode==='zhxs-hz')){
+        document.querySelector('tfoot tr td').colSpan="2"
+        document.querySelectorAll('tfoot tr td')[1].style.display="none"
+      }
+      
+    },2000)
+  }
+})
+let resizeObserver = null;
+const observeHeightChange = (targetEl) => {
+  // 确保元素已挂载
+  if (!targetEl) return;
+  // 创建ResizeObserver实例
+  resizeObserver = new ResizeObserver((entries) => {
+    const calcH= getElementToBodyTop(tableHeightRef.value)
+  tableHeight.value= ('calc(100vh - '+(parseInt(calcH+160))+"px)")
+  if(document.querySelector('.el-table').style){
+    document.querySelector('.el-table').style.height=tableHeight.value
+  }
+  });
+  // 开始监听目标元素
+  resizeObserver.observe(targetEl);
+};
+const setLastAmountRowClass=(row,rowIndex)=>{
+  if(row.isAmount===true){
+    return 'lastAmountRow'
+  }
+}
+const handleRowClick=(row)=>{
+  if(props.reportCode==='material_info'){
+    emit('selectRowChange',row)
+  }
+}
+const summaryMethod1=({columns,data})=>{
+  // 1. 初始化汇总结果数组（和表格列数量一致）
+      const result = new Array(columns.length).fill("");
+      result[0] = `合计`;
+      
+      let keys=Object.values(amountFieds.value).map(item=>item.prop)
+      columns.forEach((item,index)=>{
+        if(keys.includes(item.property)&&index!==0){
+          result[index]=amountObj.value[item.property]
+        }
+      })
+     
+      return result;
+}
+  const rowStyleMethod=({row,rowIndex})=>{
+    let styleObj={}
+    dictFieldList.value.forEach(item=>{
+      if(row[item.prop]){
+        styleObj['color']=item.dicData.find(d=>d.value===row[item.prop])?.cssClass
+      }
+    })
+    return styleObj
+  }
+
+  const cellClassNameMethod=({row,column,rowIndex,columnIndex})=>{
+    if(props.reportCode=='zhxs-hz'){
+      if(row.zone_name.includes('总计')&&row.zone_name!=='总计')  return 'color-B9DEE8'
+      else if((row.zone_name.includes('合计')&&row.bk!=='合计')||row.zone_name=='其他收入'||(columnIndex==0&&row.zone_name!=='总计')) return 'color-90B3E2'
+    
+    }
+  }
+  const headerCellClassNameMethod=({row,column,rowIndex,columnIndex})=>{
+    if(props.reportCode=='zhxs-hz'){
+      return 'color-90B3E2'
+    }
+  }
+  
+
+function getCurrentDate() {
+  const now = new Date();
+  // 补零函数：小于10则前面加0
+  const padZero = (num) => num.toString().padStart(2, '0');
+  
+  const year = now.getFullYear();
+  const month = padZero(now.getMonth() + 1);
+  const day = padZero(now.getDate());
+
+  // 返回格式化后的字符串或对象，按需选择
+  return {
+    year,
+    month,
+    day,
+    fullDate: `${year}-${month}-${day}` // 拼接成 2026-02-24 格式
+  };
+}
+const initTable = async () => {
+  isInit.value = false
+  loading.value = true
+  const { fieldList: apiFieldList, reportVo } = await ReportApi.getWebConfig(props.reportCode)
+  
+  fieldList.value = apiFieldList
+  
+  const isHeight = reportVo.tableConfig?.includes('height')
+  const isPage = reportVo.dataConfig?.includes('page')
+  const isPermi = reportVo.dataConfig?.includes('authTrue')
+  const isHideExport = reportVo.tableConfig?.includes('hideExport')
+  hideColumns.value=[]
+  tableInfo.value = { ...reportVo, isPage, isHeight, isPermi, isHideExport }
+  tableOption.value = {
+    selection: false,
+    reserveSelection: true,
+    menu: false,
+    addBtn: false,
+    // height: isHeight ? 'auto' : undefined,
+    // calcHeight: isHeight ?10 : '',
+    index: reportVo.tableConfig.includes('index'),
+    indexLabel: '序号',
+    indexWidth: 54,
+    border: reportVo.tableConfig.includes('border'),
+    // stripe: reportVo.tableConfig.includes('stripe'),
+    showSummary:false,
+    stripe:true,
+    searchShow:false,
+    searchShowBtn:false,
+    searchBtnText:'查询',
+    refreshBtn:false,
+    columnBtn:false,
+    header:false,
+    column: {}
+  }
+
+  const fieldLengObj = assembleLengObj(apiFieldList, 'labelI18n', 'fieldCode', 'fieldName')
+  for (const key in fieldLengObj) {
+    mergeLocaleMessage(key, { [props.reportCode]: fieldLengObj[key] })
+  }
+
+  // 分离固定列和动态列
+  const fixedFields = apiFieldList.filter(f => f.isFixedColumn === 'Y')
+  const dynamicFields = apiFieldList.filter(f => f.isFixedColumn !== 'Y')
+  
+ 
+  // 处理固定列
+  fixedFields.forEach((item) => {
+    const config: any = {
+      prop: item.fieldCode,
+      label: t(`${props.reportCode}.${item.fieldCode}`),
+      type: 'input',
+      overHidden: true,
+      isExport: item.isExport == 'Y',
+      search: item.queryIsWeb == 'Y'&&item.isHideSearch !== 'Y',
+      fixed: true
+    }
+    tableOption.value.column[item.fieldCode] = config
+  })
+
+  // 构建父子关系映射（仅用于识别子字段配置）
+  const childFieldConfigs = new Map()
+  dynamicFields.forEach(field => {
+    if (field.parentFieldCode && field.parentFieldCode !== '') {
+      if (!childFieldConfigs.has(field.parentFieldCode)) {
+        childFieldConfigs.set(field.parentFieldCode, [])
+      }
+      childFieldConfigs.get(field.parentFieldCode).push(field)
+    }
+  })
+  // let tableDicData=[]
+  // if( dynamicFields.filter(item=>['货品名称','剂型名称'].includes(item.fieldName)&&item.queryIsWeb == 'Y'&&item.isHideSearch !== 'Y')?.length){
+  //    tableDicData =await ReportApi.getTableList(props.reportCode)
+
+  //   }
+  // 处理动态列（暂不构建children，等数据返回后动态生成）
+  dynamicFields.forEach(async (item, index) => {
+    if (item.parentFieldCode && item.parentFieldCode !== '') return
+    const config: any = {
+      prop: item.fieldCode,
+      label: t(`${props.reportCode}.${item.fieldCode}`),
+      type: 'input',
+      overHidden: true,
+      isExport: item.isExport == 'Y',
+      sortable: item.isShowSort == 'Y' ? 'custom' : false,
+      search: item.queryIsWeb == 'Y'&&item.isHideSearch !== 'Y',
+      _hasChildConfig: childFieldConfigs.has(item.fieldCode),
+      _childConfigs: childFieldConfigs.get(item.fieldCode) || []
+    }
+    if(item.queryIsWeb == 'Y'&&item.isHideSearch !== 'Y') isSearch.value=true
+    if(!!item.searchDefaultValue&&config.search){
+       if(['年','年度','年份'].includes(item.fieldName)&&item.searchDefaultValue=='本年'){
+          tableSearch.value[config.prop]=getCurrentDate().year.toString()
+        }else if( ['月','月度','月份'].includes(item.fieldName)&&item.searchDefaultValue=='本月'){
+          tableSearch.value[config.prop]=(new Date().getMonth() + 1)+''
+        }else if(item.fieldType=='Date'&&item.searchDefaultValue=='当日'){
+          tableSearch.value[config.prop]=getCurrentDate().fullDate
+        }else{
+          tableSearch.value[config.prop]=item.searchDefaultValue
+        }
+        defualtSearch.value[config.prop]=tableSearch.value[config.prop]
+    }
+    if(props.reportCode=='zhxs-hz'&&item.fieldName=='板块'){
+      config.overHidden=false
+    }
+    if(props.reportCode=='zhxs-hz'&&config.label.includes('月(万)')){
+      let month=(new Date().getMonth() + 1)+'',lastMonth=(new Date().getMonth() + 1)-1+''
+      if(config.label.includes(month)||config.label.includes(lastMonth)){
+        showMonths.value.push(config.prop)
+      }
+    }
+    if(['年','年度','年份','月','月度','月份','年月'].includes(item.fieldName)&&config.search){
+      config.searchSpan=3
+      if(item.fieldName.includes('年')){
+        config.searchType='year'
+        config.valueFormat = 'YYYY'
+        if(props.reportCode=='ZHXSQK'||props.reportCode=='ZHXS_KD'){
+          config.searchSpan=5
+          config.searchLabel='年月'
+          yearRange.value.push(item.fieldCode)
+        }
+      }else if(item.fieldName.includes('月')){
+        if(props.reportCode=='ZHXSQK'||props.reportCode=='ZHXS_KD'){
+          monthRange.value.push(item.fieldCode)
+          config.searchSpan=4
+          config.search=false
+        }
+        config.searchType='select'
+        config.dicData=[{label:'1月',value:'1'},{label:'2月',value:'2'},{label:'3月',value:'3'},{label:'4月',value:'4'},{label:'5月',value:'5'},{label:'6月',value:'6'},{label:'7月',value:'7'},{label:'8月',value:'8'},{label:'9月',value:'9'},{label:'10月',value:'10'},{label:'11月',value:'11'},{label:'12月',value:'12'}]
+      }
+      if((props.reportCode=='ZHXSQK'||props.reportCode=='ZHXS_KD')&&item.isDimension=='Y'){
+        tableSearch.value['Group by'].push(item.fieldCode)
+      }
+      if(props.reportCode=='zd_customer'||props.reportCode=='stgoodTop10'){
+        config.searchSpan=5
+        yearRange.value.push(item.fieldCode)
+      }
+      if(!!item.searchDefaultValue&&props.reportCode=='ZHXSQK' ||props.reportCode=='zd_customer'||props.reportCode=='stgoodTop10'|| props.reportCode=='ZHXS_KD'){
+            tableSearch.value[config.prop+'Start']=defualtSearch.value[config.prop]
+            tableSearch.value[config.prop+'End']=defualtSearch.value[config.prop]
+            defualtSearch.value[config.prop+'Start']=defualtSearch.value[config.prop]
+            defualtSearch.value[config.prop+'End']=defualtSearch.value[config.prop]
+            if(config.prop=='useYear'){
+              tableSearch.value['useYearMonthStart']=defualtSearch.value[config.prop]+'-01'
+              tableSearch.value['useYearMonthEnd']=defualtSearch.value[config.prop]+'-12'
+            }else if(config.prop=='useMonth'){
+              const month=defualtSearch.value[config.prop]>10?defualtSearch.value[config.prop]:'0'+defualtSearch.value[config.prop]
+              tableSearch.value['useYearMonthStart']=tableSearch.value['useYearStart']+'-'+month
+              tableSearch.value['useYearMonthEnd']=tableSearch.value['useYearEnd']+'-'+month
+            }
+            defualtSearch.value['useYearMonthStart']=tableSearch.value['useYearMonthStart']
+            defualtSearch.value['useYearMonthEnd']=tableSearch.value['useYearMonthEnd']
+            delete defualtSearch.value[config.prop]
+            delete tableSearch.value[config.prop]
+      }
+    }
+        if(item.fieldName=='效期剩余时间(天)分类') config.searchSpan=5
+    
+    if(config.search) config.searchLabelWidth=item.fieldName.length*12 +40
+    const moreIn="MORE_IN".includes(item.queryMode)
+    config.searchType=moreIn?'select':config.searchType
+    config.multiple=config.collapseTags=config.collapseTagsTooltip =moreIn
+    item.queryMode=='LIKE'?config.multiple=config.collapseTags=config.collapseTagsTooltip =true:''
+    const jkTableDicFields={
+      '货品名称':'hpmx',
+      '货品':'hpmx',
+      '剂型':'jxjk',
+      '产品':'hpmx',
+      '产品名称':'hpmx',
+      '剂型名称':'jxjk',
+      '客户名称':'khxx',
+      '销售类型':'xslx',
+      '客户':'khxx',
+      '业务员':'ywyxx',
+      '业务区域':'ywqy',
+      '标准品名':'bzpm',
+      '疗效分类':'effect',
+      '产品大类':'cpdl'
+    }
+ 
+
+    if(Object.keys(jkTableDicFields).includes(item.fieldName)&&config.search){
+      config.dataType= 'string'
+      config.reportCode= `${jkTableDicFields[item.fieldName]}`
+      const formatterData=(res) => { //请求数据格式化
+        const arr=[...new Set(res.records.map(item=>{
+          const v=item[transferFields[config.prop]?transferFields[config.prop]:config.prop]
+          return {
+            value:config.prop=='stdGoodsName'?item[config.prop]:v,
+            label:v,
+          }}))]
+        return arr
+      }
+      ReportApi.getTableList(jkTableDicFields[item.fieldName],{pageSize: 50, pageNo:1}).then(res=>{
+        config.dicData=formatterData(res)
+        console.log(config.dicData)
+      })
+      config.formatterDic=formatterData
+     
+      searchReportSlots.value.push(config.prop)
+      // config.multiple?tableSearch.value[config.prop]=item.searchDefaultValue?item.searchDefaultValue.split(','):[]:''
+    }
+    if(item.dictCode){
+      const dictData=getStrDictOptions(item.dictCode)
+      config.dicData=dictData
+      config.searchType= 'select'
+      config.dataType= 'string'
+      dictFieldList.value.push(config)
+    }
+    
+   
+    if(!!item.isAmount){
+      index==0?amountFieds.value.fistField=config.prop:''
+      amountFieds.value[item.isAmount]=config
+      tableOption.value.showSummary=true
+    }
+    if(item.width){
+      config.width=item.width
+      config.widthOld=item.width
+    }
+    if(item.isDimension=='Y'){
+      dimensionFields.value[config.prop]=config
+      hideFeilds.value[config.prop]=item.isHideDimension
+    }
+    if(item.isHideCol == 'Y')  {hideCols.value.push(config.prop)
+      config.hide = true
+      hideColumns.value.push(config.prop)
+    }
+    if (item.queryMode == 'RANGE') config.searchRange = true
+    if (['Integer', 'BigInt', 'BigDecimal'].includes(item.fieldType)) config.type = 'number'
+    else if (item.fieldType == 'Date') {
+      config.type = 'date'
+      config.format = 'YYYY-MM-DD'
+      config.valueFormat = 'YYYY-MM-DD'
+      if(config.searchRange) dateRange.value.push(config.prop)
+    } else if (item.fieldType == 'Time') {
+      config.type = 'time'
+      config.format = 'HH:mm:ss'
+      config.valueFormat = 'HH:mm:ss'
+      if(config.searchRange) timeRange.value.push(config.prop)
+    } else if (item.fieldType == 'DateTime') {
+      config.type = 'datetime'
+      config.format = 'YYYY-MM-DD HH:mm:ss'
+      config.valueFormat = 'YYYY-MM-DD HH:mm:ss'
+      if(config.searchRange) dateTimeRange.value.push(config.prop)
+    }
+     
+    if (config.type == 'number' && config.searchRange) numberRange.value.push(config.prop)
+    if (item.queryMode == 'IN' && ['input', 'number'].includes(config.type)) {
+      config.searchType = 'tag'
+    }
+    if (item.queryMode == 'NE') config.searchLabel = `${config.label} !=`
+    if(!item.parentFieldCode&&!!item.parentFieldName){
+      if(tableOption.value.column[item.parentFieldName]){
+        tableOption.value.column[item.parentFieldName].children.push(config)
+      }else{
+        tableOption.value.column[item.parentFieldName]={
+          children:[config],
+          label:item.parentFieldName
+        }
+      }
+     }else{
+      tableOption.value.column[item.fieldCode] = config
+     }
+    
+  })
+  
+  isInit.value = true
+  searchChange()
+  initTableLayout()
+}
+const searchDimension=()=>{
+  
+  searchChange()
+}
+
+const initTableLayout = () => {
+  // if (tableOption.value.height != 'auto' && tableOption.value.height !== undefined) return
+
+  // if (tableInfo.value.isHeight || props.calcHeight) {
+  //   const calcH = props.calcHeight
+  //   let calcHeight = calcH || 10
+  //   if (calcH) tableOption.value.height = 'auto'
+  //   tableOption.value.calcHeight = calcHeight
+  // }
+
+  // if (timerObj.value.layout) clearTimeout(timerObj.value.layout)
+  // timerObj.value.layout = setTimeout(() => {
+  //   if (crudRef.value) crudRef.value.getTableHeight()
+  // }, 100)
+
+}
+
+const selectionChange = (data) => {
+  tableSelect.value = data
+}
+const clearSelection = () => {
+  crudRef.value.clearSelection()
+  tableSelect.value = []
+}
+
+const sortChange = ({ order, prop }) => {
+  const sortKey = { ascending: 'asc', descending: 'desc' }
+  tableSort.value = { order: sortKey[order], column: prop }
+  if (tablePage.value) tablePage.value['currentPage'] = 1
+  getTableData()
+}
+const getSearchData = () => {
+  return new Promise(async (resolve) => {
+    console.log(tableSearch.value)
+    let searchObj: any = {}
+    // if (tableInfo.value.isPage) {
+      const { currentPage, pageSize } = tablePage.value
+      searchObj.pageNo = currentPage
+      searchObj.pageSize = pageSize
+    // }
+    for (let key in tableSearch.value) {
+      if (tableSearch.value[key] instanceof Array) searchObj[key] = tableSearch.value[key].join(',')
+      else searchObj[key] = tableSearch.value[key]
+    }
+    //排序
+    if (tableSort.value.order) searchObj = { ...searchObj, ...tableSort.value }
+
+    searchObj = { ...searchObj, ...props.fixedSearch }
+
+    for (let key in searchObj) {
+      if (searchObj[key] === '' || searchObj[key] == null) delete searchObj[key]
+    }
+   // if(props.reportCode==='material_info') searchObj.material_name=props.row.product_name
+    resolve(searchObj)
+  })
+}
+  const computedIncluedes=(row,prop)=>{
+    return (typeof row[prop])==='string'&&(row[prop].includes('🔴')||row[prop].includes('🟢'))
+  }
+const getTableData = async (isLoading = true) => {
+  if (timerObj.value.getTableData) clearTimeout(timerObj.value.getTableData)
+
+  await new Promise((resolve) => {
+    timerObj.value.getTableData = setTimeout(() => resolve(true), 100)
+  })
+  textAlignFiels.value={}
+  return new Promise(async (resolve) => {
+    if (isLoading) loading.value = true
+    const searchObj = await getSearchData()
+   
+    try {
+      // 获取数据
+    
+      let data = await ReportApi.getTableList(props.reportCode, searchObj)
+ 
+      // 功能测试：CS_DTBT报表使用模拟数据
+      if (props.reportCode === 'CS_DTBT') {
+        data = {
+          records: [
+            { "yuefen": "一月", "benyue": 100, "leiji": 110 },
+            { "yuefen": "一月", "benyue": 120, "leiji": 130 },
+            { "yuefen": "二月", "benyue": 140, "leiji": 150 },
+            { "yuefen": "二月", "benyue": 160, "leiji": 170 },
+            { "yuefen": "三月", "benyue": 180, "leiji": 190 },
+            { "yuefen": "三月", "benyue": 200, "leiji": 210 },
+            { "yuefen": "四月", "benyue": null, "leiji": null },
+            { "yuefen": "四月", "benyue": 220, "leiji": 230 },
+            { "yuefen": "五月", "benyue": 333, "leiji": 444 },
+            { "yuefen": "六月", "benyue": 555, "leiji": 555 },
+            { "yuefen": "六月", "benyue": 666, "leiji": 666 },
+          ],
+          total: 6
+        }
+      }
+
+      if (tablePage.value&&tableInfo.value.isPage) tablePage.value['total'] = data.total
+      
+      // 查找动态分组字段（用于生成一级表头）
+      const groupField = fieldList.value.find(f => f.isDynamicGroup === 'Y')
+      
+      // 动态生成二维表头
+      if (data.records && data.records.length > 0) {
+        const newColumns = {}
+        
+        // 保留固定列
+        for (const colKey in tableOption.value.column) {
+          const colConfig = tableOption.value.column[colKey]
+          if (colConfig.fixed) {
+            newColumns[colKey] = colConfig
+          }
+        }
+        
+        if (groupField) {
+          // 有分组字段，从数据中提取所有不重复的分组值（一级表头）
+          const groupValues = [...new Set(data.records.map(r => r[groupField.fieldCode]))].filter(Boolean)
+          
+          // 找到所有子字段配置（按sortNum排序）
+          const childFields = fieldList.value
+            .filter(f => 
+              f.parentFieldCode && 
+              f.parentFieldCode !== '' && 
+              f.isFixedColumn !== 'Y'
+            )
+            .sort((a, b) => (a.sortNum || 0) - (b.sortNum || 0))
+          
+          // 为每个分组值生成列
+          groupValues.forEach(groupValue => {
+            const parentProp = `group_${groupValue}`
+            newColumns[parentProp] = {
+              label: groupValue,
+              children: childFields.map(childField => ({
+                prop: `${parentProp}_${childField.fieldCode}`,
+                label: t(`${props.reportCode}.${childField.fieldCode}`),
+                type: ['Integer', 'BigInt', 'BigDecimal'].includes(childField.fieldType) ? 'number' : 'input',
+                overHidden: true,
+                isExport: childField.isExport == 'Y'
+              }))
+            }
+          })
+        } else {
+          // 没有分组字段，使用原有的逻辑
+          for (const colKey in tableOption.value.column) {
+            const colConfig = tableOption.value.column[colKey]
+            if (!colConfig.fixed) {
+              newColumns[colKey] = colConfig
+            }
+          }
+        }
+        
+        tableOption.value.column = newColumns
+      }
+      
+      // 将扁平数据按分组字段转换为二维表头数据
+      let processedData = []
+      
+      if (groupField && data.records.length > 0) {
+        // 有分组字段，根据分组字段值进行分组
+        const fixedFields = fieldList.value.filter(f => f.isFixedColumn === 'Y')
+        const childFields = fieldList.value
+          .filter(f => f.parentFieldCode && f.parentFieldCode !== '' && f.isFixedColumn !== 'Y')
+          .sort((a, b) => (a.sortNum || 0) - (b.sortNum || 0))
+        
+        // 获取所有分组值
+        const groupValues = [...new Set(data.records.map(r => r[groupField.fieldCode]))].filter(Boolean)
+        
+        // 按分组字段值对数据进行分组
+        const groupedData = {}
+        data.records.forEach(record => {
+          const groupValue = record[groupField.fieldCode]
+          if (!groupedData[groupValue]) {
+            groupedData[groupValue] = []
+          }
+          groupedData[groupValue].push(record)
+        })
+        
+        // 计算需要生成的行数（根据固定列配置或分组内最大数据量）
+        let rowCount = 1
+        if (fixedFields.length > 0 && fixedFields[0].fixedColumnValue) {
+          rowCount = fixedFields[0].fixedColumnValue.split(',').length
+        } else {
+          // 如果没有固定列，取每个分组中数据最多的数量
+          rowCount = Math.max(...Object.values(groupedData).map((arr: any[]) => arr.length))
+        }
+        
+        // 按行处理数据
+        for (let rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+          const flatRecord = {}
+          
+          // 处理固定列
+          fixedFields.forEach(field => {
+            if (field.fixedColumnValue) {
+              const fixedValues = field.fixedColumnValue.split(',')
+              flatRecord[field.fieldCode] = fixedValues[rowIndex] || ''
+            }
+          })
+          
+          // 处理动态列数据（根据分组字段值获取对应数据）
+          groupValues.forEach(groupValue => {
+            const groupRecords = groupedData[groupValue] || []
+            const record = groupRecords[rowIndex]
+            
+            if (record) {
+              const parentProp = `group_${groupValue}`
+              childFields.forEach(childField => {
+                flatRecord[`${parentProp}_${childField.fieldCode}`] = record[childField.fieldCode]
+              })
+            }
+          })
+          
+          processedData.push(flatRecord)
+        }
+      } else {
+        // 没有分组字段，直接处理数据
+        processedData = data.records.map((record, recordIndex) => {
+          const flatRecord = { ...record }
+          // 处理固定列
+
+          fieldList.value.forEach(field => {
+              computedIncluedes(record,field.fieldCode)&&!textAlignFiels.value[field.fieldCode]?textAlignFiels.value[field.fieldCode]=true:''
+            
+            if (field.isFixedColumn === 'Y' && field.fixedColumnValue) {
+              const fixedValues = field.fixedColumnValue.split(',')
+              flatRecord[field.fieldCode] = fixedValues[recordIndex] || ''
+            }
+          })
+          // Object.keys(textAlignFiels.value).forEach(item=>{
+          //     if(textAlignFiels.value[item]){
+          //       flatRecord[item]=record[item]&&record[item].split(' ').length>1?record[item].split(' ').map(val=>'<div>'+val+'</div>').join(''):flatRecord[item]
+          //     }
+          // })
+          
+          return flatRecord
+        })
+      }
+      
+      tableData.value = processedData 
+      Object.values(tableOption.value.column).forEach( item=>{
+        let oldHide=hideCols.value.indexOf(item.prop)!==-1
+        item.hide=tableData.value[0]&&((tableSearch.value['Group by']&&tableData.value[0][item.prop]===undefined&&!item.children)||(item.children?.every(child=>(!['yearplan','yearrate'].includes(child.prop))&&(tableData.value[0][child.prop]===undefined))))||oldHide
+        if(item.children){
+          item.children.forEach(child=>{
+            child.hide=(!['yearplan','yearrate'].includes(child.prop))&&(tableData.value[0][child.prop]===undefined)
+             const prH=hideColumns.value.indexOf(child.prop)
+            child.hide?(prH===-1?hideColumns.value.push(child.prop):''):(prH!==-1&&hideCols.value.indexOf(child.prop)===-1?hideColumns.value.splice(prH,1):'') 
+          })
+        }
+        const prH=hideColumns.value.indexOf(item.prop)
+        item.hide?(prH===-1?hideColumns.value.push(item.prop):''):(prH!==-1&&hideCols.value.indexOf(item.prop)===-1?hideColumns.value.splice(prH,1):'') 
+      })
+  
+      
+      let keys=Object.keys(amountFieds.value)
+      if(!!keys.length&&!!tableData.value.length){
+        let obj={isAmount:true}
+        let value={...tableData.value[0]}
+        if(tableInfo.value.reportCode==='ZHXSQK'||tableInfo.value.reportCode==='ZHXS_KD'){
+          value=(await ReportApi.getAggMonthTotalDetail(searchObj))[0]
+          // searchObj['usemonth']?'':value.thisMonthSaMoney_s=value.thissamoney_s
+        }
+        const tData=JSON.parse(JSON.stringify(tableData.value))
+        if(props.reportCode==='zd_customer'&&tableData.value.filter(item=>item.customname=='合计').length){
+          value=tData.filter(item=>item.customname=='合计')[0]
+          value.customname=''
+          Object.keys(value).forEach(key=>{
+            value[key+'_s']=value[key]
+          })
+          tableData.value=tableData.value.filter(item=>item.customname!=='合计')
+        }
+        if(props.reportCode==='zhxs-hz'&&tableData.value.filter(item=>item.bk=='总计').length){
+          value=tData.filter(item=>item.bk=='总计'&&item.zone_name=='总计')[0]
+          value.bk=''
+          value.zone_name=''
+          Object.keys(value).forEach(key=>{
+            value[key+'_s']=value[key]
+          })
+          tableData.value=tableData.value.filter(item=> item.bk!=='总计'&&item.zone_name!=='总计')
+        }
+        keys.forEach(item=>{
+          let key=amountFieds.value[item].prop
+          key!=='fistField'?obj[key]=value[item]:''
+        })
+        amountObj.value=obj
+      }
+      let field=tableSearch.value['Group by']
+      let hides=[]
+      if(field.length){
+        field.forEach(item=>{
+          hides=Object.keys(hideFeilds.value).length?hideFeilds.value[item].split(','):[]
+        })
+      }
+      zhxsMonths.value=[]
+      Object.keys(tableOption.value.column).forEach(key=>{
+        let item=tableOption.value.column[key]
+        if(item.children){
+          item.children.forEach(child=>{
+            child.hide=hides.includes(child.prop)||hideColumns.value.includes(child.prop)
+          })
+        }
+        item.hide=hides.includes(item.prop)||hideColumns.value.includes(item.prop)
+           if(props.reportCode=='zhxs-hz'&&!item.hide){
+             if(item.label.includes('月(万)')){
+              zhxsMonths.value.push({value:item.prop,label:item.label.replace('(万)','')})
+             }
+           }
+      })
+      const liveWidthCol={
+        'InventoryRatio':['产品ID','货品ID','产品名称','产品规格',],
+        'PSI':['产品ID','货品ID','产品名称','产品规格','单位','每件数量'],
+        'ZHXSQK':['标准品名','客户名称'],
+        'ZHXS_KD':['标准品名','客户名称'],
+        'kcqmltj':['产品名称','规格','商品名','通用名'],
+        'zd_customer':['客户名称','年月'],
+        'zhxs-hz':['板块'],
+        'stgoodTop10':['产品名称'],
+        'capacity_utilization':['车间名称'],
+        'product_sales_inventory':['类别/品种']
+      }
+      Object.keys(tableOption.value.column).forEach(key=>{
+        const showCols=Object.values(tableOption.value.column).filter(item=>!item.hide)
+        
+        let item=tableOption.value.column[key]
+        item.children?'':(item.width=showCols.length<14&&(!liveWidthCol[props.reportCode]?.includes(item.label))?undefined:item.widthOld)
+        item.children?.forEach(child=>{
+             child.width=showCols.length<14?undefined:child.widthOld
+        })
+      })
+      resolve(data.records)
+      if(props.reportCode=='zhxs-hz'){
+        initMerge()
+        changeMonths()
+      }
+    } finally {
+
+      if (isLoading) loading.value = false
+      resolve()
+    }
+  })
+}
+
+const exportTableData = async () => {
+  const isSelect = tableSelect.value.length
+  await message.confirm(isSelect ? t('Avue.crud.exportTip') : t('Avue.crud.exportAllTip'))
+  exportLoading.value = true
+  if (isSelect) {
+    const columnObj = cloneDeep(tableOption.value.column)
+    const column: object[] = []
+    for (let key in columnObj) {
+      const { hide, isExport } = columnObj[key]
+      if (!hide && isExport) column.push(columnObj[key])
+    }
+    let exportData = cloneDeep(tableSelect.value)
+    exportData = exportData.map((item) => {
+      for (let key in item) {
+        if (key != '$index' && key.indexOf('$') === 0 && item[key]) {
+          const prop = key.split('$')[1]
+          item[prop] = item[key]
+        }
+      }
+      return item
+    })
+    Avue.$Export.excel({ title: tableInfo.value.reportName, columns: column, data: exportData })
+    exportLoading.value = false
+  } else {
+    const searchObj = await getSearchData()
+    ReportApi.exportExcelData(props.reportCode, searchObj)
+      .then((data) => download.excel(data, tableInfo.value.reportName))
+      .finally(() => (exportLoading.value = false))
+  }
+}
+
+/** 清空搜索值 */
+const clearSearch = () => {
+  try {
+    crudRef.value?.searchReset()
+  } catch (error) {
+    resetChange()
+  }
+}
+
+const searchChange = async (params?, done?) => {
+  if (tablePage.value) tablePage.value['currentPage'] = 1
+  if(tableSearch.value['useYearMonthStart']){
+    tableSearch.value['useYearStart']=tableSearch.value['useYearMonthStart'].split('-')[0]
+    tableSearch.value['useMonthStart']=Number(tableSearch.value['useYearMonthStart'].split('-')[1])
+  }
+  if(tableSearch.value['useYearMonthEnd']){
+    tableSearch.value['useYearEnd']=tableSearch.value['useYearMonthEnd'].split('-')[0]
+    tableSearch.value['useMonthEnd']=Number(tableSearch.value['useYearMonthEnd'].split('-')[1])
+  }
+  await getTableData()
+ 
+   if (done) done()
+}
+const resetChange = () => {
+  return new Promise(async (resolve) => {
+    tableSearch.value = {
+      'Group by':tableSearch.value['Group by']||[],
+      ...defualtSearch.value
+    }
+    if (tablePage.value) tablePage.value['currentPage'] = 1
+    await getTableData()
+    resolve(true)
+  })
+}
+const sizeChange = (pageSize) => {
+  if (tablePage.value) tablePage.value['pageSize'] = pageSize
+  clearSearch()
+}
+const currentChange = (currentPage) => {
+  if (tablePage.value) tablePage.value['currentPage'] = currentPage
+  getTableData()
+}
+const refreshChange = () => {
+  getTableData()
+}
+
+watch(
+  () => props.reportCode,
+  (value: string) => {
+    console.log(value,213123123)
+    if (value) initTable()
+  },
+  { immediate: true }
+)
+
+watch(
+  [() => windowSize.height.value, () => props.calcHeight],
+  () => {
+    initTableLayout()
+  },
+  { immediate: true }
+)
+
+onUnmounted(() => {
+
+  for (let key in timerObj.value) {
+    clearInterval(timerObj.value[key])
+    clearTimeout(timerObj.value[key])
+  }
+})
+
+defineExpose({
+  crudRef,
+  tableSelect,
+  selectIds,
+  loading,
+  clearSelection,
+  resetChange:clearSearch,
+   getTableData,
+  initTableLayout
+})
+</script>
+
+<style lang="scss" scoped>
+
+
+  :deep(.el-form-item--default){
+    margin-bottom: 10px;
+  }
+
+  :deep(.avue-crud__pagination){
+   padding-bottom: 0;
+  }
+
+  :deep(.avue-crud__tip){
+    display: none;
+  }
+
+  .amountBox{
+    &::after{
+      content:'、'
+    }
+
+    &:last-of-type::after{
+      content:''
+    }
+  }
+  
+  :deep(.el-table){
+      --el-table-border-color: #000;
+      // .el-table__expand-column{
+      //   display: none;
+      // }
+      height: auto !important;
+     .is-group th.el-table__cell,th.el-table__cell{
+      // background-color: #C6EFFE;
+        background:transparent !important;
+      }
+
+      .el-table__body tr.hover-row>td.el-table__cell{
+        background-color: #FFFFD2;
+       
+      }
+
+      &.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
+        background-color: #FFFFD2;
+      }
+      .color-B9DEE8{
+        background-color: #B9DEE8 !important;
+         font-weight: bold !important;
+      }
+      .color-90B3E2{
+        background-color: #90B3E2 !important;
+        font-weight: bold !important;
+      }
+
+      td.el-table__cell,th.el-table__cell{
+        border-right: 1px solid #000 !important;
+        border-bottom: 1px solid #000 !important;
+
+      }
+      .sort-caret.ascending{
+        border-bottom-color: #737476 ;
+      }
+      .sort-caret.descending {
+        border-top-color: #737476 ;  
+      }
+      .ascending .sort-caret.ascending{
+        border-bottom-color: #000 ;
+      }
+      .descending .sort-caret.descending{
+         border-top-color: #000 ; 
+      }
+       td.textAlignCell .cell{
+          span{
+            display: inline-block;
+            width: 100%;
+            text-align: left;
+          }
+        }
+
+      tfoot .el-table__cell{
+        border-top: 1px solid #000 !important;
+      }
+  }
+
+  .lastAmountRow{
+
+  }
+</style>