diff --git a/src/api/eam/mold/moldAccounts/index.ts b/src/api/eam/mold/moldAccounts/index.ts index e4f8385..5a76ebf 100644 --- a/src/api/eam/mold/moldAccounts/index.ts +++ b/src/api/eam/mold/moldAccounts/index.ts @@ -16,6 +16,7 @@ export interface MoldAccountsVO { available: string concurrencyStamp: number status: string + sourceType: string } // 查询设备台账列表 diff --git a/src/views/eam/mold/moldRepair/moldRepair.data.ts b/src/views/eam/mold/moldRepair/moldRepair.data.ts index c7c46ed..fbe0927 100644 --- a/src/views/eam/mold/moldRepair/moldRepair.data.ts +++ b/src/views/eam/mold/moldRepair/moldRepair.data.ts @@ -13,7 +13,8 @@ const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE) const factoryList = await selectAllFactoryArea() const moldList = ref([]); const moldListNoPage = await MoldAccountsApi.getMoldAccountsAllNoPage({ - status: '0' + status: '0', + sourceType: '0' } as MoldAccountsApi.MoldAccountsVO) // 表单校验 diff --git a/src/views/eam/mold/moldinspectionjob/index.vue b/src/views/eam/mold/moldinspectionjob/index.vue index b17c585..a68877a 100644 --- a/src/views/eam/mold/moldinspectionjob/index.vue +++ b/src/views/eam/mold/moldinspectionjob/index.vue @@ -134,6 +134,7 @@ import { MoldMaintenanceMainSec, MoldMaintenanceMainSecRules, } from '../moldmaintenancejob/moldMaintenanceMain.data' +import {MoldAccountsVO} from "@/api/eam/mold/moldAccounts"; // import TableHead from '@/components/TableHead/src/TableHead.vue' // import ImportForm from '@/components/ImportForm/src/ImportForm.vue' @@ -301,13 +302,13 @@ const buttonTableClick = async (val, row) => { const basicFormRef = ref() const openForm = async (type: string, row?: any) => { tableData.value = [] // 重置明细数据 - await MoldAccountsApi.getMoldAccountsNoPage({}).then(res => { + await MoldAccountsApi.getMoldAccountsNoPage({sourceType: '0'} as MoldAccountsVO).then(res => { MoldMaintenanceMain.allSchemas.formSchema.find(item => { return item.field == 'deviceNumber' }).componentProps.options = res }) const res = await MoldInspectionMainApi.getMoldInspectionMainNoPage() - const moldList = await MoldAccountsApi.getMoldAccountsNoPage({}) + const moldList = await MoldAccountsApi.getMoldAccountsNoPage({sourceType: '0'} as MoldAccountsVO) const repairList = await MoldMaintenanceMainApi.getMoldMainTempList('MOLD') const newMoldList = moldList.filter(item => { let flag = true diff --git a/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts b/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts index de663c0..2660325 100644 --- a/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts +++ b/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts @@ -12,11 +12,12 @@ import { validateHanset, validateNum, validateNum100 } from '@/utils/validator' import { MoldMaintenanceMain, } from '../moldmaintenancejob/moldMaintenanceMain.data' +import {MoldAccountsVO} from "@/api/eam/mold/moldAccounts"; const userStore = useUserStore() const userListAll = await UserApi.getSimpleUserList() const factoryList = await selectAllFactoryArea() -const moldList = await MoldAccountsApi.getMoldAccountsNoPage({}) -const moldListAll = await MoldAccountsApi.getMoldAccountsAllNoPage({}) +const moldList = await MoldAccountsApi.getMoldAccountsNoPage({sourceType: '0'} as MoldAccountsVO) +const moldListAll = await MoldAccountsApi.getMoldAccountsAllNoPage({sourceType: '0'} as MoldAccountsVO) const moldListByFactory = moldListAll.filter(item => item.factoryAreaNumber == userStore.userSelfInfo.deptId) const userList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: 1 }) const dutyUserList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: null }) @@ -122,7 +123,7 @@ export const MoldInspectionMain = useCrudSchemas(reactive([ table: { width: '150', }, - api: () => moldList, + api: () => moldListAll, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return moldListAll.find((account) => account.number == cellValue)?.name }, diff --git a/src/views/eam/mold/moldmaintenancejob/index.vue b/src/views/eam/mold/moldmaintenancejob/index.vue index 75a0009..7314769 100644 --- a/src/views/eam/mold/moldmaintenancejob/index.vue +++ b/src/views/eam/mold/moldmaintenancejob/index.vue @@ -249,6 +249,7 @@ import { selectAllFactoryArea } from '@/api/system/dept' import dayjs from 'dayjs' import * as RepairRelationApi from '@/api/eam/basic/repairRelation' import * as InspectionApi from '@/api/eam/basic/inspection' +import {MoldAccountsVO} from "@/api/eam/mold/moldAccounts"; const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE) const moldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value == 'MOLD') defineOptions({ name: 'MoldMaintenanceMain' }) @@ -550,7 +551,7 @@ const openForm = async (type: string, row?: any) => { if(type == 'update'){ row.classes = String(row.classes||row.classes==0?row.classes:'') } - await MoldAccountsApi.getMoldAccountsNoPage({}).then(res => { + await MoldAccountsApi.getMoldAccountsNoPage({sourceType: '0'} as MoldAccountsVO).then(res => { MoldMaintenanceMain.allSchemas.formSchema.find(item => { return item.field === 'deviceNumber' }).componentProps.options = res diff --git a/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts b/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts index 4aa0acd..ba52551 100644 --- a/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts +++ b/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts @@ -10,12 +10,13 @@ import { getStrDictOptions } from '@/utils/dict' import { dateFormatter } from '@/utils/formatTime' import Message from '@/layout/components/Message/src/Message.vue' import { t } from '@/hooks/web/useI18n' +import {MoldAccountsVO} from "@/api/eam/mold/moldAccounts"; const userListAll = await UserApi.getSimpleUserList() console.log(userListAll) const userStore = useUserStore() const factoryList = await selectAllFactoryArea() -const moldList = await MoldAccountsApi.getMoldAccountsNoPage({}) -const moldAllList = await MoldAccountsApi.getMoldAccountsAllNoPage({}) +const moldList = await MoldAccountsApi.getMoldAccountsNoPage({sourceType: '0'} as MoldAccountsVO) +const moldAllList = await MoldAccountsApi.getMoldAccountsAllNoPage({sourceType: '0'} as MoldAccountsVO) const userList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: 1 }) const dutyUserList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: null }) const deviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value == 'MOLD') @@ -984,4 +985,4 @@ export const MoldMaintenanceMainSec = useCrudSchemas(reactive([ }, isDetail:false } -])) \ No newline at end of file +]))