BUG修改

src/api/eam/sparePartsOutLocationRecordDetail/index.ts

@@ -28,45 +28,49 @@ export const getSparePartsOutLocationDetailRecordPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = { ...params }
-    return await request.post({ url: '/eam/spare-parts-in-location-main-record/senior', data })
+    return await request.post({ url: '/eam/spare-parts-out-location-detail-record/senior', data })
   } else {
-    return await request.get({ url: `/eam/spare-parts-in-location-main-record/page`, params })
+    return await request.get({ url: `/eam/spare-parts-out-location-detail-record/page`, params })
   }
 }
 
 // 查询备件入库记录主详情
 export const getSparePartsOutLocationDetailRecord = async (id: number) => {
-  return await request.get({ url: `/eam/spare-parts-in-location-main-record/get?id=` + id })
+  return await request.get({ url: `/eam/spare-parts-out-location-detail-record/get?id=` + id })
 }
 
 // 新增备件入库记录主
 export const createSparePartsOutLocationDetailRecord = async (
-  data: SparePartsInLocationMainRecordVO
+  data: SparePartsOutLocationRecordDetailVO
 ) => {
-  return await request.post({ url: `/eam/spare-parts-in-location-main-record/create`, data })
+  return await request.post({ url: `/eam/spare-parts-out-location-detail-record/create`, data })
 }
 
 // 修改备件入库记录主
 export const updateSparePartsOutLocationDetailRecord = async (
-  data: SparePartsInLocationMainRecordVO
+  data: SparePartsOutLocationRecordDetailVO
 ) => {
-  return await request.put({ url: `/eam/spare-parts-in-location-main-record/update`, data })
+  return await request.put({ url: `/eam/spare-parts-out-location-detail-record/update`, data })
 }
 
 // 删除备件入库记录主
 export const deleteSparePartsOutLocationDetailRecord = async (id: number) => {
-  return await request.delete({ url: `/eam/spare-parts-in-location-main-record/delete?id=` + id })
+  return await request.delete({
+    url: `/eam/spare-parts-out-location-detail-record/delete?id=` + id
+  })
 }
 
 // 导出备件入库记录主 Excel
 export const exportSparePartsOutLocationDetailRecord = async (params) => {
   return await request.download({
-    url: `/eam/spare-parts-in-location-main-record/export-excel`,
+    url: `/eam/spare-parts-out-location-detail-record/export-excel`,
     params
   })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/eam/spare-parts-in-location-main-record/get-import-template' })
+  return request.download({
+    url: '/eam/spare-parts-out-location-detail-record/get-import-template'
+  })
 }

src/views/eam/SparePartsOutLocationRecord/SparePartsOutLocationRecord.data.ts

@@ -11,113 +11,88 @@ import { dateFormatter } from '@/utils/formatTime'
 export const SparePartsOutLocationRecordMain = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '编号',
+      label: '备件编号',
-      field: 'number',
+      field: 'sparePartsCode',
       sort: 'custom',
       isSearch: true,
-      isForm: false
+      isForm: false,
+      table: {
+        width: 180,
+        fixed: 'left'
+      }
     },
     {
-      label: '出库编号',
+      label: '备件名称',
-      field: 'requestNumber',
+      field: 'name',
       sort: 'custom',
       isSearch: true,
-      isForm: false
+      table: {
-    },
+        width: 110
-    {
+      }
-      label: '入库主题',
-      field: 'theme',
-      sort: 'custom',
-      isSearch: true
     },
     {
-      label: '入库类型',
+      label: '备件名称',
-      field: 'type',
+      field: 'name',
       sort: 'custom',
-      dictType: DICT_TYPE.PUT_IN_TYPE,
+      isSearch: true,
-      dictClass: 'string'
+      table: {
+        width: 110
+      }
     },
     {
-      label: '流程状态',
+      label: '备件类型',
-      field: 'status',
+      field: 'classification',
       sort: 'custom',
+      dictType: DICT_TYPE.PART_CLASS,
+      dictClass: 'string',
       isSearch: false,
-      isForm: false,
+      isTable: true,
-
+      tableForm: {
-      dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM,
+        type: 'Select'
-      dictClass: 'string'
+      }
-    },
-    {
-      label: '入库申请人',
-      field: 'applyer',
-      sort: 'custom',
-      isSearch: false
     },
     {
-      label: '审核人',
+      label: '规格型号',
-      field: 'approver',
+      field: 'specifications',
-      sort: 'custom',
+      sort: 'custom'
-      isSearch: false,
-      isForm: false
     },
