From 4964d48407ddaeba1cb2ff179afb9864e6724bcc Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Wed, 15 May 2024 12:09:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201592=20=E9=A2=84=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=A0=E6=B3=95=E8=BF=9B=E8=A1=8C=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/scrapManage/Inventory/config.js  |  2 +-
 .../forecastWaste/auditing/config.js           |  2 +-
 .../forecastWaste/auditing/index.vue           | 18 +++++++++++++++++-
 .../forecastWaste/listing/config.js            |  2 +-
 .../scrapManage/scrap/disposition/config.js    |  2 +-
 .../scrapManage/scrap/scrapAuditing/config.js  |  2 +-
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/sgzb-ui/src/views/scrapManage/Inventory/config.js b/sgzb-ui/src/views/scrapManage/Inventory/config.js
index 83b29ee6..ce20c2fd 100644
--- a/sgzb-ui/src/views/scrapManage/Inventory/config.js
+++ b/sgzb-ui/src/views/scrapManage/Inventory/config.js
@@ -5,7 +5,7 @@ export const config = {
     isFormShow: true, // 是否显示表单查询组件
     handleWidth: '', // 操作列宽度
     formLabel: [
-        { f_label: '关键字', f_model: 'keywords', f_type: 'ipt' },
+        { f_label: '关键字', f_model: 'keyword', f_type: 'ipt' },
         { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
         { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] },
         { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } },
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
index 463327cc..de041702 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/config.js
@@ -15,7 +15,7 @@ export const config = {
     isFormShow: true, // 是否显示表单查询组件
     handleWidth: '', // 操作列宽度
     formLabel: [
-        { f_label: '关键字', f_model: 'keywords', f_type: 'ipt' },
+        { f_label: '关键字', f_model: 'keyword', f_type: 'ipt' },
         { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
         { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] },
         { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } },
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
index ee15441f..449e97d9 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
@@ -5,6 +5,7 @@
             ref="tbRef"
             :config="config"
             :sendApi="getForecastWasteListApi"
+            @getTableSelectionChange="getTableSelectionList"
         >
             <template slot="export" slot-scope="{ pageParams }">
                 <el-row :gutter="10" class="mb8">
@@ -195,6 +196,7 @@
                     scrapDetailList: [],
                 },
                 tbAllChecked: false, // 判断当前设备是否全部审核过
+                dataCondition: [], // 导出taskId列表
             }
         },
         created() {
@@ -227,6 +229,12 @@
             getDialogTbSelList(list) {
                 this.selAuditingList = list
             },
+            getTableSelectionList(list) {
+                this.dataCondition = []
+                if (list.length > 0) list.forEach(ele => {
+                    this.dataCondition.push(ele.taskId)
+                });
+            },
             /* 审核通过 */
             async auditingPass() {
                 if (this.selAuditingList.length < 1) {
@@ -301,7 +309,15 @@
             },
             /* 数据导出 */
             handleExport(data) {
-                console.log(data, '导出的参数')
+                console.log('🚀 ~ 导出 ~ this.dataCondition:', data, this.dataCondition)
+                if (this.dataCondition.length > 0) data.dataCondition = this.dataCondition
+                this.download(
+                    'material/scrap/exportForecastWaste',
+                    {
+                        ...data
+                    },
+                    `预报废审核列表_${new Date().getTime()}.xlsx`,
+                )
             },
         },
         watch: {
diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js
index 61732d6f..67086772 100644
--- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js
+++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js
@@ -17,7 +17,7 @@ export const config = {
     isFormShow: true, // 是否显示表单查询组件
     handleWidth: '180px', // 操作列宽度
     formLabel: [
-        { f_label: '关键字', f_model: 'keywords', f_type: 'ipt' },
+        { f_label: '关键字', f_model: 'keyword', f_type: 'ipt' },
         { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
         { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] },
         { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } },
diff --git a/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js b/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js
index e2164a30..75af0f69 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js
+++ b/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js
@@ -5,7 +5,7 @@ export const config = {
     isFormShow: true, // 是否显示表单查询组件
     handleWidth: '', // 操作列宽度
     formLabel: [
-        { f_label: '关键字', f_model: 'keywords', f_type: 'ipt' },
+        { f_label: '关键字', f_model: 'keyword', f_type: 'ipt' },
         { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
         { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] },
         { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } },
diff --git a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js
index dded2c17..0420fde9 100644
--- a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js
+++ b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js
@@ -5,7 +5,7 @@ export const config = {
     isFormShow: true, // 是否显示表单查询组件
     handleWidth: '160px', // 操作列宽度
     formLabel: [
-        { f_label: '关键字', f_model: 'keywords', f_type: 'ipt' },
+        { f_label: '关键字', f_model: 'keyword', f_type: 'ipt' },
         { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] },
         { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] },
         { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } },