Merge remote-tracking branch 'origin/master_hella' into master_hella

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

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
-    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"
-  />
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ItemAccounts.allSchemas" />
 
   <!-- 导入 -->
   <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,94 +4,88 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const MaintainExperienceRules = reactive({
   name: [required],
-  maintainNumber: [required],
+  maintainNumber: [required]
 })
 
-export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-  },
-  {
-    label: '经验标题',
-    field: 'name',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '经验内容',
-    field: 'content',
-    sort: 'custom',
-    isTable:true,
-    form: {
-      componentProps: {
-        type: 'textarea',
-        height: 200
+export const MaintainExperience = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '经验标题',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '经验内容',
+      field: 'content',
+      sort: 'custom',
+      isTable: true,
+      form: {
+        componentProps: {
+          type: 'textarea',
+          height: 200
+        }
+      }
+    },
+
+    {
+      label: '保养工单编号',
+      field: 'maintainNumber',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false
+    },
+    {
+      label: '工单类型',
+      field: 'orderType',
+      sort: 'custom',
+      isForm: false,
+      isTable: false,
+      form: {
+        component: 'SelectV2'
       }
     },
-  },
-  
-  {
-    label: '保养工单编号',
-    field: 'maintainNumber',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-  },
-  {
-    label: '工单类型',
-    field: 'orderType',
-    sort: 'custom',
-    isForm: false,
-    isTable: false,
-    form: {
-      component: 'SelectV2'
+    {
+      label: '来源字典',
+      field: 'sources',
+      sort: 'custom',
+      dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '保养类型',
+      field: 'type',
+      sort: 'custom',
+      dictType: DICT_TYPE.DEVICE_TYPE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isSearch: false,
+      isForm: false
     },
-  },
-  {
-    label: '来源字典',
-    field: 'sources',
-    sort: 'custom',
-    dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '保养类型',
-    field: 'type',
-    sort: 'custom',
-    dictType: DICT_TYPE.DEVICE_TYPE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '设备/工装编号',
-    field: 'equipmentCode',
-    sort: 'custom',
-    isSearch:false,
-    isForm:false
-  },
-  {
-    label: '设备/工装名称',
-    field: 'equipmentName',
-    sort: 'custom',
-    isSearch:false,
-    isForm:false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    detail:{
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '设备/工装编号',
+      field: 'equipmentCode',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '设备/工装名称',
+      field: 'equipmentName',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      }
     }
-  },
-
-
-
-]))
+  ])
+)

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

@@ -4,114 +4,109 @@ 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: '经验标题',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '维修工单编号',
+      field: 'repairNumber',
+      sort: 'custom',
+      isSearch: true,
 
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-  },
-  {
-    label: '经验标题',
-    field: 'name',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '维修工单编号',
-    field: 'repairNumber',
-    sort: 'custom',
-    isSearch: true,
-    
-    isForm: false,
-  },
-  {
-    label: '经验内容',
-    field: 'content',
-    sort: 'custom',
-    isSearch:false,
-    form: {
-      component: 'Input',
-      componentProps: {
-        type:'textarea',
-        valueHtml: '',
-        height: 200
+      isForm: false
+    },
+    {
+      label: '经验内容',
+      field: 'content',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'Input',
+        componentProps: {
+          type: 'textarea',
+          valueHtml: '',
+          height: 200
+        }
       }
     },
-  },
- 
-  {
-    label: '来源字典',
-    field: 'sources',
-    sort: 'custom',
-    dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '报修类型',
-    field: 'type',
-    sort: 'custom',
-    dictType: DICT_TYPE.DEVICE_TYPE,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '设备/工装编号',
-    field: 'equipmentCode',
-    sort: 'custom',
-    isSearch:false,
-    isForm:false
-  },
-  {
-    label: '设备/工装名称',
-    field: 'equipmentName',
-    sort: 'custom',
-    isSearch:false,
-    isForm:false
-  },
-  {
-    label: '故障时间',
-    field: 'faultTime',
-    formatter: dateFormatter,
-    sort: 'custom',
-    isSearch:false,
-    isForm:false,
-    detail:{
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    }
-  },
-  {
-    label: '故障类型',
-    field: 'faultType',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '创建人',
-    field: 'createTime',
-    sort: 'custom',
-    isSearch:false,
-    isForm:false,
-    isTable:false,
-    isDetail:false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-    isSearch:false,
-    detail:{
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+
+    {
+      label: '来源字典',
+      field: 'sources',
+      sort: 'custom',
+      dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '报修类型',
+      field: 'type',
+      sort: 'custom',
+      dictType: DICT_TYPE.DEVICE_TYPE,
+      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '设备/工装编号',
+      field: 'equipmentCode',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '设备/工装名称',
+      field: 'equipmentName',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '故障时间',
+      field: 'faultTime',
+      formatter: dateFormatter,
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      }
+    },
+    {
+      label: '故障类型',
+      field: 'faultType',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false
+    },
+    {
+      label: '创建人',
+      field: 'createTime',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      isTable: false,
+      isDetail: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
+      isSearch: false,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      }
     }
