diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index d56a082..81b2b3b 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -9,6 +9,20 @@
             placeholder="仓库名称"
           ></el-input>
         </el-form-item>
+        <!-- <el-form-item class="query-form-item" label="仓库类型:">
+          <el-input
+            
+            clearable
+            placeholder="仓库类型"
+          ></el-input>
+        </el-form-item> -->
+        <el-form-item label="仓库类型" prop="advanceType" >
+                <el-select v-model="subData.advanceType"  placeholder="请选择仓库类型" style="width: 80%">
+                  <el-option  label="入账库"  value="1"/>
+                  <el-option  label="寄售库"  value="2"/>
+                  <el-option  label="预验收库" value="3"/>
+                </el-select>
+              </el-form-item>
         <el-form-item>
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
@@ -28,13 +42,13 @@
       >
         <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
         <el-table-column
-          prop="name"
-          label="仓库名称"
+          prop="code"
+          label="仓库编码"
         >
         </el-table-column>
         <el-table-column
-          prop="code"
-          label="仓库编码"
+          prop="name"
+          label="仓库名称"
         >
         </el-table-column>
         <el-table-column
@@ -47,6 +61,11 @@
           label="上级仓库"
         >
         </el-table-column>
+        <el-table-column
+          prop="advanceType"
+          label="仓库类型"
+        >
+        </el-table-column>
         <el-table-column label="允许供应商使用" prop="spUse">
           <template slot-scope="scope">
             <el-tag :type="scope.row.spUse | spUerFilterType">{{
@@ -448,6 +467,7 @@ export default {
       },
       sysList: [],
       sysSubList: [],
+      advanceTypese:[],
     };
   },
   methods: {
@@ -483,6 +503,7 @@ export default {
           this.loading = false;
           let invlist = response.data || [];
           this.list = this.handleTree(invlist, "code", "parentCode");
+          console.log(this.list);
         })
         .catch(() => {
           this.loading = false;
@@ -516,6 +537,10 @@ export default {
           this.subData = {advanceType: data.advanceType.toString(), spUse: false,parentCode:data.code};
         }
       }
+      //转换
+      let advanceTypese =this.subData.advanceType
+
+
       this.subFormVisible = true;
       this.getSubThrsysDetailData();
       if(this.subData.parentCode!=null && this.subData.parentCode!=""){