diff --git a/public/config/config.json b/public/config/config.json index f2effa1..2db2f06 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", - "versionByEqpt":"1.3.1.2", - "baseUrl": "http://192.168.206.127:5909", + "versionByEqpt":"1.3.2.0", + "baseUrl": "http://111.198.10.15:21609", "baseUrlBusiness": "http://111.198.10.15:21611", "baseUrlLaboratory": "http://111.198.10.15:21610", "pathDict": { diff --git a/public/config/config.json b/public/config/config.json index f2effa1..2db2f06 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", - "versionByEqpt":"1.3.1.2", - "baseUrl": "http://192.168.206.127:5909", + "versionByEqpt":"1.3.2.0", + "baseUrl": "http://111.198.10.15:21609", "baseUrlBusiness": "http://111.198.10.15:21611", "baseUrlLaboratory": "http://111.198.10.15:21610", "pathDict": { diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts index f05bb23..99716ba 100644 --- a/src/api/eqpt/subpackage/certificate.ts +++ b/src/api/eqpt/subpackage/certificate.ts @@ -42,3 +42,13 @@ data, }) } +// 获取上次送检单位 +export function getLastSubcontractor(id: string) { + return request({ + url: '/subcontract/certificate/lastSubcontractor', + method: 'get', + params: { + equipmentId: id, + }, + }) +} diff --git a/public/config/config.json b/public/config/config.json index f2effa1..2db2f06 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", - "versionByEqpt":"1.3.1.2", - "baseUrl": "http://192.168.206.127:5909", + "versionByEqpt":"1.3.2.0", + "baseUrl": "http://111.198.10.15:21609", "baseUrlBusiness": "http://111.198.10.15:21611", "baseUrlLaboratory": "http://111.198.10.15:21610", "pathDict": { diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts index f05bb23..99716ba 100644 --- a/src/api/eqpt/subpackage/certificate.ts +++ b/src/api/eqpt/subpackage/certificate.ts @@ -42,3 +42,13 @@ data, }) } +// 获取上次送检单位 +export function getLastSubcontractor(id: string) { + return request({ + url: '/subcontract/certificate/lastSubcontractor', + method: 'get', + params: { + equipmentId: id, + }, + }) +} diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 751cef4..432ff96 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -89,6 +89,26 @@ align: 'center', }, { + text: '安装位置', + value: 'installLocation', + align: 'center', + }, + { + text: '详细位置', + value: 'installLocationExt', + align: 'center', + }, + { + text: '设备分组', + value: 'groupNames', + align: 'center', + }, + { + text: '检定(校准)机构', + value: 'checkOrganization', + align: 'center', + }, + { text: '负责人', value: 'directorName', align: 'center', diff --git a/public/config/config.json b/public/config/config.json index f2effa1..2db2f06 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", - "versionByEqpt":"1.3.1.2", - "baseUrl": "http://192.168.206.127:5909", + "versionByEqpt":"1.3.2.0", + "baseUrl": "http://111.198.10.15:21609", "baseUrlBusiness": "http://111.198.10.15:21611", "baseUrlLaboratory": "http://111.198.10.15:21610", "pathDict": { diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts index f05bb23..99716ba 100644 --- a/src/api/eqpt/subpackage/certificate.ts +++ b/src/api/eqpt/subpackage/certificate.ts @@ -42,3 +42,13 @@ data, }) } +// 获取上次送检单位 +export function getLastSubcontractor(id: string) { + return request({ + url: '/subcontract/certificate/lastSubcontractor', + method: 'get', + params: { + equipmentId: id, + }, + }) +} diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 751cef4..432ff96 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -89,6 +89,26 @@ align: 'center', }, { + text: '安装位置', + value: 'installLocation', + align: 'center', + }, + { + text: '详细位置', + value: 'installLocationExt', + align: 'center', + }, + { + text: '设备分组', + value: 'groupNames', + align: 'center', + }, + { + text: '检定(校准)机构', + value: 'checkOrganization', + align: 'center', + }, + { text: '负责人', value: 'directorName', align: 'center', diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index f842866..98cdc3d 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -89,6 +89,26 @@ align: 'center', }, { + text: '安装位置', + value: 'installLocation', + align: 'center', + }, + { + text: '详细位置', + value: 'installLocationExt', + align: 'center', + }, + { + text: '设备分组', + value: 'groupNames', + align: 'center', + }, + { + text: '检定(校准)机构', + value: 'checkOrganization', + align: 'center', + }, + { text: '负责人', value: 'directorName', align: 'center', diff --git a/public/config/config.json b/public/config/config.json index f2effa1..2db2f06 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", - "versionByEqpt":"1.3.1.2", - "baseUrl": "http://192.168.206.127:5909", + "versionByEqpt":"1.3.2.0", + "baseUrl": "http://111.198.10.15:21609", "baseUrlBusiness": "http://111.198.10.15:21611", "baseUrlLaboratory": "http://111.198.10.15:21610", "pathDict": { diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts index f05bb23..99716ba 100644 --- a/src/api/eqpt/subpackage/certificate.ts +++ b/src/api/eqpt/subpackage/certificate.ts @@ -42,3 +42,13 @@ data, }) } +// 获取上次送检单位 +export function getLastSubcontractor(id: string) { + return request({ + url: '/subcontract/certificate/lastSubcontractor', + method: 'get', + params: { + equipmentId: id, + }, + }) +} diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 751cef4..432ff96 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -89,6 +89,26 @@ align: 'center', }, { + text: '安装位置', + value: 'installLocation', + align: 'center', + }, + { + text: '详细位置', + value: 'installLocationExt', + align: 'center', + }, + { + text: '设备分组', + value: 'groupNames', + align: 'center', + }, + { + text: '检定(校准)机构', + value: 'checkOrganization', + align: 'center', + }, + { text: '负责人', value: 'directorName', align: 'center', diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index f842866..98cdc3d 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -89,6 +89,26 @@ align: 'center', }, { + text: '安装位置', + value: 'installLocation', + align: 'center', + }, + { + text: '详细位置', + value: 'installLocationExt', + align: 'center', + }, + { + text: '设备分组', + value: 'groupNames', + align: 'center', + }, + { + text: '检定(校准)机构', + value: 'checkOrganization', + align: 'center', + }, + { text: '负责人', value: 'directorName', align: 'center', diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 896f060..8b8bfeb 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -781,6 +781,10 @@ // 绑定参试任务 const taskRef = ref() const bindTask = () => { + if (!selectList.value.length) { + ElMessage.warning('请先选择需要绑定的设备') + return + } taskRef.value.initDialog() } // 确认绑定 diff --git a/public/config/config.json b/public/config/config.json index f2effa1..2db2f06 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", - "versionByEqpt":"1.3.1.2", - "baseUrl": "http://192.168.206.127:5909", + "versionByEqpt":"1.3.2.0", + "baseUrl": "http://111.198.10.15:21609", "baseUrlBusiness": "http://111.198.10.15:21611", "baseUrlLaboratory": "http://111.198.10.15:21610", "pathDict": { diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts index f05bb23..99716ba 100644 --- a/src/api/eqpt/subpackage/certificate.ts +++ b/src/api/eqpt/subpackage/certificate.ts @@ -42,3 +42,13 @@ data, }) } +// 获取上次送检单位 +export function getLastSubcontractor(id: string) { + return request({ + url: '/subcontract/certificate/lastSubcontractor', + method: 'get', + params: { + equipmentId: id, + }, + }) +} diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 751cef4..432ff96 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -89,6 +89,26 @@ align: 'center', }, { + text: '安装位置', + value: 'installLocation', + align: 'center', + }, + { + text: '详细位置', + value: 'installLocationExt', + align: 'center', + }, + { + text: '设备分组', + value: 'groupNames', + align: 'center', + }, + { + text: '检定(校准)机构', + value: 'checkOrganization', + align: 'center', + }, + { text: '负责人', value: 'directorName', align: 'center', diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index f842866..98cdc3d 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -89,6 +89,26 @@ align: 'center', }, { + text: '安装位置', + value: 'installLocation', + align: 'center', + }, + { + text: '详细位置', + value: 'installLocationExt', + align: 'center', + }, + { + text: '设备分组', + value: 'groupNames', + align: 'center', + }, + { + text: '检定(校准)机构', + value: 'checkOrganization', + align: 'center', + }, + { text: '负责人', value: 'directorName', align: 'center', diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 896f060..8b8bfeb 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -781,6 +781,10 @@ // 绑定参试任务 const taskRef = ref() const bindTask = () => { + if (!selectList.value.length) { + ElMessage.warning('请先选择需要绑定的设备') + return + } taskRef.value.initDialog() } // 确认绑定 diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue index 76edf6f..0c296a7 100644 --- a/src/views/tested/device/model/components/list.vue +++ b/src/views/tested/device/model/components/list.vue @@ -76,7 +76,7 @@ // 获取数据 const fetchData = (isNowPage = true) => { listLoading.value = true - getModelList({ ...listQuery, inspectable: listQuery.inspectable.join() }).then((response) => { + getModelList({ ...listQuery, inspectable: listQuery.inspectable.length === 2 ? '1,2' : listQuery.inspectable.join() }).then((response) => { list.value = response.data.rows.map((item: any) => ({ ...item, helpInstruction: item.helpInstruction ? item.helpInstruction : '/' })) total.value = parseInt(response.data.total) listLoading.value = false diff --git a/public/config/config.json b/public/config/config.json index f2effa1..2db2f06 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,7 +1,7 @@ { "title":"计量业务系统", - "versionByEqpt":"1.3.1.2", - "baseUrl": "http://192.168.206.127:5909", + "versionByEqpt":"1.3.2.0", + "baseUrl": "http://111.198.10.15:21609", "baseUrlBusiness": "http://111.198.10.15:21611", "baseUrlLaboratory": "http://111.198.10.15:21610", "pathDict": { diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts index f05bb23..99716ba 100644 --- a/src/api/eqpt/subpackage/certificate.ts +++ b/src/api/eqpt/subpackage/certificate.ts @@ -42,3 +42,13 @@ data, }) } +// 获取上次送检单位 +export function getLastSubcontractor(id: string) { + return request({ + url: '/subcontract/certificate/lastSubcontractor', + method: 'get', + params: { + equipmentId: id, + }, + }) +} diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue index 751cef4..432ff96 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceMultiple.vue @@ -89,6 +89,26 @@ align: 'center', }, { + text: '安装位置', + value: 'installLocation', + align: 'center', + }, + { + text: '详细位置', + value: 'installLocationExt', + align: 'center', + }, + { + text: '设备分组', + value: 'groupNames', + align: 'center', + }, + { + text: '检定(校准)机构', + value: 'checkOrganization', + align: 'center', + }, + { text: '负责人', value: 'directorName', align: 'center', diff --git a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue index f842866..98cdc3d 100644 --- a/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue +++ b/src/views/tested/MeasurementPlan/task/components/selectDeviceSinge.vue @@ -89,6 +89,26 @@ align: 'center', }, { + text: '安装位置', + value: 'installLocation', + align: 'center', + }, + { + text: '详细位置', + value: 'installLocationExt', + align: 'center', + }, + { + text: '设备分组', + value: 'groupNames', + align: 'center', + }, + { + text: '检定(校准)机构', + value: 'checkOrganization', + align: 'center', + }, + { text: '负责人', value: 'directorName', align: 'center', diff --git a/src/views/tested/device/info/components/list.vue b/src/views/tested/device/info/components/list.vue index 896f060..8b8bfeb 100644 --- a/src/views/tested/device/info/components/list.vue +++ b/src/views/tested/device/info/components/list.vue @@ -781,6 +781,10 @@ // 绑定参试任务 const taskRef = ref() const bindTask = () => { + if (!selectList.value.length) { + ElMessage.warning('请先选择需要绑定的设备') + return + } taskRef.value.initDialog() } // 确认绑定 diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue index 76edf6f..0c296a7 100644 --- a/src/views/tested/device/model/components/list.vue +++ b/src/views/tested/device/model/components/list.vue @@ -76,7 +76,7 @@ // 获取数据 const fetchData = (isNowPage = true) => { listLoading.value = true - getModelList({ ...listQuery, inspectable: listQuery.inspectable.join() }).then((response) => { + getModelList({ ...listQuery, inspectable: listQuery.inspectable.length === 2 ? '1,2' : listQuery.inspectable.join() }).then((response) => { list.value = response.data.rows.map((item: any) => ({ ...item, helpInstruction: item.helpInstruction ? item.helpInstruction : '/' })) total.value = parseInt(response.data.total) listLoading.value = false diff --git a/src/views/tested/subpackage/certificate/components/edit.vue b/src/views/tested/subpackage/certificate/components/edit.vue index 2d65300..37311d4 100644 --- a/src/views/tested/subpackage/certificate/components/edit.vue +++ b/src/views/tested/subpackage/certificate/components/edit.vue @@ -8,7 +8,7 @@ import { getDictByCode } from '@/api/system/dict' import useUserStore from '@/store/modules/user' import { getUserDept } from '@/api/system/user' -import { editCertificate } from '@/api/eqpt/subpackage/certificate' +import { editCertificate, getLastSubcontractor } from '@/api/eqpt/subpackage/certificate' import subpackageDialog from '@/views/tested/subpackage/task/components/subpackageDialog.vue' import deviceDialog from '@/views/tested/device/group/components/selectDevice.vue' const $route = useRoute() @@ -46,11 +46,12 @@ subcontractorNo: '', updateTime: '', helpInstruction: '', + limitInstruction: '', }) // 表单 const rules = ref({ certificateNo: [{ required: true, message: '证书编号必填', trigger: ['blur', 'change'] }], certificateName: [{ required: true, message: '证书名称必填', trigger: ['blur', 'change'] }], - subcontractorNo: [{ required: true, message: '检测单位编号必填', trigger: ['blur', 'change'] }], + subcontractorNo: [{ required: true, message: '检定(校准)机构编号必填', trigger: ['blur', 'change'] }], equipmentNo: [{ required: true, message: '受检设备编号必填', trigger: ['blur', 'change'] }], checkDate: [{ required: true, message: '检定(校准)日期必填', trigger: ['blur', 'change'] }], // meterIdentify: [{ required: true, message: '计量标识必选', trigger: ['blur', 'change'] }], @@ -209,6 +210,17 @@ ruleForm.value.subcontractorName = subcontractors.companyName ruleForm.value.subcontractorId = subcontractors.id } +// 上次送检单位 +const lastSubcontractor = ref() +watch(() => ruleForm.value.equipmentName, () => { + if (!$route.path.includes('create')) { + return + } + getLastSubcontractor(ruleForm.value.equipmentId).then((res) => { + console.log(res.data) + lastSubcontractor.value = res.data + }) +})