-  },
- 
-]))
+  ])
+)

src/views/eam/sparePartsInLocationRecord/index.vue

@@ -44,7 +44,7 @@
       </template>
     </Table>
   </ContentWrap>
-  
+
   <!-- 详情 -->
   <Detail
     ref="detailRef"
@@ -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[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '编号',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-  },
-  {
-    label: '入库主题',
-    field: 'theme',
-    sort: 'custom',
-    isSearch: true,
-  },{
-    label: '入库类型',
-    field: 'type',
-    sort: 'custom',
-    dictType: DICT_TYPE.PUT_IN_TYPE,
-    dictClass: 'string',
-   
-  },
-  {
-    label: '流程状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    
-    dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM,
-    dictClass: 'string',
-   
-  },
-  {
-    label: '入库申请人',
-    field: 'applyer',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '审核人',
-    field: 'approver',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '审核内容',
-    field: 'approveContent',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '审核时间',
-    field: 'approveTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm: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')]
+export const SparePartsInLocationRecordMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '备件编号',
+      field: 'sparePartsCode',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        width: 180,
+        fixed: 'left'
       }
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+    {
+      label: '备件名称',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 110
       }
     },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '备件名称',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 110
+      }
     },
-  },
-  {
-    label: '入库时间',
-    field: 'createTime',
-    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')]
+    {
+      label: '备件类型',
+      field: 'classification',
+      sort: 'custom',
+      dictType: DICT_TYPE.PART_CLASS,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
       }
     },
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+
+    {
+      label: '规格型号',
+      field: 'specifications',
+      sort: 'custom'
     },
-  },
 
-  
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: false,
-  },
-]))
+    {
+      label: '存放位置',
+      field: 'locationCode',
+      sort: 'custom'
+    },
+    {
+      label: '计量单位',
+      field: 'uom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '生产厂家',
+      field: 'brand',
+      sort: 'custom'
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom'
+    },
+    {
+      label: '申领数量',
+      field: 'applyQty',
+      sort: 'custom'
+    },
+    {
+      label: '出库时问',
+      field: 'createTime',
+      sort: 'custom'
+    }
+  ])
+)
 // 备件入库子表
 export const SparePartsInLocationRecordDetailRules = reactive({
   number: [required],
@@ -133,24 +106,42 @@ export const SparePartsInLocationRecordDetailRules = reactive({
   locationCode: [required],
   areaCode: [required],
   sparePartsCode: [required],
-  applyQty: [required],
+  applyQty: [required]
 })
 
-export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '库位编号',
-    field: 'locationCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择库位编号', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位信息', // 查询弹窗标题
-       
-      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
-      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+export const SparePartsInLocationRecordDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '库位编号',
+      field: 'locationCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择库位编号', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '库位信息', // 查询弹窗标题
+
+          searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+          searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      },
+      tableForm: {
+        isInpuFocusShow: true,
+        searchListPlaceholder: '请选择备件编号', // 输入框占位文本
+        searchField: 'itemNumber', // 查询弹窗赋值字段
+        searchTitle: '备件信息', // 查询弹窗标题
+
+        searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+        searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
         searchCondition: [
           {
             key: 'available',
@@ -160,99 +151,80 @@ export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive<CrudSche
         ]
       }
     },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-      searchField: 'itemNumber', // 查询弹窗赋值字段
-      searchTitle: '备件信息', // 查询弹窗标题
-    
-      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
-      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
-      searchCondition: [
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
+    {
+      label: '库区编号',
+      field: 'areaCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
         }
-      ]
-    }
-  },
-  {
-    label: '库区编号',
-    field: 'areaCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps: {
+      },
+      tableForm: {
         disabled: true
       }
     },
