diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue index a4c1e4a..5345d78 100644 --- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue +++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue @@ -23,7 +23,7 @@ { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '规格型号', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, - { text: '辅助字段说明', value: 'helpInstruction', align: 'center' }, + { text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' }, { text: '设备分类', value: 'deviceTypeName', align: 'center' }, { text: '检校标准装置', value: 'belongStandardEquipmentName', align: 'center' }, { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' }, diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue index a4c1e4a..5345d78 100644 --- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue +++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue @@ -23,7 +23,7 @@ { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '规格型号', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, - { text: '辅助字段说明', value: 'helpInstruction', align: 'center' }, + { text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' }, { text: '设备分类', value: 'deviceTypeName', align: 'center' }, { text: '检校标准装置', value: 'belongStandardEquipmentName', align: 'center' }, { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' }, diff --git a/src/views/equipement/source/cert/detail.vue b/src/views/equipement/source/cert/detail.vue index 84d679e..0889e29 100644 --- a/src/views/equipement/source/cert/detail.vue +++ b/src/views/equipement/source/cert/detail.vue @@ -66,11 +66,10 @@ const meterIdentifyDict = ref([]) // 计量标识 const groupCodeList = ref([]) // 部门 const labCodeList = ref([]) // 实验室 - // 获取字典值 async function getDict() { // 计量标识 - getDictByCode('equipmentSourceMeterIdentify').then((response) => { + getDictByCode('bizMeterIdentify').then((response) => { meterIdentifyDict.value = response.data }) // 实验室 @@ -335,7 +334,6 @@ filterable disabled class="full-width-input" - @change="changeLabName" > @@ -349,7 +347,6 @@ filterable disabled class="full-width-input" - @change="changeGroupCode" > @@ -490,8 +487,6 @@ - - diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue index a4c1e4a..5345d78 100644 --- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue +++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue @@ -23,7 +23,7 @@ { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '规格型号', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, - { text: '辅助字段说明', value: 'helpInstruction', align: 'center' }, + { text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' }, { text: '设备分类', value: 'deviceTypeName', align: 'center' }, { text: '检校标准装置', value: 'belongStandardEquipmentName', align: 'center' }, { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' }, diff --git a/src/views/equipement/source/cert/detail.vue b/src/views/equipement/source/cert/detail.vue index 84d679e..0889e29 100644 --- a/src/views/equipement/source/cert/detail.vue +++ b/src/views/equipement/source/cert/detail.vue @@ -66,11 +66,10 @@ const meterIdentifyDict = ref([]) // 计量标识 const groupCodeList = ref([]) // 部门 const labCodeList = ref([]) // 实验室 - // 获取字典值 async function getDict() { // 计量标识 - getDictByCode('equipmentSourceMeterIdentify').then((response) => { + getDictByCode('bizMeterIdentify').then((response) => { meterIdentifyDict.value = response.data }) // 实验室 @@ -335,7 +334,6 @@ filterable disabled class="full-width-input" - @change="changeLabName" > @@ -349,7 +347,6 @@ filterable disabled class="full-width-input" - @change="changeGroupCode" > @@ -490,8 +487,6 @@ - - diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue index 66d0e0d..d3a9700 100644 --- a/src/views/equipement/source/cert/list.vue +++ b/src/views/equipement/source/cert/list.vue @@ -59,7 +59,7 @@ // 查询字典 const getDict = async () => { // 计量标识 - const response = await getDictByCode('equipmentSourceMeterIdentify') + const response = await getDictByCode('bizMeterIdentify') meterIdentifyList.value = response.data response.data.forEach((item: { value: string; name: string }) => { meterIdentifyDict.value[`${item.value}`] = item.name diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue index a4c1e4a..5345d78 100644 --- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue +++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue @@ -23,7 +23,7 @@ { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '规格型号', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, - { text: '辅助字段说明', value: 'helpInstruction', align: 'center' }, + { text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' }, { text: '设备分类', value: 'deviceTypeName', align: 'center' }, { text: '检校标准装置', value: 'belongStandardEquipmentName', align: 'center' }, { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' }, diff --git a/src/views/equipement/source/cert/detail.vue b/src/views/equipement/source/cert/detail.vue index 84d679e..0889e29 100644 --- a/src/views/equipement/source/cert/detail.vue +++ b/src/views/equipement/source/cert/detail.vue @@ -66,11 +66,10 @@ const meterIdentifyDict = ref([]) // 计量标识 const groupCodeList = ref([]) // 部门 const labCodeList = ref([]) // 实验室 - // 获取字典值 async function getDict() { // 计量标识 - getDictByCode('equipmentSourceMeterIdentify').then((response) => { + getDictByCode('bizMeterIdentify').then((response) => { meterIdentifyDict.value = response.data }) // 实验室 @@ -335,7 +334,6 @@ filterable disabled class="full-width-input" - @change="changeLabName" > @@ -349,7 +347,6 @@ filterable disabled class="full-width-input" - @change="changeGroupCode" > @@ -490,8 +487,6 @@ - - diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue index 66d0e0d..d3a9700 100644 --- a/src/views/equipement/source/cert/list.vue +++ b/src/views/equipement/source/cert/list.vue @@ -59,7 +59,7 @@ // 查询字典 const getDict = async () => { // 计量标识 - const response = await getDictByCode('equipmentSourceMeterIdentify') + const response = await getDictByCode('bizMeterIdentify') meterIdentifyList.value = response.data response.data.forEach((item: { value: string; name: string }) => { meterIdentifyDict.value[`${item.value}`] = item.name diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue index 98893bb..e0c7bf1 100644 --- a/src/views/equipement/source/plan/components/basic.vue +++ b/src/views/equipement/source/plan/components/basic.vue @@ -12,6 +12,7 @@ import { SCHEDULE } from '@/utils/scheduleDict' import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue' import useUserStore from '@/store/modules/user' +import { validateMobile } from '@/utils/validate' import { getInfo as getEquipmentInfo, getEquipmentList } from '@/api/equipment/info/book' import { useCheckList } from '@/commonMethods/useCheckList' import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable' @@ -85,11 +86,21 @@ const ruleFormRef = ref() // 表单ref const loading = ref(false) // loading const infoId = ref('') // id + +const validatePhone = (rule: any, value: any, callback: any) => { + if (!value) { + callback(new Error('联系电话不能为空')) + } + if (!validateMobile(value)) { + callback(new Error('请输入正确格式的手机号')) + } + callback() +} const rules = ref({ // 校验规则 // 表单验证规则 applyTraceDate: [{ required: true, message: '申请溯源时间不能为空', trigger: ['blur', 'change'] }], contacts: [{ required: true, message: '联系人不能为空', trigger: ['blur', 'change'] }], - phone: [{ required: true, message: '联系电话不能为空', trigger: ['blur', 'change'] }], + phone: [{ required: true, validator: validatePhone, trigger: ['blur', 'change'] }], labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }], groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }], planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }], diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue index a4c1e4a..5345d78 100644 --- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue +++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue @@ -23,7 +23,7 @@ { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '规格型号', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, - { text: '辅助字段说明', value: 'helpInstruction', align: 'center' }, + { text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' }, { text: '设备分类', value: 'deviceTypeName', align: 'center' }, { text: '检校标准装置', value: 'belongStandardEquipmentName', align: 'center' }, { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' }, diff --git a/src/views/equipement/source/cert/detail.vue b/src/views/equipement/source/cert/detail.vue index 84d679e..0889e29 100644 --- a/src/views/equipement/source/cert/detail.vue +++ b/src/views/equipement/source/cert/detail.vue @@ -66,11 +66,10 @@ const meterIdentifyDict = ref([]) // 计量标识 const groupCodeList = ref([]) // 部门 const labCodeList = ref([]) // 实验室 - // 获取字典值 async function getDict() { // 计量标识 - getDictByCode('equipmentSourceMeterIdentify').then((response) => { + getDictByCode('bizMeterIdentify').then((response) => { meterIdentifyDict.value = response.data }) // 实验室 @@ -335,7 +334,6 @@ filterable disabled class="full-width-input" - @change="changeLabName" > @@ -349,7 +347,6 @@ filterable disabled class="full-width-input" - @change="changeGroupCode" > @@ -490,8 +487,6 @@ - - diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue index 66d0e0d..d3a9700 100644 --- a/src/views/equipement/source/cert/list.vue +++ b/src/views/equipement/source/cert/list.vue @@ -59,7 +59,7 @@ // 查询字典 const getDict = async () => { // 计量标识 - const response = await getDictByCode('equipmentSourceMeterIdentify') + const response = await getDictByCode('bizMeterIdentify') meterIdentifyList.value = response.data response.data.forEach((item: { value: string; name: string }) => { meterIdentifyDict.value[`${item.value}`] = item.name diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue index 98893bb..e0c7bf1 100644 --- a/src/views/equipement/source/plan/components/basic.vue +++ b/src/views/equipement/source/plan/components/basic.vue @@ -12,6 +12,7 @@ import { SCHEDULE } from '@/utils/scheduleDict' import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue' import useUserStore from '@/store/modules/user' +import { validateMobile } from '@/utils/validate' import { getInfo as getEquipmentInfo, getEquipmentList } from '@/api/equipment/info/book' import { useCheckList } from '@/commonMethods/useCheckList' import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable' @@ -85,11 +86,21 @@ const ruleFormRef = ref() // 表单ref const loading = ref(false) // loading const infoId = ref('') // id + +const validatePhone = (rule: any, value: any, callback: any) => { + if (!value) { + callback(new Error('联系电话不能为空')) + } + if (!validateMobile(value)) { + callback(new Error('请输入正确格式的手机号')) + } + callback() +} const rules = ref({ // 校验规则 // 表单验证规则 applyTraceDate: [{ required: true, message: '申请溯源时间不能为空', trigger: ['blur', 'change'] }], contacts: [{ required: true, message: '联系人不能为空', trigger: ['blur', 'change'] }], - phone: [{ required: true, message: '联系电话不能为空', trigger: ['blur', 'change'] }], + phone: [{ required: true, validator: validatePhone, trigger: ['blur', 'change'] }], labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }], groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }], planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }], diff --git a/src/views/equipement/source/plan/detail.vue b/src/views/equipement/source/plan/detail.vue index 8c207d8..e0f10b4 100644 --- a/src/views/equipement/source/plan/detail.vue +++ b/src/views/equipement/source/plan/detail.vue @@ -167,7 +167,7 @@ // -----------------------------------------------钩子------------------------------------------ watch(() => approvalStatusName.value, (val) => { - if (val === '草稿箱' || pageType.value === 'add') { // 全部草稿箱把审批详情删了 + if (val === '草稿箱' || pageType.value === 'add') { // 草稿箱把审批详情删了 if (radioMenus.value[radioMenus.value.length - 1].value === 'sourcePlan-approval-record') { radioMenus.value.pop() } @@ -179,7 +179,6 @@ } }) onMounted(async () => { - init() // fetchUserList() // 获取用户列表 approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名字 processId.value = $route.query.processId as string // 流程实例id diff --git a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue index a4c1e4a..5345d78 100644 --- a/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue +++ b/src/views/business/taskMeasure/myTask/dialog/selectItemDialog.vue @@ -23,7 +23,7 @@ { text: '设备名称', value: 'deviceName', align: 'center' }, { text: '规格型号', value: 'model', align: 'center' }, { text: '辅助字段', value: 'helpInstruction', align: 'center' }, - { text: '辅助字段说明', value: 'helpInstruction', align: 'center' }, + { text: '辅助字段说明', value: 'helpFieldInstruction', align: 'center' }, { text: '设备分类', value: 'deviceTypeName', align: 'center' }, { text: '检校标准装置', value: 'belongStandardEquipmentName', align: 'center' }, { text: '设备检定项分类', value: 'itemCategoryName', align: 'center' }, diff --git a/src/views/equipement/source/cert/detail.vue b/src/views/equipement/source/cert/detail.vue index 84d679e..0889e29 100644 --- a/src/views/equipement/source/cert/detail.vue +++ b/src/views/equipement/source/cert/detail.vue @@ -66,11 +66,10 @@ const meterIdentifyDict = ref([]) // 计量标识 const groupCodeList = ref([]) // 部门 const labCodeList = ref([]) // 实验室 - // 获取字典值 async function getDict() { // 计量标识 - getDictByCode('equipmentSourceMeterIdentify').then((response) => { + getDictByCode('bizMeterIdentify').then((response) => { meterIdentifyDict.value = response.data }) // 实验室 @@ -335,7 +334,6 @@ filterable disabled class="full-width-input" - @change="changeLabName" > @@ -349,7 +347,6 @@ filterable disabled class="full-width-input" - @change="changeGroupCode" > @@ -490,8 +487,6 @@ - - diff --git a/src/views/equipement/source/cert/list.vue b/src/views/equipement/source/cert/list.vue index 66d0e0d..d3a9700 100644 --- a/src/views/equipement/source/cert/list.vue +++ b/src/views/equipement/source/cert/list.vue @@ -59,7 +59,7 @@ // 查询字典 const getDict = async () => { // 计量标识 - const response = await getDictByCode('equipmentSourceMeterIdentify') + const response = await getDictByCode('bizMeterIdentify') meterIdentifyList.value = response.data response.data.forEach((item: { value: string; name: string }) => { meterIdentifyDict.value[`${item.value}`] = item.name diff --git a/src/views/equipement/source/plan/components/basic.vue b/src/views/equipement/source/plan/components/basic.vue index 98893bb..e0c7bf1 100644 --- a/src/views/equipement/source/plan/components/basic.vue +++ b/src/views/equipement/source/plan/components/basic.vue @@ -12,6 +12,7 @@ import { SCHEDULE } from '@/utils/scheduleDict' import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue' import useUserStore from '@/store/modules/user' +import { validateMobile } from '@/utils/validate' import { getInfo as getEquipmentInfo, getEquipmentList } from '@/api/equipment/info/book' import { useCheckList } from '@/commonMethods/useCheckList' import { useDoubleClickTableRow, useSetAllRowReadable } from '@/commonMethods/useSetAllRowReadable' @@ -85,11 +86,21 @@ const ruleFormRef = ref() // 表单ref const loading = ref(false) // loading const infoId = ref('') // id + +const validatePhone = (rule: any, value: any, callback: any) => { + if (!value) { + callback(new Error('联系电话不能为空')) + } + if (!validateMobile(value)) { + callback(new Error('请输入正确格式的手机号')) + } + callback() +} const rules = ref({ // 校验规则 // 表单验证规则 applyTraceDate: [{ required: true, message: '申请溯源时间不能为空', trigger: ['blur', 'change'] }], contacts: [{ required: true, message: '联系人不能为空', trigger: ['blur', 'change'] }], - phone: [{ required: true, message: '联系电话不能为空', trigger: ['blur', 'change'] }], + phone: [{ required: true, validator: validatePhone, trigger: ['blur', 'change'] }], labCode: [{ required: true, message: '实验室不能为空', trigger: ['blur', 'change'] }], groupCode: [{ required: true, message: '部门不能为空', trigger: ['blur', 'change'] }], planYear: [{ required: true, message: '年不能为空', trigger: ['blur', 'change'] }], diff --git a/src/views/equipement/source/plan/detail.vue b/src/views/equipement/source/plan/detail.vue index 8c207d8..e0f10b4 100644 --- a/src/views/equipement/source/plan/detail.vue +++ b/src/views/equipement/source/plan/detail.vue @@ -167,7 +167,7 @@ // -----------------------------------------------钩子------------------------------------------ watch(() => approvalStatusName.value, (val) => { - if (val === '草稿箱' || pageType.value === 'add') { // 全部草稿箱把审批详情删了 + if (val === '草稿箱' || pageType.value === 'add') { // 草稿箱把审批详情删了 if (radioMenus.value[radioMenus.value.length - 1].value === 'sourcePlan-approval-record') { radioMenus.value.pop() } @@ -179,7 +179,6 @@ } }) onMounted(async () => { - init() // fetchUserList() // 获取用户列表 approvalStatusName.value = $route.query.approvalStatusName as string // 审批状态名字 processId.value = $route.query.processId as string // 流程实例id diff --git a/src/views/equipement/source/resultConfirm/components/basic.vue b/src/views/equipement/source/resultConfirm/components/basic.vue index 23e3cb2..96cc937 100644 --- a/src/views/equipement/source/resultConfirm/components/basic.vue +++ b/src/views/equipement/source/resultConfirm/components/basic.vue @@ -832,13 +832,13 @@