+
     {
-      label: '审核内容',
+      label: '存放位置',
-      field: 'approveContent',
+      field: 'locationCode',
-      sort: 'custom',
+      sort: 'custom'
-      isSearch: false,
-      isForm: false
     },
     {
-      label: '审核时间',
+      label: '计量单位',
-      field: 'approveTime',
+      field: 'uom',
       sort: 'custom',
-      formatter: dateFormatter,
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
       isSearch: false,
-      isForm: false,
+      isTable: true,
-      search: {
+      tableForm: {
-        component: 'DatePicker',
+        type: 'Select'
-        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'
       }
     },
-      detail: {
+    {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      label: '生产厂家',
-      }
+      field: 'brand',
+      sort: 'custom'
     },
     {
-      label: '入库时间',
+      label: '申请单号',
-      field: 'createTime',
+      field: 'requestNumber',
-      sort: 'custom',
+      sort: 'custom'
-      formatter: dateFormatter,
-      isSearch: false,
-      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,
+    {
-      detail: {
+      label: '申领数量',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      field: 'applyQty',
-      }
+      sort: 'custom'
     },
-
     {
-      label: '备注',
+      label: '出库时问',
-      field: 'remark',
+      field: 'createTime',
-      sort: 'custom',
+      sort: 'custom'
-      isSearch: false
     }
   ])
 )

src/views/eam/SparePartsOutLocationRecord/index.vue

@@ -153,7 +153,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
 // 子表新增的时候选择表格之后需要会显得字段
 const Echo = []
 const { tableObject, tableMethods } = useTable({
-  getListApi: SparePartsOutLocationRecordMainApi.getSparePartsOutLocationRecordMainPage // 分页接口
+  getListApi: SparePartsOutLocationRecordDetailApi.getSparePartsOutLocationDetailRecordPage // 分页接口
 })
 
 // 获得表格的各种操作

src/views/eam/itemAccounts/index.vue

@@ -60,20 +60,7 @@
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
 
   <!-- 详情 -->
-  <DetailLedger
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemAccounts.allSchemas" />
-    ref="detailRef"
-    :isBasic="true"
-    :allSchemas="ItemAccounts.allSchemas"
-    :subTabs="subTabList"
-    :operationRecordList="operationRecordList"
-    @handleOperationTabsChange="handleOperationTabsChange"
-    :detailAllSchemas="detailAllSchemas"
-    :apiPage="apiPage"
-    :dialogApiPage="dialogApiPage"
-    :dialogAllSchemas="dialogAllSchemas"
-    :dynamicInfoFields="dynamicInfoFields"
-    funcCode="tool_mould_file"
-  />
 
   <!-- 导入 -->
   <ImportForm

src/views/eam/itemAccounts/itemAccounts.data.ts

@@ -22,6 +22,9 @@ export const ItemAccounts = useCrudSchemas(
       field: 'itemNumber',
       sort: 'custom',
       isSearch: true,
+      table: {
+        width: 200
+      },
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {

src/views/eam/maintainExperience/maintainExperience.data.ts

@@ -4,32 +4,28 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const MaintainExperienceRules = reactive({
   name: [required],
-  maintainNumber: [required],
+  maintainNumber: [required]
 })
 
-export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
+export const MaintainExperience = useCrudSchemas(
-  {
+  reactive<CrudSchema[]>([
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-  },
     {
       label: '经验标题',
       field: 'name',
       sort: 'custom',
-    isSearch: true,
+      isSearch: true
     },
     {
       label: '经验内容',
       field: 'content',
       sort: 'custom',
-    isTable:true,
+      isTable: true,
       form: {
         componentProps: {
           type: 'textarea',
           height: 200
         }
-    },
+      }
     },
 
     {
@@ -37,7 +33,7 @@ export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
       field: 'maintainNumber',
       sort: 'custom',
       isSearch: true,
-    isForm: false,
+      isForm: false
     },
     {
       label: '工单类型',
@@ -47,7 +43,7 @@ export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
       isTable: false,
       form: {
         component: 'SelectV2'
-    },
+      }
     },
     {
       label: '来源字典',
@@ -56,7 +52,7 @@ export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
       dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
       dictClass: 'string', // 默认都是字符串类型其他暂不考虑
       isSearch: false,
-    isForm:false
+      isForm: false
     },
     {
       label: '保养类型',
@@ -65,21 +61,21 @@ export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
       dictType: DICT_TYPE.DEVICE_TYPE,
       dictClass: 'string', // 默认都是字符串类型其他暂不考虑
       isSearch: false,
-    isForm:false
+      isForm: false
     },
     {
       label: '设备/工装编号',
       field: 'equipmentCode',
       sort: 'custom',
-    isSearch:false,
+      isSearch: false,
-    isForm:false
+      isForm: false
     },
     {
       label: '设备/工装名称',
       field: 'equipmentName',
       sort: 'custom',
-    isSearch:false,
+      isSearch: false,
-    isForm:false
+      isForm: false
     },
     {
       label: '创建时间',
@@ -87,11 +83,9 @@ export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
       sort: 'custom',
       formatter: dateFormatter,
       isForm: false,
-    detail:{
+      detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
       }
-  },
+    }
-
+  ])
-
+)
-
-]))

src/views/eam/repairExperience/repairExperience.data.ts

@@ -4,21 +4,16 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const RepairExperienceRules = reactive({
   name: [required],
-  repairNumber: [required],
+  repairNumber: [required]
 })
 
-export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
+export const RepairExperience = useCrudSchemas(
-
+  reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-  },
     {
       label: '经验标题',
       field: 'name',
       sort: 'custom',
-    isSearch: true,
+      isSearch: true
     },
     {
       label: '维修工单编号',
@@ -26,21 +21,21 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
       sort: 'custom',
       isSearch: true,
 
-    isForm: false,
+      isForm: false
     },
     {
       label: '经验内容',
       field: 'content',
       sort: 'custom',
-    isSearch:false,
+      isSearch: false,
       form: {
         component: 'Input',
         componentProps: {
-        type:'textarea',
+          type: 'textarea',
           valueHtml: '',
           height: 200
         }
-    },
+      }
     },
 
     {
@@ -50,7 +45,7 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
       dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
       dictClass: 'string', // 默认都是字符串类型其他暂不考虑
       isSearch: false,
-    isForm:false
+      isForm: false
     },
     {
       label: '报修类型',
@@ -59,30 +54,30 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
       dictType: DICT_TYPE.DEVICE_TYPE,
       dictClass: 'string', // 默认都是字符串类型其他暂不考虑
       isSearch: false,
-    isForm:false
+      isForm: false
     },
     {
       label: '设备/工装编号',
       field: 'equipmentCode',
       sort: 'custom',
-    isSearch:false,
+      isSearch: false,
-    isForm:false
+      isForm: false
     },
     {
       label: '设备/工装名称',
       field: 'equipmentName',
       sort: 'custom',
-    isSearch:false,
+      isSearch: false,
-    isForm:false
+      isForm: false
     },
     {
       label: '故障时间',
       field: 'faultTime',
       formatter: dateFormatter,
       sort: 'custom',
-    isSearch:false,
+      isSearch: false,
-    isForm:false,
+      isForm: false,
-    detail:{
+      detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
       }
     },
@@ -91,16 +86,16 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
       field: 'faultType',
       sort: 'custom',
       isSearch: false,
-    isForm:false
+      isForm: false
     },
     {
       label: '创建人',
       field: 'createTime',
       sort: 'custom',
-    isSearch:false,
+      isSearch: false,
-    isForm:false,
+      isForm: false,
-    isTable:false,
+      isTable: false,
-    isDetail:false
+      isDetail: false
     },
     {
       label: '创建时间',
@@ -108,10 +103,10 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
       sort: 'custom',
       formatter: dateFormatter,
       isForm: false,
-    isSearch:false,
+      isSearch: false,
-    detail:{
+      detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
       }
-  },
+    }
- 
+  ])
-]))
+)

src/views/eam/sparePartsInLocationRecord/index.vue