-    tableForm:{
-      disabled: true
-    }
-  },
-  {
-    label: '备件编号',
-    field: 'sparePartsCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
+    {
+      label: '备件编号',
+      field: 'sparePartsCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
         disabled: true
       }
     },
-    tableForm:{
-      disabled: true
-    }
-  },
-  {
-    label: '库存数量',
-    field: 'currentQty',
-    sort: 'custom',
-    isSearch: false,
-    tableForm: {
-      disabled: true
+    {
+      label: '库存数量',
+      field: 'currentQty',
+      sort: 'custom',
+      isSearch: false,
+      tableForm: {
+        disabled: true
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      isDetail: false,
+      isTable: false
     },
-    form:{
-     componentProps:{
-      disabled: true
-     }
+    {
+      label: '申领数量',
+      field: 'applyQty',
+      sort: 'custom',
+      isSearch: false
     },
-    isDetail:false,
-    isTable:false
-  },
-  {
-    label: '申领数量',
-    field: 'applyQty',
-    sort: 'custom',
-    isSearch: false
-  },
-  {
-    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')]
-      }
+    {
+      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,
+      isTableForm: false
     },
-    isForm: false,
-    isTableForm:false
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: true,
-  },
- 
-]))
-
-
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      isSearch: true
+    }
+  ])
+)

src/views/eam/sparepartsinlocation/index.vue

@@ -132,29 +132,29 @@ const updataTableColumns = (val) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-    nextTick(() => {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      console.log(11, val[0])
-      if (type == 'tableForm') {
-        if (formField == 'locationCode') {
-          row['locationCode'] = val[0].locationNumber
-          row['areaCode'] = val[0].areaNumber
-          row['sparePartsCode'] = val[0].itemNumber
-          row['currentQty'] = val[0].qty
-          row['isRadeIn'] = val[0].isRadeIn
-        }
-      } else {
-        if (formField == 'locationCode') {
-          setV['locationCode'] = val[0].locationNumber
-          setV['areaCode'] = val[0].areaNumber
-          setV['sparePartsCode'] = val[0].itemNumber
-          setV['currentQty'] = val[0].qty
-          setV['isRadeIn'] = val[0].isRadeIn
-        }
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    console.log(11, val[0])
+    if (type == 'tableForm') {
+      if (formField == 'locationCode') {
+        row['locationCode'] = val[0].locationNumber
+        row['areaCode'] = val[0].areaNumber
+        row['sparePartsCode'] = val[0].itemNumber
+        row['currentQty'] = val[0].qty
+        row['isRadeIn'] = val[0].isRadeIn
+      }
+    } else {
+      if (formField == 'locationCode') {
+        setV['locationCode'] = val[0].locationNumber
+        setV['areaCode'] = val[0].areaNumber
+        setV['sparePartsCode'] = val[0].itemNumber
+        setV['currentQty'] = val[0].qty
+        setV['isRadeIn'] = val[0].isRadeIn
       }
-      formRef.setValues(setV)
-    })
+    }
+    formRef.setValues(setV)
+  })
 }
 // 查询页面返回——详情
 const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
@@ -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)