From 208c53a214c62c88076411bdb5c845dc7eb39b1b Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Thu, 14 Mar 2024 15:02:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eam/device/deviceMaintainPlan/index.ts | 1 + .../eam/mold/moldInspectionDetail/index.ts | 2 + src/components/UploadFile/src/UploadImgs.vue | 1 + .../deviceMaintainPlan.data.ts | 3 +- src/views/eam/device/deviceRepair/index.vue | 2 - .../deviceSpotInspectionRecordMain.data.ts | 13 +++- .../eam/device/deviceinspectionjob/index.vue | 12 ++-- .../deviceMaintainOrderMain.data.ts | 27 ++++---- .../eam/device/devicemaintenancejob/index.vue | 20 +++++- .../moldMaintainPlan/moldMaintainPlan.data.ts | 3 +- src/views/eam/mold/moldRepair/index.vue | 16 ++--- .../eam/mold/moldinspectionjob/index.vue | 68 ++++++++++++++++--- .../moldInspectionMain.data.ts | 20 +++--- .../moldMaintainOrderMain.data.ts | 14 +++- .../eam/mold/moldmaintenancejob/index.vue | 37 ++++++++-- .../moldMaintenanceMain.data.ts | 44 ++++++------ 16 files changed, 203 insertions(+), 80 deletions(-) diff --git a/src/api/eam/device/deviceMaintainPlan/index.ts b/src/api/eam/device/deviceMaintainPlan/index.ts index 4f2997c..016d33f 100644 --- a/src/api/eam/device/deviceMaintainPlan/index.ts +++ b/src/api/eam/device/deviceMaintainPlan/index.ts @@ -14,6 +14,7 @@ export interface DeviceMaintainPlanVO { // 查询保养计划列表 export const getDeviceMaintainPlanPage = async (params) => { + params.type = 'DEVICE' if (params.isSearch) { delete params.isSearch const data = {...params} diff --git a/src/api/eam/mold/moldInspectionDetail/index.ts b/src/api/eam/mold/moldInspectionDetail/index.ts index c547270..71081c3 100644 --- a/src/api/eam/mold/moldInspectionDetail/index.ts +++ b/src/api/eam/mold/moldInspectionDetail/index.ts @@ -3,6 +3,7 @@ import request from '@/config/axios' export interface MoldInspectionDetailVO { id: number number: string + masterId: number siteId: string available: string concurrencyStamp: number @@ -14,6 +15,7 @@ export interface MoldInspectionDetailVO { completionTime: Date engineer: string uncompleted: string + status: string } // 查询检修工单子列表 diff --git a/src/components/UploadFile/src/UploadImgs.vue b/src/components/UploadFile/src/UploadImgs.vue index b298df0..064e6e8 100644 --- a/src/components/UploadFile/src/UploadImgs.vue +++ b/src/components/UploadFile/src/UploadImgs.vue @@ -170,6 +170,7 @@ const handleExceed = () => { const viewImageUrl = ref('') const imgViewVisible = ref(false) const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => { + console.log('uploadFile', uploadFile) viewImageUrl.value = uploadFile.url! imgViewVisible.value = true } diff --git a/src/views/eam/device/deviceMaintainPlan/deviceMaintainPlan.data.ts b/src/views/eam/device/deviceMaintainPlan/deviceMaintainPlan.data.ts index c950c8e..0298634 100644 --- a/src/views/eam/device/deviceMaintainPlan/deviceMaintainPlan.data.ts +++ b/src/views/eam/device/deviceMaintainPlan/deviceMaintainPlan.data.ts @@ -50,7 +50,8 @@ export const DeviceMaintainPlan = useCrudSchemas(reactive([ label: '类型', field: 'type', sort: 'custom', - isSearch: true, + isSearch: false, + isTable: false, form: { component: 'Select' }, diff --git a/src/views/eam/device/deviceRepair/index.vue b/src/views/eam/device/deviceRepair/index.vue index d63f955..839a6e5 100644 --- a/src/views/eam/device/deviceRepair/index.vue +++ b/src/views/eam/device/deviceRepair/index.vue @@ -295,8 +295,6 @@ function handleBackout(row) { } const onChange = (field, cur, item,formRef) => { - console.log(cur) - console.log(item) if (field == 'factoryAreaNumber') { nextTick(() => { const setV = {} diff --git a/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts b/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts index 07d1a8f..0066580 100644 --- a/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts +++ b/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts @@ -49,6 +49,16 @@ export const DeviceSpotInspectionRecordMain = useCrudSchemas(reactive { return deviceListNoPage.find((account) => account.number == cellValue)?.name }, + search:{ + component: 'Select', + componentProps: { + options: deviceListNoPage, + optionsAlias: { + labelField: 'name', + valueField: 'number' + }, + }, + }, form: { component: 'Select', componentProps: { @@ -114,7 +124,8 @@ export const DeviceSpotInspectionRecordMain = useCrudSchemas(reactive { return deviceDeviceTypeList.find((account) => account.value == cellValue)?.label }, - isSearch: true, + isSearch: false, + isTable: false, search: { component: 'Select', componentProps: { diff --git a/src/views/eam/device/deviceinspectionjob/index.vue b/src/views/eam/device/deviceinspectionjob/index.vue index 434324b..782ac68 100644 --- a/src/views/eam/device/deviceinspectionjob/index.vue +++ b/src/views/eam/device/deviceinspectionjob/index.vue @@ -431,7 +431,9 @@ const detailSubmitForm = async (formType, data, getList, formRef, tableList) => } console.log('data1',data1) if (formType === 'create') { + await DeviceInspectionDetailApi.createDeviceInspectionDetail(data1) + message.success(t('common.createSuccess')) } else { await DeviceInspectionDetailApi.updateDeviceInspectionDetail(data1) @@ -439,7 +441,6 @@ const detailSubmitForm = async (formType, data, getList, formRef, tableList) => } formRef.dialogVisible = false // 刷新当前列表 - await getList() detailRef.value.tableObject.tableList.forEach(item => { if (item.itemNumbers?.length > 0) { let str = '' @@ -448,10 +449,11 @@ const detailSubmitForm = async (formType, data, getList, formRef, tableList) => }) item.itemNumbers1 = str.substring(0, str.length - 1) } - }) + + await formRef.getList() } finally { - formRef.formLoading = false + formRef.value.formLoading = false } } @@ -489,11 +491,11 @@ const submitForm = async (formType, data) => { await DeviceInspectionMainApi.updateDeviceInspectionMain(data) message.success(t('common.updateSuccess')) } - formRef.value.dialogVisible = false + basicFormRef.value.dialogVisible = false // 刷新当前列表 getList() } finally { - formRef.value.formLoading = false + basicFormRef.value.formLoading = false } } diff --git a/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts b/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts index 68a5948..deb6e78 100644 --- a/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts +++ b/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts @@ -5,8 +5,8 @@ import { dateFormatter } from '@/utils/formatTime' import { ItemSearchTable } from '../../basic/item/item.data' import * as ItemApi from '@/api/eam/basic/item' const factoryList = await selectAllFactoryArea() -const userList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: undefined, flag: 1 }) -const dutyUserList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: undefined, flag: undefined }) +const userList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: '', flag: 1 }) +const dutyUserList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: '', flag: null }) // 表单校验 export const DeviceMaintainOrderMainRules = reactive({ @@ -24,7 +24,7 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive([ label: '保养单号', field: 'number', sort: 'custom', - isSearch: true, + isSearch: false, table: { width: '150', }, @@ -33,7 +33,7 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive([ label: '保养计划单号', field: 'planNumber', sort: 'custom', - isSearch: true, + isSearch: false, table: { width: '150', }, @@ -47,15 +47,6 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive([ width: '150', }, }, - { - label: '描述', - field: 'describes', - sort: 'custom', - isSearch: true, - table: { - width: '150', - }, - }, { label: '工单所属周期', field: 'executePeriod', @@ -116,11 +107,21 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.WEI_XIU_ORDER_STATUS, dictClass: 'string', }, + { + label: '描述', + field: 'describes', + sort: 'custom', + isSearch: false, + table: { + width: '150', + }, + }, { label: '类型', field: 'type', sort: 'custom', isSearch: false, + isTable: false, table: { width: '150', }, diff --git a/src/views/eam/device/devicemaintenancejob/index.vue b/src/views/eam/device/devicemaintenancejob/index.vue index 25e00ef..10fa28e 100644 --- a/src/views/eam/device/devicemaintenancejob/index.vue +++ b/src/views/eam/device/devicemaintenancejob/index.vue @@ -120,7 +120,9 @@ import * as DeviceMaintenanceDetailApi from '@/api/eam/device/deviceMaintenanceD import * as defaultButtons from '@/utils/disposition/defaultButtons' import { useUserStore } from '@/store/modules/user' import { selecUserByType } from '@/api/system/dept' - +import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE) +const deviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value != 'MOLD') defineOptions({ name: 'DeviceMaintenanceMain' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -212,6 +214,9 @@ const buttonBaseClick = (val, item) => { // 新增 DeviceMaintenanceMain.allSchemas.formSchema[3].value = 'DEVICE' DeviceMaintenanceMain.allSchemas.formSchema[0].componentProps.disabled = false + DeviceMaintenanceMain.allSchemas.formSchema.find(item => { + return item.field == 'type' + }).componentProps.options = deviceTypeList openForm('create') } else if (val == 'import') { // 导入 @@ -284,6 +289,9 @@ const buttonTableClick = async (val, row) => { DeviceMaintenanceMain.allSchemas.formSchema[0].componentProps.disabled = false if (val == 'edit') { // 编辑 + DeviceMaintenanceMain.allSchemas.formSchema.find(item => { + return item.field == 'type' + }).componentProps.options = deviceTypeList openForm('update', row) DeviceMaintenanceMain.allSchemas.formSchema[0].componentProps.disabled = true } else if (val == 'delete') { @@ -294,6 +302,9 @@ const buttonTableClick = async (val, row) => { } else if (val == 'repair') { openDetail(row, '代码', row.number) } else if (val == 'turnOrder') { + DeviceMaintenanceMain.allSchemas.formSchema.find(item => { + return item.field == 'type' + }).componentProps.options = deviceMoldTypeList openForm('turnOrder', row) } else if (val == 'finish') { finishOrder(row) @@ -375,7 +386,10 @@ const searchFormClick = (searchData) => { // 接单 function acceptOrder(row) { - DeviceMaintenanceMainApi.orderStepChange(row) + DeviceMaintenanceMainApi.orderStepChange(row).then(item => { + message.success('接单成功') + getList() + }) getList() } // 转办 @@ -528,7 +542,7 @@ const detailSubmitForm= async (formType,data,getList,formRef,tableList) => { }) } finally { - formRef.formLoading = false + formRef.value.formLoading = false } } diff --git a/src/views/eam/mold/moldMaintainPlan/moldMaintainPlan.data.ts b/src/views/eam/mold/moldMaintainPlan/moldMaintainPlan.data.ts index 509ecbd..5def7f7 100644 --- a/src/views/eam/mold/moldMaintainPlan/moldMaintainPlan.data.ts +++ b/src/views/eam/mold/moldMaintainPlan/moldMaintainPlan.data.ts @@ -51,7 +51,8 @@ export const MoldMaintainPlan = useCrudSchemas(reactive([ label: '类型', field: 'type', sort: 'custom', - isSearch: true, + isSearch: false, + isTable: false, form: { component: 'Select' }, diff --git a/src/views/eam/mold/moldRepair/index.vue b/src/views/eam/mold/moldRepair/index.vue index a306f47..43ee9c5 100644 --- a/src/views/eam/mold/moldRepair/index.vue +++ b/src/views/eam/mold/moldRepair/index.vue @@ -292,15 +292,13 @@ onMounted(async () => { importTemplateData.templateUrl = await MoldRepairApi.importTemplate() }) -const onChange = (field, cur, item) => { - if (field == 'declarerPhone') { - if (cur != null && cur != '') { - if(validatePhoneNumber(cur)) { - console.log("手机号码格式正确"); - } else { - message.error('手机号码格式不正确！') - } - } +const onChange = (field, cur, item, formRef) => { + if (field == 'factoryAreaNumber') { + nextTick(() => { + const setV = {} + setV['deviceNumber'] = '' + formRef.setValues(setV) + }) } } diff --git a/src/views/eam/mold/moldinspectionjob/index.vue b/src/views/eam/mold/moldinspectionjob/index.vue index b42d846..f62b344 100644 --- a/src/views/eam/mold/moldinspectionjob/index.vue +++ b/src/views/eam/mold/moldinspectionjob/index.vue @@ -70,6 +70,8 @@ :detailValidate="detailValidate" @detailSubmitForm="detailSubmitForm" :isSearchTableItem="true" + :openFormCallBack="openFormCallBack" + @detailOnChange="detailOnChange" /> @@ -161,7 +163,7 @@ const buttonBaseClick = (val, item) => { if (val == 'add') { // 新增 // MoldInspectionMain.allSchemas.formSchema[4].value = 'PROCCED'; MoldInspectionMain.allSchemas.formSchema.find((item) => item.field == 'status').value = 'PROCCED'; - MoldInspectionMain.allSchemas.formSchema[5].value = 'DEVICE'; + MoldInspectionMain.allSchemas.formSchema.find((item) => item.field == 'type').value = 'MOLD'; openForm('create') } else if (val == 'import') { // 导入 handleImport() @@ -349,19 +351,31 @@ const detailValidate = (data) => { // tag = true; // return tag; // } + let req = MoldInspectionDetailRules.uncompleted?.find(item => { + return item.required == true + }) + if (req !== undefined) { + tag = false + message.warning('需填入未完成原因') + } else { + tag = true + } + return tag } // 子表提交 -const detailSubmitForm = async (formType, data, getList, formRef, tableList) => { - console.log('data',data) +const detailSubmitForm = async (formType, data, getList1, formRef, tableList) => { + console.log('data', data) try { let data1 = { id: data.id, - number: data.maintenanceNumber, + number: data.number, + masterId: data.masterId, siteId: data.siteId, available: data.available, concurrencyStamp: data.concurrencyStamp, name: data.name, peoples: data.peoples, + status: data.status, estimatedMinutes: data.estimatedMinutes, actualMinutes: data.actualMinutes, chargePeoples: data.chargePeoples.join(','), @@ -371,15 +385,19 @@ const detailSubmitForm = async (formType, data, getList, formRef, tableList) => } console.log('data1',data1) if (formType === 'create') { + console.log('create', data1) await MoldInspectionDetailApi.createMoldInspectionDetail(data1) + console.log('finish', data1) message.success(t('common.createSuccess')) } else { await MoldInspectionDetailApi.updateMoldInspectionDetail(data1) message.success(t('common.updateSuccess')) } formRef.dialogVisible = false + console.log('before', data1) // 刷新当前列表 - await getList() + await formRef.getList1 + console.log('after', data1) detailRef.value.tableObject.tableList.forEach(item => { if (item.itemNumbers?.length > 0) { let str = '' @@ -391,7 +409,7 @@ const detailSubmitForm = async (formType, data, getList, formRef, tableList) => }) } finally { - formRef.formLoading = false + detailRef.value.formLoading = false } } @@ -429,12 +447,46 @@ const submitForm = async (formType, data) => { await MoldInspectionMainApi.updateMoldInspectionMain(data) message.success(t('common.updateSuccess')) } - formRef.value.dialogVisible = false + basicFormRef.value.dialogVisible = false // 刷新当前列表 getList() } finally { - formRef.value.formLoading = false + basicFormRef.value.formLoading = false + } +} + + + +function detailOnChange(field, cur, item) { + if (field == 'status') { + if (cur == '1') { + MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false + MoldInspectionDetailRules.uncompleted = [required] + } else { + MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true + MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.value = '' + MoldInspectionDetailRules.uncompleted = [{ required: false }] + } + } +} + +const openFormCallBack = (type, row, masterParmas, callback) => { + if (row == undefined || row == null) { + MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true + MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.value = '' + delete MoldInspectionDetailRules.uncompleted; + MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'status').value = '0' + } else { + if (row.status == '1') { + MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = false + MoldInspectionDetailRules.uncompleted = [required] + } else { + MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.disabled = true + MoldInspectionDetail.allSchemas.formSchema.find(item => item.field == 'uncompleted').componentProps.value = '' + MoldInspectionDetailRules.uncompleted = [{ required: false }] + } } + callback() } /** 初始化 **/ diff --git a/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts b/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts index d7d2190..8335150 100644 --- a/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts +++ b/src/views/eam/mold/moldinspectionjob/moldInspectionMain.data.ts @@ -294,6 +294,7 @@ export const MoldInspectionDetailRules = reactive({ ], number: [required], actualMinutes: [ + required, { validator:validateNum, message: '请输入数字格式', trigger: 'blur'} ], maintenance: [required], @@ -455,12 +456,15 @@ export const MoldInspectionDetail = useCrudSchemas(reactive([ label: '未完成原因', field: 'uncompleted', sort: 'custom', - table: { - width: '150', - }, isSearch: false, - isForm: true, isTable: true, + form: { + component: 'Input', + componentProps: { + type: 'textarea', + disabled: true, + } + } }, { label: '备件', @@ -481,8 +485,8 @@ export const MoldInspectionDetail = useCrudSchemas(reactive([ // tableData.value.itemNumbers1 = value.map(item => item.itemNumber) }, searchCondition: [{ - key: 'moldNumber', - value: 'moldNumber', + key: 'deviceNumber', + value: 'deviceNumber', message: '请选择设备模具编号！', isMainValue: true }] @@ -498,8 +502,8 @@ export const MoldInspectionDetail = useCrudSchemas(reactive([ searchAllSchemas: ItemSearchTable.allSchemas, // 查询弹窗所需类 searchPage: ItemApi.getItemList, // 查询弹窗所需分页方法 searchCondition: [{ - key: 'moldNumber', - value: 'moldNumber', + key: 'deviceNumber', + value: 'deviceNumber', message: '请选择设备模具编号！', isMainValue: true }] diff --git a/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts b/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts index e874d2c..1b7cc4d 100644 --- a/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts +++ b/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts @@ -5,8 +5,8 @@ import { dateFormatter } from '@/utils/formatTime' import { ItemSearchTable } from '../../basic/item/item.data' import * as ItemApi from '@/api/eam/basic/item' const factoryList = await selectAllFactoryArea() -const userList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: undefined, flag: 1 }) -const dutyUserList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: undefined, flag: undefined }) +const userList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: 1 }) +const dutyUserList = await selecUserByType({ classType: 'MOLD', factoryAreaNumber: '', flag: undefined }) // 表单校验 export const MoldMaintainOrderMainRules = reactive({ @@ -99,11 +99,21 @@ export const MoldMaintainOrderMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.WEI_XIU_ORDER_STATUS, dictClass: 'string', }, + { + label: '描述', + field: 'describes', + sort: 'custom', + isSearch: false, + table: { + width: '150', + }, + }, { label: '类型', field: 'type', sort: 'custom', isSearch: false, + isTable: false, table: { width: '150', }, diff --git a/src/views/eam/mold/moldmaintenancejob/index.vue b/src/views/eam/mold/moldmaintenancejob/index.vue index c19a76c..d787f18 100644 --- a/src/views/eam/mold/moldmaintenancejob/index.vue +++ b/src/views/eam/mold/moldmaintenancejob/index.vue @@ -118,6 +118,9 @@ import * as MoldMaintenanceMainApi from '@/api/eam/mold/moldMaintenanceMain' import * as MoldMaintenanceDetailApi from '@/api/eam/mold/moldMaintenanceDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { useUserStore } from '@/store/modules/user' +import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +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' }) const message = useMessage() // 消息弹窗 @@ -208,8 +211,18 @@ const HeadButttondata = [ const buttonBaseClick = (val, item) => { if (val == 'add') { // 新增 - MoldMaintenanceMain.allSchemas.formSchema[3].value = 'MOLD' - MoldMaintenanceMain.allSchemas.formSchema[0].componentProps.disabled = false + MoldMaintenanceMain.allSchemas.formSchema.find(item => { + return item.field == 'type' + }).value = 'MOLD' + MoldMaintenanceMain.allSchemas.formSchema.find(item => { + return item.field == 'deviceNumber' + }).componentProps.disabled = false + MoldMaintenanceMain.allSchemas.formSchema.find(item => { + return item.field == 'type' + }).componentProps.disabled = false + MoldMaintenanceMain.allSchemas.formSchema.find(item => { + return item.field == 'type' + }).componentProps.options = moldTypeList openForm('create') } else if (val == 'import') { // 导入 @@ -282,13 +295,24 @@ const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 openForm('update', row) - MoldMaintenanceMain.allSchemas.formSchema[0].componentProps.disabled = true + MoldMaintenanceMain.allSchemas.formSchema.find(item => { + return item.field == 'deviceNumber' + }).componentProps.disabled = true + MoldMaintenanceMain.allSchemas.formSchema.find(item => { + return item.field == 'type' + }).componentProps.disabled = true } else if (val == 'delete') { // 删除 handleDelete(row.id) } else if (val == 'acceptOrder') { acceptOrder(row) } else if (val == 'turnOrder') { + MoldMaintenanceMain.allSchemas.formSchema.find(item => { + return item.field == 'type' + }).componentProps.options = deviceMoldTypeList + MoldMaintenanceMain.allSchemas.formSchema.find(item => { + return item.field == 'type' + }).componentProps.disabled = false openForm('turnOrder', row) } else if (val == 'finishOrder') { finishOrder(row) @@ -371,7 +395,10 @@ const searchFormClick = (searchData) => { // 接单 function acceptOrder(row) { - MoldMaintenanceMainApi.orderStepChange(row) + MoldMaintenanceMainApi.orderStepChange(row).then(item => { + message.success('接单成功') + getList() + }) } // 转办 function turnOrder() {} @@ -524,7 +551,7 @@ const detailSubmitForm= async (formType,data,getList,formRef,tableList) => { }) } finally { - formRef.formLoading = false + formRef.value.formLoading = false } } diff --git a/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts b/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts index d04bb92..e2154d2 100644 --- a/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts +++ b/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts @@ -44,7 +44,27 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive([ isSearch: false, isTable: true, }, - + { + label: '类型', + field: 'type', + sort: 'custom', + table: { + width: '150', + }, + isSearch: false, + isForm: true, + dictType: DICT_TYPE.DEVICE_MOLD_TYPE, + dictClass: 'string', + form: { + component: 'Select', + componentProps: { + disabled: true, + } + }, + search: { + value: 'MOLD' + } + }, { label: '设备模具编号', field: 'deviceNumber', @@ -134,27 +154,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive([ }, } }, - { - label: '类型', - field: 'type', - sort: 'custom', - table: { - width: '150', - }, - isSearch: false, - isForm: true, - dictType: DICT_TYPE.DEVICE_MOLD_TYPE, - dictClass: 'string', - form: { - component: 'Select', - componentProps: { - disabled: true, - } - }, - search: { - value: 'MOLD' - } - }, + { label: '班次', field: 'classes',