From d48d3e82c3caee63b806bb7d08c0030caefd69f2 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 16 May 2024 17:44:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E5=BA=9F=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=AD=89=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E5=B0=81=E8=A3=85=E9=87=8D=E5=A4=8D=E7=BB=84=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/api/scrap/forecastWaste.js | 5 +- sgzb-ui/src/components/TableModel/index.vue | 11 +- .../scrapManage/component/scrapSource.vue | 20 ++ .../forecastWaste/auditing/index.vue | 26 +- .../forecastWaste/listing/index.vue | 262 +++++++++--------- .../scrapManage/scrap/disposition/config.js | 2 +- .../scrapManage/scrap/disposition/index.vue | 27 +- .../scrapManage/scrap/scrapAuditing/config.js | 4 +- .../scrapManage/scrap/scrapAuditing/index.vue | 25 +- sgzb-ui/vue.config.js | 2 +- 10 files changed, 226 insertions(+), 158 deletions(-) create mode 100644 sgzb-ui/src/views/scrapManage/component/scrapSource.vue diff --git a/sgzb-ui/src/api/scrap/forecastWaste.js b/sgzb-ui/src/api/scrap/forecastWaste.js index 932f9fc5..67ea629b 100644 --- a/sgzb-ui/src/api/scrap/forecastWaste.js +++ b/sgzb-ui/src/api/scrap/forecastWaste.js @@ -27,7 +27,7 @@ export const submitScrapApi = (data) => { /* 报废列表 */ export const getScrapListApi = (data) => { - return request.post('/material/scrap/scrapTaskReviewList', data) + return request.get('/material/scrap/scrapTaskReviewList', { params: data }) } /* 报废审核接口 */ @@ -37,10 +37,11 @@ export const auditingScrapApi = (data) => { /* 处置列表接口 */ export const getDispositionListApi = (data) => { - return request.post('/material/scrap/obtainDisposalList', data) + return request.get('/material/scrap/obtainDisposalList', { params: data }) } /* 处置发送接口 */ export const submitDispositionApi = (data) => { return request.post('/material/scrap/obtainDisposal', data) } + diff --git a/sgzb-ui/src/components/TableModel/index.vue b/sgzb-ui/src/components/TableModel/index.vue index 4cd661c8..1a05cc31 100644 --- a/sgzb-ui/src/components/TableModel/index.vue +++ b/sgzb-ui/src/components/TableModel/index.vue @@ -20,6 +20,10 @@ ref="tableRef" select-on-indeterminate @selection-change="handleSelectionChange" + v-loading="loading" + element-loading-text="数据正在加载,请稍后" + element-loading-spinner="el-icon-loading" + element-loading-background="rgba(0, 0, 0, 0.6)" > +
+ + + +
+ + + diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue index 081539ac..0a64f8c8 100644 --- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue +++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue @@ -21,9 +21,7 @@