From 1bfc6b8e594681f6a3bc17ef346a3eb66589ab50 Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Tue, 9 Jul 2024 11:51:19 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/equipmentledger.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue index 4676d4a..020e9f0 100644 --- a/src/views/leger/equipmentledger.vue +++ b/src/views/leger/equipmentledger.vue @@ -633,7 +633,8 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l cancelButtonText: "取消", type: "warning" }).then(() => { - window.open(`/api/equipmentledger/export?daf-auth=${getToken()}`); + var formStr = Object.keys(this.search).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(this.search[key])}`).join('&'); + window.open(`/api/equipmentledger/export?daf-auth=${getToken()}&${formStr}`); }); }, beforeOpen(done, type) { From 0131448fb43342e533955f48cf49302db822d55e Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Tue, 9 Jul 2024 15:02:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E7=94=BB=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/toolinventoryrecord.vue | 296 +++++++++++++----------- 1 file changed, 162 insertions(+), 134 deletions(-) diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue index bcfc3b6..dd773d1 100644 --- a/src/views/leger/toolinventoryrecord.vue +++ b/src/views/leger/toolinventoryrecord.vue @@ -6,9 +6,10 @@ :page="page" :permission="permissionList" :before-open="beforeOpen" + :search.sync="search" + :header-cell-class-name="headerClass" v-model="form" ref="crud" - @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange" @@ -23,17 +24,43 @@ icon="el-icon-delete" plain v-if="permission.toolinventoryrecord_delete" - @click="handleDelete">删 除 + @click="handleDelete">批量删除 + + From 8fdd66e3fbfd511d9169fb52d915fcc239d156d3 Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Tue, 9 Jul 2024 15:02:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E5=88=97=E7=B4=A2?= =?UTF-8?q?=E5=BC=95=E8=A1=A8=E7=A4=BA=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/equipmentledger.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue index 4676d4a..e104241 100644 --- a/src/views/leger/equipmentledger.vue +++ b/src/views/leger/equipmentledger.vue @@ -84,7 +84,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l searchMenuSpan: 6, tip: false, border: true, - index: true, + index: false, viewBtn: true, selection: true, column: [ From e61e4d346c46da11ad2ad1c1c8dd7f73acc26a63 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Tue, 9 Jul 2024 15:03:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E7=94=BB=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/leger/toolinventoryrecord.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/api/leger/toolinventoryrecord.js b/src/api/leger/toolinventoryrecord.js index 2a0347d..6931de1 100644 --- a/src/api/leger/toolinventoryrecord.js +++ b/src/api/leger/toolinventoryrecord.js @@ -47,4 +47,23 @@ export const update = (row) => { data: row }) } +export const auditing = (ids) => { + return request({ + url: '/api/toolinventoryrecord/auditing', + method: 'post', + params: { + ids, + } + }) +} + +export const reject = (ids) => { + return request({ + url: '/api/toolinventoryrecord/reject', + method: 'post', + params: { + ids, + } + }) +}