diff --git a/src/assets/icons/icon-quality.svg b/src/assets/icons/icon-quality.svg index 13e9631..00640be 100644 --- a/src/assets/icons/icon-quality.svg +++ b/src/assets/icons/icon-quality.svg @@ -1 +1 @@ - + diff --git a/src/assets/icons/icon-quality.svg b/src/assets/icons/icon-quality.svg index 13e9631..00640be 100644 --- a/src/assets/icons/icon-quality.svg +++ b/src/assets/icons/icon-quality.svg @@ -1 +1 @@ - + diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 1e45b21..fa0f56b 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '参数', value: 'params', align: 'center', required: true }, { text: '量', value: 'capacity', align: 'center', width: '120', required: true }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, - { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' }, + { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '230px' }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' }, { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, @@ -127,7 +127,7 @@ params: paramsMap[props.itemCategoryName! as string]!, // 参数 capacity: capacityMap[props.itemCategoryName! as string]!, // 量 unit: form.value.standardValueUpperUnit, // 单位 - measureIndicationValue: calc(Number(calc(form.value.fullScaleValue as number, form.value.points, '/')), (i + 1), '*') + form.value.fullScaleValueUnit, // 被检表示值 + measureIndicationValue: calc(Number(calc(form.value.fullScaleValue as number, form.value.points, '/')), (i + 1), '*'), // 被检表示值 standardValue: `${calc(Number(calc(form.value.standardValueUpper, form.value.points, '/')), (i + 1), '*')}`, // 标准值 frequency: form.value.frequency, // 频率 frequencyUnit: form.value.frequencyUnit, // 频率单位 @@ -474,6 +474,7 @@ + {{ form.fullScaleValueUnit }} + diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 1e45b21..fa0f56b 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '参数', value: 'params', align: 'center', required: true }, { text: '量', value: 'capacity', align: 'center', width: '120', required: true }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, - { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' }, + { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '230px' }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' }, { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, @@ -127,7 +127,7 @@ params: paramsMap[props.itemCategoryName! as string]!, // 参数 capacity: capacityMap[props.itemCategoryName! as string]!, // 量 unit: form.value.standardValueUpperUnit, // 单位 - measureIndicationValue: calc(Number(calc(form.value.fullScaleValue as number, form.value.points, '/')), (i + 1), '*') + form.value.fullScaleValueUnit, // 被检表示值 + measureIndicationValue: calc(Number(calc(form.value.fullScaleValue as number, form.value.points, '/')), (i + 1), '*'), // 被检表示值 standardValue: `${calc(Number(calc(form.value.standardValueUpper, form.value.points, '/')), (i + 1), '*')}`, // 标准值 frequency: form.value.frequency, // 频率 frequencyUnit: form.value.frequencyUnit, // 频率单位 @@ -474,6 +474,7 @@ + {{ form.fullScaleValueUnit }} ({ ...item, id: '' })) : [{}], + measureItemDataLowPowerList: standardRef.value.list.length ? standardRef.value.list.map((item: any) => ({ ...item, itemId: infoId.value, id: '' })) : [{}], ...standardRef.value.form, } } diff --git a/src/assets/icons/icon-quality.svg b/src/assets/icons/icon-quality.svg index 13e9631..00640be 100644 --- a/src/assets/icons/icon-quality.svg +++ b/src/assets/icons/icon-quality.svg @@ -1 +1 @@ - + diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 1e45b21..fa0f56b 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '参数', value: 'params', align: 'center', required: true }, { text: '量', value: 'capacity', align: 'center', width: '120', required: true }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, - { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' }, + { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '230px' }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' }, { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, @@ -127,7 +127,7 @@ params: paramsMap[props.itemCategoryName! as string]!, // 参数 capacity: capacityMap[props.itemCategoryName! as string]!, // 量 unit: form.value.standardValueUpperUnit, // 单位 - measureIndicationValue: calc(Number(calc(form.value.fullScaleValue as number, form.value.points, '/')), (i + 1), '*') + form.value.fullScaleValueUnit, // 被检表示值 + measureIndicationValue: calc(Number(calc(form.value.fullScaleValue as number, form.value.points, '/')), (i + 1), '*'), // 被检表示值 standardValue: `${calc(Number(calc(form.value.standardValueUpper, form.value.points, '/')), (i + 1), '*')}`, // 标准值 frequency: form.value.frequency, // 频率 frequencyUnit: form.value.frequencyUnit, // 频率单位 @@ -474,6 +474,7 @@ + {{ form.fullScaleValueUnit }} ({ ...item, id: '' })) : [{}], + measureItemDataLowPowerList: standardRef.value.list.length ? standardRef.value.list.map((item: any) => ({ ...item, itemId: infoId.value, id: '' })) : [{}], ...standardRef.value.form, } } diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue index ae07943..a707a62 100644 --- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue +++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue @@ -272,8 +272,9 @@ +
{{ scope.row[item.value] }} diff --git a/src/assets/icons/icon-quality.svg b/src/assets/icons/icon-quality.svg index 13e9631..00640be 100644 --- a/src/assets/icons/icon-quality.svg +++ b/src/assets/icons/icon-quality.svg @@ -1 +1 @@ - + diff --git a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue index 1e45b21..fa0f56b 100644 --- a/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue +++ b/src/views/business/measure/item/components/first/templateDetailCreatePattern.vue @@ -33,7 +33,7 @@ { text: '参数', value: 'params', align: 'center', required: true }, { text: '量', value: 'capacity', align: 'center', width: '120', required: true }, { text: '单位', value: 'unit', align: 'center', width: '120', required: true }, - { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '180px' }, + { text: '被检表示值', value: 'measureIndicationValue', align: 'center', required: true, width: '230px' }, { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180px', reg: isNumber, validMessage: '要求为数字' }, { text: '分辨力', value: 'resolution', align: 'center', required: true, reg: (resolution: string | number) => { return Number(resolution) <= 1 } }, { text: '准确度等级', value: 'accuracyLevel', align: 'center', required: true }, @@ -127,7 +127,7 @@ params: paramsMap[props.itemCategoryName! as string]!, // 参数 capacity: capacityMap[props.itemCategoryName! as string]!, // 量 unit: form.value.standardValueUpperUnit, // 单位 - measureIndicationValue: calc(Number(calc(form.value.fullScaleValue as number, form.value.points, '/')), (i + 1), '*') + form.value.fullScaleValueUnit, // 被检表示值 + measureIndicationValue: calc(Number(calc(form.value.fullScaleValue as number, form.value.points, '/')), (i + 1), '*'), // 被检表示值 standardValue: `${calc(Number(calc(form.value.standardValueUpper, form.value.points, '/')), (i + 1), '*')}`, // 标准值 frequency: form.value.frequency, // 频率 frequencyUnit: form.value.frequencyUnit, // 频率单位 @@ -474,6 +474,7 @@ + {{ form.fullScaleValueUnit }} ({ ...item, id: '' })) : [{}], + measureItemDataLowPowerList: standardRef.value.list.length ? standardRef.value.list.map((item: any) => ({ ...item, itemId: infoId.value, id: '' })) : [{}], ...standardRef.value.form, } } diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue index ae07943..a707a62 100644 --- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue +++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue @@ -272,8 +272,9 @@ +
{{ scope.row[item.value] }} diff --git a/src/views/quality/correct/handle/components/ApprovalDialog.vue b/src/views/quality/correct/handle/components/ApprovalDialog.vue index 67bbda0..fa93dc1 100644 --- a/src/views/quality/correct/handle/components/ApprovalDialog.vue +++ b/src/views/quality/correct/handle/components/ApprovalDialog.vue @@ -8,9 +8,8 @@ import request from '@/api/index' import { getUserList } from '@/api/system/user' import { UploadFile, getPhotoUrl } from '@/api/file' -import { addApprovalUser } from '@/api/system/process' +import { addApprovalUser, getProcessDetail } from '@/api/system/process' import quality from '/public/config/quality.json' -import { getProcessDetail } from '@/api/system/process' /** * 审批弹窗 */ @@ -43,10 +42,11 @@ formId: { type: String, default: '', - } + }, }) const emit = defineEmits(['onSuccess', 'refuse', 'reject', 'sendApprovalRecord']) const $route = useRoute() +const currentApprovalNode = ref('') // 当前审批节点名称 // 弹窗显示状态 const dialogVisible = ref(false) // 默认表单 @@ -78,7 +78,7 @@ // agree同意 refuse拒绝 reject驳回 revoke取消 const userInfo = useUserStore() -const nextText = ref('') // 下一审批节点名称 +const nextText = ref('') // 下一审批节点名称 // 是否展示 下一节点审批节点 审批人 const isShowUser = ref(false) // ---------------表单提交-------------------------------- @@ -124,6 +124,7 @@ if (res.data.length) { const data = res.data[res.data.length - 1] if (data.length) { + currentApprovalNode.value = data[data.length - 1].taskName if (data[data.length - 1].taskName === $props.lastName) { isShowUser.value = false } @@ -324,24 +325,25 @@ nextText.value = '' } else { - getProcessDetail($props.formId).then(res => { + getProcessDetail($props.formId).then((res) => { if (res.data?.nodeConfig) { - function flattenObject(obj: any, parentKey: string = '', result: any = {}): any { - for (let key in obj) { + function flattenObject(obj: any, parentKey = '', result: any = {}): any { + for (const key in obj) { if (obj.hasOwnProperty(key)) { - const newKey = parentKey ? `${parentKey}.${key}` : key; + const newKey = parentKey ? `${parentKey}.${key}` : key if (typeof obj[key] === 'object' && obj[key] !== null && !Array.isArray(obj[key])) { - flattenObject(obj[key], newKey, result); - } else { - result[newKey] = obj[key]; + flattenObject(obj[key], newKey, result) + } + else { + result[newKey] = obj[key] } } } - return result; + return result } const response = flattenObject(res.data.nodeConfig) const result = [] - for (let key in response) { + for (const key in response) { if (key.includes('nodeName')) { // console.log(key) result.push(response[key]) @@ -384,8 +386,11 @@