Browse Source

解决eam备件报错

master_hella_20240701
songguoqiang 5 months ago
parent
commit
4fe135f4ed
  1. 54
      src/views/eam/applicationRecord/applicationRecordMain.data.ts
  2. 10
      src/views/eam/applicationRecord/index.vue
  3. 4
      src/views/eam/itemApplyMain/index.vue
  4. 160
      src/views/eam/itemApplyMain/itemApplyMain.data.ts

54
src/views/eam/applicationRecord/applicationRecordMain.data.ts

@ -1,8 +1,8 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import { ItemAccounts } from '@/views/eam/item/itemAccounts/itemAccounts.data'
import * as ItemAccountsApi from '@/api/eam/item/itemAccounts'
import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
import * as ItemAccountsApi from '@/api/eam/itemAccounts'
//import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
import { validateHanset, validateEmail } from '@/utils/validator'
const { t } = useI18n() // 国际化
@ -154,30 +154,30 @@ export const ApplicationRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
{
label: '设备/模具编号',
field: 'deviceNumber',
sort: 'custom',
isSearch: true,
tableForm: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择单号',
searchField: 'number',
searchTitle: '单号信息',
searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: "TRUE",
isMainValue: false
}, {
key: 'type',
value: "type",
isMainValue: true
}
]
},
},
// {
// label: '设备/模具编号',
// field: 'deviceNumber',
// sort: 'custom',
// isSearch: true,
// tableForm: {
// isInpuFocusShow: true,
// searchListPlaceholder: '请选择单号',
// searchField: 'number',
// searchTitle: '单号信息',
// searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
// searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
// searchCondition: [{
// key: 'available',
// value: "TRUE",
// isMainValue: false
// }, {
// key: 'type',
// value: "type",
// isMainValue: true
// }
// ]
// },
// },
{
label: '申领数量',
field: 'qty',

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

@ -47,13 +47,13 @@
:isShowAddBtn="false"
:detailButtonIsShow="true" />
<!-- 审批详情 -->
<approveDetail ref="detailRef1" :isBasic="false" :allSchemas="ApplicationRecordMain.allSchemas"
<!-- <approveDetail ref="detailRef1" :isBasic="false" :allSchemas="ApplicationRecordMain.allSchemas"
:detailAllSchemas="ApplicationRecordDetail.allSchemas" :detailAllSchemasRules="ApplicationRecordDetailRules"
:apiAgree="ApplicationRecordMainApi.agreeApplicationRecordMain"
:apiDisAgree="ApplicationRecordMainApi.disAgreeApplicationRecordMain"
:apiPage="ApplicationRecordDetailApi.getApplicationRecordDetailPage"
@searchTableSuccessDetail="searchTableSuccessDetail"
@agree="getList"/>
@agree="getList"/> -->
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :isShowOut="true" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
@ -62,12 +62,12 @@
<script setup lang="ts">
import download from '@/utils/download'
import { ApplicationRecordMain, ApplicationRecordMainRules, ApplicationRecordDetail, ApplicationRecordDetailRules } from './applicationRecordMain.data'
import * as ApplicationRecordMainApi from '@/api/eam/item/applicationRecordMain'
import * as ApplicationRecordDetailApi from '@/api/eam/item/applicationRecordDetail'
import * as ApplicationRecordMainApi from '@/api/eam/applicationRecordMain'
import * as ApplicationRecordDetailApi from '@/api/eam/applicationRecordDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import approveDetail from '@/components/Detail/src/approveDetail.vue'
//import approveDetail from '@/components/Detail/src/approveDetail.vue'
//
defineOptions({ name: 'ApplicationRecord' })

4
src/views/eam/itemApplyMain/index.vue

@ -49,8 +49,8 @@
<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 ItemApplyMainApi from '@/api/eam/itemApplyMain'
import * as ItemApplyDetailApi from '@/api/eam/itemApplyDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'

160
src/views/eam/itemApplyMain/itemApplyMain.data.ts

@ -1,8 +1,8 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import { ItemAccounts } from '@/views/eam/item/itemAccounts/itemAccounts.data'
import * as ItemAccountsApi from '@/api/eam/item/itemAccounts'
import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
import * as ItemAccountsApi from '@/api/eam/itemAccounts'
//import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
import { validateHanset, validateEmail } from '@/utils/validator'
const { t } = useI18n() // 国际化
@ -43,23 +43,23 @@ export const ItemApplyMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: false,
},
{
label: '状态',
field: 'status',
sort: 'custom',
dictType: DICT_TYPE.ITEM_APPLY_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
isForm: false,
table: {
width: 150
},
tableForm: {
type: 'Select',
disabled: false
}
},
// {
// label: '状态',
// field: 'status',
// sort: 'custom',
// dictType: DICT_TYPE.ITEM_APPLY_STATUS,
// dictClass: 'string',
// isSearch: true,
// isTable: true,
// isForm: false,
// table: {
// width: 150
// },
// tableForm: {
// type: 'Select',
// disabled: false
// }
// },
{
label: '描述',
field: 'name',
@ -156,66 +156,66 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '类型',
field: 'type',
sort: 'custom',
dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
dictClass: 'string',
isSearch: true,
isTable: true,
table: {
width: 150
},
tableForm: {
type: 'Select',
disabled: false
}
},
{
label: '设备/模具编号',
field: 'deviceNumber',
sort: 'custom',
isSearch: true,
tableForm: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择单号',
searchField: 'number',
searchTitle: '单号信息',
searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: "TRUE",
isMainValue: false
}, {
key: 'type',
value: "type",
isMainValue: true
}
]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择单号',
searchField: 'number',
searchTitle: '单号信息',
searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: "TRUE",
isMainValue: false
}, {
key: 'type',
value: "type",
isMainValue: true
}]
}
}
},
// {
// label: '类型',
// field: 'type',
// sort: 'custom',
// dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
// dictClass: 'string',
// isSearch: true,
// isTable: true,
// table: {
// width: 150
// },
// tableForm: {
// type: 'Select',
// disabled: false
// }
// },
// {
// label: '设备/模具编号',
// field: 'deviceNumber',
// sort: 'custom',
// isSearch: true,
// tableForm: {
// isInpuFocusShow: true,
// searchListPlaceholder: '请选择单号',
// searchField: 'number',
// searchTitle: '单号信息',
// searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
// searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
// searchCondition: [{
// key: 'available',
// value: "TRUE",
// isMainValue: false
// }, {
// key: 'type',
// value: "type",
// isMainValue: true
// }
// ]
// },
// form: {
// // labelMessage: '信息提示说明!!!',
// componentProps: {
// isSearchList: true,
// searchListPlaceholder: '请选择单号',
// searchField: 'number',
// searchTitle: '单号信息',
// searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
// searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
// searchCondition: [{
// key: 'available',
// value: "TRUE",
// isMainValue: false
// }, {
// key: 'type',
// value: "type",
// isMainValue: true
// }]
// }
// }
// },
{
label: '申领数量',
field: 'qty',

Loading…
Cancel
Save