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 @@
导出
-
-
-
+
+ 导入
+
查询
重置
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) {