✨ feat(mes): 新增质检指标结果值属性校验
parent
3ab07d7412
commit
98714fde0c
|
|
@ -9,14 +9,14 @@
|
||||||
v-loading="formLoading"
|
v-loading="formLoading"
|
||||||
>
|
>
|
||||||
<el-form-item label="检测项编码" prop="code">
|
<el-form-item label="检测项编码" prop="code">
|
||||||
<el-input v-model="formData.code" placeholder="请输入检测项编码">
|
<el-input v-model="formData.code" placeholder="请输入检测项编码" :maxlength="64">
|
||||||
<template #append>
|
<template #append>
|
||||||
<el-button @click="generateCode"> 生成 </el-button>
|
<el-button @click="generateCode"> 生成 </el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="检测项名称" prop="name">
|
<el-form-item label="检测项名称" prop="name">
|
||||||
<el-input v-model="formData.name" placeholder="请输入检测项名称" />
|
<el-input v-model="formData.name" placeholder="请输入检测项名称" :maxlength="100" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="检测项类型" prop="type">
|
<el-form-item label="检测项类型" prop="type">
|
||||||
<el-select v-model="formData.type" placeholder="请选择检测项类型" clearable class="!w-1/1">
|
<el-select v-model="formData.type" placeholder="请选择检测项类型" clearable class="!w-1/1">
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="检测工具" prop="tool">
|
<el-form-item label="检测工具" prop="tool">
|
||||||
<el-input v-model="formData.tool" placeholder="请输入检测工具" />
|
<el-input v-model="formData.tool" placeholder="请输入检测工具" :maxlength="100" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="结果值类型" prop="resultType">
|
<el-form-item label="结果值类型" prop="resultType">
|
||||||
<el-select
|
<el-select
|
||||||
|
|
@ -64,13 +64,27 @@
|
||||||
label="字典类型"
|
label="字典类型"
|
||||||
prop="resultSpecification"
|
prop="resultSpecification"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-select
|
||||||
v-model="formData.resultSpecification"
|
v-model="formData.resultSpecification"
|
||||||
placeholder="请输入字典类型名(如 sys_yes_no)"
|
placeholder="请选择字典类型"
|
||||||
/>
|
filterable
|
||||||
|
class="!w-1/1"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="dictType in dictTypeList"
|
||||||
|
:key="dictType.type"
|
||||||
|
:label="dictType.name"
|
||||||
|
:value="dictType.type"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item label="备注" prop="remark">
|
||||||
<el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
|
<el-input
|
||||||
|
type="textarea"
|
||||||
|
v-model="formData.remark"
|
||||||
|
placeholder="请输入备注"
|
||||||
|
:maxlength="250"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
|
|
@ -82,17 +96,19 @@
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { getStrDictOptions, getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
import { getStrDictOptions, getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||||
import { QcIndicatorApi, QcIndicatorVO } from '@/api/mes/qc/indicator'
|
import { QcIndicatorApi, QcIndicatorVO } from '@/api/mes/qc/indicator'
|
||||||
import { generateRandomStr } from '@/utils'
|
import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
|
||||||
import { MesQcResultValueType } from '@/views/mes/utils/constants'
|
import { getSimpleDictTypeList, DictTypeVO } from '@/api/system/dict/dict.type'
|
||||||
|
import { MesAutoCodeRuleCode, MesQcResultValueType } from '@/views/mes/utils/constants'
|
||||||
|
|
||||||
defineOptions({ name: 'IndicatorForm' })
|
defineOptions({ name: 'IndicatorForm' })
|
||||||
|
const emit = defineEmits(['success'])
|
||||||
|
|
||||||
const { t } = useI18n() // 国际化
|
const { t } = useI18n() // 国际化
|
||||||
const message = useMessage() // 消息弹窗
|
const message = useMessage() // 消息弹窗
|
||||||
|
|
||||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||||
const dialogTitle = ref('') // 弹窗的标题
|
const dialogTitle = ref('') // 弹窗的标题
|
||||||
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
|
const formLoading = ref(false) // 表单的加载中
|
||||||
const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
const formType = ref('') // 表单的类型:create - 新增;update - 修改
|
||||||
const formData = ref({
|
const formData = ref({
|
||||||
id: undefined,
|
id: undefined,
|
||||||
|
|
@ -105,17 +121,27 @@ const formData = ref({
|
||||||
remark: undefined
|
remark: undefined
|
||||||
})
|
})
|
||||||
const formRules = reactive({
|
const formRules = reactive({
|
||||||
code: [{ required: true, message: '检测项编码不能为空', trigger: 'blur' }],
|
code: [
|
||||||
name: [{ required: true, message: '检测项名称不能为空', trigger: 'blur' }],
|
{ required: true, message: '检测项编码不能为空', trigger: 'blur' },
|
||||||
|
{ max: 64, message: '检测项编码长度不能超过 64 个字符', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
name: [
|
||||||
|
{ required: true, message: '检测项名称不能为空', trigger: 'blur' },
|
||||||
|
{ max: 100, message: '检测项名称长度不能超过 100 个字符', trigger: 'blur' }
|
||||||
|
],
|
||||||
type: [{ required: true, message: '检测项类型不能为空', trigger: 'change' }],
|
type: [{ required: true, message: '检测项类型不能为空', trigger: 'change' }],
|
||||||
resultType: [{ required: true, message: '结果值类型不能为空', trigger: 'change' }]
|
resultType: [{ required: true, message: '结果值类型不能为空', trigger: 'change' }],
|
||||||
|
resultSpecification: [{ required: true, message: '结果值属性不能为空', trigger: 'change' }],
|
||||||
|
remark: [{ max: 250, message: '备注长度不能超过 250 个字符', trigger: 'blur' }]
|
||||||
})
|
})
|
||||||
const formRef = ref() // 表单 Ref
|
const formRef = ref() // 表单 Ref
|
||||||
|
const dictTypeList = ref<DictTypeVO[]>([]) // 系统字典类型列表
|
||||||
|
|
||||||
/** 生成检测项编码 */
|
/** 生成检测项编码 */
|
||||||
const generateCode = () => {
|
const generateCode = async () => {
|
||||||
// TODO @芋艿:后续对接后端编码生成接口
|
formData.value.code = await AutoCodeRecordApi.generateAutoCode(
|
||||||
formData.value.code = 'QI' + generateRandomStr(12)
|
MesAutoCodeRuleCode.QC_INDICATOR_CODE
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 结果值类型变更时清空结果值属性 */
|
/** 结果值类型变更时清空结果值属性 */
|
||||||
|
|
@ -129,6 +155,10 @@ const open = async (type: string, id?: number) => {
|
||||||
dialogTitle.value = t('action.' + type)
|
dialogTitle.value = t('action.' + type)
|
||||||
formType.value = type
|
formType.value = type
|
||||||
resetForm()
|
resetForm()
|
||||||
|
// 加载字典类型列表(供 DICT 类型选择使用)
|
||||||
|
if (dictTypeList.value.length === 0) {
|
||||||
|
dictTypeList.value = await getSimpleDictTypeList()
|
||||||
|
}
|
||||||
// 修改时,设置数据
|
// 修改时,设置数据
|
||||||
if (id) {
|
if (id) {
|
||||||
formLoading.value = true
|
formLoading.value = true
|
||||||
|
|
@ -139,10 +169,8 @@ const open = async (type: string, id?: number) => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
|
|
||||||
|
|
||||||
/** 提交表单 */
|
/** 提交表单 */
|
||||||
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
|
|
||||||
const submitForm = async () => {
|
const submitForm = async () => {
|
||||||
// 校验表单
|
// 校验表单
|
||||||
await formRef.value.validate()
|
await formRef.value.validate()
|
||||||
|
|
@ -179,4 +207,6 @@ const resetForm = () => {
|
||||||
}
|
}
|
||||||
formRef.value?.resetFields()
|
formRef.value?.resetFields()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
defineExpose({ open })
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,7 @@ const { t } = useI18n() // 国际化
|
||||||
const loading = ref(true) // 列表的加载中
|
const loading = ref(true) // 列表的加载中
|
||||||
const list = ref<QcIndicatorVO[]>([]) // 列表的数据
|
const list = ref<QcIndicatorVO[]>([]) // 列表的数据
|
||||||
const total = ref(0) // 列表的总页数
|
const total = ref(0) // 列表的总页数
|
||||||
|
const exportLoading = ref(false) // 导出的加载中
|
||||||
const queryParams = reactive({
|
const queryParams = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
|
|
@ -163,7 +164,7 @@ const queryParams = reactive({
|
||||||
resultType: undefined
|
resultType: undefined
|
||||||
})
|
})
|
||||||
const queryFormRef = ref() // 搜索的表单
|
const queryFormRef = ref() // 搜索的表单
|
||||||
const exportLoading = ref(false) // 导出的加载中
|
const formRef = ref() // 表单弹窗
|
||||||
|
|
||||||
/** 查询列表 */
|
/** 查询列表 */
|
||||||
const getList = async () => {
|
const getList = async () => {
|
||||||
|
|
@ -190,7 +191,6 @@ const resetQuery = () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 添加/修改操作 */
|
/** 添加/修改操作 */
|
||||||
const formRef = ref()
|
|
||||||
const openForm = (type: string, id?: number) => {
|
const openForm = (type: string, id?: number) => {
|
||||||
formRef.value.open(type, id)
|
formRef.value.open(type, id)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -467,6 +467,7 @@ export const MesAutoCodeRuleCode = {
|
||||||
PRO_FEEDBACK_CODE: 'PRO_FEEDBACK_CODE', // 生产报工单编码
|
PRO_FEEDBACK_CODE: 'PRO_FEEDBACK_CODE', // 生产报工单编码
|
||||||
PRO_WORK_ORDER_CODE: 'PRO_WORK_ORDER_CODE', // 生产工单编码
|
PRO_WORK_ORDER_CODE: 'PRO_WORK_ORDER_CODE', // 生产工单编码
|
||||||
QC_DEFECT_CODE: 'QC_DEFECT_CODE', // 缺陷类型编码
|
QC_DEFECT_CODE: 'QC_DEFECT_CODE', // 缺陷类型编码
|
||||||
|
QC_INDICATOR_CODE: 'QC_INDICATOR_CODE', // 检测项编码
|
||||||
PRO_CARD_CODE: 'PRO_CARD_CODE' // 流转卡编码
|
PRO_CARD_CODE: 'PRO_CARD_CODE' // 流转卡编码
|
||||||
} as const
|
} as const
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue