货站品名增加品名查询条件

@@ -8,6 +8,11 @@
                         <el-input v-model="selectionData.goodsStation" placeholder="请输入货站名称" maxlength="50" clearable />
                         <el-input v-model="selectionData.goodsStation" placeholder="请输入货站名称" maxlength="50" clearable />
                     </el-form-item>
                     </el-form-item>
                 </el-col>
                 </el-col>
+                <el-col :span="6">
+                    <el-form-item label="品名">
+                        <el-input v-model="selectionData.goodsName" placeholder="请输入货站名称" maxlength="50" clearable />
+                    </el-form-item>
+                </el-col>
             </el-row>
             </el-row>
         </el-form>
         </el-form>
         <div style="display:flex;padding:10px 20px">
         <div style="display:flex;padding:10px 20px">
@@ -28,6 +33,10 @@
                 class="upload-demo" v-hasPermi="['base:goodsStation:add']">
                 class="upload-demo" v-hasPermi="['base:goodsStation:add']">
                 <el-button type="primary" icon="el-icon-upload2" size="small">导入Excel</el-button>
                 <el-button type="primary" icon="el-icon-upload2" size="small">导入Excel</el-button>
             </el-upload>
             </el-upload>
+            <el-button icon="el-icon-download" type="primary" size="small" style="margin-left:10px"
+                @click="downloadExcel">
+                导出Excel
+            </el-button>
         </div>
         </div>
         <Tables ref="goodsStation" ductName="goodsStation" :data="tableData" :headerData="tableHeader" :selection="true"
         <Tables ref="goodsStation" ductName="goodsStation" :data="tableData" :headerData="tableHeader" :selection="true"
             :order="true" :selectFixed="false" :totalCount="totalCount" :loading="loading"
             :order="true" :selectFixed="false" :totalCount="totalCount" :loading="loading"
@@ -43,8 +52,7 @@
                 </el-table-column>
                 </el-table-column>
             </template>
             </template>
         </Tables>
         </Tables>
-        <Dialog :open="open" @close="close" />
-        <UpDateResult :dialogVisible="resultOpen" :resultData="errorData" @close="resultClose" />
+        <Dialog :open="open" :openStatus="openStatus" @close="close" />
     </div>
     </div>
 </template>
 </template>
 
 
@@ -64,6 +72,7 @@ export default {
         return {
         return {
             selectionData: {
             selectionData: {
                 goodsStation: '',
                 goodsStation: '',
+                goodsName: '',
                 size: 20,
                 size: 20,
                 page: 1
                 page: 1
             },
             },
@@ -74,9 +83,9 @@ export default {
             errorData: [],
             errorData: [],
             tableHeight: null,
             tableHeight: null,
             totalCount: 0,
             totalCount: 0,
+            openStatus: '',
             loading: false,
             loading: false,
             open: false,
             open: false,
-            resultOpen: false,
         }
         }
     },
     },
     created() {
     created() {
@@ -118,6 +127,7 @@ export default {
         //新增
         //新增
         add() {
         add() {
             this.open = true
             this.open = true
+            this.openStatus = 'add'
         },
         },
         //删除
         //删除
         del(val) {
         del(val) {
@@ -160,6 +170,11 @@ export default {
                 console.log(err)
                 console.log(err)
             })
             })
         },
         },
+        //导出
+        downloadExcel() {
+            this.open = true
+            this.openStatus = 'downloadExcel'
+        },
         //复选
         //复选
         tableSelect(val) {
         tableSelect(val) {
             this.checkData = val.selection
             this.checkData = val.selection
@@ -186,15 +201,14 @@ export default {
                             type: "warning",
                             type: "warning",
                         });
                         });
                     } else {
                     } else {
+                        if (this.errorData.length > 0) {
                             this.$message.warning(res.msg);
                             this.$message.warning(res.msg);
                             this.errorData = res.data;
                             this.errorData = res.data;
-                        if (this.errorData.length > 0) {
-                            this.resultOpen = true
+                            this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } })
                         }
                         }
                     }
                     }
                 } else {
                 } else {
                     this.$message.success(res.msg);
                     this.$message.success(res.msg);
-                    this.errorData = res.data;
                     this.selection(1)
                     this.selection(1)
                 }
                 }
             });
             });
@@ -233,6 +247,7 @@ export default {
         },
         },
         close() {
         close() {
             this.open = false
             this.open = false
+            this.openStatus = ''
             this.selection(1)
             this.selection(1)
         },
         },
         resultClose() {
         resultClose() {