Merge branch 'master' of http://git.echepei.com/zhujiawei/Warehouse_management_ui

src/views/basicdata/warehouse/index.vue

@@ -215,6 +215,12 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="库区地址" align="center" prop="fAddr" >
+            <template scope="scope">
+              <el-input v-model="scope.row.fAddr"  placeholder="库区地址" />
+            </template>
+          </el-table-column>
+
           <el-table-column label="备注" align="center" prop="remark" >
             <template scope="scope">
               <el-input v-model="scope.row.remark"  placeholder="备注" />