diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue index 002a43b..c25a836 100644 --- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue +++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue @@ -593,6 +593,7 @@ @@ -604,6 +605,7 @@ v-model.trim="fromListInfo.standardEquipmentId" clearable placeholder="标准名称" + style="width: 100%;" size="default" :disabled="pageType === 'detail'" @change="standardChange" @@ -622,6 +624,7 @@ @@ -631,6 +634,7 @@ @@ -642,6 +646,7 @@ @@ -654,6 +659,7 @@ @@ -665,6 +671,7 @@ clearable placeholder="标准负责人" size="default" + style="width: 100%;" disabled > @@ -693,6 +701,7 @@ v-model="formInline.category" clearable placeholder="类别" + style="width: 100%;" size="default" disabled > @@ -711,6 +720,7 @@ v-model.trim="formInline.standardLevel" clearable placeholder="标准等级" + style="width: 100%;" size="default" disabled > @@ -729,6 +739,7 @@ v-model.trim="formInline.transmitRange" clearable placeholder="传递范围" + style="width: 100%;" size="default" disabled > @@ -746,6 +757,7 @@ @@ -758,6 +770,7 @@ v-model="formInline.preparationDate" type="datetime" placeholder="请选择筹建日期" + style="width: 100%;" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" disabled @@ -770,6 +783,7 @@ v-model.trim="formInline.standardLaboratory" clearable placeholder="标准所在实验室" + style="width: 100%;" size="default" disabled @clear="clearDeptList" @@ -789,6 +803,7 @@ @@ -798,6 +813,7 @@ @@ -810,6 +826,7 @@ v-model.trim="formInline.managerState" clearable placeholder="管理状态" + style="width: 100%;" size="default" disabled > @@ -828,6 +845,7 @@ v-model.trim="formInline.measureMajor" clearable placeholder="计量专业" + style="width: 100%;" size="default" disabled > @@ -845,6 +863,7 @@ @@ -854,6 +873,7 @@ @@ -904,6 +925,7 @@ @@ -914,6 +936,7 @@ - + @@ -950,6 +974,7 @@ placeholder="请选择发证日期" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" + style="width: 100%;" disabled /> diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue index 002a43b..c25a836 100644 --- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue +++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue @@ -593,6 +593,7 @@ @@ -604,6 +605,7 @@ v-model.trim="fromListInfo.standardEquipmentId" clearable placeholder="标准名称" + style="width: 100%;" size="default" :disabled="pageType === 'detail'" @change="standardChange" @@ -622,6 +624,7 @@ @@ -631,6 +634,7 @@ @@ -642,6 +646,7 @@ @@ -654,6 +659,7 @@ @@ -665,6 +671,7 @@ clearable placeholder="标准负责人" size="default" + style="width: 100%;" disabled > @@ -693,6 +701,7 @@ v-model="formInline.category" clearable placeholder="类别" + style="width: 100%;" size="default" disabled > @@ -711,6 +720,7 @@ v-model.trim="formInline.standardLevel" clearable placeholder="标准等级" + style="width: 100%;" size="default" disabled > @@ -729,6 +739,7 @@ v-model.trim="formInline.transmitRange" clearable placeholder="传递范围" + style="width: 100%;" size="default" disabled > @@ -746,6 +757,7 @@ @@ -758,6 +770,7 @@ v-model="formInline.preparationDate" type="datetime" placeholder="请选择筹建日期" + style="width: 100%;" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" disabled @@ -770,6 +783,7 @@ v-model.trim="formInline.standardLaboratory" clearable placeholder="标准所在实验室" + style="width: 100%;" size="default" disabled @clear="clearDeptList" @@ -789,6 +803,7 @@ @@ -798,6 +813,7 @@ @@ -810,6 +826,7 @@ v-model.trim="formInline.managerState" clearable placeholder="管理状态" + style="width: 100%;" size="default" disabled > @@ -828,6 +845,7 @@ v-model.trim="formInline.measureMajor" clearable placeholder="计量专业" + style="width: 100%;" size="default" disabled > @@ -845,6 +863,7 @@ @@ -854,6 +873,7 @@ @@ -904,6 +925,7 @@ @@ -914,6 +936,7 @@ - + @@ -950,6 +974,7 @@ placeholder="请选择发证日期" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" + style="width: 100%;" disabled /> diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue index c762b33..a75d816 100644 --- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue +++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue @@ -251,6 +251,7 @@ v-model.trim="formInline.standardNo" placeholder="系统编号,自动生成" disabled + class="full-width-input" /> @@ -260,6 +261,7 @@ v-model.trim="formInline.standardName" placeholder="标准名称" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -269,6 +271,7 @@ v-model.trim="formInline.projectNo" placeholder="项目编号" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -278,6 +281,7 @@ v-model.trim="formInline.constructionStandardProject" placeholder="建标项目" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -289,6 +293,7 @@ v-model.trim="formInline.organizeNo" placeholder="组织机构代码" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -301,6 +306,7 @@ v-model.trim="formInline.constructionStandardUnitName" placeholder="建标单位名称" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -312,6 +318,7 @@ placeholder="标准负责人" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -341,6 +349,7 @@ placeholder="类别" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -404,6 +416,7 @@ v-model="formInline.preparationDate" type="datetime" placeholder="请选择筹建日期" + style="width: 100%;" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" :disabled="buttonType === 'detail'" @@ -418,6 +431,7 @@ placeholder="标准科室" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" @clear="clearDeptList" > @@ -445,6 +460,7 @@ v-model.trim="formInline.laboratoryOwnerContact" placeholder="联系方式" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -458,6 +474,7 @@ placeholder="管理状态" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -500,6 +519,7 @@ - + @@ -594,6 +616,7 @@ @@ -604,6 +605,7 @@ v-model.trim="fromListInfo.standardEquipmentId" clearable placeholder="标准名称" + style="width: 100%;" size="default" :disabled="pageType === 'detail'" @change="standardChange" @@ -622,6 +624,7 @@ @@ -631,6 +634,7 @@ @@ -642,6 +646,7 @@ @@ -654,6 +659,7 @@ @@ -665,6 +671,7 @@ clearable placeholder="标准负责人" size="default" + style="width: 100%;" disabled > @@ -693,6 +701,7 @@ v-model="formInline.category" clearable placeholder="类别" + style="width: 100%;" size="default" disabled > @@ -711,6 +720,7 @@ v-model.trim="formInline.standardLevel" clearable placeholder="标准等级" + style="width: 100%;" size="default" disabled > @@ -729,6 +739,7 @@ v-model.trim="formInline.transmitRange" clearable placeholder="传递范围" + style="width: 100%;" size="default" disabled > @@ -746,6 +757,7 @@ @@ -758,6 +770,7 @@ v-model="formInline.preparationDate" type="datetime" placeholder="请选择筹建日期" + style="width: 100%;" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" disabled @@ -770,6 +783,7 @@ v-model.trim="formInline.standardLaboratory" clearable placeholder="标准所在实验室" + style="width: 100%;" size="default" disabled @clear="clearDeptList" @@ -789,6 +803,7 @@ @@ -798,6 +813,7 @@ @@ -810,6 +826,7 @@ v-model.trim="formInline.managerState" clearable placeholder="管理状态" + style="width: 100%;" size="default" disabled > @@ -828,6 +845,7 @@ v-model.trim="formInline.measureMajor" clearable placeholder="计量专业" + style="width: 100%;" size="default" disabled > @@ -845,6 +863,7 @@ @@ -854,6 +873,7 @@ @@ -904,6 +925,7 @@ @@ -914,6 +936,7 @@ - + @@ -950,6 +974,7 @@ placeholder="请选择发证日期" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" + style="width: 100%;" disabled /> diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue index c762b33..a75d816 100644 --- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue +++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue @@ -251,6 +251,7 @@ v-model.trim="formInline.standardNo" placeholder="系统编号,自动生成" disabled + class="full-width-input" /> @@ -260,6 +261,7 @@ v-model.trim="formInline.standardName" placeholder="标准名称" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -269,6 +271,7 @@ v-model.trim="formInline.projectNo" placeholder="项目编号" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -278,6 +281,7 @@ v-model.trim="formInline.constructionStandardProject" placeholder="建标项目" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -289,6 +293,7 @@ v-model.trim="formInline.organizeNo" placeholder="组织机构代码" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -301,6 +306,7 @@ v-model.trim="formInline.constructionStandardUnitName" placeholder="建标单位名称" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -312,6 +318,7 @@ placeholder="标准负责人" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -341,6 +349,7 @@ placeholder="类别" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -404,6 +416,7 @@ v-model="formInline.preparationDate" type="datetime" placeholder="请选择筹建日期" + style="width: 100%;" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" :disabled="buttonType === 'detail'" @@ -418,6 +431,7 @@ placeholder="标准科室" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" @clear="clearDeptList" > @@ -445,6 +460,7 @@ v-model.trim="formInline.laboratoryOwnerContact" placeholder="联系方式" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -458,6 +474,7 @@ placeholder="管理状态" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -500,6 +519,7 @@ - + @@ -594,6 +616,7 @@ + + + + diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue index 002a43b..c25a836 100644 --- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue +++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue @@ -593,6 +593,7 @@ @@ -604,6 +605,7 @@ v-model.trim="fromListInfo.standardEquipmentId" clearable placeholder="标准名称" + style="width: 100%;" size="default" :disabled="pageType === 'detail'" @change="standardChange" @@ -622,6 +624,7 @@ @@ -631,6 +634,7 @@ @@ -642,6 +646,7 @@ @@ -654,6 +659,7 @@ @@ -665,6 +671,7 @@ clearable placeholder="标准负责人" size="default" + style="width: 100%;" disabled > @@ -693,6 +701,7 @@ v-model="formInline.category" clearable placeholder="类别" + style="width: 100%;" size="default" disabled > @@ -711,6 +720,7 @@ v-model.trim="formInline.standardLevel" clearable placeholder="标准等级" + style="width: 100%;" size="default" disabled > @@ -729,6 +739,7 @@ v-model.trim="formInline.transmitRange" clearable placeholder="传递范围" + style="width: 100%;" size="default" disabled > @@ -746,6 +757,7 @@ @@ -758,6 +770,7 @@ v-model="formInline.preparationDate" type="datetime" placeholder="请选择筹建日期" + style="width: 100%;" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" disabled @@ -770,6 +783,7 @@ v-model.trim="formInline.standardLaboratory" clearable placeholder="标准所在实验室" + style="width: 100%;" size="default" disabled @clear="clearDeptList" @@ -789,6 +803,7 @@ @@ -798,6 +813,7 @@ @@ -810,6 +826,7 @@ v-model.trim="formInline.managerState" clearable placeholder="管理状态" + style="width: 100%;" size="default" disabled > @@ -828,6 +845,7 @@ v-model.trim="formInline.measureMajor" clearable placeholder="计量专业" + style="width: 100%;" size="default" disabled > @@ -845,6 +863,7 @@ @@ -854,6 +873,7 @@ @@ -904,6 +925,7 @@ @@ -914,6 +936,7 @@ - + @@ -950,6 +974,7 @@ placeholder="请选择发证日期" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" + style="width: 100%;" disabled /> diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue index c762b33..a75d816 100644 --- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue +++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue @@ -251,6 +251,7 @@ v-model.trim="formInline.standardNo" placeholder="系统编号,自动生成" disabled + class="full-width-input" /> @@ -260,6 +261,7 @@ v-model.trim="formInline.standardName" placeholder="标准名称" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -269,6 +271,7 @@ v-model.trim="formInline.projectNo" placeholder="项目编号" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -278,6 +281,7 @@ v-model.trim="formInline.constructionStandardProject" placeholder="建标项目" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -289,6 +293,7 @@ v-model.trim="formInline.organizeNo" placeholder="组织机构代码" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -301,6 +306,7 @@ v-model.trim="formInline.constructionStandardUnitName" placeholder="建标单位名称" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -312,6 +318,7 @@ placeholder="标准负责人" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -341,6 +349,7 @@ placeholder="类别" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -404,6 +416,7 @@ v-model="formInline.preparationDate" type="datetime" placeholder="请选择筹建日期" + style="width: 100%;" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" :disabled="buttonType === 'detail'" @@ -418,6 +431,7 @@ placeholder="标准科室" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" @clear="clearDeptList" > @@ -445,6 +460,7 @@ v-model.trim="formInline.laboratoryOwnerContact" placeholder="联系方式" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -458,6 +474,7 @@ placeholder="管理状态" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -500,6 +519,7 @@ - + @@ -594,6 +616,7 @@ + + + + diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue index 29dfbae..bcdcf3b 100644 --- a/src/views/device/standardEquipment/components/standardListAdd.vue +++ b/src/views/device/standardEquipment/components/standardListAdd.vue @@ -4,7 +4,7 @@ import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus' import type { IOptions } from '../standard_interface' import baseInfo from './standardList/baseInfo.vue' -import table from './standardList/temptable.vue' +import TemplateTable from './standardList/templateTable.vue' import { getStaffList } from '@/api/measure/person' import { getTypeSelect } from '@/api/system/price' import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard' @@ -34,16 +34,20 @@ comp: any } const menu = shallowRef([ - { name: '基本信息', comp: baseInfo }, - { name: '计量人员', comp: table }, - { name: '标准配套设备', comp: table }, - { name: '检定规程', comp: table }, - { name: '重复性考核记录', comp: table }, - { name: '稳定性考核记录', comp: table }, - { name: '证书管理', comp: table }, + { name: '计量人员', comp: TemplateTable }, + { name: '标准配套设备', comp: TemplateTable }, + { name: '检定规程', comp: TemplateTable }, + { name: '重复性考核记录', comp: TemplateTable }, + { name: '稳定性考核记录', comp: TemplateTable }, + { name: '证书管理', comp: TemplateTable }, ]) +if (pageType.value === 'edit') { + menu.value = [{ name: '计量人员', comp: TemplateTable }, + { name: '标准配套设备', comp: TemplateTable }, + { name: '检定规程', comp: TemplateTable }] +} const currentCompRef = ref() -const current = ref('基本信息') +const current = ref('计量人员') const currentComp = shallowRef(baseInfo) watch(current, (newValue) => { currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp @@ -57,6 +61,130 @@ const setData = (newValue: object) => { formInline.value = newValue } +const queryParams = { + id: '', + limit: 20, + offset: 1, +} +// 关闭 +interface TableColumn { + text: string + value: string + align: string +} + +interface checkedRecord { + text: string +} +// 计量人员 +const measurementPersonnelColumns = ref([ + { text: '姓名', value: 'name', align: 'center' }, + { text: '计量人员编号', value: 'staffNo', align: 'center' }, + { text: '工作部门', value: 'deptId', align: 'center' }, + { text: '计量专业', value: 'major', align: 'center' }, + { text: '证书编号', value: 'verifierCertificateNo', align: 'center' }, + { text: '证书有效期', value: 'certificateDate', align: 'center' }, +]) +const measurementPersonnel = ref([]) +const measurementPersonnelLoading = ref(false) +function fetchmeasurementPersonnel(query = { ...queryParams }) { + measurementPersonnelLoading.value = true + measurementPersonnel.value = [{ + text: 'xx', + }] + measurementPersonnelLoading.value = false +} + +// 标准配套设备 +const corollaryEquipmentColumns = ref([ + { text: '设备名称', value: 'text', align: 'center' }, + { text: '设备编号', value: 'text', align: 'center' }, + { text: '型号', value: 'text', align: 'center' }, + { text: '测量范围', value: 'text', align: 'center' }, + { text: '使用部门', value: 'text', align: 'center' }, + { text: '检定时间', value: 'text', align: 'center' }, + { text: '检定结果', value: 'text', align: 'center' }, + { text: '有效日期', value: 'text', align: 'center' }, +]) +const corollaryEquipment = ref([]) +const corollaryEquipmentLoading = ref(false) +function fetchcorollaryEquipment(query = { ...queryParams }) { + corollaryEquipmentLoading.value = true + corollaryEquipment.value = [{ + text: 'xx', + }] + corollaryEquipmentLoading.value = false +} + +// 检定规程 +const regulationVerificationColumns = ref([ + { text: '文件名称', value: 'text', align: 'center' }, + { text: '文件编号', value: 'text', align: 'center' }, + { text: '文件号', value: 'text', align: 'center' }, + { text: '实施时间', value: 'text', align: 'center' }, + { text: '实施状态', value: 'text', align: 'center' }, +]) +const regulationVerification = ref([]) +const regulationVerificationLoading = ref(false) +function fetchregulationVerification(query = { ...queryParams }) { + regulationVerificationLoading.value = true + regulationVerification.value = [{ + text: 'xx', + }] + regulationVerificationLoading.value = false +} + +// 重复性考核记录 +const repetitiveRppraisalRecordColumns = ref([ + { text: '记录编号', value: 'text', align: 'center' }, + { text: '记录名称', value: 'text', align: 'center' }, + { text: '考核时间', value: 'text', align: 'center' }, + { text: '考核结果', value: 'text', align: 'center' }, +]) +const repetitiveRppraisalRecord = ref([]) +const repetitiveRppraisalRecordLoading = ref(false) +function fetchrepetitiveRppraisalRecord(query = { ...queryParams }) { + repetitiveRppraisalRecordLoading.value = true + repetitiveRppraisalRecord.value = [{ + text: 'xx', + }] + repetitiveRppraisalRecordLoading.value = false +} + +// 稳定性考核记录 +const stabilityAssessmentRecordColumns = ref([ + { text: '记录编号', value: 'text', align: 'center' }, + { text: '记录名称', value: 'text', align: 'center' }, + { text: '考核时间', value: 'text', align: 'center' }, + { text: '考核结果', value: 'text', align: 'center' }, +]) +const stabilityAssessmentRecord = ref([]) +const stabilityAssessmentRecordLoading = ref(false) +function fetchstabilityAssessmentRecord(query = { ...queryParams }) { + stabilityAssessmentRecordLoading.value = true + stabilityAssessmentRecord.value = [{ + text: 'xx', + }] + stabilityAssessmentRecordLoading.value = false +} + +// 证书管理 +const certificateManagementColumns = ref([ + { text: '证书编号', value: 'text', align: 'center' }, + { text: '证书名称', value: 'text', align: 'center' }, + { text: '证书类型', value: 'text', align: 'center' }, + { text: '证书出具日期', value: 'text', align: 'center' }, + { text: '证书有效期', value: 'text', align: 'center' }, +]) +const certificateManagement = ref([]) +const certificateManagementLoading = ref(false) +function fetchcertificateManagement(query = { ...queryParams }) { + certificateManagementLoading.value = true + certificateManagement.value = [{ + text: 'xx', + }] + certificateManagementLoading.value = false +} // 编辑获取详情的提交按钮 const submitFormDetail = () => { if (pageType.value === 'edit') { @@ -69,16 +197,17 @@ } else { // 打印 - const printObj = ref({ - id: 'print', // 需要打印元素的id - popTitle: '测量标准装置', // 打印配置页上方的标题 - extraHead: '', // 最上方的头部文字,附加在head标签上的额外标签,使用逗号分割 - preview: false, // 是否启动预览模式,默认是false - standard: '', - extarCss: '', - }) + } } +const printObj = ref({ + id: 'form', // 需要打印元素的id + popTitle: '测量标准装置', // 打印配置页上方的标题 + extraHead: '', // 最上方的头部文字,附加在head标签上的额外标签,使用逗号分割 + preview: false, // 是否启动预览模式,默认是false + standard: '', + extarCss: '', +}) // 提交 const submitForm = () => { if (pageType.value === 'detail') { return submitFormDetail() } @@ -103,39 +232,62 @@ }) }) } +onMounted(() => { + if (pageType.value === 'detail') { + // fetchmeasurementPersonnel() // 计量人员 + fetchcorollaryEquipment() // 标准配套设备 + fetchregulationVerification() // 检定规程 + fetchrepetitiveRppraisalRecord() // 重复性考核记录 + fetchstabilityAssessmentRecord() // 稳定性考核记录 + fetchcertificateManagement() // 证书管理 + } + else if (pageType.value === 'edit') { + // fetchmeasurementPersonnel() // 计量人员 + fetchcorollaryEquipment() // 标准配套设备 + fetchregulationVerification() // 检定规程 + } +}) diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue index 002a43b..c25a836 100644 --- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue +++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue @@ -593,6 +593,7 @@ @@ -604,6 +605,7 @@ v-model.trim="fromListInfo.standardEquipmentId" clearable placeholder="标准名称" + style="width: 100%;" size="default" :disabled="pageType === 'detail'" @change="standardChange" @@ -622,6 +624,7 @@ @@ -631,6 +634,7 @@ @@ -642,6 +646,7 @@ @@ -654,6 +659,7 @@ @@ -665,6 +671,7 @@ clearable placeholder="标准负责人" size="default" + style="width: 100%;" disabled > @@ -693,6 +701,7 @@ v-model="formInline.category" clearable placeholder="类别" + style="width: 100%;" size="default" disabled > @@ -711,6 +720,7 @@ v-model.trim="formInline.standardLevel" clearable placeholder="标准等级" + style="width: 100%;" size="default" disabled > @@ -729,6 +739,7 @@ v-model.trim="formInline.transmitRange" clearable placeholder="传递范围" + style="width: 100%;" size="default" disabled > @@ -746,6 +757,7 @@ @@ -758,6 +770,7 @@ v-model="formInline.preparationDate" type="datetime" placeholder="请选择筹建日期" + style="width: 100%;" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" disabled @@ -770,6 +783,7 @@ v-model.trim="formInline.standardLaboratory" clearable placeholder="标准所在实验室" + style="width: 100%;" size="default" disabled @clear="clearDeptList" @@ -789,6 +803,7 @@ @@ -798,6 +813,7 @@ @@ -810,6 +826,7 @@ v-model.trim="formInline.managerState" clearable placeholder="管理状态" + style="width: 100%;" size="default" disabled > @@ -828,6 +845,7 @@ v-model.trim="formInline.measureMajor" clearable placeholder="计量专业" + style="width: 100%;" size="default" disabled > @@ -845,6 +863,7 @@ @@ -854,6 +873,7 @@ @@ -904,6 +925,7 @@ @@ -914,6 +936,7 @@ - + @@ -950,6 +974,7 @@ placeholder="请选择发证日期" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" + style="width: 100%;" disabled /> diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue index c762b33..a75d816 100644 --- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue +++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue @@ -251,6 +251,7 @@ v-model.trim="formInline.standardNo" placeholder="系统编号,自动生成" disabled + class="full-width-input" /> @@ -260,6 +261,7 @@ v-model.trim="formInline.standardName" placeholder="标准名称" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -269,6 +271,7 @@ v-model.trim="formInline.projectNo" placeholder="项目编号" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -278,6 +281,7 @@ v-model.trim="formInline.constructionStandardProject" placeholder="建标项目" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -289,6 +293,7 @@ v-model.trim="formInline.organizeNo" placeholder="组织机构代码" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -301,6 +306,7 @@ v-model.trim="formInline.constructionStandardUnitName" placeholder="建标单位名称" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -312,6 +318,7 @@ placeholder="标准负责人" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -341,6 +349,7 @@ placeholder="类别" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -404,6 +416,7 @@ v-model="formInline.preparationDate" type="datetime" placeholder="请选择筹建日期" + style="width: 100%;" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" :disabled="buttonType === 'detail'" @@ -418,6 +431,7 @@ placeholder="标准科室" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" @clear="clearDeptList" > @@ -445,6 +460,7 @@ v-model.trim="formInline.laboratoryOwnerContact" placeholder="联系方式" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -458,6 +474,7 @@ placeholder="管理状态" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -500,6 +519,7 @@ - + @@ -594,6 +616,7 @@ + + + + diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue index 29dfbae..bcdcf3b 100644 --- a/src/views/device/standardEquipment/components/standardListAdd.vue +++ b/src/views/device/standardEquipment/components/standardListAdd.vue @@ -4,7 +4,7 @@ import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus' import type { IOptions } from '../standard_interface' import baseInfo from './standardList/baseInfo.vue' -import table from './standardList/temptable.vue' +import TemplateTable from './standardList/templateTable.vue' import { getStaffList } from '@/api/measure/person' import { getTypeSelect } from '@/api/system/price' import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard' @@ -34,16 +34,20 @@ comp: any } const menu = shallowRef([ - { name: '基本信息', comp: baseInfo }, - { name: '计量人员', comp: table }, - { name: '标准配套设备', comp: table }, - { name: '检定规程', comp: table }, - { name: '重复性考核记录', comp: table }, - { name: '稳定性考核记录', comp: table }, - { name: '证书管理', comp: table }, + { name: '计量人员', comp: TemplateTable }, + { name: '标准配套设备', comp: TemplateTable }, + { name: '检定规程', comp: TemplateTable }, + { name: '重复性考核记录', comp: TemplateTable }, + { name: '稳定性考核记录', comp: TemplateTable }, + { name: '证书管理', comp: TemplateTable }, ]) +if (pageType.value === 'edit') { + menu.value = [{ name: '计量人员', comp: TemplateTable }, + { name: '标准配套设备', comp: TemplateTable }, + { name: '检定规程', comp: TemplateTable }] +} const currentCompRef = ref() -const current = ref('基本信息') +const current = ref('计量人员') const currentComp = shallowRef(baseInfo) watch(current, (newValue) => { currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp @@ -57,6 +61,130 @@ const setData = (newValue: object) => { formInline.value = newValue } +const queryParams = { + id: '', + limit: 20, + offset: 1, +} +// 关闭 +interface TableColumn { + text: string + value: string + align: string +} + +interface checkedRecord { + text: string +} +// 计量人员 +const measurementPersonnelColumns = ref([ + { text: '姓名', value: 'name', align: 'center' }, + { text: '计量人员编号', value: 'staffNo', align: 'center' }, + { text: '工作部门', value: 'deptId', align: 'center' }, + { text: '计量专业', value: 'major', align: 'center' }, + { text: '证书编号', value: 'verifierCertificateNo', align: 'center' }, + { text: '证书有效期', value: 'certificateDate', align: 'center' }, +]) +const measurementPersonnel = ref([]) +const measurementPersonnelLoading = ref(false) +function fetchmeasurementPersonnel(query = { ...queryParams }) { + measurementPersonnelLoading.value = true + measurementPersonnel.value = [{ + text: 'xx', + }] + measurementPersonnelLoading.value = false +} + +// 标准配套设备 +const corollaryEquipmentColumns = ref([ + { text: '设备名称', value: 'text', align: 'center' }, + { text: '设备编号', value: 'text', align: 'center' }, + { text: '型号', value: 'text', align: 'center' }, + { text: '测量范围', value: 'text', align: 'center' }, + { text: '使用部门', value: 'text', align: 'center' }, + { text: '检定时间', value: 'text', align: 'center' }, + { text: '检定结果', value: 'text', align: 'center' }, + { text: '有效日期', value: 'text', align: 'center' }, +]) +const corollaryEquipment = ref([]) +const corollaryEquipmentLoading = ref(false) +function fetchcorollaryEquipment(query = { ...queryParams }) { + corollaryEquipmentLoading.value = true + corollaryEquipment.value = [{ + text: 'xx', + }] + corollaryEquipmentLoading.value = false +} + +// 检定规程 +const regulationVerificationColumns = ref([ + { text: '文件名称', value: 'text', align: 'center' }, + { text: '文件编号', value: 'text', align: 'center' }, + { text: '文件号', value: 'text', align: 'center' }, + { text: '实施时间', value: 'text', align: 'center' }, + { text: '实施状态', value: 'text', align: 'center' }, +]) +const regulationVerification = ref([]) +const regulationVerificationLoading = ref(false) +function fetchregulationVerification(query = { ...queryParams }) { + regulationVerificationLoading.value = true + regulationVerification.value = [{ + text: 'xx', + }] + regulationVerificationLoading.value = false +} + +// 重复性考核记录 +const repetitiveRppraisalRecordColumns = ref([ + { text: '记录编号', value: 'text', align: 'center' }, + { text: '记录名称', value: 'text', align: 'center' }, + { text: '考核时间', value: 'text', align: 'center' }, + { text: '考核结果', value: 'text', align: 'center' }, +]) +const repetitiveRppraisalRecord = ref([]) +const repetitiveRppraisalRecordLoading = ref(false) +function fetchrepetitiveRppraisalRecord(query = { ...queryParams }) { + repetitiveRppraisalRecordLoading.value = true + repetitiveRppraisalRecord.value = [{ + text: 'xx', + }] + repetitiveRppraisalRecordLoading.value = false +} + +// 稳定性考核记录 +const stabilityAssessmentRecordColumns = ref([ + { text: '记录编号', value: 'text', align: 'center' }, + { text: '记录名称', value: 'text', align: 'center' }, + { text: '考核时间', value: 'text', align: 'center' }, + { text: '考核结果', value: 'text', align: 'center' }, +]) +const stabilityAssessmentRecord = ref([]) +const stabilityAssessmentRecordLoading = ref(false) +function fetchstabilityAssessmentRecord(query = { ...queryParams }) { + stabilityAssessmentRecordLoading.value = true + stabilityAssessmentRecord.value = [{ + text: 'xx', + }] + stabilityAssessmentRecordLoading.value = false +} + +// 证书管理 +const certificateManagementColumns = ref([ + { text: '证书编号', value: 'text', align: 'center' }, + { text: '证书名称', value: 'text', align: 'center' }, + { text: '证书类型', value: 'text', align: 'center' }, + { text: '证书出具日期', value: 'text', align: 'center' }, + { text: '证书有效期', value: 'text', align: 'center' }, +]) +const certificateManagement = ref([]) +const certificateManagementLoading = ref(false) +function fetchcertificateManagement(query = { ...queryParams }) { + certificateManagementLoading.value = true + certificateManagement.value = [{ + text: 'xx', + }] + certificateManagementLoading.value = false +} // 编辑获取详情的提交按钮 const submitFormDetail = () => { if (pageType.value === 'edit') { @@ -69,16 +197,17 @@ } else { // 打印 - const printObj = ref({ - id: 'print', // 需要打印元素的id - popTitle: '测量标准装置', // 打印配置页上方的标题 - extraHead: '', // 最上方的头部文字,附加在head标签上的额外标签,使用逗号分割 - preview: false, // 是否启动预览模式,默认是false - standard: '', - extarCss: '', - }) + } } +const printObj = ref({ + id: 'form', // 需要打印元素的id + popTitle: '测量标准装置', // 打印配置页上方的标题 + extraHead: '', // 最上方的头部文字,附加在head标签上的额外标签,使用逗号分割 + preview: false, // 是否启动预览模式,默认是false + standard: '', + extarCss: '', +}) // 提交 const submitForm = () => { if (pageType.value === 'detail') { return submitFormDetail() } @@ -103,39 +232,62 @@ }) }) } +onMounted(() => { + if (pageType.value === 'detail') { + // fetchmeasurementPersonnel() // 计量人员 + fetchcorollaryEquipment() // 标准配套设备 + fetchregulationVerification() // 检定规程 + fetchrepetitiveRppraisalRecord() // 重复性考核记录 + fetchstabilityAssessmentRecord() // 稳定性考核记录 + fetchcertificateManagement() // 证书管理 + } + else if (pageType.value === 'edit') { + // fetchmeasurementPersonnel() // 计量人员 + fetchcorollaryEquipment() // 标准配套设备 + fetchregulationVerification() // 检定规程 + } +}) diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue index 876d6e3..107637b 100644 --- a/src/views/measure/train/plan.vue +++ b/src/views/measure/train/plan.vue @@ -31,8 +31,22 @@ const options = ref([]) const loadingTable = ref(false) // 初始化路由 +// 培训时间数组 +const trainTimeArr = ref([ + listQuery.value.trainStartTime, + listQuery.value.trainEndTime, +]) +// 创建时间数组 +const createTimeArr = ref([ + listQuery.value.createStartTime, + listQuery.value.createEndTime, +]) const $router = useRouter() const fetchData = (isNowPage: boolean) => { + listQuery.value.trainStartTime = trainTimeArr.value[0] || '' + listQuery.value.trainEndTime = trainTimeArr.value[1] || '' + listQuery.value.createStartTime = createTimeArr.value[0] || '' + listQuery.value.createEndTime = createTimeArr.value[0] || '' loadingTable.value = true if (!isNowPage) { // 是否显示当前页,否则跳转第一页 @@ -110,16 +124,7 @@ const searchList = () => { fetchData(true) } -// 培训时间数组 -const trainTimeArr = ref([ - listQuery.value.trainStartTime, - listQuery.value.trainEndTime, -]) -// 创建时间数组 -const createTimeArr = ref([ - listQuery.value.createStartTime, - listQuery.value.createEndTime, -]) + // 重置 const clearList = () => { listQuery.value = { @@ -134,6 +139,8 @@ offset: 1, limit: 20, } + trainTimeArr.value = [] + createTimeArr.value = [] } // 导出 const exportExcelBtn = () => { diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue index 002a43b..c25a836 100644 --- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue +++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue @@ -593,6 +593,7 @@ @@ -604,6 +605,7 @@ v-model.trim="fromListInfo.standardEquipmentId" clearable placeholder="标准名称" + style="width: 100%;" size="default" :disabled="pageType === 'detail'" @change="standardChange" @@ -622,6 +624,7 @@ @@ -631,6 +634,7 @@ @@ -642,6 +646,7 @@ @@ -654,6 +659,7 @@ @@ -665,6 +671,7 @@ clearable placeholder="标准负责人" size="default" + style="width: 100%;" disabled > @@ -693,6 +701,7 @@ v-model="formInline.category" clearable placeholder="类别" + style="width: 100%;" size="default" disabled > @@ -711,6 +720,7 @@ v-model.trim="formInline.standardLevel" clearable placeholder="标准等级" + style="width: 100%;" size="default" disabled > @@ -729,6 +739,7 @@ v-model.trim="formInline.transmitRange" clearable placeholder="传递范围" + style="width: 100%;" size="default" disabled > @@ -746,6 +757,7 @@ @@ -758,6 +770,7 @@ v-model="formInline.preparationDate" type="datetime" placeholder="请选择筹建日期" + style="width: 100%;" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" disabled @@ -770,6 +783,7 @@ v-model.trim="formInline.standardLaboratory" clearable placeholder="标准所在实验室" + style="width: 100%;" size="default" disabled @clear="clearDeptList" @@ -789,6 +803,7 @@ @@ -798,6 +813,7 @@ @@ -810,6 +826,7 @@ v-model.trim="formInline.managerState" clearable placeholder="管理状态" + style="width: 100%;" size="default" disabled > @@ -828,6 +845,7 @@ v-model.trim="formInline.measureMajor" clearable placeholder="计量专业" + style="width: 100%;" size="default" disabled > @@ -845,6 +863,7 @@ @@ -854,6 +873,7 @@ @@ -904,6 +925,7 @@ @@ -914,6 +936,7 @@ - + @@ -950,6 +974,7 @@ placeholder="请选择发证日期" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" + style="width: 100%;" disabled /> diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue index c762b33..a75d816 100644 --- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue +++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue @@ -251,6 +251,7 @@ v-model.trim="formInline.standardNo" placeholder="系统编号,自动生成" disabled + class="full-width-input" /> @@ -260,6 +261,7 @@ v-model.trim="formInline.standardName" placeholder="标准名称" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -269,6 +271,7 @@ v-model.trim="formInline.projectNo" placeholder="项目编号" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -278,6 +281,7 @@ v-model.trim="formInline.constructionStandardProject" placeholder="建标项目" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -289,6 +293,7 @@ v-model.trim="formInline.organizeNo" placeholder="组织机构代码" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -301,6 +306,7 @@ v-model.trim="formInline.constructionStandardUnitName" placeholder="建标单位名称" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -312,6 +318,7 @@ placeholder="标准负责人" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -341,6 +349,7 @@ placeholder="类别" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -404,6 +416,7 @@ v-model="formInline.preparationDate" type="datetime" placeholder="请选择筹建日期" + style="width: 100%;" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD h:m:s" :disabled="buttonType === 'detail'" @@ -418,6 +431,7 @@ placeholder="标准科室" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" @clear="clearDeptList" > @@ -445,6 +460,7 @@ v-model.trim="formInline.laboratoryOwnerContact" placeholder="联系方式" :disabled="buttonType === 'detail'" + class="full-width-input" /> @@ -458,6 +474,7 @@ placeholder="管理状态" size="default" :disabled="buttonType === 'detail'" + style="width: 100%;" > @@ -500,6 +519,7 @@ - + @@ -594,6 +616,7 @@ + + + + diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue index 29dfbae..bcdcf3b 100644 --- a/src/views/device/standardEquipment/components/standardListAdd.vue +++ b/src/views/device/standardEquipment/components/standardListAdd.vue @@ -4,7 +4,7 @@ import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus' import type { IOptions } from '../standard_interface' import baseInfo from './standardList/baseInfo.vue' -import table from './standardList/temptable.vue' +import TemplateTable from './standardList/templateTable.vue' import { getStaffList } from '@/api/measure/person' import { getTypeSelect } from '@/api/system/price' import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard' @@ -34,16 +34,20 @@ comp: any } const menu = shallowRef([ - { name: '基本信息', comp: baseInfo }, - { name: '计量人员', comp: table }, - { name: '标准配套设备', comp: table }, - { name: '检定规程', comp: table }, - { name: '重复性考核记录', comp: table }, - { name: '稳定性考核记录', comp: table }, - { name: '证书管理', comp: table }, + { name: '计量人员', comp: TemplateTable }, + { name: '标准配套设备', comp: TemplateTable }, + { name: '检定规程', comp: TemplateTable }, + { name: '重复性考核记录', comp: TemplateTable }, + { name: '稳定性考核记录', comp: TemplateTable }, + { name: '证书管理', comp: TemplateTable }, ]) +if (pageType.value === 'edit') { + menu.value = [{ name: '计量人员', comp: TemplateTable }, + { name: '标准配套设备', comp: TemplateTable }, + { name: '检定规程', comp: TemplateTable }] +} const currentCompRef = ref() -const current = ref('基本信息') +const current = ref('计量人员') const currentComp = shallowRef(baseInfo) watch(current, (newValue) => { currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp @@ -57,6 +61,130 @@ const setData = (newValue: object) => { formInline.value = newValue } +const queryParams = { + id: '', + limit: 20, + offset: 1, +} +// 关闭 +interface TableColumn { + text: string + value: string + align: string +} + +interface checkedRecord { + text: string +} +// 计量人员 +const measurementPersonnelColumns = ref([ + { text: '姓名', value: 'name', align: 'center' }, + { text: '计量人员编号', value: 'staffNo', align: 'center' }, + { text: '工作部门', value: 'deptId', align: 'center' }, + { text: '计量专业', value: 'major', align: 'center' }, + { text: '证书编号', value: 'verifierCertificateNo', align: 'center' }, + { text: '证书有效期', value: 'certificateDate', align: 'center' }, +]) +const measurementPersonnel = ref([]) +const measurementPersonnelLoading = ref(false) +function fetchmeasurementPersonnel(query = { ...queryParams }) { + measurementPersonnelLoading.value = true + measurementPersonnel.value = [{ + text: 'xx', + }] + measurementPersonnelLoading.value = false +} + +// 标准配套设备 +const corollaryEquipmentColumns = ref([ + { text: '设备名称', value: 'text', align: 'center' }, + { text: '设备编号', value: 'text', align: 'center' }, + { text: '型号', value: 'text', align: 'center' }, + { text: '测量范围', value: 'text', align: 'center' }, + { text: '使用部门', value: 'text', align: 'center' }, + { text: '检定时间', value: 'text', align: 'center' }, + { text: '检定结果', value: 'text', align: 'center' }, + { text: '有效日期', value: 'text', align: 'center' }, +]) +const corollaryEquipment = ref([]) +const corollaryEquipmentLoading = ref(false) +function fetchcorollaryEquipment(query = { ...queryParams }) { + corollaryEquipmentLoading.value = true + corollaryEquipment.value = [{ + text: 'xx', + }] + corollaryEquipmentLoading.value = false +} + +// 检定规程 +const regulationVerificationColumns = ref([ + { text: '文件名称', value: 'text', align: 'center' }, + { text: '文件编号', value: 'text', align: 'center' }, + { text: '文件号', value: 'text', align: 'center' }, + { text: '实施时间', value: 'text', align: 'center' }, + { text: '实施状态', value: 'text', align: 'center' }, +]) +const regulationVerification = ref([]) +const regulationVerificationLoading = ref(false) +function fetchregulationVerification(query = { ...queryParams }) { + regulationVerificationLoading.value = true + regulationVerification.value = [{ + text: 'xx', + }] + regulationVerificationLoading.value = false +} + +// 重复性考核记录 +const repetitiveRppraisalRecordColumns = ref([ + { text: '记录编号', value: 'text', align: 'center' }, + { text: '记录名称', value: 'text', align: 'center' }, + { text: '考核时间', value: 'text', align: 'center' }, + { text: '考核结果', value: 'text', align: 'center' }, +]) +const repetitiveRppraisalRecord = ref([]) +const repetitiveRppraisalRecordLoading = ref(false) +function fetchrepetitiveRppraisalRecord(query = { ...queryParams }) { + repetitiveRppraisalRecordLoading.value = true + repetitiveRppraisalRecord.value = [{ + text: 'xx', + }] + repetitiveRppraisalRecordLoading.value = false +} + +// 稳定性考核记录 +const stabilityAssessmentRecordColumns = ref([ + { text: '记录编号', value: 'text', align: 'center' }, + { text: '记录名称', value: 'text', align: 'center' }, + { text: '考核时间', value: 'text', align: 'center' }, + { text: '考核结果', value: 'text', align: 'center' }, +]) +const stabilityAssessmentRecord = ref([]) +const stabilityAssessmentRecordLoading = ref(false) +function fetchstabilityAssessmentRecord(query = { ...queryParams }) { + stabilityAssessmentRecordLoading.value = true + stabilityAssessmentRecord.value = [{ + text: 'xx', + }] + stabilityAssessmentRecordLoading.value = false +} + +// 证书管理 +const certificateManagementColumns = ref([ + { text: '证书编号', value: 'text', align: 'center' }, + { text: '证书名称', value: 'text', align: 'center' }, + { text: '证书类型', value: 'text', align: 'center' }, + { text: '证书出具日期', value: 'text', align: 'center' }, + { text: '证书有效期', value: 'text', align: 'center' }, +]) +const certificateManagement = ref([]) +const certificateManagementLoading = ref(false) +function fetchcertificateManagement(query = { ...queryParams }) { + certificateManagementLoading.value = true + certificateManagement.value = [{ + text: 'xx', + }] + certificateManagementLoading.value = false +} // 编辑获取详情的提交按钮 const submitFormDetail = () => { if (pageType.value === 'edit') { @@ -69,16 +197,17 @@ } else { // 打印 - const printObj = ref({ - id: 'print', // 需要打印元素的id - popTitle: '测量标准装置', // 打印配置页上方的标题 - extraHead: '', // 最上方的头部文字,附加在head标签上的额外标签,使用逗号分割 - preview: false, // 是否启动预览模式,默认是false - standard: '', - extarCss: '', - }) + } } +const printObj = ref({ + id: 'form', // 需要打印元素的id + popTitle: '测量标准装置', // 打印配置页上方的标题 + extraHead: '', // 最上方的头部文字,附加在head标签上的额外标签,使用逗号分割 + preview: false, // 是否启动预览模式,默认是false + standard: '', + extarCss: '', +}) // 提交 const submitForm = () => { if (pageType.value === 'detail') { return submitFormDetail() } @@ -103,39 +232,62 @@ }) }) } +onMounted(() => { + if (pageType.value === 'detail') { + // fetchmeasurementPersonnel() // 计量人员 + fetchcorollaryEquipment() // 标准配套设备 + fetchregulationVerification() // 检定规程 + fetchrepetitiveRppraisalRecord() // 重复性考核记录 + fetchstabilityAssessmentRecord() // 稳定性考核记录 + fetchcertificateManagement() // 证书管理 + } + else if (pageType.value === 'edit') { + // fetchmeasurementPersonnel() // 计量人员 + fetchcorollaryEquipment() // 标准配套设备 + fetchregulationVerification() // 检定规程 + } +}) diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue index 876d6e3..107637b 100644 --- a/src/views/measure/train/plan.vue +++ b/src/views/measure/train/plan.vue @@ -31,8 +31,22 @@ const options = ref([]) const loadingTable = ref(false) // 初始化路由 +// 培训时间数组 +const trainTimeArr = ref([ + listQuery.value.trainStartTime, + listQuery.value.trainEndTime, +]) +// 创建时间数组 +const createTimeArr = ref([ + listQuery.value.createStartTime, + listQuery.value.createEndTime, +]) const $router = useRouter() const fetchData = (isNowPage: boolean) => { + listQuery.value.trainStartTime = trainTimeArr.value[0] || '' + listQuery.value.trainEndTime = trainTimeArr.value[1] || '' + listQuery.value.createStartTime = createTimeArr.value[0] || '' + listQuery.value.createEndTime = createTimeArr.value[0] || '' loadingTable.value = true if (!isNowPage) { // 是否显示当前页,否则跳转第一页 @@ -110,16 +124,7 @@ const searchList = () => { fetchData(true) } -// 培训时间数组 -const trainTimeArr = ref([ - listQuery.value.trainStartTime, - listQuery.value.trainEndTime, -]) -// 创建时间数组 -const createTimeArr = ref([ - listQuery.value.createStartTime, - listQuery.value.createEndTime, -]) + // 重置 const clearList = () => { listQuery.value = { @@ -134,6 +139,8 @@ offset: 1, limit: 20, } + trainTimeArr.value = [] + createTimeArr.value = [] } // 导出 const exportExcelBtn = () => { diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue index 9bc1a68..df09a66 100644 --- a/src/views/measure/train/trainLog.vue +++ b/src/views/measure/train/trainLog.vue @@ -119,6 +119,8 @@ offset: 1, limit: 20, } + trainTimeArr.value = [] + createTimeArr.value = [] } // 导出 const exportExcelBtn = () => {