Merge branch 'intex' into intex_pandian

src/api/wms/deliTimeWms/index.ts

@@ -50,4 +50,9 @@ export const exportDeliTime = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/deli-time-wms/get-import-template' })
+}
+
+// 校验是否使用
+export const getIsUse = async (id: number) => {
+  return await request.get({ url: `/wms/deli-time-wms/get?id=` + id })
 }

src/api/wms/modelCalendar/index.ts

@@ -0,0 +1,58 @@
+import request from '@/config/axios'
+
+export interface ModelCalendarMainVO {
+  id: number
+  model: string
+  yearAndMonth: string
+  delayDeli: number
+  remark: string
+  available: string
+  siteId: string
+  concurrencyStamp: number
+}
+
+// 查询受入号日历主列表
+export const getModelCalendarMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/model-calendar-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/model-calendar-main/page`, params })
+  }
+}
+
+// 查询受入号日历主详情
+export const getModelCalendarMain = async (id: number) => {
+  return await request.get({ url: `/wms/model-calendar-main/get?id=` + id })
+}
+
+// 新增受入号日历主
+export const createModelCalendarMain = async (data: ModelCalendarMainVO) => {
+  return await request.post({ url: `/wms/model-calendar-main/create`, data })
+}
+
+// 修改受入号日历主
+export const updateModelCalendarMain = async (data: ModelCalendarMainVO) => {
+  return await request.put({ url: `/wms/model-calendar-main/update`, data })
+}
+
+// 删除受入号日历主
+export const deleteModelCalendarMain = async (id: number) => {
+  return await request.delete({ url: `/wms/model-calendar-main/delete?ids=` + id })
+}
+
+// 导出受入号日历主 Excel
+export const exportModelCalendarMain = async (params) => {
+  return await request.download({ url: `/wms/model-calendar-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/model-calendar-main/get-import-template' })
+}
+
+// 查询供应商便次配置列表
+export const getPageTableHead = async (params) => {
+  return await request.get({ url: `/wms/supplier-deli-main/queryPageTableHead`, params })
+}

src/api/wms/modelDeliTime/index.ts

@@ -28,6 +28,10 @@ export const createSupplierAddrDeliTimeDetail = async (data: SupplierAddrDeliTim
   return await request.post({ url: `/wms/model-deli-time-main/create`, data })
 }
 
