diff --git a/src/api/thrsys/thrInvWarehouse.js b/src/api/thrsys/thrInvWarehouse.js
index e007b2a..eb4adbd 100644
--- a/src/api/thrsys/thrInvWarehouse.js
+++ b/src/api/thrsys/thrInvWarehouse.js
@@ -41,3 +41,12 @@ export function deleteThrWarehouse(data) {
         data: data
     });
 }
+
+//下载第三方系统仓库
+export function download(param) {
+    return axios({
+        url: "/spms/thrsys/warehouse/download",
+        method: "get",
+        params: param
+    })
+}
diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index 4c58585..8a5cedb 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -17,14 +17,28 @@
                         <el-option label="仓库" value=false></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item class="query-form-item">
+                    <el-select v-model="query.thirdSysFk" placeholder="请选择第三方系统" @change="sysChange">
+                        <el-option
+                            v-for="item in thirdSys"
+                            :key="item.value"
+                            :label="item.thirdName"
+                            :value="item.thirdId">
+                            <span style="float: left">{{ item.thirdName }}</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item>
                     <el-button-group>
                         <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                         <el-button type="primary" icon="search" @click="getList">查询</el-button>
                         <el-button type="primary" @click.native="handleForm(null, null,'addTop')"
                         >添加仓库
-                        </el-button
-                        >
+                        </el-button>
+                        <el-button type="primary" @click.native="downloadWarehouse()"
+                        >下载仓库
+                        </el-button>
                     </el-button-group>
                 </el-form-item>
             </el-form>
@@ -60,6 +74,11 @@
                 <!--                        <span>{{ enableMap[scope.row.isDefault] }}</span>-->
                 <!--                    </template>-->
                 <!--                </el-table-column>-->
+                <el-table-column prop="thirdSysFk" label="第三方系统名称">
+                    <template slot-scope="scope">
+                        <span v-for="item in thirdSys" :key="item.thirdId">{{item.thirdName}}</span>
+                    </template>
+                </el-table-column>
 
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">
@@ -193,6 +212,17 @@
                         <el-option label="仓库" :value='false'></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item class="query-form-item" label="第三方系统:">
+                    <el-select v-model="formData.thirdSysFk" placeholder="仓库类型" clearable>
+                        <el-option
+                            v-for="item in thirdSys"
+                            :key="item.thirdId"
+                            :lable="item.thirdId"
+                            :value="item.thirdName"
+                        >
+                        </el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="状态:" prop="status" class="query-form-item">
                     <el-radio-group v-model="formData.status">
                         <el-radio :label="0">禁用</el-radio>
@@ -234,8 +264,10 @@
 import {
     filterThrList,
     saveThrWarehouse,
-    deleteThrWarehouse
+    deleteThrWarehouse,
+    download
 } from "../../api/thrsys/thrInvWarehouse";
+import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
 
 const formJson = {
     id: null,
@@ -289,11 +321,10 @@ export default {
                     {required: true, message: "请输入仓库货位代码", trigger: "blur"}
                 ]
             },
-            pidData: {}
-            ,
-            deleteLoading: false
-        }
-            ;
+            pidData: {},
+            deleteLoading: false,
+            thirdSys: [],
+        };
     },
     methods: {
         /*eslint-disable */
@@ -341,6 +372,7 @@ export default {
             this.query = {
                 name: "",
                 status: "",
+                thirdSysFk: ""
             };
             this.getList();
         },
@@ -423,6 +455,11 @@ export default {
             this.$refs["dataForm"].validate((valid) => {
                 if (valid) {
                     this.formLoading = true;
+                    this.thirdSys.forEach((item) => {
+                        if (this.formData.thirdSysFk == item.thirdName) {
+                            this.formData.thirdSysFk = item.thirdId;
+                        }
+                    });
                     let data = Object.assign({}, this.formData);
                     saveThrWarehouse(data, this.formName)
                         .then((response) => {
@@ -517,6 +554,39 @@ export default {
                 CurrentDate += '0' + Day
             }
             return CurrentDate
+        },
+        getBasicThirdSys() {
+            let query = {
+                enabled: true,
+            };
+            getBasicThirdSys(query)
+                .then((response) => {
+                    this.thirdSys = response.data.list || [];
+                    this.query.thirdSysFk = this.thirdSys[0].thirdId;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                });
+        },
+        downloadWarehouse() {
+            if (null == this.query.thirdSysFk) {
+                this.$message.warning("请选择需要下载的第三方系统");
+                return;
+            }
+            let params = {
+                thirdSysFk: this.query.thirdSysFk
+            }
+            download(params).then((res) => {
+                if (res.code == 20000) {
+                    this.$message.success("下载完成");
+                    this.getList();
+                } else {
+                    this.$message.error("下载失败");
+                }
+            }).catch((error) => {
+                this.$message.error("下载失败");
+            })
         }
     },
     filters: {
@@ -540,6 +610,7 @@ export default {
     created() {
         // 加载表格数据
         this.getList();
+        this.getBasicThirdSys();
     },
 };
 </script>