From 5fc50f56a890b5c90b51178ca0675c957c2da24f Mon Sep 17 00:00:00 2001 From: zhousq Date: Thu, 16 May 2024 14:34:56 +0800 Subject: [PATCH] =?UTF-8?q?2024-05-16=20=E4=BF=AE=E6=94=B9=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrPersonAbility/hrPersonAbility.data.ts | 17 +++- src/views/mes/hrPersonAbility/index.vue | 16 +++- src/views/mes/opersteps/index.vue | 10 +++ src/views/mes/opersteps/opersteps.data.ts | 5 +- src/views/mes/operstepsType/index.vue | 9 +++ .../processroute/components/configDialog.vue | 30 ++++--- src/views/mes/processroute/index.vue | 19 +++-- .../mes/processroute/processroute.data.ts | 12 +-- .../components/qualifiedCheck.vue | 80 +++++++++++-------- 9 files changed, 131 insertions(+), 67 deletions(-) diff --git a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts index 81c779e86..614e2ef7f 100644 --- a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts +++ b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts @@ -1,8 +1,9 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import * as AbilityInfoApi from '@/api/mes/abilityInfo' +import * as UserApi from "@/api/system/user"; import { AbilityInfo } from '../abilityInfo/abilityInfo.data' - +import {searchUser} from "@/views/wms/basicDataManage/orderManage/team/team.data"; // 表单校验 export const HrPersonAbilityRules = reactive({ @@ -116,6 +117,20 @@ export const HrPersonAbility = useCrudSchemas(reactive([ field: 'personCode', sort: 'custom', isSearch: true, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchTitle: '人员信息', // 查询弹窗标题 + searchAllSchemas: searchUser.allSchemas, // 查询弹窗所需类 + searchField: 'username', // 查询弹窗赋值字段 + searchPage: UserApi.getUserPage, // 查询弹窗所需分页方法 + searchCondition: [{ + action: "==", + column: 'userType', + value: 'WORKER' + }] + } + } }, { label: '能力编号', diff --git a/src/views/mes/hrPersonAbility/index.vue b/src/views/mes/hrPersonAbility/index.vue index f4b11845f..a4bc513f0 100644 --- a/src/views/mes/hrPersonAbility/index.vue +++ b/src/views/mes/hrPersonAbility/index.vue @@ -49,7 +49,7 @@ @searchTableSuccess="searchTableSuccess" :isBusiness="false" /> - + @@ -80,9 +80,17 @@ const tableColumns = ref(HrPersonAbility.allSchemas.tableColumns) // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { - const setV = {} - setV[formField] = val[0][searchField] - formRef.setValues(setV) + if (formField === 'ablityCode') { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + } + if (formField === 'personCode') { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + } + }) } diff --git a/src/views/mes/opersteps/index.vue b/src/views/mes/opersteps/index.vue index 4e2c1abc8..6250e6ef1 100644 --- a/src/views/mes/opersteps/index.vue +++ b/src/views/mes/opersteps/index.vue @@ -149,6 +149,16 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + let disabledFlag = false + if(type==='update'){ + disabledFlag = true + } + Opersteps.allSchemas.formSchema.forEach(item => { + if (item.field == 'stepsCode') { + item.componentProps.disabled =disabledFlag + } + }) + basicFormRef.value.open(type, row) basicFormRef.value.open(type, row) } diff --git a/src/views/mes/opersteps/opersteps.data.ts b/src/views/mes/opersteps/opersteps.data.ts index 96dc16c9d..6dc4c1f12 100644 --- a/src/views/mes/opersteps/opersteps.data.ts +++ b/src/views/mes/opersteps/opersteps.data.ts @@ -5,7 +5,10 @@ import { OperstepsType } from '../operstepsType/operstepsType.data' // 表单校验 export const OperstepsRules = reactive({ - concurrencyStamp: [required], + //concurrencyStamp: [required], + stepsCode: [required], + stepsName: [required], + collectCode: [required], }) export const Opersteps = useCrudSchemas(reactive([ diff --git a/src/views/mes/operstepsType/index.vue b/src/views/mes/operstepsType/index.vue index 20c4d9940..761b74318 100644 --- a/src/views/mes/operstepsType/index.vue +++ b/src/views/mes/operstepsType/index.vue @@ -149,6 +149,15 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + let disabledFlag = false + if(type==='update'){ + disabledFlag = true + } + OperstepsType.allSchemas.formSchema.forEach(item => { + if (item.field == 'collectCode') { + item.componentProps.disabled =disabledFlag + } + }) basicFormRef.value.open(type, row) } diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index 589d36a19..08cdcd6bb 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -42,7 +42,7 @@ @@ -250,10 +250,16 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { }) } } -const deleteNode=(row)=>{ - processData.value.splice(processData.value.indexOf(row),1) +const deleteNode=(row,index:number)=>{ + //console.log('row------',index) + //showProcessNodeData.value.splice(index,1) + processData.value.splice((page.value.current-1)*page.value.size+index,1) page.value.total=processData.value.length page.value.current=1 + showProcessNodeData.value=processData.value.slice(1,1+page.value.size); + + //page.value.current=1 + //showProcessNodeData.value=processData.value.slice((page.value.current-1)*page.value.size,page.value.size) graph.value.removeNode(row.code) } @@ -278,6 +284,9 @@ const openDetail = (row: any) => { materialData.value = [] mouldData.value = [] workStationList.value = [] + processData.value=[] + showProcessNodeData.value = [] + showMaterialsData.value = [] graph.value.on('node:dblclick', ({ e, x, y, node, view }) => { nodeClick(e, x, y, node, view) }) @@ -297,6 +306,7 @@ const handleDrawerClose = () => { //console.log(graph.value.toJSON()) rowData.value=null } + emit('close') } //**获取 工序信息 */ const getProcessInfo = async (id: any) => { @@ -440,15 +450,15 @@ const saveResult = async () => { processrouteId: processRouteId.value } - let res = ProcessrouteApi.saveGraphData(gdata) - if (res) { - message.success('保存成功！') - } else { - message.error('保存失败！') - } + await ProcessrouteApi.saveGraphData(gdata) + // if (res) { + // message.success('保存成功！') + // } else { + // message.error('保存失败！') + // } isShowDrawer.value = false handleDrawerClose() - emit('close') + //emit('close',) //return res } diff --git a/src/views/mes/processroute/index.vue b/src/views/mes/processroute/index.vue index 45d4c879d..98b69f762 100644 --- a/src/views/mes/processroute/index.vue +++ b/src/views/mes/processroute/index.vue @@ -157,16 +157,25 @@ const buttonTableClick = async (val, row) => { openDetail(row) } } -const dailogClose=() => { - console.log('close'); - nextTick?.(()=>{ - getList() - }) +const dailogClose= () => { + //console.log('dailogClose--confge',getList()); + //nextTick?.(()=>{ + getList() + //}) } /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + let disabledFlag = false + if(type==='update'){ + disabledFlag = true + } + Processroute.allSchemas.formSchema.forEach(item => { + if (item.field == 'processrouteCode') { + item.componentProps.disabled =disabledFlag + } + }) basicFormRef.value.open(type, row) } diff --git a/src/views/mes/processroute/processroute.data.ts b/src/views/mes/processroute/processroute.data.ts index 077aecc88..c5640450b 100644 --- a/src/views/mes/processroute/processroute.data.ts +++ b/src/views/mes/processroute/processroute.data.ts @@ -7,8 +7,6 @@ export const ProcessrouteRules = reactive({ processrouteCode: [required], processName: [required], productCode: [required], - ablityCode: [required], - ablityCode: [required], }) export const Processroute = useCrudSchemas(reactive([ @@ -59,15 +57,7 @@ export const Processroute = useCrudSchemas(reactive([ field: 'processrouteCode', sort: 'custom', isSearch: true, - // form: { - // component: 'Input', - - // componentProps: { - // slots:{ - // default:} - // disabled: true - // } - // } + }, { diff --git a/src/views/mes/workScheduling/components/qualifiedCheck.vue b/src/views/mes/workScheduling/components/qualifiedCheck.vue index bf2d7733e..0c58be7d7 100644 --- a/src/views/mes/workScheduling/components/qualifiedCheck.vue +++ b/src/views/mes/workScheduling/components/qualifiedCheck.vue @@ -7,29 +7,29 @@ width="600px" > - - - + + + - - + + - - + + - + - - + + - - + + @@ -51,7 +51,8 @@ const formLoading = ref(false) const personOption=ref([]) const saveFlag=ref(false) const planDayCode=ref() -const form = reactive({ +const baseformRef=ref() +const baseform = reactive({ id:0, planDayCode: "", processCode:"", @@ -66,13 +67,13 @@ const openDetail = async (row: any, titleName: any,code:string) => { //console.log('row-68',row) dialogVisible.value = true dialogTitle.value = titleName - form.processCode=row.nodeCode - form.personSelected=[] - form.planDayCode=code - form.personSelected=[] - form.qualified=0 - form.unqualified=0 - form.id=row.id + baseform.processCode=row.nodeCode + baseform.personSelected=[] + baseform.planDayCode=code + baseform.personSelected=[] + baseform.qualified=0 + baseform.unqualified=0 + baseform.id=row.id planDayCode.value=code getCurrentWorkerList(row.nodeCode) @@ -92,30 +93,37 @@ const qcount=ref(0) //数量处理 const handleCount = () => { qcount.value++ - if (form.qualified> rowData.value.planCount - form.unqualified) { + if (baseform.qualified> rowData.value.planCount - baseform.unqualified) { message.alert('合格数量超限！计划总数【'+rowData.value.planCount+'】') - form.qualified =rowData.value.planCount - form.unqualified + baseform.qualified =rowData.value.planCount - baseform.unqualified return } - if (form.unqualified> rowData.value.planCount -form.qualified ) { + if (baseform.unqualified> rowData.value.planCount -baseform.qualified ) { message.alert('不合格数量超限！') - form.unqualified =rowData.value.planCount-form.qualified + baseform.unqualified =rowData.value.planCount-baseform.qualified return } } //提交质检 -const saveReport = async() => { - - saveFlag.value = true - try { - await workschedulingApi.processQualified(form) - }finally{ - saveFlag.value = false - dialogVisible.value = false - emit('close') - } +const saveReport = () => { + if (!baseformRef) return + baseformRef.value.validate((valid) => { + if (valid) { + saveFlag.value = true + try { + workschedulingApi.processQualified(baseform) + }finally{ + saveFlag.value = false + dialogVisible.value = false + emit('close') + } + } else { + console.log('请确认数据的正确！') + } + }) + //console.log("report-saveReport-82",data) //await workschedulingApi.reportWorkByProcess(data) @@ -124,4 +132,6 @@ const saveReport = async() => { const emit = defineEmits(['success', 'close']) defineOptions({ name: 'qualifiedCheck' }) defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗 + +