diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts index b5ef49d..5f96d6f 100644 --- a/src/api/measure/person.ts +++ b/src/api/measure/person.ts @@ -50,3 +50,28 @@ responseType: 'blob', }) } +// 证书记录列表 +export function getCertificateList(data: StaffListType) { + return request({ + url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 证书记录导出 +export function CertificateListList(data: object) { + return request({ + url: '/certificate/exportCertificateList', + method: 'post', + data, + responseType: 'blob', + }) +} +// 证书记录新增 +export function addCertificateList(data: object) { + return request({ + url: '/certificate/addStaffCertificate', + method: 'post', + data, + }) +} diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts index b5ef49d..5f96d6f 100644 --- a/src/api/measure/person.ts +++ b/src/api/measure/person.ts @@ -50,3 +50,28 @@ responseType: 'blob', }) } +// 证书记录列表 +export function getCertificateList(data: StaffListType) { + return request({ + url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 证书记录导出 +export function CertificateListList(data: object) { + return request({ + url: '/certificate/exportCertificateList', + method: 'post', + data, + responseType: 'blob', + }) +} +// 证书记录新增 +export function addCertificateList(data: object) { + return request({ + url: '/certificate/addStaffCertificate', + method: 'post', + data, + }) +} diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue index d85b082..172f006 100644 --- a/src/views/measure/person/certificateLog.vue +++ b/src/views/measure/person/certificateLog.vue @@ -1,3 +1,327 @@ + + + - 证书记录 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批量导入 + + + 模板下载 + + + 新建 + + + 导出 + + + 打印 + + + + + + + + {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }} + + + + + + + + 编辑 + + + 详情 + + + + + + + + + + diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts index b5ef49d..5f96d6f 100644 --- a/src/api/measure/person.ts +++ b/src/api/measure/person.ts @@ -50,3 +50,28 @@ responseType: 'blob', }) } +// 证书记录列表 +export function getCertificateList(data: StaffListType) { + return request({ + url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 证书记录导出 +export function CertificateListList(data: object) { + return request({ + url: '/certificate/exportCertificateList', + method: 'post', + data, + responseType: 'blob', + }) +} +// 证书记录新增 +export function addCertificateList(data: object) { + return request({ + url: '/certificate/addStaffCertificate', + method: 'post', + data, + }) +} diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue index d85b082..172f006 100644 --- a/src/views/measure/person/certificateLog.vue +++ b/src/views/measure/person/certificateLog.vue @@ -1,3 +1,327 @@ + + + - 证书记录 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批量导入 + + + 模板下载 + + + 新建 + + + 导出 + + + 打印 + + + + + + + + {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }} + + + + + + + + 编辑 + + + 详情 + + + + + + + + + + diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue new file mode 100644 index 0000000..c7b936f --- /dev/null +++ b/src/views/measure/person/components/addRecord.vue @@ -0,0 +1,461 @@ + + + + + + + + + {{ title }}计量人员 + + + + 完成 + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ current }} + + + + 删除行 + + + 添加行 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts index b5ef49d..5f96d6f 100644 --- a/src/api/measure/person.ts +++ b/src/api/measure/person.ts @@ -50,3 +50,28 @@ responseType: 'blob', }) } +// 证书记录列表 +export function getCertificateList(data: StaffListType) { + return request({ + url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 证书记录导出 +export function CertificateListList(data: object) { + return request({ + url: '/certificate/exportCertificateList', + method: 'post', + data, + responseType: 'blob', + }) +} +// 证书记录新增 +export function addCertificateList(data: object) { + return request({ + url: '/certificate/addStaffCertificate', + method: 'post', + data, + }) +} diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue index d85b082..172f006 100644 --- a/src/views/measure/person/certificateLog.vue +++ b/src/views/measure/person/certificateLog.vue @@ -1,3 +1,327 @@ + + + - 证书记录 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批量导入 + + + 模板下载 + + + 新建 + + + 导出 + + + 打印 + + + + + + + + {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }} + + + + + + + + 编辑 + + + 详情 + + + + + + + + + + diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue new file mode 100644 index 0000000..c7b936f --- /dev/null +++ b/src/views/measure/person/components/addRecord.vue @@ -0,0 +1,461 @@ + + + + + + + + + {{ title }}计量人员 + + + + 完成 + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ current }} + + + + 删除行 + + + 添加行 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue new file mode 100644 index 0000000..952da9d --- /dev/null +++ b/src/views/measure/person/components/personListDialog.vue @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 确认 + + 取消 + + + + + + + diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts index b5ef49d..5f96d6f 100644 --- a/src/api/measure/person.ts +++ b/src/api/measure/person.ts @@ -50,3 +50,28 @@ responseType: 'blob', }) } +// 证书记录列表 +export function getCertificateList(data: StaffListType) { + return request({ + url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 证书记录导出 +export function CertificateListList(data: object) { + return request({ + url: '/certificate/exportCertificateList', + method: 'post', + data, + responseType: 'blob', + }) +} +// 证书记录新增 +export function addCertificateList(data: object) { + return request({ + url: '/certificate/addStaffCertificate', + method: 'post', + data, + }) +} diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue index d85b082..172f006 100644 --- a/src/views/measure/person/certificateLog.vue +++ b/src/views/measure/person/certificateLog.vue @@ -1,3 +1,327 @@ + + + - 证书记录 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批量导入 + + + 模板下载 + + + 新建 + + + 导出 + + + 打印 + + + + + + + + {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }} + + + + + + + + 编辑 + + + 详情 + + + + + + + + + + diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue new file mode 100644 index 0000000..c7b936f --- /dev/null +++ b/src/views/measure/person/components/addRecord.vue @@ -0,0 +1,461 @@ + + + + + + + + + {{ title }}计量人员 + + + + 完成 + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ current }} + + + + 删除行 + + + 添加行 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue new file mode 100644 index 0000000..952da9d --- /dev/null +++ b/src/views/measure/person/components/personListDialog.vue @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 确认 + + 取消 + + + + + + + diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts index b695b29..9dd5d33 100644 --- a/src/views/measure/person/person-interface.ts +++ b/src/views/measure/person/person-interface.ts @@ -3,9 +3,9 @@ staffNo: string // 人员编号 name: string // 姓名 deptId: string // 工作部门 - major: string // 计量专业 - verifierCertificateNo: string // 证书号 - certificateStatus: string // 证书状态 + major?: string // 计量专业 + verifierCertificateNo?: string // 证书号 + certificateStatus?: string // 证书状态 limit: number offset: number } diff --git a/src/api/measure/person.ts b/src/api/measure/person.ts index b5ef49d..5f96d6f 100644 --- a/src/api/measure/person.ts +++ b/src/api/measure/person.ts @@ -50,3 +50,28 @@ responseType: 'blob', }) } +// 证书记录列表 +export function getCertificateList(data: StaffListType) { + return request({ + url: `/certificate/queryCertificateList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} +// 证书记录导出 +export function CertificateListList(data: object) { + return request({ + url: '/certificate/exportCertificateList', + method: 'post', + data, + responseType: 'blob', + }) +} +// 证书记录新增 +export function addCertificateList(data: object) { + return request({ + url: '/certificate/addStaffCertificate', + method: 'post', + data, + }) +} diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue index d85b082..172f006 100644 --- a/src/views/measure/person/certificateLog.vue +++ b/src/views/measure/person/certificateLog.vue @@ -1,3 +1,327 @@ + + + - 证书记录 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 批量导入 + + + 模板下载 + + + 新建 + + + 导出 + + + 打印 + + + + + + + + {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }} + + + + + + + + 编辑 + + + 详情 + + + + + + + + + + diff --git a/src/views/measure/person/components/addRecord.vue b/src/views/measure/person/components/addRecord.vue new file mode 100644 index 0000000..c7b936f --- /dev/null +++ b/src/views/measure/person/components/addRecord.vue @@ -0,0 +1,461 @@ + + + + + + + + + {{ title }}计量人员 + + + + 完成 + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ current }} + + + + 删除行 + + + 添加行 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/measure/person/components/personListDialog.vue b/src/views/measure/person/components/personListDialog.vue new file mode 100644 index 0000000..952da9d --- /dev/null +++ b/src/views/measure/person/components/personListDialog.vue @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 确认 + + 取消 + + + + + + + diff --git a/src/views/measure/person/person-interface.ts b/src/views/measure/person/person-interface.ts index b695b29..9dd5d33 100644 --- a/src/views/measure/person/person-interface.ts +++ b/src/views/measure/person/person-interface.ts @@ -3,9 +3,9 @@ staffNo: string // 人员编号 name: string // 姓名 deptId: string // 工作部门 - major: string // 计量专业 - verifierCertificateNo: string // 证书号 - certificateStatus: string // 证书状态 + major?: string // 计量专业 + verifierCertificateNo?: string // 证书号 + certificateStatus?: string // 证书状态 limit: number offset: number } diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue index fd5e7eb..d26e734 100644 --- a/src/views/system/notice/noteAdd.vue +++ b/src/views/system/notice/noteAdd.vue @@ -298,9 +298,23 @@