From f2e9f45bd6301aa5f9bf7fe3c69d5afff475a9ee Mon Sep 17 00:00:00 2001 From: zty Date: Tue, 23 Apr 2024 17:33:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/api/eaduitors.js | 80 ++--- client/src/api/qa.js | 11 +- client/src/api/qc.js | 8 + client/src/api/review.js | 8 + .../informatiomCollect/externalAuditor.vue | 101 ++++-- .../informatiomCollect/laboratoryContact.vue | 2 +- .../views/informatiomCollect/qualificInfo.vue | 92 +++--- .../informatiomCollect/qualityActive.vue | 87 +++++- .../informatiomCollect/qualityCommend.vue | 71 ++++- .../views/informatiomCollect/reviewStatus.vue | 77 ++++- client/src/views/supervisionNew/mytask.vue | 2 +- .../migrations/0028_auto_20240422_1623.py | 23 ++ .../0029_alter_qualityactivities_roles.py | 18 ++ ...030_alter_externalauditors_review_types.py | 18 ++ server/apps/information/models.py | 11 +- server/apps/information/serializers.py | 2 +- server/apps/information/views.py | 287 +++++++++++++----- ...审员情况-外审员情况统计表.xlsx | Bin 0 -> 10442 bytes ...技术负责人联系方式统计表.xlsx | Bin 0 -> 9775 bytes ...每月收集）-评审情况统计表.xlsx | Bin 0 -> 9857 bytes ...收集）-质量相关活动统计表.xlsx | Bin 0 -> 9633 bytes ...收集）-质量相关表彰统计表.xlsx | Bin 0 -> 9212 bytes 22 files changed, 679 insertions(+), 219 deletions(-) create mode 100644 server/apps/information/migrations/0028_auto_20240422_1623.py create mode 100644 server/apps/information/migrations/0029_alter_qualityactivities_roles.py create mode 100644 server/apps/information/migrations/0030_alter_externalauditors_review_types.py create mode 100644 server/外审员情况-外审员情况统计表.xlsx create mode 100644 server/实验室联系方式-实验室负责人质量负责人技术负责人联系方式统计表.xlsx create mode 100644 server/评审情况（每月收集）-评审情况统计表.xlsx create mode 100644 server/质量活动（每月收集）-质量相关活动统计表.xlsx create mode 100644 server/质量表彰（每月收集）-质量相关表彰统计表.xlsx diff --git a/client/src/api/eaduitors.js b/client/src/api/eaduitors.js index 324e7cc..e7cf719 100644 --- a/client/src/api/eaduitors.js +++ b/client/src/api/eaduitors.js @@ -11,43 +11,51 @@ export function getMyEas(query) { } - export function getOneEa(id) { - return request({ - url: `/info/ea/${id}/`, - method: 'get' - }) - } - - - export function updateEa(id, data) { - return request({ - url: `/info/ea/${id}/`, - method: 'put', - data - }) - } - - export function createEa(data) { - return request({ - url: `/info/ea/`, - method: 'post', - data - }) - } +export function getOneEa(id) { + return request({ + url: `/info/ea/${id}/`, + method: 'get' + }) +} - export function delEa(id) { - return request({ - url: `/info/ea/${id}/`, - method: 'delete' - }) - } +export function updateEa(id, data) { + return request({ + url: `/info/ea/${id}/`, + method: 'put', + data + }) +} + +export function createEa(data) { + return request({ + url: `/info/ea/`, + method: 'post', + data + }) +} - export function exportData(data) { - return request({ - url: `/info/ea/filter_by_date/`, - method: 'post', - data - }) - } \ No newline at end of file +export function delEa(id) { + return request({ + url: `/info/ea/${id}/`, + method: 'delete' + }) +} + + +export function exportData(data) { + return request({ + url: `/info/ea/filter_by_date/`, + method: 'post', + data + }) +} + +export function impData(data) { + return request({ + url: `/info/ea/imp/`, + method: 'post', + data + }) +} \ No newline at end of file diff --git a/client/src/api/qa.js b/client/src/api/qa.js index 652bff6..0d6a2c6 100644 --- a/client/src/api/qa.js +++ b/client/src/api/qa.js @@ -2,7 +2,7 @@ import request from '@/utils/request' -export function getgetMyRcsRcs(query) { +export function getgetMyRcs(query) { return request({ url: '/info/qa/', method: 'get', @@ -56,3 +56,12 @@ export function getRc_activate() { data }) } + + export function impData(data) { + return request({ + url: `/info/qa/imp/`, + method: 'post', + data + }) + } + diff --git a/client/src/api/qc.js b/client/src/api/qc.js index 15274a3..2e3c712 100644 --- a/client/src/api/qc.js +++ b/client/src/api/qc.js @@ -54,3 +54,11 @@ export function getRc_activate() { data }) } + + export function impData(data) { + return request({ + url: `/info/qc/imp/`, + method: 'post', + data + }) + } diff --git a/client/src/api/review.js b/client/src/api/review.js index 8e4b551..36524ed 100644 --- a/client/src/api/review.js +++ b/client/src/api/review.js @@ -52,3 +52,11 @@ export function getMyRs(query) { data }) } + + export function impData(data) { + return request({ + url: `/info/ar/imp/`, + method: 'post', + data + }) + } diff --git a/client/src/views/informatiomCollect/externalAuditor.vue b/client/src/views/informatiomCollect/externalAuditor.vue index 94c1dd9..e590659 100644 --- a/client/src/views/informatiomCollect/externalAuditor.vue +++ b/client/src/views/informatiomCollect/externalAuditor.vue @@ -2,6 +2,7 @@
新增 + 导入 导出 @@ -46,18 +47,7 @@ - - - - + 确认
+ + + + + 点击下载模板 + + + + 上传文件 + + + +
+ 取消 + 确认 +
+ + { + this.$refs["Form"].clearValidate(); + }); }, submitUpload() { this.$refs.upload.submit(); this.impDialogVisible = false; + this.saveLoading = true; + impData(this.impForm).then(res=>{ + console.log(this.impForm) + if(res.code>=200){ + this.saveLoading = false; + this.$message.success("提交成功"); + this.getList(); + }else{ + this.$message.error(res.message); + this.saveLoading = false; + } + }) }, handleImport(type){ this.impDialogVisible = true; @@ -219,16 +272,14 @@ export default { window.open(file.value); } }, - handleUpSuccess(res, file) { - this.fileList = [file]; - this.form.notification_form = res.data.path - console.log(this.form) + handleUpSuccess(res, file, fileList) { + console.log(res, file, fileList) + this.impForm.file = res.data.path; + console.log(this.impForm) }, - handleRemove_res(file) { - // 实现删除文件结果告知单 - this.fileList_res = []; - this.form.result_form = null - console.log(this.form) + handleRemove(file) { + this.fileList = []; + this.impForm.file = ''; }, checkPermission, @@ -236,7 +287,9 @@ export default { if (!value) return true; return data.label.indexOf(value) !== -1; }, - + onSubmit(){ + + }, getList() { this.listLoading = true; this.tableData.results =[]; diff --git a/client/src/views/informatiomCollect/laboratoryContact.vue b/client/src/views/informatiomCollect/laboratoryContact.vue index 24adbc1..cd4ff6c 100644 --- a/client/src/views/informatiomCollect/laboratoryContact.vue +++ b/client/src/views/informatiomCollect/laboratoryContact.vue @@ -8,7 +8,7 @@ - + diff --git a/client/src/views/informatiomCollect/qualificInfo.vue b/client/src/views/informatiomCollect/qualificInfo.vue index 0a5b50d..76e4b66 100644 --- a/client/src/views/informatiomCollect/qualificInfo.vue +++ b/client/src/views/informatiomCollect/qualificInfo.vue @@ -2,7 +2,7 @@
新增 - 导出 + 导出 确认
- - - - - - - - - - - 取消 - 确定 - - +