Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/api/wms/purchaseMain/index.ts

@@ -54,6 +54,22 @@ export const deletePurchaseMain = async (id: number) => {
   return await request.delete({ url: `/wms/purchase-main/delete?id=` + id })
 }
 
+// 关闭采购订单主
+export const closePurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-main/close?id=` + id })
+}
+// 打开采购订单主
+export const openPurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-main/open?id=` + id })
+}
+// 发布采购订单主
+export const publishPurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-main/publish?id=` + id })
+}
+// 下架采购订单主
+export const witPurchaseMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-main/wit?id=` + id })
+}
 // 导出采购订单主 Excel
 export const exportPurchaseMain = async (params) => {
   return await request.download({ url: `/wms/purchase-main/export-excel`, params })

src/api/wms/purchasePlanMain/index.ts

@@ -49,6 +49,33 @@ export const deletePurchasePlanMain = async (id: number) => {
   return await request.delete({ url: `/wms/purchase-plan-main/delete?id=` + id })
 }
 
+// 关闭要货计划主
+export const closePurchasePlanMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-plan-main/close?id=` + id })
+}
+// 打开要货计划主
+export const openPurchasePlanMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-plan-main/open?id=` + id })
+}
+// 发布要货计划主
+export const publishPurchasePlanMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-plan-main/publish?id=` + id })
+}
+// 下架要货计划主
+export const witPurchasePlanMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-plan-main/wit?id=` + id })
+}
+
+// 接受要货计划主
+export const accPurchasePlanMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-plan-main/acc?id=` + id })
+}
+
+// 驳回要货计划主
+export const rejPurchasePlanMain = async (id: number) => {
+  return await request.post({ url: `/wms/purchase-plan-main/rej?id=` + id })
+}
+
 // 导出要货计划主 Excel
 export const exportPurchasePlanMain = async (params) => {
   return await request.download({ url: `/wms/purchase-plan-main/export-excel`, params })

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue

@@ -5,28 +5,15 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="PurchaseMain.allSchemas"
-    />
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="PurchaseMain.allSchemas" />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
+    <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"
-    >
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
       <template #number="{row}">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
@@ -39,40 +26,22 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="formRef"
-    @success="getList"
-    :rules="PurchaseMainRules"
-    :formAllSchemas="PurchaseMain.allSchemas"
-    :tableAllSchemas="PurchaseDetail.allSchemas"
-    :tableFormRules="PurchaseDetailRules"
-    :tableData="tableData"
-    :apiUpdate="PurchaseMainApi.updatePurchaseMain"
-    :apiCreate="PurchaseMainApi.createPurchaseMain"
-    :isBusiness="true"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-  />
+  <BasicForm ref="formRef" @success="getList" :rules="PurchaseMainRules" :formAllSchemas="PurchaseMain.allSchemas"
+    :tableAllSchemas="PurchaseDetail.allSchemas" :tableFormRules="PurchaseDetailRules" :tableData="tableData"
+    :apiUpdate="PurchaseMainApi.updatePurchaseMain" :apiCreate="PurchaseMainApi.createPurchaseMain" :isBusiness="true"
+    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm" />
 
   <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="PurchaseMain.allSchemas"
-    :detailAllSchemas="PurchaseDetail.allSchemas"
-    :detailAllSchemasRules="PurchaseDetailRules"
-    :apiCreate="PurchaseDetailApi.createPurchaseDetail"
-    :apiUpdate="PurchaseDetailApi.updatePurchaseDetail"
-    :apiPage="PurchaseDetailApi.getPurchaseDetailPage"
-    :apiDelete="PurchaseDetailApi.deletePurchaseDetail"
-    :Echo="Echo"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-  />
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="PurchaseMain.allSchemas"
+    :detailAllSchemas="PurchaseDetail.allSchemas" :detailAllSchemasRules="PurchaseDetailRules"
+    :apiCreate="PurchaseDetailApi.createPurchaseDetail" :apiUpdate="PurchaseDetailApi.updatePurchaseDetail"
+    :apiPage="PurchaseDetailApi.getPurchaseDetailPage" :apiDelete="PurchaseDetailApi.deletePurchaseDetail" :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData" @success="importSuccess" :isShowOut="true" />
+  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :isShowOut="true" />
 </template>
 
 <script setup lang="ts">
@@ -87,7 +56,6 @@ defineOptions({ name: 'PurchaseMain' })
 
   const message = useMessage() // 消息弹窗
   const { t } = useI18n() // 国际化
-
   const route = useRoute() // 路由信息
   const routeName = ref()
   routeName.value = route.name
@@ -178,32 +146,28 @@ const isShowMainButton = (row,val) => {
   const butttondata = (row) => {
     return [
       defaultButtons.mainListOrderCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
-    defaultButtons.mainListOrderPubBtn({hide:isShowMainButton(row,['1'])}), // 发布
       defaultButtons.mainListOrderOpeBtn({ hide: isShowMainButton(row, ['3']) }), // 打开
+      defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
       defaultButtons.mainListOrderWitBtn({ hide: isShowMainButton(row, ['2']) }), // 下架
       defaultButtons.mainListEditBtn({ hasPermi: 'wms:purchase-main:update', hide: isShowMainButton(row, ['1']) }), // 编辑
-    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchase-main:delete',hide:isShowMainButton(row,['1'])}), // 删除
+      defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:purchase-main:delete', hide: isShowMainButton(row, ['1']) }), // 删除
     ]
   }
 
-
-
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
-  if (val == 'mainClose') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
-  } else if (val == 'mainReAdd') { // 重新添加
-    console.log('列表-操作按钮事件-重新添加')
-  } else if (val == 'mainSubmit') { // 提交审批
-    console.log('列表-操作按钮事件-提交审批')
-  } else if (val == 'mainTurnDown') { // 驳回
-    console.log('列表-操作按钮事件-驳回')
-  } else if (val == 'mainApprove') { // 审批通过
-    console.log('列表-操作按钮事件-审批通过')
-  } else if (val == 'edit') { // 编辑
+    if (val == 'edit') { // 编辑
       openForm('update', row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.id)
+    } else if (val == 'mainOrderClo') { // 关闭
+      handleClose(row.id)
+    } else if (val == 'mainOrderOpe') { // 打开
+      handleOpen(row.id)
+    } else if (val == 'mainOrderPub') { // 发布
+      handlePublish(row.id)
+    } else if (val == 'mainOrderWit') { // 下架
+      handleWit(row.id)
     }
   }
 
@@ -233,6 +197,58 @@ const handleDelete = async (id: number) => {
     } catch { }
   }
 
+  /** 关闭按钮操作 */
+  const handleClose = async (id : number) => {
+    try {
+      // 关闭的二次确认
+      await message.confirm('是否关闭所选中数据？')
+      // 发起关闭
+      await PurchaseMainApi.closePurchaseMain(id)
+      message.success(t('关闭成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 打开按钮操作 */
+  const handleOpen = async (id : number) => {
+    try {
+      // 打开的二次确认
+      await message.confirm('是否打开所选中数据？')
+      // 发起打开
+      await PurchaseMainApi.openPurchaseMain(id)
+      message.success(t('打开成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 发布按钮操作 */
+  const handlePublish = async (id : number) => {
+    try {
+      // 发布的二次确认
+      await message.confirm('是否发布所选中数据？')
+      // 发起发布
+      await PurchaseMainApi.publishPurchaseMain(id)
+      message.success(t('发布成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 下架按钮操作 */
+  const handleWit = async (id : number) => {
+    try {
+      // 下架的二次确认
+      await message.confirm('是否下架所选中数据？')
+      // 发起下架
+      await PurchaseMainApi.witPurchaseMain(id)
+      message.success(t('下架成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
   /** 导出按钮操作 */
   const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
@@ -242,7 +258,7 @@ const handleExport = async () => {
       // 发起导出
       exportLoading.value = true
       const data = await PurchaseMainApi.exportPurchaseMain(setSearchParams)
-    download.excel(data, '采购订单主.xlsx')
+      download.excel(data, '采购订单主.xls')
     } catch {
     } finally {
       exportLoading.value = false

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -5,28 +5,16 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="PurchasePlanMain.allSchemas"
-    />
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="PurchasePlanMain.allSchemas" />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
+    <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"
-    >
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
       <template #number="{row}">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
@@ -39,40 +27,25 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="formRef"
-    @success="getList"
-    :rules="PurchasePlanMainRules"
-    :formAllSchemas="PurchasePlanMain.allSchemas"
-    :tableAllSchemas="PurchasePlanDetail.allSchemas"
-    :tableFormRules="PurchasePlanDetailRules"
-    :tableData="tableData"
-    :apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain"
-    :apiCreate="PurchasePlanMainApi.createPurchasePlanMain"
-    :isBusiness="true"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-  />
+  <BasicForm ref="formRef" @success="getList" :rules="PurchasePlanMainRules"
+    :formAllSchemas="PurchasePlanMain.allSchemas" :tableAllSchemas="PurchasePlanDetail.allSchemas"
+    :tableFormRules="PurchasePlanDetailRules" :tableData="tableData"
+    :apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain" :apiCreate="PurchasePlanMainApi.createPurchasePlanMain"
+    :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
 
   <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="PurchasePlanMain.allSchemas"
-    :detailAllSchemas="PurchasePlanDetail.allSchemas"
-    :detailAllSchemasRules="PurchasePlanDetailRules"
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="PurchasePlanMain.allSchemas"
+    :detailAllSchemas="PurchasePlanDetail.allSchemas" :detailAllSchemasRules="PurchasePlanDetailRules"
     :apiCreate="PurchasePlanDetailApi.createPurchasePlanDetail"
     :apiUpdate="PurchasePlanDetailApi.updatePurchasePlanDetail"
     :apiPage="PurchasePlanDetailApi.getPurchasePlanDetailPage"
-    :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail"
-    :Echo="Echo"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-  />
+    :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail" :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -183,40 +156,35 @@ const isShowMainButton = (row,val) => {
   // 列表-操作按钮
   const butttondata = (row) => {
     return [
-        defaultButtons.mainListPurchasePlanModBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_REJECTED'])}), // 修改
-        defaultButtons.mainListPurchasePlanWitBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_PUBLISHED'])}), // 下架
-        defaultButtons.mainListPurchasePlanRejBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_PUBLISHED'])}), // 不接受
-        defaultButtons.mainListPurchasePlanAccBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_PUBLISHED'])}), // 接受
-        defaultButtons.mainListPurchasePlanPubBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_READY'])}), // 发布
-        defaultButtons.mainListPurchasePlanCloBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_READY'])}), // 关闭
-        defaultButtons.mainListPurchasePlanOpeBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_CLOSED'])}), // 打开
-        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_READY']),hasPermi:'wms:purchase-plan-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_READY']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除
+      defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架
+      defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受
+      defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受
+      defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
+      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
+      defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
+      defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:delete' }), // 删除
     ]
   }
 
-
-
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
-  if (val == 'mainPurPlanOpe') { // 打开
-    console.log('列表-操作按钮事件-打开')
-  } else if (val == 'mainPurPlanClo') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
-  } else if (val == 'mainPurPlanPub') { // 发布
-    console.log('列表-操作按钮事件-发布')
-  } else if (val == 'mainPurPlanAcc') { // 接受
-    console.log('列表-操作按钮事件-接受')
-  } else if (val == 'mainPurPlanRej') { // 不接受
-    console.log('列表-操作按钮事件-不接受')
-  } else if (val == 'mainPurPlanWit') { // 下架
-    console.log('列表-操作按钮事件-下架')
-  } else if (val == 'mainPurPlanMod') { // 修改
-    console.log('列表-操作按钮事件-修改')
-  } else if (val == 'edit') { // 编辑
+    if (val == 'edit') { // 编辑
       openForm('update', row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.id)
+    } else if (val == 'mainPurPlanClo') { // 关闭
+      handleClose(row.id)
+    } else if (val == 'mainPurPlanOpe') { // 打开
+      handleOpen(row.id)
+    } else if (val == 'mainPurPlanPub') { // 发布
+      handlePublish(row.id)
+    } else if (val == 'mainPurPlanWit') { // 下架
+      handleWit(row.id)
+    } else if (val == 'mainPurPlanAcc') { // 接受
+      handleAcc(row.id)
+    } else if (val == 'mainPurPlanRej') { // 驳回
+      handleWit(row.id)
     }
   }
 
@@ -246,6 +214,85 @@ const handleDelete = async (id: number) => {
     } catch { }
   }
 
+  /** 关闭按钮操作 */
+  const handleClose = async (id : number) => {
+    try {
+      // 关闭的二次确认
+      await message.confirm('是否关闭所选中数据？')
+      // 发起关闭
+      await PurchasePlanMainApi.closePurchasePlanMain(id)
+      message.success(t('关闭成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 打开按钮操作 */
+  const handleOpen = async (id : number) => {
+    try {
+      // 打开的二次确认
+      await message.confirm('是否打开所选中数据？')
+      // 发起打开
+      await PurchasePlanMainApi.openPurchasePlanMain(id)
+      message.success(t('打开成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 发布按钮操作 */
+  const handlePublish = async (id : number) => {
+    try {
+      // 发布的二次确认
+      await message.confirm('是否发布所选中数据？')
+      // 发起发布
+      await PurchasePlanMainApi.publishPurchasePlanMain(id)
+      message.success(t('发布成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 下架按钮操作 */
+  const handleWit = async (id : number) => {
+    try {
+      // 下架的二次确认
+      await message.confirm('是否下架所选中数据？')
+      // 发起下架
+      await PurchasePlanMainApi.witPurchasePlanMain(id)
+      message.success(t('下架成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 接受按钮操作 */
+  const handleAcc = async (id : number) => {
+    try {
+      // 接受的二次确认
+      await message.confirm('是否接受所选中数据？')
+      // 发起接受
+      await PurchasePlanMainApi.accPurchasePlanMain(id)
+      message.success(t('接受成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 驳回按钮操作 */
+  const handleRej = async (id : number) => {
+    try {
+      // 驳回的二次确认
+      await message.confirm('是否驳回所选中数据？')
+      // 发起驳回
+      await PurchasePlanMainApi.rejPurchasePlanMain(id)
+      message.success(t('驳回成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+
   /** 导出按钮操作 */
   const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
@@ -255,7 +302,7 @@ const handleExport = async () => {
       // 发起导出
       exportLoading.value = true
       const data = await PurchasePlanMainApi.exportPurchasePlanMain(setSearchParams)
-    download.excel(data, '要货计划主.xlsx')
+      download.excel(data, '要货计划主.xls')
     } catch {
     } finally {
       exportLoading.value = false

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -98,7 +98,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     form: {
-      value: 'PLAN_PURCHASE_READY',
+      value: '1',
       componentProps: {
         disabled: true
       }
@@ -107,46 +107,18 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '开始时间',
     field: 'beginTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     sort: 'custom',
     table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+      width: 150
     },
     isForm: false,
   },
   {
     label: '结束时间',
     field: 'endTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     sort: 'custom',
     table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
+      width: 150
     },
     isForm: false,
   },