From b1d27438fdce1fac18b9e66a8f31a7a868cc03b4 Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Tue, 9 Jul 2024 09:41:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=9D=99=E6=80=81=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E3=80=81=E6=96=87=E6=A1=A3=E6=B8=85=E5=86=8C?= =?UTF-8?q?=E4=B8=8A=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/equipmentledger.vue | 13 +++++- src/views/leger/equipmentledgerDetail.vue | 57 +++++++++++++++++++---- 2 files changed, 60 insertions(+), 10 deletions(-) diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue index 65716f6..4676d4a 100644 --- a/src/views/leger/equipmentledger.vue +++ b/src/views/leger/equipmentledger.vue @@ -47,11 +47,11 @@ 导出 + @click="handleExport">导出 @@ -627,6 +627,15 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l this.$refs.crud.toggleSelection(); }); }, + handleExport() { + this.$confirm("是否导出数据?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + window.open(`/api/equipmentledger/export?daf-auth=${getToken()}`); + }); + }, beforeOpen(done, type) { if (["edit", "view"].includes(type)) { getDetail(this.form.id).then(res => { diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue index ca5e0e9..8afe879 100644 --- a/src/views/leger/equipmentledgerDetail.vue +++ b/src/views/leger/equipmentledgerDetail.vue @@ -36,9 +36,15 @@ ref="crud2" @row-update="document_rowUpdate" @row-save="document_rowSave" - @row-del="document_rowDel"> + @row-del="document_rowDel" + :upload-after="uploadAfter" + :upload-preview="(file) => handleUploadPreview(file)" + :upload-delete="(file) => handleUploadDelete(file)"> + @@ -108,6 +114,7 @@ shouldShowButton:{}, addUpdateShowButton:{}, readonlyForm:{}, + document_form:{}, option: { column: [{ label: '基本信息', @@ -559,6 +566,9 @@ label: "页数", prop: "page", span: 20, + rules: [{ + trigger: "blur" + }] }, { label: "关键字", @@ -577,13 +587,24 @@ }] }, { - label: "附件", - prop: "accessory", + label: '附件', + prop: 'accessoryName', + dataType: 'object', + fileType: 'img',//img/video/audio + type: 'upload', + // hide: true, + limit: 1, + propsHttp: { + res: 'data', + }, + data: { + fileType: "1"// 静态台账-文档清册 + }, + headers: { + }, span: 20, - rules: [{ - trigger: "blur" - }] - }, + action: './api/system/file/upload' + } ] } } @@ -887,6 +908,20 @@ }, handleDownload(row) { window.open(`/api/system/file/download?daf-auth=${getToken()}&fileName=${row.accessoryName}`); + }, + uploadAfter(response, done) { + // response 是服务器响应 + this.document_form.accessoryName = response.fileName; + this.document_form.prAccessoryName = response.name; + done(); + }, + handleUploadPreview(file) { + // 禁止文件预览 + return false; + }, + handleUploadDelete(file) { + this.document_form.accessoryName = ''; + this.document_form.prAccessoryName = ''; } } } @@ -902,6 +937,12 @@ outline: none; pointer-events: none; } +.frame_class1 .el-input__icon { + display: none; +} +.frame_class1 .el-input--prefix .el-input__inner { + padding-left: 15px; +} .container { display: flex; justify-content: flex-end; /* 将子元素推到容器的末端 */ From a4c1e01ab502dffbf24d99b4fc8e80f5fb0a608e Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Tue, 9 Jul 2024 10:31:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/leger/toolinventoryrecord.js | 50 ++++ src/views/leger/toolinventoryrecord.vue | 342 ++++++++++++++++++++++++ 2 files changed, 392 insertions(+) create mode 100644 src/api/leger/toolinventoryrecord.js create mode 100644 src/views/leger/toolinventoryrecord.vue diff --git a/src/api/leger/toolinventoryrecord.js b/src/api/leger/toolinventoryrecord.js new file mode 100644 index 0000000..b84125c --- /dev/null +++ b/src/api/leger/toolinventoryrecord.js @@ -0,0 +1,50 @@ +import request from '@/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/leger/toolinventoryrecord/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/leger/toolinventoryrecord/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/leger/toolinventoryrecord/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/leger/toolinventoryrecord/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/leger/toolinventoryrecord/submit', + method: 'post', + data: row + }) +} + diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue new file mode 100644 index 0000000..bcfc3b6 --- /dev/null +++ b/src/views/leger/toolinventoryrecord.vue @@ -0,0 +1,342 @@ + + + + + From 1ff3e60eb35c978a7693e8b282643efa10875c2e Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Tue, 9 Jul 2024 10:49:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/leger/inspectionstandards.js | 50 +++++ src/views/leger/inspectionstandards.vue | 234 ++++++++++++++++++++++++ 2 files changed, 284 insertions(+) create mode 100644 src/api/leger/inspectionstandards.js create mode 100644 src/views/leger/inspectionstandards.vue diff --git a/src/api/leger/inspectionstandards.js b/src/api/leger/inspectionstandards.js new file mode 100644 index 0000000..ee5f327 --- /dev/null +++ b/src/api/leger/inspectionstandards.js @@ -0,0 +1,50 @@ +import request from '@/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/leger/inspectionstandards/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/leger/inspectionstandards/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/leger/inspectionstandards/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/leger/inspectionstandards/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/leger/inspectionstandards/submit', + method: 'post', + data: row + }) +} + diff --git a/src/views/leger/inspectionstandards.vue b/src/views/leger/inspectionstandards.vue new file mode 100644 index 0000000..df3967b --- /dev/null +++ b/src/views/leger/inspectionstandards.vue @@ -0,0 +1,234 @@ + + + + + From 2cb2451055736a65c8438f99d2e761bb4c875197 Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Tue, 9 Jul 2024 10:57:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/leger/inspectionstandards.js | 2 +- src/api/leger/toolinventoryrecord.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/leger/inspectionstandards.js b/src/api/leger/inspectionstandards.js index ee5f327..de4f7c3 100644 --- a/src/api/leger/inspectionstandards.js +++ b/src/api/leger/inspectionstandards.js @@ -1,4 +1,4 @@ -import request from '@/axios'; +import request from '@/router/axios'; export const getList = (current, size, params) => { return request({ diff --git a/src/api/leger/toolinventoryrecord.js b/src/api/leger/toolinventoryrecord.js index b84125c..2a0347d 100644 --- a/src/api/leger/toolinventoryrecord.js +++ b/src/api/leger/toolinventoryrecord.js @@ -1,4 +1,4 @@ -import request from '@/axios'; +import request from '@/router/axios'; export const getList = (current, size, params) => { return request({