diff --git a/src/api/resource/seal.ts b/src/api/resource/seal.ts index 0a95a3e..dfbb25f 100644 --- a/src/api/resource/seal.ts +++ b/src/api/resource/seal.ts @@ -73,6 +73,16 @@ }) } +// 导出 +export function exportSealNoteList(data: any) { + return request({ + url: `${prefix}/note/listExport`, + method: 'post', + data, + responseType: 'blob', + }) +} + // 提交流程 export function submitSealNote(data: object) { return request({ diff --git a/src/api/resource/seal.ts b/src/api/resource/seal.ts index 0a95a3e..dfbb25f 100644 --- a/src/api/resource/seal.ts +++ b/src/api/resource/seal.ts @@ -73,6 +73,16 @@ }) } +// 导出 +export function exportSealNoteList(data: any) { + return request({ + url: `${prefix}/note/listExport`, + method: 'post', + data, + responseType: 'blob', + }) +} + // 提交流程 export function submitSealNote(data: object) { return request({ diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue index 776a035..f818081 100644 --- a/src/views/business/measure/item/components/fourth/templateDetail.vue +++ b/src/views/business/measure/item/components/fourth/templateDetail.vue @@ -683,6 +683,50 @@ --> + + + + + + + + + + + + 设定点偏差及切换差
@@ -737,50 +781,7 @@ -
- - - - - - - - - - - + diff --git a/src/api/resource/seal.ts b/src/api/resource/seal.ts index 0a95a3e..dfbb25f 100644 --- a/src/api/resource/seal.ts +++ b/src/api/resource/seal.ts @@ -73,6 +73,16 @@ }) } +// 导出 +export function exportSealNoteList(data: any) { + return request({ + url: `${prefix}/note/listExport`, + method: 'post', + data, + responseType: 'blob', + }) +} + // 提交流程 export function submitSealNote(data: object) { return request({ diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue index 776a035..f818081 100644 --- a/src/views/business/measure/item/components/fourth/templateDetail.vue +++ b/src/views/business/measure/item/components/fourth/templateDetail.vue @@ -683,6 +683,50 @@ --> + + + + + + + + + + + + 设定点偏差及切换差
@@ -737,50 +781,7 @@ -
- - - - - - - - - - - + diff --git a/src/views/equipement/standard/checkRecord/list.vue b/src/views/equipement/standard/checkRecord/list.vue index 6cd489f..dc1335e 100644 --- a/src/views/equipement/standard/checkRecord/list.vue +++ b/src/views/equipement/standard/checkRecord/list.vue @@ -22,6 +22,7 @@ getCheckRecordList, refuseApproval, } from '@/api/equipment/standard/checkRecords' +import useUserStore from '@/store/modules/user' import { SCHEDULE } from '@/utils/scheduleDict' const approvalDialog = ref() // 审批对话ref const { proxy } = getCurrentInstance() as any @@ -30,6 +31,7 @@ const buttonBoxActive = 'equipmentCheckRecord' // 存储在sessionstorage里面的字段名,用于记录右上角buttonbox点击状态 const menu = ref([]) // 审批状态按钮组合 const active = ref('') // 右上方按钮 +const user = useUserStore() // 用户信息 // 查询条件 const timeRange = ref<[DateModelType, DateModelType]>(['', '']) const listQuery: Ref = ref({ @@ -285,6 +287,7 @@ recordName: listQuery.value.recordName, // 核查记录名称 recordNo: listQuery.value.recordNo, // 核查记录编号 checkEquipmentManufactureNo: listQuery.value.checkEquipmentManufactureNo, // 核查设备出厂编号 + createUserId: user.id, offset: 1, limit: 20, ids: checkoutList.value, @@ -399,7 +402,7 @@ - diff --git a/src/views/equipement/standard/checkRecord/list.vue b/src/views/equipement/standard/checkRecord/list.vue index 6cd489f..dc1335e 100644 --- a/src/views/equipement/standard/checkRecord/list.vue +++ b/src/views/equipement/standard/checkRecord/list.vue @@ -22,6 +22,7 @@ getCheckRecordList, refuseApproval, } from '@/api/equipment/standard/checkRecords' +import useUserStore from '@/store/modules/user' import { SCHEDULE } from '@/utils/scheduleDict' const approvalDialog = ref() // 审批对话ref const { proxy } = getCurrentInstance() as any @@ -30,6 +31,7 @@ const buttonBoxActive = 'equipmentCheckRecord' // 存储在sessionstorage里面的字段名,用于记录右上角buttonbox点击状态 const menu = ref([]) // 审批状态按钮组合 const active = ref('') // 右上方按钮 +const user = useUserStore() // 用户信息 // 查询条件 const timeRange = ref<[DateModelType, DateModelType]>(['', '']) const listQuery: Ref = ref({ @@ -285,6 +287,7 @@ recordName: listQuery.value.recordName, // 核查记录名称 recordNo: listQuery.value.recordNo, // 核查记录编号 checkEquipmentManufactureNo: listQuery.value.checkEquipmentManufactureNo, // 核查设备出厂编号 + createUserId: user.id, offset: 1, limit: 20, ids: checkoutList.value, @@ -399,7 +402,7 @@ - diff --git a/src/views/equipement/standard/checkRecord/list.vue b/src/views/equipement/standard/checkRecord/list.vue index 6cd489f..dc1335e 100644 --- a/src/views/equipement/standard/checkRecord/list.vue +++ b/src/views/equipement/standard/checkRecord/list.vue @@ -22,6 +22,7 @@ getCheckRecordList, refuseApproval, } from '@/api/equipment/standard/checkRecords' +import useUserStore from '@/store/modules/user' import { SCHEDULE } from '@/utils/scheduleDict' const approvalDialog = ref() // 审批对话ref const { proxy } = getCurrentInstance() as any @@ -30,6 +31,7 @@ const buttonBoxActive = 'equipmentCheckRecord' // 存储在sessionstorage里面的字段名,用于记录右上角buttonbox点击状态 const menu = ref([]) // 审批状态按钮组合 const active = ref('') // 右上方按钮 +const user = useUserStore() // 用户信息 // 查询条件 const timeRange = ref<[DateModelType, DateModelType]>(['', '']) const listQuery: Ref = ref({ @@ -285,6 +287,7 @@ recordName: listQuery.value.recordName, // 核查记录名称 recordNo: listQuery.value.recordNo, // 核查记录编号 checkEquipmentManufactureNo: listQuery.value.checkEquipmentManufactureNo, // 核查设备出厂编号 + createUserId: user.id, offset: 1, limit: 20, ids: checkoutList.value, @@ -399,7 +402,7 @@ -