From 02ef18d9e27bceab45bb57773f25645bcf4a83b9 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 17 Jun 2024 16:57:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?qms=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/dynamicRule/index.vue | 13 +++++++++++-- src/views/qms/inspectionMethod/index.vue | 12 ++++++++++-- src/views/qms/samplingProcess/index.vue | 10 +++++++++- src/views/qms/selectedSet/index.vue | 13 +++++++++++-- 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/src/views/qms/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue index 4eb9bf10a..1e62a5b29 100644 --- a/src/views/qms/dynamicRule/index.vue +++ b/src/views/qms/dynamicRule/index.vue @@ -79,7 +79,15 @@ /> - + diff --git a/src/views/eam/equipmentSpotCheckMain/SpotCheckOrderDetail.vue b/src/views/eam/equipmentSpotCheckMain/SpotCheckOrderDetail.vue new file mode 100644 index 000000000..6c175bcfc --- /dev/null +++ b/src/views/eam/equipmentSpotCheckMain/SpotCheckOrderDetail.vue @@ -0,0 +1,1055 @@ + + + + + diff --git a/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts b/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts index 377dcf90f..c0e4b8e4c 100644 --- a/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts +++ b/src/views/eam/equipmentSpotCheckMain/equipmentSpotCheckMain.data.ts @@ -2,6 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data"; import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; +import {BasicFaultType} from "@/views/eam/basicFaultType/basicFaultType.data"; +import * as BasicFaultTypeApi from "@/api/eam/basicFaultType"; import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data"; import * as WorkshopApi from "@/api/wms/workshop"; @@ -25,11 +27,19 @@ export const EquipmentSpotCheckMain = useCrudSchemas(reactive([ isDetail:false, }, { - label: '工单编号', + label: '点检工单', field: 'number', sort: 'custom', isSearch: true, }, + { + label: '来源字典', + field: 'sources', + sort: 'custom', + dictType: DICT_TYPE.EAM_SPOTCHECK_SOURCES, + dictClass: 'string', + isSearch: false, + }, { label: '点检描述', field: 'describing', @@ -74,7 +84,7 @@ export const EquipmentSpotCheckMain = useCrudSchemas(reactive([ isSearch: false, }, { - label: '计划工单号', + label: '点检计划工单号', field: 'planNumber', sort: 'custom', isSearch: true, @@ -171,16 +181,32 @@ export const EquipmentSpotCheckMain = useCrudSchemas(reactive([ label: '故障类型枚举', field: 'faultType', sort: 'custom', - dictType: DICT_TYPE.FAILURE_REASON, - dictClass: 'string', isSearch: true, - isSearch: false, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择故障类型', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '故障类型信息', // 查询弹窗标题 + searchAllSchemas: BasicFaultType.allSchemas, // 查询弹窗所需类 + searchPage: BasicFaultTypeApi.getBasicFaultTypePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, }, { label: '验证人', field: 'verifyer', sort: 'custom', isSearch: false, + form: { + component: 'InputNumber', + value: 0 + }, }, { label: '验证内容', @@ -215,10 +241,12 @@ export const EquipmentSpotCheckMain = useCrudSchemas(reactive([ field: 'maintenancer', sort: 'custom', isSearch: false, - form: { - component: 'InputNumber', - value: 0 - }, + }, + { + label: '点检人电话', + field: 'maintenancePhone', + sort: 'custom', + isSearch: false, }, { label: '完成时间', @@ -318,13 +346,16 @@ export const EquipmentSpotCheckMain = useCrudSchemas(reactive([ label: '班组类型', field: 'classType', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '所属厂区编号', field: 'factoryAreaCode', sort: 'custom', isSearch: false, + isTable: false, + isForm: false, + isDetail:false, }, { label: '车间编号', @@ -404,6 +435,160 @@ export const EquipmentSpotCheckMain = useCrudSchemas(reactive([ isForm: false, isDetail:false, }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '是否可用默认TRUE', + field: 'available', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail: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' + } + }, + }, + { + label: '删除人id', + field: 'deleterId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + + +export const RelationSpotCheckPlanItemRules = reactive({ + planNumber: [required], + itemCode: [required], + itemName: [required], + concurrencyStamp: [required], +}) + +export const RelationSpotCheckPlanItem = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '计划编号', + field: 'planNumber', + sort: 'custom', + isSearch: true, + }, + { + label: '项编号', + field: 'itemCode', + sort: 'custom', + isSearch: true, + }, + { + label: '项名称', + field: 'itemName', + sort: 'custom', + isSearch: true, + }, + { + label: '是否必选', + field: 'isSelectd', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.FALSE_OR_TRUE, + dictClass: 'string', + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail: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, + }, + { + label: '部门id', + field: 'departmentCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, { label: '备注', field: 'remark', diff --git a/src/views/eam/equipmentSpotCheckMain/finishForm1.vue b/src/views/eam/equipmentSpotCheckMain/finishForm1.vue new file mode 100644 index 000000000..a5acf0fb5 --- /dev/null +++ b/src/views/eam/equipmentSpotCheckMain/finishForm1.vue @@ -0,0 +1,144 @@ + + + + diff --git a/src/views/eam/equipmentSpotCheckMain/finishForm2.vue b/src/views/eam/equipmentSpotCheckMain/finishForm2.vue new file mode 100644 index 000000000..0894c57b3 --- /dev/null +++ b/src/views/eam/equipmentSpotCheckMain/finishForm2.vue @@ -0,0 +1,151 @@ + + + + diff --git a/src/views/eam/equipmentSpotCheckMain/index.vue b/src/views/eam/equipmentSpotCheckMain/index.vue index e7a54ca45..09f3d6cdd 100644 --- a/src/views/eam/equipmentSpotCheckMain/index.vue +++ b/src/views/eam/equipmentSpotCheckMain/index.vue @@ -33,7 +33,7 @@ @@ -48,10 +48,30 @@ :apiCreate="EquipmentSpotCheckMainApi.createEquipmentSpotCheckMain" @searchTableSuccess="searchTableSuccess" :isBusiness="false" + @onChange="onChange" /> + + + - + @@ -60,11 +80,23 @@