diff --git a/src/api/request.ts b/src/api/request.ts index fedfcda..c8b25e9 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -30,7 +30,6 @@ request.interceptors.request.use( (request) => { - console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/api/request.ts b/src/api/request.ts index fedfcda..c8b25e9 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -30,7 +30,6 @@ request.interceptors.request.use( (request) => { - console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 2bb0eef..484f431 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -101,7 +101,7 @@ @@ -124,7 +124,7 @@ - + { - console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 2bb0eef..484f431 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -101,7 +101,7 @@ @@ -124,7 +124,7 @@ - + @@ -122,7 +122,7 @@ - + { - console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 2bb0eef..484f431 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -101,7 +101,7 @@ @@ -124,7 +124,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -124,7 +124,7 @@ - + { - console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 2bb0eef..484f431 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -101,7 +101,7 @@ @@ -124,7 +124,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -124,7 +124,7 @@ - + { - console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 2bb0eef..484f431 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -101,7 +101,7 @@ @@ -124,7 +124,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -124,7 +124,7 @@ - + - + @@ -209,18 +210,16 @@ - + - - @@ -239,6 +238,8 @@ + + @@ -248,31 +249,32 @@ - - - - - - - + + + - - + + - - - - + + + + @@ -283,5 +285,20 @@ diff --git a/src/api/request.ts b/src/api/request.ts index fedfcda..c8b25e9 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -30,7 +30,6 @@ request.interceptors.request.use( (request) => { - console.log(request, 'request') const userStore = useUserStore() /** * 全局拦截请求发送前提交的参数 diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue index 2bb0eef..484f431 100644 --- a/src/components/Approval/ApprovalDialog.vue +++ b/src/components/Approval/ApprovalDialog.vue @@ -101,7 +101,7 @@ @@ -124,7 +124,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -124,7 +124,7 @@ - + - + @@ -209,18 +210,16 @@ - + - - @@ -239,6 +238,8 @@ + + @@ -248,31 +249,32 @@ - - - - - - - + + + - - + + - - - - + + + + @@ -283,5 +285,20 @@ diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue index e7690a9..8e94282 100644 --- a/src/views/tested/MeasurementPlan/task/components/tableList.vue +++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue @@ -4,8 +4,11 @@ import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue' import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' +import showPhotos from '@/views/tested/device/info/components/showPhoto.vue' import { uploadApi } from '@/api/system/notice' import { useCheckList } from '@/utils/useCheckList' +import { getInfoDetail } from '@/api/eqpt/device/info' + const $props = defineProps({ data: { type: Array, @@ -14,7 +17,7 @@ }) const $route = useRoute() // 表头显示标题 -const columns = ref([ +const columnsHandler = ref([ { text: '统一编号', value: 'sampleNo', @@ -39,7 +42,7 @@ { text: '附件', value: 'appendixDescn', - required: true, + required: false, isBtn: false, isUpload: true, width: '350px', @@ -66,6 +69,58 @@ isUpload: false, }, ]) +const columnsDetail = ref([ + { + text: '统一编号', + value: 'sampleNo', + required: true, + isBtn: true, + isUpload: false, + }, + { + text: '设备名称', + value: 'sampleName', + required: true, + isBtn: false, + isUpload: false, + }, + { + text: '型号', + value: 'sampleModel', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '附件', + value: 'appendixDescn', + required: false, + isBtn: false, + isUpload: true, + width: '350px', + }, + { + text: '接收状态', + value: 'samplestatusName', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定结果', + value: 'measureCompletePercent', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定完成时间', + value: 'measureCompleteTime', + required: false, + isBtn: false, + isUpload: false, + }, +]) const list = ref([]) // 检查数据列表 function checkCertificateList() { @@ -210,6 +265,21 @@ currentIndex.value = index fileRef.value.click() } +const $router = useRouter() +const deviceDetail = (row: any) => { + console.log(row, 'row') + // 获取设备详情 + // getInfoDetail({ equipmentId: row.sampleId }).then((res) => { + $router.push({ + path: '/info/detail', + query: { + row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }), + id: row.sampleId, + statusName: '全部', + }, + }) + // }) +} diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue index e7690a9..8e94282 100644 --- a/src/views/tested/MeasurementPlan/task/components/tableList.vue +++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue @@ -4,8 +4,11 @@ import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue' import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' +import showPhotos from '@/views/tested/device/info/components/showPhoto.vue' import { uploadApi } from '@/api/system/notice' import { useCheckList } from '@/utils/useCheckList' +import { getInfoDetail } from '@/api/eqpt/device/info' + const $props = defineProps({ data: { type: Array, @@ -14,7 +17,7 @@ }) const $route = useRoute() // 表头显示标题 -const columns = ref([ +const columnsHandler = ref([ { text: '统一编号', value: 'sampleNo', @@ -39,7 +42,7 @@ { text: '附件', value: 'appendixDescn', - required: true, + required: false, isBtn: false, isUpload: true, width: '350px', @@ -66,6 +69,58 @@ isUpload: false, }, ]) +const columnsDetail = ref([ + { + text: '统一编号', + value: 'sampleNo', + required: true, + isBtn: true, + isUpload: false, + }, + { + text: '设备名称', + value: 'sampleName', + required: true, + isBtn: false, + isUpload: false, + }, + { + text: '型号', + value: 'sampleModel', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '附件', + value: 'appendixDescn', + required: false, + isBtn: false, + isUpload: true, + width: '350px', + }, + { + text: '接收状态', + value: 'samplestatusName', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定结果', + value: 'measureCompletePercent', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定完成时间', + value: 'measureCompleteTime', + required: false, + isBtn: false, + isUpload: false, + }, +]) const list = ref([]) // 检查数据列表 function checkCertificateList() { @@ -210,6 +265,21 @@ currentIndex.value = index fileRef.value.click() } +const $router = useRouter() +const deviceDetail = (row: any) => { + console.log(row, 'row') + // 获取设备详情 + // getInfoDetail({ equipmentId: row.sampleId }).then((res) => { + $router.push({ + path: '/info/detail', + query: { + row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }), + id: row.sampleId, + statusName: '全部', + }, + }) + // }) +} diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue index e7690a9..8e94282 100644 --- a/src/views/tested/MeasurementPlan/task/components/tableList.vue +++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue @@ -4,8 +4,11 @@ import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue' import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' +import showPhotos from '@/views/tested/device/info/components/showPhoto.vue' import { uploadApi } from '@/api/system/notice' import { useCheckList } from '@/utils/useCheckList' +import { getInfoDetail } from '@/api/eqpt/device/info' + const $props = defineProps({ data: { type: Array, @@ -14,7 +17,7 @@ }) const $route = useRoute() // 表头显示标题 -const columns = ref([ +const columnsHandler = ref([ { text: '统一编号', value: 'sampleNo', @@ -39,7 +42,7 @@ { text: '附件', value: 'appendixDescn', - required: true, + required: false, isBtn: false, isUpload: true, width: '350px', @@ -66,6 +69,58 @@ isUpload: false, }, ]) +const columnsDetail = ref([ + { + text: '统一编号', + value: 'sampleNo', + required: true, + isBtn: true, + isUpload: false, + }, + { + text: '设备名称', + value: 'sampleName', + required: true, + isBtn: false, + isUpload: false, + }, + { + text: '型号', + value: 'sampleModel', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '附件', + value: 'appendixDescn', + required: false, + isBtn: false, + isUpload: true, + width: '350px', + }, + { + text: '接收状态', + value: 'samplestatusName', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定结果', + value: 'measureCompletePercent', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定完成时间', + value: 'measureCompleteTime', + required: false, + isBtn: false, + isUpload: false, + }, +]) const list = ref([]) // 检查数据列表 function checkCertificateList() { @@ -210,6 +265,21 @@ currentIndex.value = index fileRef.value.click() } +const $router = useRouter() +const deviceDetail = (row: any) => { + console.log(row, 'row') + // 获取设备详情 + // getInfoDetail({ equipmentId: row.sampleId }).then((res) => { + $router.push({ + path: '/info/detail', + query: { + row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }), + id: row.sampleId, + statusName: '全部', + }, + }) + // }) +} diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue index e7690a9..8e94282 100644 --- a/src/views/tested/MeasurementPlan/task/components/tableList.vue +++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue @@ -4,8 +4,11 @@ import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue' import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' +import showPhotos from '@/views/tested/device/info/components/showPhoto.vue' import { uploadApi } from '@/api/system/notice' import { useCheckList } from '@/utils/useCheckList' +import { getInfoDetail } from '@/api/eqpt/device/info' + const $props = defineProps({ data: { type: Array, @@ -14,7 +17,7 @@ }) const $route = useRoute() // 表头显示标题 -const columns = ref([ +const columnsHandler = ref([ { text: '统一编号', value: 'sampleNo', @@ -39,7 +42,7 @@ { text: '附件', value: 'appendixDescn', - required: true, + required: false, isBtn: false, isUpload: true, width: '350px', @@ -66,6 +69,58 @@ isUpload: false, }, ]) +const columnsDetail = ref([ + { + text: '统一编号', + value: 'sampleNo', + required: true, + isBtn: true, + isUpload: false, + }, + { + text: '设备名称', + value: 'sampleName', + required: true, + isBtn: false, + isUpload: false, + }, + { + text: '型号', + value: 'sampleModel', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '附件', + value: 'appendixDescn', + required: false, + isBtn: false, + isUpload: true, + width: '350px', + }, + { + text: '接收状态', + value: 'samplestatusName', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定结果', + value: 'measureCompletePercent', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定完成时间', + value: 'measureCompleteTime', + required: false, + isBtn: false, + isUpload: false, + }, +]) const list = ref([]) // 检查数据列表 function checkCertificateList() { @@ -210,6 +265,21 @@ currentIndex.value = index fileRef.value.click() } +const $router = useRouter() +const deviceDetail = (row: any) => { + console.log(row, 'row') + // 获取设备详情 + // getInfoDetail({ equipmentId: row.sampleId }).then((res) => { + $router.push({ + path: '/info/detail', + query: { + row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }), + id: row.sampleId, + statusName: '全部', + }, + }) + // }) +} diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue index e7690a9..8e94282 100644 --- a/src/views/tested/MeasurementPlan/task/components/tableList.vue +++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue @@ -4,8 +4,11 @@ import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue' import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' +import showPhotos from '@/views/tested/device/info/components/showPhoto.vue' import { uploadApi } from '@/api/system/notice' import { useCheckList } from '@/utils/useCheckList' +import { getInfoDetail } from '@/api/eqpt/device/info' + const $props = defineProps({ data: { type: Array, @@ -14,7 +17,7 @@ }) const $route = useRoute() // 表头显示标题 -const columns = ref([ +const columnsHandler = ref([ { text: '统一编号', value: 'sampleNo', @@ -39,7 +42,7 @@ { text: '附件', value: 'appendixDescn', - required: true, + required: false, isBtn: false, isUpload: true, width: '350px', @@ -66,6 +69,58 @@ isUpload: false, }, ]) +const columnsDetail = ref([ + { + text: '统一编号', + value: 'sampleNo', + required: true, + isBtn: true, + isUpload: false, + }, + { + text: '设备名称', + value: 'sampleName', + required: true, + isBtn: false, + isUpload: false, + }, + { + text: '型号', + value: 'sampleModel', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '附件', + value: 'appendixDescn', + required: false, + isBtn: false, + isUpload: true, + width: '350px', + }, + { + text: '接收状态', + value: 'samplestatusName', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定结果', + value: 'measureCompletePercent', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定完成时间', + value: 'measureCompleteTime', + required: false, + isBtn: false, + isUpload: false, + }, +]) const list = ref([]) // 检查数据列表 function checkCertificateList() { @@ -210,6 +265,21 @@ currentIndex.value = index fileRef.value.click() } +const $router = useRouter() +const deviceDetail = (row: any) => { + console.log(row, 'row') + // 获取设备详情 + // getInfoDetail({ equipmentId: row.sampleId }).then((res) => { + $router.push({ + path: '/info/detail', + query: { + row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }), + id: row.sampleId, + statusName: '全部', + }, + }) + // }) +} diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue index e7690a9..8e94282 100644 --- a/src/views/tested/MeasurementPlan/task/components/tableList.vue +++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue @@ -4,8 +4,11 @@ import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue' import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' +import showPhotos from '@/views/tested/device/info/components/showPhoto.vue' import { uploadApi } from '@/api/system/notice' import { useCheckList } from '@/utils/useCheckList' +import { getInfoDetail } from '@/api/eqpt/device/info' + const $props = defineProps({ data: { type: Array, @@ -14,7 +17,7 @@ }) const $route = useRoute() // 表头显示标题 -const columns = ref([ +const columnsHandler = ref([ { text: '统一编号', value: 'sampleNo', @@ -39,7 +42,7 @@ { text: '附件', value: 'appendixDescn', - required: true, + required: false, isBtn: false, isUpload: true, width: '350px', @@ -66,6 +69,58 @@ isUpload: false, }, ]) +const columnsDetail = ref([ + { + text: '统一编号', + value: 'sampleNo', + required: true, + isBtn: true, + isUpload: false, + }, + { + text: '设备名称', + value: 'sampleName', + required: true, + isBtn: false, + isUpload: false, + }, + { + text: '型号', + value: 'sampleModel', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '附件', + value: 'appendixDescn', + required: false, + isBtn: false, + isUpload: true, + width: '350px', + }, + { + text: '接收状态', + value: 'samplestatusName', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定结果', + value: 'measureCompletePercent', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定完成时间', + value: 'measureCompleteTime', + required: false, + isBtn: false, + isUpload: false, + }, +]) const list = ref([]) // 检查数据列表 function checkCertificateList() { @@ -210,6 +265,21 @@ currentIndex.value = index fileRef.value.click() } +const $router = useRouter() +const deviceDetail = (row: any) => { + console.log(row, 'row') + // 获取设备详情 + // getInfoDetail({ equipmentId: row.sampleId }).then((res) => { + $router.push({ + path: '/info/detail', + query: { + row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }), + id: row.sampleId, + statusName: '全部', + }, + }) + // }) +} diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue index e7690a9..8e94282 100644 --- a/src/views/tested/MeasurementPlan/task/components/tableList.vue +++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue @@ -4,8 +4,11 @@ import selectDevice from '@/views/tested/MeasurementPlan/plan/components/selectDevice.vue' import selectDeviceSinge from '@/views/tested/device/group/components/selectDevice.vue' import showPhoto from '@/views/tested/device/info/components/showPhotoSinge.vue' +import showPhotos from '@/views/tested/device/info/components/showPhoto.vue' import { uploadApi } from '@/api/system/notice' import { useCheckList } from '@/utils/useCheckList' +import { getInfoDetail } from '@/api/eqpt/device/info' + const $props = defineProps({ data: { type: Array, @@ -14,7 +17,7 @@ }) const $route = useRoute() // 表头显示标题 -const columns = ref([ +const columnsHandler = ref([ { text: '统一编号', value: 'sampleNo', @@ -39,7 +42,7 @@ { text: '附件', value: 'appendixDescn', - required: true, + required: false, isBtn: false, isUpload: true, width: '350px', @@ -66,6 +69,58 @@ isUpload: false, }, ]) +const columnsDetail = ref([ + { + text: '统一编号', + value: 'sampleNo', + required: true, + isBtn: true, + isUpload: false, + }, + { + text: '设备名称', + value: 'sampleName', + required: true, + isBtn: false, + isUpload: false, + }, + { + text: '型号', + value: 'sampleModel', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '附件', + value: 'appendixDescn', + required: false, + isBtn: false, + isUpload: true, + width: '350px', + }, + { + text: '接收状态', + value: 'samplestatusName', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定结果', + value: 'measureCompletePercent', + required: false, + isBtn: false, + isUpload: false, + }, + { + text: '检定完成时间', + value: 'measureCompleteTime', + required: false, + isBtn: false, + isUpload: false, + }, +]) const list = ref([]) // 检查数据列表 function checkCertificateList() { @@ -210,6 +265,21 @@ currentIndex.value = index fileRef.value.click() } +const $router = useRouter() +const deviceDetail = (row: any) => { + console.log(row, 'row') + // 获取设备详情 + // getInfoDetail({ equipmentId: row.sampleId }).then((res) => { + $router.push({ + path: '/info/detail', + query: { + row: JSON.stringify({ id: row.sampleId, equipmentId: row.sampleId }), + id: row.sampleId, + statusName: '全部', + }, + }) + // }) +}