BUG修改

src/api/eam/item/applicationRecordDetail/index.ts

@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface ItemApplyDetailVO {
+  number: string
+  name: string
+  type: string
+  applyId: number
+  applyDeptId: number
+  approveId: number
+  approveTime: Date
+  outId: number
+  outTime: Date
+  siteId: string
+  available: string
+  concurrencyStamp: number
+}
+
+// 查询备件申领记录主列表
+export const getItemApplyDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/item-apply-detail/senior', data })
+  } else {
+    return await request.get({ url: `/eam/item-apply-detail/page`, params })
+  }
+}
+
+// 查询备件申领记录主详情
+export const getItemApplyDetail = async (id: number) => {
+  return await request.get({ url: `/eam/item-apply-detail/get?id=` + id })
+}
+
+// 新增备件申领记录主
+export const createItemApplyDetail = async (data: ItemApplyDetailVO) => {
+  return await request.post({ url: `/eam/item-apply-detail/create`, data })
+}
+
+// 修改备件申领记录主
+export const updateItemApplyDetail = async (data: ItemApplyDetailVO) => {
+  return await request.put({ url: `/eam/item-apply-detail/update`, data })
+}
+
+// 删除备件申领记录主
+export const deleteItemApplyDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/item-apply-detail/delete?id=` + id })
+}
+
+// 导出备件申领记录主 Excel
+export const exportItemApplyDetail = async (params) => {
+  return await request.download({ url: `/eam/item-apply-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/item-apply-detail/get-import-template' })
+}

src/api/eam/item/applicationRecordMain/index.ts

@@ -0,0 +1,57 @@
+import request from '@/config/axios'
+
+export interface ItemApplyMainVO {
+  number: string
+  name: string
+  type: string
+  applyId: number
+  applyDeptId: number
+  approveId: number
+  approveTime: Date
+  outId: number
+  outTime: Date
+  siteId: string
+  available: string
+  concurrencyStamp: number
+}
+
+// 查询备件申领记录主列表
+export const getItemApplyMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/item-apply-main/senior', data })
+  } else {
+    return await request.get({ url: `/eam/item-apply-main/page`, params })
+  }
+}
+
+// 查询备件申领记录主详情
+export const getItemApplyMain = async (id: number) => {
+  return await request.get({ url: `/eam/item-apply-main/get?id=` + id })
+}
+
+// 新增备件申领记录主
+export const createItemApplyMain = async (data: ItemApplyMainVO) => {
+  return await request.post({ url: `/eam/item-apply-main/create`, data })
+}
+
+// 修改备件申领记录主
+export const updateItemApplyMain = async (data: ItemApplyMainVO) => {
+  return await request.put({ url: `/eam/item-apply-main/update`, data })
+}
+
+// 删除备件申领记录主
+export const deleteItemApplyMain = async (id: number) => {
+  return await request.delete({ url: `/eam/item-apply-main/delete?id=` + id })
+}
+
+// 导出备件申领记录主 Excel
+export const exportItemApplyMain = async (params) => {
+  return await request.download({ url: `/eam/item-apply-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/item-apply-main/get-import-template' })
+}

src/api/eam/item/itemOrderMain/index.ts

@@ -54,6 +54,12 @@ export const deleteItemOrderMain = async (id: number) => {
   return await request.delete({ url: `/eam/item-order-main/delete?id=` + id })
 }
 
+// 关闭采购订单主
+export const closeItemOrderMain = async (id: number) => {
+  return await request.post({ url: `/eam/item-order-main/close?id=` + id })
+}
+
+
 // 导出备件采购订单主 Excel
 export const exportItemOrderMain = async (params) => {
   return await request.download({ url: `/eam/item-order-main/export-excel`, params })

src/utils/dict.ts

@@ -286,4 +286,8 @@ export enum DICT_TYPE {
   JX_STATUS = 'JX_STATUS',  //检修状态,
   EXECUTION_CYCLE = 'execution_cycle', //模具保养周期
   MOLD_EXECUTION_CYCLE = 'mold_execution_cycle', //模具保养周期
+  GET_ORDER_STATUS = 'get_order_status', //模具保养周期
+  IS_OPEN = 'is_open', //是否打开
+  
+  
 }

src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts

@@ -99,21 +99,6 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '保养类型',
-    field: 'maintenanceType',
-    dictType: DICT_TYPE.MAINTENANCE_TYPE,
-    dictClass: 'string',
-    sort: 'custom',
-    isSearch: false,
-   form: {
-     component: 'Select',
-     value: 'CYCLE',
-     componentProps: {
-       disabled: true
-     }
-   },
-  },
   {
     label: '保养类型',
     field: 'executionCycle',

src/views/eam/basic/item/index.vue

@@ -126,7 +126,7 @@
   const searchTableRef = ref()
   const openItem = (number : String) => {
     itemNumber.value = number;
-    searchTableRef.value.open('设备列表', DeviceAccounts.allSchemas, DeviceAccountsApi.getDeviceAccountsPage, null, Item.allSchemas.searchSchema, true, null, null, null, null);
+    searchTableRef.value.open('设备列表', DeviceAccounts.allSchemas, DeviceAccountsApi.getDeviceAccountsPage(), null, Item.allSchemas.searchSchema, true, null, null, null, null);
   }
 
   const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => {

src/views/eam/basic/moldMaintenance/moldMaintenance.data.ts

@@ -99,18 +99,6 @@ export const MoldMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '保养类型',
-    field: 'maintenanceType',
-    dictType: DICT_TYPE.MAINTENANCE_TYPE,
-    dictClass: 'string',
-    sort: 'custom',
-    isSearch: false,
-   form: {
-     component: 'Select'
-   },
-  },
-  
   {
     label: '保养周期',
     field: 'executionCycle',

src/views/eam/item/applicationRecord/index.vue

@@ -0,0 +1,285 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ItemApplyMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="ItemApplyMain.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 #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm ref="formRef" @success="getList" :rules="ItemApplyMainRules" :formAllSchemas="ItemApplyMain.allSchemas"
+    :tableAllSchemas="ItemApplyDetail.allSchemas" :tableFormRules="ItemApplyDetailRules" :tableData="tableData"
+    :apiUpdate="ItemApplyMainApi.updateItemApplyMain" :apiCreate="ItemApplyMainApi.createItemApplyMain"
+    :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="ItemApplyMain.allSchemas"
+    :detailAllSchemas="ItemApplyDetail.allSchemas" :detailAllSchemasRules="ItemApplyDetailRules"
+    :apiCreate="ItemApplyDetailApi.createItemApplyDetail" :apiUpdate="ItemApplyDetailApi.updateItemApplyDetail"
+    :apiPage="ItemApplyDetailApi.getItemApplyDetailPage" :apiDelete="ItemApplyDetailApi.deleteItemApplyDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :isShowOut="true" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+  import download from '@/utils/download'
+  import { ItemApplyMain, ItemApplyMainRules, ItemApplyDetail, ItemApplyDetailRules } from './itemApplyMain.data'
+  import * as ItemApplyMainApi from '@/api/eam/item/itemApplyMain'
+  import * as ItemApplyDetailApi from '@/api/eam/item/itemApplyDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+
+  // 采购订单
+  defineOptions({ name: 'ItemApplyMain' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(ItemApplyMain.allSchemas.tableColumns)
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    nextTick(async () => {
+      if (type == 'tableForm') {
+        // 明细查询页赋值
+        row[formField] = val[0][searchField]
+        row['itemNumber'] = val[0]['number']
+        row['isRadeIn'] = val[0]['isRadeIn']
+        row['available'] = val[0]['available']
+      } else {
+        const setV = {}
+        setV[formField] = val[0][searchField]
+        formRef.setValues(setV)
+      }
+    })
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    nextTick(async () => {
+      const setV = {}
+      // if(formField == 'itemCode'){
+      //     await ItembasicApi.getItembasicPage({
+      //       code: setV['itemCode']
+      //     }).then(res => {
+      //       setV['uom'] = res.list[0].uom
+      //       setV[formField] = val[0][searchField]
+      //     })
+      //   }
+      formRef.setValues(setV)
+    })
+  }
+
+  // 子表新增的时候选择表格之后需要会显得字段
+  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+  const Echo = []
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: ItemApplyMainApi.getItemApplyMainPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn(null), // 新增
+    defaultButtons.defaultImportBtn(null), // 导入
+    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, item) => {
+    if (val == 'add') { // 新增
+      openForm('create')
+    } else if (val == 'import') { // 导入
+      handleImport()
+    } else if (val == 'export') { // 导出
+      handleExport()
+    } else if (val == 'refresh') { // 刷新
+      getList()
+    } else if (val == 'filtrate') { // 筛选
+    } else { // 其他按钮
+      console.log('其他按钮', item)
+    }
+  }
+
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+  // 列表-操作按钮
+  const butttondata = (row) => {
+    return [
+      defaultButtons.mainListEditBtn(null), // 编辑
+      defaultButtons.mainListDeleteBtn(null), // 删除
+    ]
+  }
+
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
+    if (val == 'edit') { // 编辑
+      openForm('update', row)
+    } else if (val == 'delete') { // 删除
+      handleDelete(row.id)
+    }
+  }
+
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    tableData.value = [] // 重置明细数据
+    formRef.value.open(type, row)
+  }
+
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue, 'basicItemApplyMain')
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await ItemApplyMainApi.deleteItemApplyMain(id)
+      message.success(t('common.delSuccess'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await ItemApplyMainApi.exportItemApplyMain(tableObject.params)
+      download.excel(data, '备件申领记录主.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  ItemApplyDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  const tableData = ref([])
+
+  // 添加明细
+  const handleAddTable = () => {
+    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+  }
+  // 删除明细
+  const handleDeleteTable = (item, index) => {
+    tableData.value.splice(index, 1)
+  }
+
+  // 主子数据 提交
+  const submitForm = async (formType, data) => {
+    data.subList = tableData.value // 拼接子表数据参数
+    try {
+      if (formType === 'create') {
+        await ItemApplyMainApi.createItemApplyMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ItemApplyMainApi.updateItemApplyMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
+    }
+  }
+
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '采购订单主导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
+
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await ItemApplyMainApi.importTemplate()
+  })
+</script>

src/views/eam/item/applicationRecord/itemApplyMain.data.ts

@@ -0,0 +1,269 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import { Item } from '@/views/eam/basic/item/item.data'
+import * as ItemApi from '@/api/eam/basic/item'
+import { validateHanset, validateEmail } from '@/utils/validator'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 备件申请主表
+ */
+export const ItemApplyMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '领用编号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '申领人',
+    field: 'applyId',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+  },
+  {
+    label: '审批人',
+    field: 'approveId',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+  },
+  {
+    label: '出库人',
+    field: 'outId',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+  },
+  {
+    label: '描述',
+    field: 'name',
+    sort: 'custom',
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+ {
+   label: '操作',
+   field: 'action',
+   isDetail: false,
+   isForm: false,
+   table: {
+     width: 200,
+     fixed: 'right'
+   }
+ }
+]))
+
+//表单校验
+export const ItemApplyMainRules = reactive({
+  name: [
+    { required: true, message: '请填写描述', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 备件申请子表
+ */
+export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '备件编号',
+    field: 'itemNumber',
+    sort: 'custom',
+    isSearch: true,
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择备件编号',
+      searchField: 'number',
+      searchTitle: '库区信息',
+      searchAllSchemas: Item.allSchemas, // 查询弹窗所需类
+      searchPage: ItemApi.getItemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }
+      ]
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '库存数量',
+    field: 'currentQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  
+  
+  {
+    label: '是否以旧换新',
+    field: 'isRadeIn',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: false,
+  }
+]))
+
+//表单校验
+export const ItemApplyDetailRules = reactive({
+  lineNumber: [
+    { required: true, message: '请输入行号', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  stdPackQty: [
+    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  ],
+  stdPackUnit: [
+    { required: true, message: '请选择标包单位', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  taxRate: [
+    { required: true, message: '请输入税率', trigger: 'blur' }
+  ],
+  shippedQty: [
+    { required: true, message: '请输入已发货数量', trigger: 'blur' }
+  ],
+  receivedQty: [
+    { required: true, message: '请输入已收货数量', trigger: 'blur' }
+  ],
+  returnedQty: [
+    { required: true, message: '请输入已退货数量', trigger: 'blur' }
+  ],
+  putawayQty: [
+    { required: true, message: '请输入已上架数量', trigger: 'blur' }
+  ],
+  overReceivingPercent: [
+    { required: true, message: '请输入超收百分比', trigger: 'blur' }
+  ],
+  orderQty: [
+    { required: true, message: '请输入订单数量', trigger: 'blur' }
+  ],
+  uom: [
+    { required: true, message: '请选择计量单位', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+  nuumber: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物品代码', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})

src/views/eam/item/itemOrderMain/index.vue

@@ -102,9 +102,7 @@
   }
 
   // 子表新增的时候选择表格之后需要会显得字段
-  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
   const Echo = []
-
   const { tableObject, tableMethods } = useTable({
     getListApi: ItemOrderMainApi.getItemOrderMainPage // 分页接口
   })
@@ -148,7 +146,7 @@
   
   // 根据状态返回该按钮是否显示
   const isShowMainButton = (row, val) => {
-    if (val.indexOf(row.status) > -1) {
+    if (val.indexOf(row.available) > -1) {
       return false
     } else {
       return true
@@ -158,6 +156,7 @@
   // 列表-操作按钮
   const butttondata = (row) => {
     return [
+      defaultButtons.mainListOrderCloBtn({ hide: isShowMainButton(row, ['TRUE']) }), // 关闭
       defaultButtons.mainListEditBtn(null), // 编辑
       defaultButtons.mainListDeleteBtn(null), // 删除
     ]
@@ -167,7 +166,11 @@
   const buttonTableClick = async (val, row) => {
     if (val == 'edit') { // 编辑
       openForm('update', row)
-    } else if (val == 'delete') { // 删除
+    } 
+    else if (val == 'mainOrderClo') { // 关闭
+      handleClose(row.id)
+    }
+    else if (val == 'delete') { // 删除
       handleDelete(row.id)
     }
   }
@@ -198,6 +201,19 @@
     } catch { }
   }
   
+  /** 关闭按钮操作 */
+  const handleClose = async (id : number) => {
+    try {
+      // 关闭的二次确认
+      await message.confirm('是否关闭所选中数据？')
+      // 发起关闭
+      await ItemOrderMainApi.closeItemOrderMain(id)
+      message.success(t('关闭成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
   /** 导出按钮操作 */
   const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {

src/views/eam/item/itemOrderMain/itemOrderMain.data.ts

@@ -47,28 +47,27 @@ export const ItemOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
   },
   {
-    label: '是否可用',
+    label: '接收备件状态',
-    field: 'available',
+    field: 'status',
-    dictType: DICT_TYPE.TRUE_FALSE,
+    sort: 'custom',
+    dictType: DICT_TYPE.GET_ORDER_STATUS,
     dictClass: 'string',
-    isSearch: false,
     isTable: true,
-    sort: 'custom',
+    isForm: false,
-    table: {
-      width: 150
-    },
     tableForm: {
-      type: 'Select',
+      type: 'Select'
-      inactiveValue: 'FALSE',
-      disabled: true
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
     }
+  },
+  {
+    label: '状态',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.IS_OPEN,
+    dictClass: 'string',
+    isTable: true,
+    isForm: true,
+    tableForm: {
+      type: 'Select'
     }
   },
   {