+
+export const addModelDeliTimeDetail = async (data: SupplierAddrDeliTimeDetailVO) => {
+  return await request.post({ url: `/wms/model-deli-time-detail/addDetail`, data })
+}
 // 修改供应商地点便次时间配置明细
 export const updateSupplierAddrDeliTimeDetail = async (data: SupplierAddrDeliTimeDetailVO) => {
   return await request.put({ url: `/wms/model-deli-time-main/update`, data })

src/api/wms/receivedNumberDeliDetail/index.ts

@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface ReceivedNumberDeliDetailVO {
+  id: number
+  masterId: number
+  serial: number
+  deliNo: number
+  delayDeli: number
+  day: Date
+  beginTime: Date
+  remark: string
+  available: string
+  siteId: string
+  concurrencyStamp: number
+}
+
+// 查询受入号便次子列表
+export const getReceivedNumberDeliDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/received-number-deli-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/received-number-deli-detail/page`, params })
+  }
+}
+
+// 查询受入号便次子详情
+export const getReceivedNumberDeliDetail = async (id: number) => {
+  return await request.get({ url: `/wms/received-number-deli-detail/get?id=` + id })
+}
+
+// 新增受入号便次子
+export const createReceivedNumberDeliDetail = async (data: ReceivedNumberDeliDetailVO) => {
+  return await request.post({ url: `/wms/received-number-deli-detail/create`, data })
+}
+
+// 修改受入号便次子
+export const updateReceivedNumberDeliDetail = async (data: ReceivedNumberDeliDetailVO) => {
+  return await request.put({ url: `/wms/received-number-deli-detail/update`, data })
+}
+
+// 删除受入号便次子
+export const deleteReceivedNumberDeliDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/received-number-deli-detail/delete?id=` + id })
+}
+
+// 导出受入号便次子 Excel
+export const exportReceivedNumberDeliDetail = async (params) => {
+  return await request.download({ url: `/wms/received-number-deli-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/received-number-deli-detail/get-import-template' })
+}

src/api/wms/receivedNumberDeliMain/index.ts

@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface ReceivedNumberDeliMainVO {
+  id: number
+  model: string
+  yearAndMonth: string
+  remark: string
+  available: string
+  siteId: string
+  concurrencyStamp: number
+}
+
+// 查询受入号便次主列表
+export const getReceivedNumberDeliMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/received-number-deli-main/senior', data })
+  } else {
+    return await request.get({ url: `/wms/received-number-deli-main/page`, params })
+  }
+}
+
+// 查询受入号便次主详情
+export const getReceivedNumberDeliMain = async (id: number) => {
+  return await request.get({ url: `/wms/received-number-deli-main/get?id=` + id })
+}
+
+// 新增受入号便次主
+export const createReceivedNumberDeliMain = async (data: ReceivedNumberDeliMainVO) => {
+  return await request.post({ url: `/wms/received-number-deli-main/create`, data })
+}
+
+// 修改受入号便次主
+export const updateReceivedNumberDeliMain = async (data: ReceivedNumberDeliMainVO) => {
+  return await request.put({ url: `/wms/received-number-deli-main/update`, data })
+}
+
+// 删除受入号便次主
+export const deleteReceivedNumberDeliMain = async (id: number) => {
+  return await request.delete({ url: `/wms/received-number-deli-main/delete?id=` + id })
+}
+
+// 导出受入号便次主 Excel
+export const exportReceivedNumberDeliMain = async (params) => {
+  return await request.download({ url: `/wms/received-number-deli-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/received-number-deli-main/get-import-template' })
+}
+
+// 查询供应商便次配置列表
+export const getPageTableHead = async (params) => {
+  return await request.get({ url: `/wms/received-number-deli-main/queryPageTableHead`, params })
+}

src/views/wms/basicDataManage/receivedNumberDeliMain/index.vue

@@ -0,0 +1,359 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ReceivedNumberDeliMain.allSchemas.searchSchema" @search="search" @reset="search" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ReceivedNumberDeliMain.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 v-for="item in dateColumns" :key="item.field" #[item.field]="{row}">
+        <div :style="{ maxHeight: getMaxHeight(row)}">
+          <div v-for="(cur,index) in row[item.field]" :key="index">
+            {{cur}}
+          </div>
+        </div>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ReceivedNumberDeliMainRules"
+    :formAllSchemas="ReceivedNumberDeliMain.allSchemas"
+    :apiUpdate="SupplierDeliMainApi.updateSupplierDeliMain"
+    :apiCreate="SupplierDeliMainApi.createSupplierDeliMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ReceivedNumberDeliMain.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/basic/supplier-deli-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ReceivedNumberDeliMain,ReceivedNumberDeliMainRules } from './receivedNumberDeliMain.data'
+import * as SupplierDeliMainApi from '@/api/wms/receivedNumberDeliMain'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
+
+defineOptions({ name: 'ReceivedNumberDeliMain' })
+
+// const array = [{
+//     field: "code1",
+//     isForm: false,
+//     isTable: true,
+//     isSearch: true,
+//     label: "编码1",
+//     sort: "custom",
+//     sortTableDefault: 999,
+//     width: 150,
+//     table:{
+//       width: 150,
+//     }
+//     }]
+    
+const orginTableColumns = ref(ReceivedNumberDeliMain.allSchemas.tableColumns)
+const tableColumns = ref(ReceivedNumberDeliMain.allSchemas.tableColumns)
+// 字段设置 更新主列表字段
+const updataTableColumns = (val: { [x: string]: any; field: string; label?: string | undefined; width?: string | number | undefined; fixed?: "left" | "right" | undefined; children?: any[] | undefined }[]) => {
+  orginTableColumns.value = val
+}
+
+const { tableObject:tableObjectHead, tableMethods:tableMethodsHead } = useTable({
+  getListApi: SupplierDeliMainApi.getPageTableHead // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList: getListHead, setSearchParams: setSearchParamsHead } = tableMethodsHead
+const search = (mold) => {
+  setSearchParamsHead(mold)
+  setSearchParams(mold)
+}
+const dateColumns = ref([])
+watch(()=>tableObjectHead.tableList,()=>{
+  updateDateTableColumns()
+},{deep:true})
+const updateDateTableColumns = ()=>{
+  console.log('tableObjectHead', tableObjectHead)
+  dateColumns.value = []
+  if(tableObjectHead.tableList.length>10){
+    tableObjectHead.tableList.forEach(item=>{
+    dateColumns.value.push({
+        width:120,
+        field: item,
+        label: item
+      })
+    })
+  }else{
+    tableObjectHead.tableList.forEach(item=>{
+    dateColumns.value.push({
+        field: item,
+        label: item
+      })
+    })
+  }
+  tableColumns.value  = [...orginTableColumns.value,...dateColumns.value]
+  console.log('tableColumns',tableColumns.value)
+}
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+// const tableColumns = ref(SupplierDeliMain.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField: string | number, searchField: string | number, val: { [x: string]: any }[], formRef: { setValues: (arg0: {}) => void }) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+// const updataTableColumns = (val) => {
+
+//   tableColumns.value = val
+// }
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierDeliMainApi.getReceivedNumberDeliMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+const getListExecute = () => {
+  tableObject.params.yearAndMonth=formatDate(new Date(),'YYYY-MM')
+  getList()
+  tableObject.tableList.forEach(item=>item.isOpen = false)
+}
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:supplierDeliMain:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:supplierDeliMain:import'}), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  // defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val: string, item: any) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getListHead()
+    getListExecute()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  const array = []
+  // 如果子数据条数超过6条不展示按钮
+  dateColumns.value.forEach(item => {
+    if (row[item.field]?.length > 6) {
+    array.push(row)
+    }
+  })
+  return [
+    {
+      label: t(`ts.展开更多`).replace('ts.', ''),
+      name: 'open',
+      hide: row.isOpen || array.length==0,
+      type: 'primary',
+      color: '',
+      link: true, // 文本展现按钮
+      hasPermi: ''
+    },
+    {
+      label: t(`ts.收起`).replace('ts.', ''),
+      name: 'retract',
+      hide: !row.isOpen || array.length==0,
+      type: 'primary',
+      color: '',
+      link: true, // 文本展现按钮
+      hasPermi: ''
+    }
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val: string, row:any) => {
+  if (val == 'open') { // 展开
+    // openForm('update', row)
+    row.isOpen = true
+    getMaxHeight(row)
+  } else if (val == 'retract') { // 收起
+    row.isOpen = false
+    getMaxHeight(row)
+    // handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType: string,data: SupplierDeliMainApi.SupplierDeliMainVO) => {
+  var isHave =ReceivedNumberDeliMain.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await SupplierDeliMainApi.createSupplierDeliMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await SupplierDeliMainApi.updateSupplierDeliMain(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getListExecute()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierDeliMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SupplierDeliMainApi.deleteSupplierDeliMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getListExecute()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await SupplierDeliMainApi.exportReceivedNumberDeliMain(tableObject.params)
+    download.excel(data, '受入号便次配置主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '供应商便次配置主导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getListExecute()
+}
+
+// 筛选提交
+const searchFormClick = (searchData: { filters: any }) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getListExecute() // 刷新当前列表
+}
+
+const getMaxHeight=(row)=> {
+  // 根据条件返回不同的高度值
+  if (row.isOpen === true) { // 例如：特定名字的行改变高度
+    return 'none'; // 特定高度值
+  }
+  return '140px'; // 默认高度值
+}
+/** 初始化 **/
+onMounted(async () => {
+  getListHead()
+  getListExecute()
+  //importTemplateData.templateUrl = await SupplierDeliMainApi.importTemplate()
+})
+
+</script>
+<style lang="scss">
+// .el-table .cell.el-tooltip{
+//   height:140px;
+// }
+</style>

src/views/wms/basicDataManage/receivedNumberDeliMain/receivedNumberDeliDetail.data.ts

@@ -0,0 +1,114 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+/*
+export const SupplierDeliDetailRules = reactive({
+  masterId: [required],
+  deliNo: [required],
+  delayDeli: [required],
+  beginTime: [required],
+})
+*/
+
+export const SupplierDeliDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '主id',
+    field: 'masterId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '便次',
+    field: 'deliNo',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '延迟便次',
+    field: 'delayDeli',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    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: '是否可用默认TRUE',
+    field: 'available',
+    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: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/wms/basicDataManage/receivedNumberDeliMain/receivedNumberDeliMain.data.ts

@@ -0,0 +1,54 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { formatDate } from '@/utils/formatTime'
+
+// 表单校验
+export const ReceivedNumberDeliMainRules = reactive({
+  supplierCode: [required],
+  supplierAddress: [required],
+  yearAndMonth: [required],
+})
+
+export const ReceivedNumberDeliMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '受入号',
+    field: 'model',
+    sort: 'custom',
+    isSearch: true,
+    table:{
+      width : 180
+    }
+  },
+  {
+    label: '延迟便次',
+    field: 'delayDeli',
+    sort: 'custom',
+    isSearch: false,
+    table:{
+      width : 180
+    }
+  },
+  {
+    label: '年月',
+    field: 'yearAndMonth',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      value: formatDate(new Date(),'YYYY-MM'),
+      componentProps: {
+        type: 'month',
+        valueFormat: 'YYYY-MM',
+      }
+    }
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isForm: false,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   }
+  // }
+]))

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

@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, dateFormatterHHMMSS } from '@/utils/formatTime'
 
 // 表单校验
 export const DeliTimeRules = reactive({
@@ -36,23 +36,30 @@ export const DeliTimeWms = useCrudSchemas(reactive<CrudSchema[]>([
     label: '开始时间',
     field: 'beginTime',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatterHHMMSS,
     isSearch: true,
+    table: {
+      width:120
+    },
     search: {
-      component: 'DatePicker',
+      component: 'TimePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'time',
-        type: 'daterange',
+        dateFormat: 'HH:mm:ss',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        valueFormat: 'x'
       }
     },
     form: {
-      component: 'DatePicker',
+      component: 'TimePicker',
       componentProps: {
-        type: 'datetime',
+        type: 'time',
+        dateFormat: 'HH:mm:ss',
         valueFormat: 'x'
       }
     },
+    detail: {
+      dateFormat:'HH:mm:ss'
+    }
   },
   {
     label: '创建者',

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

@@ -54,7 +54,7 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="DeliTimeWms.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/basic/deli-time/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/deli-time-wms/import" :importTemplateData="importTemplateData" @success="importSuccess" :isShowOut="true" :updateIsDisable="true" :coverIsDisable="true" :mode="2"/>
 </template>
 
 <script setup lang="ts">
@@ -191,6 +191,11 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
+  const isUse = await DeliTimeWmsApi.getIsUse(id)
+    if (isUse) {
+      message.warning('该编号已经配置受入号便次时间，不可删除')
+      return
+    }
   try {
     // 删除的二次确认
     await message.delConfirm()

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

@@ -0,0 +1,399 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ModelCalendar.allSchemas.searchSchema" @search="search" @reset="search" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ModelCalendar.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"
+      row-key="id"
+      :selection="true"
+      @getSelectionRows="getSelectionRows"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template v-for="item in dateColumns" :key="item.field" #[item.field]="{row}">
+        <div :style="{ maxHeight: getMaxHeight(row)}">
+          <div v-for="(cur,index) in row[item.field]" :key="index">
+            {{cur}}
+          </div>
+        </div>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ModelCalendarRules"
+    :formAllSchemas="ModelCalendar.allSchemas"
+    :apiUpdate="ModelCalendarApi.updateSupplierDeliMain"
+    :apiCreate="ModelCalendarApi.createSupplierDeliMain"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ModelCalendar.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/model-calendar-main/import" :importTemplateData="importTemplateData" @success="importSuccess" :showDownLoad="false" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ModelCalendar, ModelCalendarRules } from './modelcalendar.data'
+import * as ModelCalendarApi from '@/api/wms/modelCalendar'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
+import { debug } from 'console'
+
+defineOptions({ name: 'modelcalendar' })
+
+// const array = [{
+//     field: "code1",
+//     isForm: false,
+//     isTable: true,
+//     isSearch: true,
+//     label: "编码1",
+//     sort: "custom",
+//     sortTableDefault: 999,
+//     width: 150,
+//     table:{
+//       width: 150,
+//     }
+//     }]
+    
+const orginTableColumns = ref(ModelCalendar.allSchemas.tableColumns)
+const tableColumns = ref(ModelCalendar.allSchemas.tableColumns)
+// 字段设置 更新主列表字段
+const updataTableColumns = (val: { [x: string]: any; field: string; label?: string | undefined; width?: string | number | undefined; fixed?: "left" | "right" | undefined; children?: any[] | undefined }[]) => {
+  orginTableColumns.value = val
+}
+
+const { tableObject:tableObjectHead, tableMethods:tableMethodsHead } = useTable({
+  getListApi: ModelCalendarApi.getPageTableHead // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList: getListHead, setSearchParams: setSearchParamsHead } = tableMethodsHead
+const search = (mold) => {
+  setSearchParamsHead(mold)
+  setSearchParams(mold)
+}
+const dateColumns = ref([])
+watch(()=>tableObjectHead.tableList,()=>{
+  updateDateTableColumns()
+},{deep:true})
+const updateDateTableColumns = ()=>{
+  console.log('tableObjectHead', tableObjectHead)
+  dateColumns.value = []
+  if(tableObjectHead.tableList.length>10){
+    tableObjectHead.tableList.forEach(item=>{
+    dateColumns.value.push({
+        width:120,
+        field: item,
+        label: item
+      })
+    })
+  }else{
+    tableObjectHead.tableList.forEach(item=>{
+    dateColumns.value.push({
+        field: item,
+        label: item
+      })
+    })
+  }
+  tableColumns.value  = [...orginTableColumns.value,...dateColumns.value]
+  console.log('tableColumns',tableColumns.value)
+}
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+// const tableColumns = ref(ModelCalendar.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField: string | number, searchField: string | number, val: { [x: string]: any }[], formRef: { setValues: (arg0: {}) => void }) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+// const updataTableColumns = (val) => {
+
+//   tableColumns.value = val
+// }
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ModelCalendarApi.getModelCalendarMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+const getListExecute = () => {
+  tableObject.params.yearAndMonth=formatDate(new Date(),'YYYY-MM')
+  getList()
+  tableObject.tableList.forEach(item=>item.isOpen = false)
+}
+
+const selectionRowsData = ref([])//多选数据
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:supplierDeliMain:create'}), // 新增
+  // defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  defaultButtons.mainLisSelectiontDeleteBtn(null), // 批量删除
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  // defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val: string, item: any) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'selection_delete') { // 批量删除
+    handleDelete()
+  }else if (val == 'refresh') { // 刷新
+    getListHead()
+    getListExecute()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  const array = []
+  // 如果子数据条数超过6条不展示按钮
+  dateColumns.value.forEach(item => {
+    if (row[item.field]?.length > 6) {
+    array.push(row)
+    }
+  })
+  return [
+    {
+      label: t(`ts.展开更多`).replace('ts.', ''),
+      name: 'open',
+      hide: row.isOpen || array.length==0,
+      type: 'primary',
+      color: '',
+      link: true, // 文本展现按钮
+      hasPermi: ''
+    },
+    {
+      label: t(`ts.收起`).replace('ts.', ''),
+      name: 'retract',
+      hide: !row.isOpen || array.length==0,
+      type: 'primary',
+      color: '',
+      link: true, // 文本展现按钮
+      hasPermi: ''
+    },
+    defaultButtons.mainListDeleteBtn(null), // 删除
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val: string, row:any) => {
+  if (val == 'open') { // 展开
+    // openForm('update', row)
+    row.isOpen = true
+    getMaxHeight(row)
+  } else if (val == 'retract') { // 收起
+    row.isOpen = false
+    getMaxHeight(row)
+  } else if(val == 'delete'){
+    handleDelete(row)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType: string,data: ModelCalendarApi.SupplierDeliMainVO) => {
+  var isHave =ModelCalendar.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ModelCalendarApi.createSupplierDeliMain(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ModelCalendarApi.updateSupplierDeliMain(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getListExecute()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierDeliMain')
+}
+
+/** 删除按钮操作 */
+// const handleDelete = async (row?:any) => {
+// const handleDelete = async (id: number) => {
+//   try {
+//     // 删除的二次确认
+//     await message.delConfirm()
+//     // 发起删除
+//     await ModelCalendarApi.deleteModelCalendarMain(id)
+//     message.success(t('common.delSuccess'))
+//     // 刷新列表
+//     await getListExecute()
+//   } catch {}
+// }
+const handleDelete = async (row?:any) => {
+  try {
+    // 发起删除
+    let str
+    if (row) {
+      // 删除的二次确认
+      await message.delConfirm()
+      str = row.id
+    } else {
+      console.log(selectionRowsData.value)
+      if (selectionRowsData.value.length == 0) {
+        message.warning('请选择数据')
+        return
+      }
+      // 删除的二次确认
+      await message.delConfirm()
+      str = selectionRowsData.value.map(item=>item.id).join(',')
+    }
+    await ModelCalendarApi.deleteModelCalendarMain(str)
+    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 ModelCalendarApi.exportModelCalendarMain(tableObject.params)
+    download.excel(data, '受入号日历.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '受入号日历导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getListExecute()
+}
+
+// 筛选提交
+const searchFormClick = (searchData: { filters: any }) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getListExecute() // 刷新当前列表
+}
+
+const getMaxHeight=(row)=> {
+  // 根据条件返回不同的高度值
+  if (row.isOpen === true) { // 例如：特定名字的行改变高度
+    return 'none'; // 特定高度值
+  }
+  return '140px'; // 默认高度值
+}
+const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+ selectionRowsData.value = currentPageSelectionRows
+    console.log(selectionRowsData.value)
+}
+/** 初始化 **/
+onMounted(async () => {
+  getListHead()
+  getListExecute()
+  importTemplateData.templateUrl = await ModelCalendarApi.importTemplate()
+})
+
+</script>
+<style lang="scss">
+// .el-table .cell.el-tooltip{
+//   height:140px;
+// }
+</style>

src/views/wms/basicDataManage/supplierManage/modelCalendar/modelcalendar.data.ts

@@ -0,0 +1,73 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { formatDate } from '@/utils/formatTime'
+
+// 表单校验
+export const ModelCalendarRules = reactive({
+  supplierCode: [required],
+  supplierAddress: [required],
+  yearAndMonth: [required],
+})
+
+export const ModelCalendar = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: '受入号',
+  //   field: 'model',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table:{
+  //     width : 180
+  //   }
+  // },
+  // {
+  //   label: '供应商地点',
+  //   field: 'supplierAddress',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table:{
+  //     width : 180
+  //   }
+  // },
+  {
+    label: '受入号',
+    field: 'model',
+    sort: 'custom',
+    isSearch: true,
+    table:{
+      width : 180
+    }
+  },
+  {
+    label: '延迟便次',
+    field: 'delayDeli',
+    sort: 'custom',
+    isSearch: false,
+    table:{
+      width : 180
+    }
+  },
+  {
+    label: '年月',
+    field: 'yearAndMonth',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      value: formatDate(new Date(),'YYYY-MM'),
+      componentProps: {
+        type: 'month',
+        valueFormat: 'YYYY-MM',
+        clearable:false
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/wms/basicDataManage/supplierManage/modelCalendar/modelcalendardetail.data.ts

@@ -0,0 +1,114 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+/*
+export const SupplierDeliDetailRules = reactive({
+  masterId: [required],
+  deliNo: [required],
+  delayDeli: [required],
+  beginTime: [required],
+})
+*/
+
+export const SupplierDeliDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '主id',
+    field: 'masterId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '便次',
+    field: 'deliNo',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '延迟便次',
+    field: 'delayDeli',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
+    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: '是否可用默认TRUE',
+    field: 'available',
+    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: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

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

@@ -69,16 +69,31 @@
     :apiCreate="ModelDeliTimeDetailApi.createPurchaseClaimRequestDetail"
     :apiUpdate="ModelDeliTimeDetailApi.updatePurchaseClaimRequestDetail"
     :apiPage="ModelDeliTimeDetailApi.getSupplierAddrDeliTimeDetailPage"
-    :apiDelete="ModelDeliTimeDetailApi.deletePurchaseClaimRequestDetail"
+    :apiDelete="ModelDeliTimeDetailApi.deleteSupplierAddrDeliTimeDetail"
     :detailButtonIsShowDelete="true"
-    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowAdd="true"
+    :detailButtonIsShowEdit='false'
+    :detailButtonIsShowAddStatusArray="[]"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    :isChangeDetailDrawer="[]"
+    :changeDetailDrawer="true"
     @detailOpenForm="detailOpenForm"
   />
 
+  <SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
+
   <!-- :detailAllSchemas="ModelDeliTimeDetail.allSchemas" -->
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/supplier-addr-deli-time-detail/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm 
+    ref="importFormRef" 
+    url="/wms/model-deli-time-detail/import" 
+    :importTemplateData="importTemplateData" 
+    @success="importSuccess" 
+    :isShowOut="true" 
+    :updateIsDisable="true"
+    :appendIsDisable="true"
+    :mode="3"
+  />
 </template>
 
 <script setup lang="ts">
@@ -90,6 +105,8 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { debug } from 'console'
+import { DeliTimeWms } from '../deliTimeWms/deliTimeWms.data'
+import * as DeliTimeWmsApi from '@/api/wms/deliTimeWms'
 
 defineOptions({ name: 'ModelDeliTime' })
 
@@ -359,7 +376,9 @@ const formsSuccess = async (formType,data) => {
 /** 详情操作 */
 const detailRef = ref()
 const detailData = ref({})
+const masterId = ref(0)
 const openDetail = (row: any, titleName: any, titleValue: any) => {
+  masterId.value = row.masterId
   detailData.value = row
   detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierAddrDeliTimeDetail')
 }
@@ -417,6 +436,41 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const tableSelectionDelete = (selection) => {
+  tableData.value = tableData.value.filter((item) => !selection.includes(item))
+}
+
+const searchTableRef = ref()
+const detailOpenForm = (type, row) => {
+   searchTableRef.value.open(
+      '便次时间配置',
+      DeliTimeWms.allSchemas,
+      DeliTimeWmsApi.getDeliTimePage,
+      null,
+      DeliTimeWms.allSchemas.searchSchema,
+      true,
+      null,
+      null,
+      null,
+      null,
+      null
+      // searchTableSelections.value
+    )
+}
+
+const submitItem = async (formType, data,  val, tableList) => {
+  console.log('formType',formType)
+  console.log('data',data)
+  console.log('val',val)
+  console.log('tableList',tableList)
+  val.forEach((item) => {
+    item.masterId = masterId;
+  });
+  await ModelDeliTimeDetailApi.addModelDeliTimeDetail(val)
+  message.success(t('common.createSuccess'))
+  detailRef.value.updateList()
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()

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

@@ -165,6 +165,10 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       value: 0,
+      componentProps: {
+        min:0,
+        precision:0
+      }
     },
   },
   {
@@ -277,19 +281,32 @@ export const ModelDeliTimeDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'shift',
     sort: 'custom',
     isForm: false,
+    dictType: DICT_TYPE.SHIFT,
+    dictClass: 'string',
     tableForm:{
       disabled:true,
+      type:'Select'
     }
   },
   {
-    label: '开始时间',
+    label: '操作',
-    field: 'beginTime',
+    field: 'action',
-    sort: 'custom',
     isForm: false,
-    formatter: dateFormatter,
+    isTableForm:false,
-    tableForm:{
+    table: {
-      disabled:true,
+      width: 150,
-      formatter: dateFormatter,
+      fixed: 'right'
     }
-  },
+  }
+  // {
+  //   label: '开始时间',
+  //   field: 'beginTime',
+  //   sort: 'custom',
+  //   isForm: false,
+  //   formatter: dateFormatter,
+  //   tableForm:{
+  //     disabled:true,
+  //     formatter: dateFormatter,
+  //   }
+  // },
 ]))

src/views/wms/supplierManage/supplierDeliMain/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template v-for="item in dateColumns" :key="item.field" #[item.field]="{row}">
-        <div :style="{ maxHeight: getHeight(row) }">
+        <div :style="{ maxHeight: getMaxHeight(row)}">
           <div v-for="(cur,index) in row[item.field]" :key="index">
             {{cur}}
           </div>
@@ -240,10 +240,10 @@ const buttonTableClick = async (val: string, row:any) => {
   if (val == 'open') { // 展开
     // openForm('update', row)
     row.isOpen = true
-    getHeight(row)
+    getMaxHeight(row)
   } else if (val == 'retract') { // 收起
     row.isOpen = false
-    getHeight(row)
+    getMaxHeight(row)
     // handleDelete(row.id)
   }
 }
@@ -336,10 +336,11 @@ const searchFormClick = (searchData: { filters: any }) => {
   }
   getListExecute() // 刷新当前列表
 }
-const getHeight=(row)=> {
+
+const getMaxHeight=(row)=> {
   // 根据条件返回不同的高度值
   if (row.isOpen === true) { // 例如：特定名字的行改变高度
-    return 'auto'; // 特定高度值
+    return 'none'; // 特定高度值
   }
   return '140px'; // 默认高度值
 }

src/views/wms/supplierManage/supplierDeliMain/supplierDeliMain.data.ts

@@ -60,13 +60,13 @@ export const SupplierDeliMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
+  {
-  //   label: '操作',
+    label: '操作',
-  //   field: 'action',
+    field: 'action',
-  //   isForm: false,
+    isForm: false,
-  //   table: {
+    table: {
-  //     width: 150,
+      width: 150,
-  //     fixed: 'right'
+      fixed: 'right'
-  //   }
+    }
-  // }
+  }
 ]))