From 1733d569da0f7f38fb2e67b1b09b2a217ca7ef33 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Thu, 24 Nov 2022 18:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../suppliesstronger/ProcessSuppliesStrongerList.vue  |  6 +++---
 .../suppliesstronger/ProcessSuppliesStrongerLists.vue |  2 +-
 src/views/waste/ProcessWasteListCable.vue             | 11 +++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index b23997d..c84259c 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -35,9 +35,9 @@
     <div class="table-operator">
 <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
       <a-button type="primary" icon="download" @click="handleExportXls('物资总库')">导出</a-button>
-<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-<!--        <a-button type="primary" icon="import">导入</a-button>-->
-<!--      </a-upload>-->
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index d26e440..d8c3ee5 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -273,7 +273,7 @@
             title:'流程表单号',
             align:"center",
             scopedSlots: { customRender: 'processId' },
-            dataIndex: 'warehousingBatch',
+            dataIndex: 'flowPath',
           },
           {
             title:'供应商',
diff --git a/src/views/waste/ProcessWasteListCable.vue b/src/views/waste/ProcessWasteListCable.vue
index 5e3f119..ea311a2 100644
--- a/src/views/waste/ProcessWasteListCable.vue
+++ b/src/views/waste/ProcessWasteListCable.vue
@@ -192,7 +192,7 @@
             title:'电缆规格',
             align:"center",
             scopedSlots: { customRender: 'typeSpecification' },
-            dataIndex: 'typeSpecification'
+            dataIndex: 'materialName'
           },
           {
             title:'缴料队组',
@@ -222,7 +222,7 @@
           {
             title:'存放地',
             align:"center",
-            dataIndex: 'depositary'
+            dataIndex: 'depositary_dictText'
           },
           {
             title:'报废原因',
@@ -252,6 +252,7 @@
         url: {
           list: "/waste/processWaste/listCable",
           exportXlsUrl: "/waste/processWaste/exportXlsByWaste",
+          importExcelUrl: "waste/processWaste/importCableExcel",
         },
         dictOptions:{},
         superFieldList:[],
@@ -266,6 +267,12 @@
       },
     },
     methods: {
+      //重置
+      searchReset() {
+        this.queryParam = {}
+        this.createScrapTime = [];
+        this.loadData(1);
+      },
       initDictConfig(){
       },
       onDateChange: function (value, dateString) {