@@ -86,7 +86,7 @@ const updataTableColumns = (val) => {
 // 子表新增的时候选择表格之后需要会显得字段
 const Echo = []
 const { tableObject, tableMethods } = useTable({
-  getListApi: SparePartsInLocationRecordMainApi.getSparePartsInLocationRecordMainPage // 分页接口
+  getListApi: SparePartsInLocationRecordDetailApi.getSparePartsInLocationRecordDetailPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -100,12 +100,11 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
-
 ]
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-if (val == 'refresh') {
+  if (val == 'refresh') {
     // 刷新
     getList()
   } else if (val == 'filtrate') {

src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts

@@ -3,129 +3,102 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as ItemAccountsApi from '@/api/eam/itemAccounts'
 import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
 
-
 // 表单校验
 export const SparePartsInLocationRecordMainRules = reactive({
   number: [required],
   theme: [required],
-  type: [required],
+  type: [required]
 })
 // 备件入库主表
-export const SparePartsInLocationRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+export const SparePartsInLocationRecordMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
     {
-    label: 'id',
+      label: '备件编号',
-    field: 'id',
+      field: 'sparePartsCode',
       sort: 'custom',
-    isSearch: false,
+      isSearch: true,
-    isTable: false,
       isForm: false,
-    isDetail:false,
+      table: {
+        width: 180,
+        fixed: 'left'
+      }
     },
     {
-    label: '编号',
+      label: '备件名称',
-    field: 'number',
+      field: 'name',
       sort: 'custom',
       isSearch: true,
-    isForm: false,
+      table: {
+        width: 110
+      }
     },
     {
-    label: '入库主题',
+      label: '备件名称',
-    field: 'theme',
+      field: 'name',
       sort: 'custom',
       isSearch: true,
-  },{
+      table: {
-    label: '入库类型',
+        width: 110
-    field: 'type',
+      }
-    sort: 'custom',
-    dictType: DICT_TYPE.PUT_IN_TYPE,
-    dictClass: 'string',
-   
     },
     {
-    label: '流程状态',
+      label: '备件类型',
-    field: 'status',
+      field: 'classification',
       sort: 'custom',
-    isSearch: false,
+      dictType: DICT_TYPE.PART_CLASS,
-    isForm:false,
-    
-    dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM,
       dictClass: 'string',
-   
-  },
-  {
-    label: '入库申请人',
-    field: 'applyer',
-    sort: 'custom',
       isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
     },
+
     {
-    label: '审核人',
+      label: '规格型号',
-    field: 'approver',
+      field: 'specifications',
-    sort: 'custom',
+      sort: 'custom'
-    isSearch: false,
-    isForm:false
     },
+
     {
-    label: '审核内容',
+      label: '存放位置',
-    field: 'approveContent',
+      field: 'locationCode',
-    sort: 'custom',
+      sort: 'custom'
-    isSearch: false,
-    isForm:false
     },
     {
-    label: '审核时间',
+      label: '计量单位',
-    field: 'approveTime',
+      field: 'uom',
       sort: 'custom',
-    formatter: dateFormatter,
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
       isSearch: false,
-    isForm:false,
+      isTable: true,
-    search: {
+      tableForm: {
-      component: 'DatePicker',
+        type: 'Select'
-      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',
+      label: '生产厂家',
-      componentProps: {
+      field: 'brand',
-        type: 'datetime',
+      sort: 'custom'
-        valueFormat: 'x'
-      }
     },
-    detail: {
+    {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom'
     },
+    {
+      label: '申领数量',
+      field: 'applyQty',
+      sort: 'custom'
     },
     {
-    label: '入库时间',
+      label: '出库时问',
       field: 'createTime',
-    sort: 'custom',
+      sort: 'custom'
-    formatter: dateFormatter,
-    isSearch: false,
-    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,
+)
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-  },
-
-  
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: false,
-  },
-]))
 // 备件入库子表
 export const SparePartsInLocationRecordDetailRules = reactive({
   number: [required],
@@ -133,10 +106,11 @@ export const SparePartsInLocationRecordDetailRules = reactive({
   locationCode: [required],
   areaCode: [required],
   sparePartsCode: [required],
-  applyQty: [required],
+  applyQty: [required]
 })
 
-export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+export const SparePartsInLocationRecordDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
     {
       label: '库位编号',
       field: 'locationCode',
@@ -187,7 +161,7 @@ export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive<CrudSche
           disabled: true
         }
       },
-    tableForm:{
+      tableForm: {
         disabled: true
       }
     },
@@ -203,7 +177,7 @@ export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive<CrudSche
           disabled: true
         }
       },
-    tableForm:{
+      tableForm: {
         disabled: true
       }
     },
@@ -215,13 +189,13 @@ export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive<CrudSche
       tableForm: {
         disabled: true
       },
-    form:{
+      form: {
-     componentProps:{
+        componentProps: {
           disabled: true
         }
       },
-    isDetail:false,
+      isDetail: false,
-    isTable:false
+      isTable: false
     },
     {
       label: '申领数量',
@@ -244,15 +218,13 @@ export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive<CrudSche
         }
       },
       isForm: false,
-    isTableForm:false
+      isTableForm: false
     },
     {
       label: '备注',
       field: 'remark',
       sort: 'custom',
-    isSearch: true,
+      isSearch: true
-  },
+    }
- 
+  ])
-]))
+)
-
-

src/views/eam/sparepartsinlocation/index.vue

@@ -363,11 +363,6 @@ const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
   console.log(formRef.value)
   formRef.value.formLoading = true
-  let isHave = data.subList.some(item=>item.applyQty>item.currentQty)
-  if(isHave){
-    message.warning('申领数量不能大于库存数量')
-    return
-  }
   try {
     if (formType === 'create') {
       await SparePartsInLocationMainApi.createSparePartsInLocationMain(data)