diff --git a/hw-ui/src/views/wms/info/stocktotal/index.vue b/hw-ui/src/views/wms/info/stocktotal/index.vue
index 84cbd3d..e2c9bed 100644
--- a/hw-ui/src/views/wms/info/stocktotal/index.vue
+++ b/hw-ui/src/views/wms/info/stocktotal/index.vue
@@ -1,218 +1,245 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="仓库ID" prop="warehouseId">
-        <el-input
-          v-model="queryParams.warehouseId"
-          placeholder="请输入仓库ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库楼层" prop="warehouseFloor">
-        <el-input
-          v-model="queryParams.warehouseFloor"
-          placeholder="请输入仓库楼层"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="物料ID" prop="materialId">
-        <el-input
-          v-model="queryParams.materialId"
-          placeholder="请输入物料ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总数量;仓库存放的总数量" prop="totalAmount">
-        <el-input
-          v-model="queryParams.totalAmount"
-          placeholder="请输入总数量;仓库存放的总数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="冻结数量;手动冻结的，暂时可不用" prop="frozenAmount">
-        <el-input
-          v-model="queryParams.frozenAmount"
-          placeholder="请输入冻结数量;手动冻结的，暂时可不用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="占用数量;申请时占用的数量，在出库时要减去出库数量，并且总数量要同步更新;" prop="occupyAmount">
-        <el-input
-          v-model="queryParams.occupyAmount"
-          placeholder="请输入占用数量;申请时占用的数量，在出库时要减去出库数量，并且总数量要同步更新;"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createDate">
-        <el-date-picker clearable
-          v-model="queryParams.createDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="最后更新时间" prop="updateDate">
-        <el-date-picker clearable
-          v-model="queryParams.updateDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择最后更新时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="有效标记" prop="activeFlag">
-        <el-input
-          v-model="queryParams.activeFlag"
-          placeholder="请输入有效标记"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['wms:stocktotal:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['wms:stocktotal:edit']"
-        >修改</el-button>
+    <el-row :gutter="20">
+      <!--仓库数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="warehouseName"
+            placeholder="请输入仓库名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="warehouseList"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="warehouseId"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          />
+        </div>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['wms:stocktotal:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['wms:stocktotal:export']"
-        >导出</el-button>
+
+
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
+<!--          <el-form-item label="仓库ID" prop="warehouseId">-->
+<!--            <el-input-->
+<!--              v-model="queryParams.warehouseId"-->
+<!--              placeholder="请输入仓库ID"-->
+<!--              clearable-->
+<!--              @keyup.enter.native="handleQuery"-->
+<!--            />-->
+<!--          </el-form-item>-->
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="daterangeCreateDate"
+              style="width: 340px"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <!--          <el-col :span="1.5">-->
+          <!--            <el-button-->
+          <!--              type="primary"-->
+          <!--              plain-->
+          <!--              icon="el-icon-plus"-->
+          <!--              size="mini"-->
+          <!--              @click="handleAdd"-->
+          <!--              v-hasPermi="['wms:stocktotal:add']"-->
+          <!--            >新增-->
+          <!--            </el-button>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="1.5">-->
+          <!--            <el-button-->
+          <!--              type="success"-->
+          <!--              plain-->
+          <!--              icon="el-icon-edit"-->
+          <!--              size="mini"-->
+          <!--              :disabled="single"-->
+          <!--              @click="handleUpdate"-->
+          <!--              v-hasPermi="['wms:stocktotal:edit']"-->
+          <!--            >修改-->
+          <!--            </el-button>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="1.5">-->
+          <!--            <el-button-->
+          <!--              type="danger"-->
+          <!--              plain-->
+          <!--              icon="el-icon-delete"-->
+          <!--              size="mini"-->
+          <!--              :disabled="multiple"-->
+          <!--              @click="handleDelete"-->
+          <!--              v-hasPermi="['wms:stocktotal:remove']"-->
+          <!--            >删除-->
+          <!--            </el-button>-->
+          <!--          </el-col>-->
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['wms:stocktotal:export']"
+            >导出
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="stocktotalList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center"/>
+          <!--          <el-table-column label="总库存ID" align="center" prop="stockTotalId"/>-->
+          <!--          <el-table-column label="仓库ID" align="center" prop="warehouseId"/>-->
+          <el-table-column label="仓库名称" align="center" prop="warehouseName"/>
+          <el-table-column label="仓库楼层" align="center" prop="warehouseFloor"/>
+          <!--          <el-table-column label="库存类型" align="center" prop="stockType"/>-->
+          <el-table-column label="物料ID" align="center" prop="materialId"/>
+          <el-table-column label="物料编号" align="center" prop="materialCode"/>
+          <el-table-column label="物料名称" align="center" prop="materialName"/>
+          <el-table-column label="总数量" align="center" prop="totalAmount"/>
+          <el-table-column label="冻结数量" align="center" prop="frozenAmount"/>
+          <el-table-column label="占用数量" align="center" prop="occupyAmount"/>
+<!--          <el-table-column label="创建时间" align="center" prop="createDate" width="180">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="最后更新时间" align="center" prop="updateDate" width="180">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span>{{ parseTime(scope.row.updateDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <!--          <el-table-column label="有效标记" align="center" prop="activeFlag"/>-->
+        </el-table>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    <el-row :gutter="20">
+      <el-col :span="20" :offset="4" :xs="20">
+        <el-divider content-position="center">库位库存明细信息</el-divider>
 
-    <el-table v-loading="loading" :data="stocktotalList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="总库存ID" align="center" prop="stockTotalId" />
-      <el-table-column label="仓库ID" align="center" prop="warehouseId" />
-      <el-table-column label="仓库楼层" align="center" prop="warehouseFloor" />
-      <el-table-column label="库存类型：1原材料，2半成品，3成品" align="center" prop="stockType" />
-      <el-table-column label="物料ID" align="center" prop="materialId" />
-      <el-table-column label="总数量;仓库存放的总数量" align="center" prop="totalAmount" />
-      <el-table-column label="冻结数量;手动冻结的，暂时可不用" align="center" prop="frozenAmount" />
-      <el-table-column label="占用数量;申请时占用的数量，在出库时要减去出库数量，并且总数量要同步更新;" align="center" prop="occupyAmount" />
-      <el-table-column label="创建时间" align="center" prop="createDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="最后更新时间" align="center" prop="updateDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="有效标记" align="center" prop="activeFlag" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['wms:stocktotal:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['wms:stocktotal:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+        <el-table v-loading="loadingTwo" :data="rawstockList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center"/>
+          <!--          <el-table-column label="原材料库存ID" align="center" prop="rawStockId" />-->
+          <!--          <el-table-column label="仓库ID" align="center" prop="warehouseId"/>-->
+          <el-table-column label="仓库名称" align="center" prop="warehouseName" width="120" v-if="columns[0].visible"/>
+          <el-table-column label="仓库楼层" align="center" prop="warehouseFloor" v-if="columns[1].visible"/>
+          <el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[2].visible"/>
+          <!--          <el-table-column label="库存类型" align="center" prop="stockType"/>-->
+          <el-table-column label="物料编号" align="center" prop="materialCode" width="120" v-if="columns[3].visible"/>
+          <el-table-column label="物料名称" align="center" prop="materialName" width="150" v-if="columns[4].visible"/>
+          <el-table-column label="成品编号" align="center" prop="materialCode" width="120" v-if="columns[10].visible"/>
+          <el-table-column label="成品名称" align="center" prop="materialName" width="150" v-if="columns[11].visible"/>
+          <el-table-column label="计划编号" align="center" prop="planCode" width="100"  v-if="columns[12].visible"/>
+          <el-table-column label="计划明细编号" align="center" prop="planDetailCode" width="120"  v-if="columns[13].visible"/>
+          <el-table-column label="销售订单编号" align="center" prop="saleorderCode" width="120"  v-if="columns[14].visible"/>
+          <el-table-column label="入库批次号" align="center" prop="instockBatch" width="100" v-if="columns[5].visible"/>
+          <el-table-column label="托盘RFID代码" align="center" prop="palletInfoCode" width="120" v-if="columns[6].visible"/>
+          <!--          <el-table-column label="入库时间" align="center" prop="instockDate" width="180">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <span>{{ parseTime(scope.row.instockDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column label="最晚出库时间" align="center" prop="lastOutstockTime" width="180">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <span>{{ parseTime(scope.row.lastOutstockTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column label="质检状态" align="center" prop="qualityStatus" />-->
+          <!--          <el-table-column label="完整标识" align="center" prop="completeFlag" />-->
+          <el-table-column label="总数量" align="center" prop="totalAmount" v-if="columns[7].visible"/>
+          <!--          <el-table-column label="冻结数量" align="center" prop="frozenAmount"/>-->
+          <el-table-column label="占用数量" align="center" prop="occupyAmount" v-if="columns[8].visible"/>
+          <!--          <el-table-column label="供应商ID" align="center" prop="supplierId" />-->
+          <el-table-column label="创建时间" align="center" prop="createDate" width="180" v-if="columns[9].visible">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <!--          <el-table-column label="最后更新时间" align="center" prop="updateDate" width="180" >-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <span>{{ parseTime(scope.row.updateDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column label="有效标记" align="center" prop="activeFlag" />-->
+        </el-table>
+        <pagination
+          v-show="twoPTotal>0"
+          :total="twoPTotal"
+          :page.sync="queryTwoParams.pageNum"
+          :limit.sync="queryTwoParams.pageSize"
+          @pagination="getTwoList"
+        />
+      </el-col>
+    </el-row>
 
     <!-- 添加或修改原材料库存对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="仓库ID" prop="warehouseId">
-          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库ID"/>
         </el-form-item>
         <el-form-item label="仓库楼层" prop="warehouseFloor">
-          <el-input v-model="form.warehouseFloor" placeholder="请输入仓库楼层" />
+          <el-input v-model="form.warehouseFloor" placeholder="请输入仓库楼层"/>
         </el-form-item>
         <el-form-item label="物料ID" prop="materialId">
-          <el-input v-model="form.materialId" placeholder="请输入物料ID" />
+          <el-input v-model="form.materialId" placeholder="请输入物料ID"/>
         </el-form-item>
         <el-form-item label="总数量;仓库存放的总数量" prop="totalAmount">
-          <el-input v-model="form.totalAmount" placeholder="请输入总数量;仓库存放的总数量" />
+          <el-input v-model="form.totalAmount" placeholder="请输入总数量;仓库存放的总数量"/>
         </el-form-item>
         <el-form-item label="冻结数量;手动冻结的，暂时可不用" prop="frozenAmount">
-          <el-input v-model="form.frozenAmount" placeholder="请输入冻结数量;手动冻结的，暂时可不用" />
+          <el-input v-model="form.frozenAmount" placeholder="请输入冻结数量;手动冻结的，暂时可不用"/>
         </el-form-item>
         <el-form-item label="占用数量;申请时占用的数量，在出库时要减去出库数量，并且总数量要同步更新;" prop="occupyAmount">
-          <el-input v-model="form.occupyAmount" placeholder="请输入占用数量;申请时占用的数量，在出库时要减去出库数量，并且总数量要同步更新;" />
+          <el-input v-model="form.occupyAmount" placeholder="请输入占用数量;申请时占用的数量，在出库时要减去出库数量，并且总数量要同步更新;"/>
         </el-form-item>
         <el-form-item label="创建时间" prop="createDate">
           <el-date-picker clearable
-            v-model="form.createDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择创建时间">
+                          v-model="form.createDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择创建时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="最后更新时间" prop="updateDate">
           <el-date-picker clearable
-            v-model="form.updateDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择最后更新时间">
+                          v-model="form.updateDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择最后更新时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="有效标记" prop="activeFlag">
-          <el-input v-model="form.activeFlag" placeholder="请输入有效标记" />
+          <el-input v-model="form.activeFlag" placeholder="请输入有效标记"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -224,7 +251,16 @@
 </template>
 
 <script>
-import { listStocktotal, getStocktotal, delStocktotal, addStocktotal, updateStocktotal } from "@/api/wms/stocktotal";
+import {
+  listStocktotal,
+  getStocktotal,
+  delStocktotal,
+  addStocktotal,
+  updateStocktotal,
+  listRawstock,
+  listProductstock
+} from "@/api/wms/stocktotal";
+import {getWarehouses} from "@//api/wms/wmslocation";
 
 export default {
   name: "Stocktotal",
@@ -232,6 +268,7 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      loadingTwo: true,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -242,16 +279,30 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      // 第二表格总条数
+      twoPTotal: 0,
       // 原材料库存表格数据
       stocktotalList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      // 类型：原材料库存=1、成品库存=2
+      type: null,
+      // 仓库List
+      warehouseList: [],
+      // 仓库名称
+      warehouseName: undefined,
+      // 有效标记时间范围
+      daterangeCreateDate: [],
+      defaultProps: {
+        children: "children",
+        label: "warehouseName"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 2,
         warehouseId: null,
         warehouseFloor: null,
         stockType: null,
@@ -263,31 +314,63 @@ export default {
         updateDate: null,
         activeFlag: null
       },
+      queryTwoParams: {
+        pageNum: 1,
+        pageSize: 2
+      },
       // 表单参数
       form: {},
-      // 表单校验
-      rules: {
-        warehouseId: [
-          { required: true, message: "仓库ID不能为空", trigger: "blur" }
-        ],
-        warehouseFloor: [
-          { required: true, message: "仓库楼层不能为空", trigger: "blur" }
-        ],
-        stockType: [
-          { required: true, message: "库存类型：1原材料，2半成品，3成品不能为空", trigger: "change" }
-        ],
-        materialId: [
-          { required: true, message: "物料ID不能为空", trigger: "blur" }
-        ],
-        totalAmount: [
-          { required: true, message: "总数量;仓库存放的总数量不能为空", trigger: "blur" }
-        ],
-      }
+      // 原材料库存表格数据
+      rawstockList: [],
+      // 显示列
+      columns: [],
     };
   },
   created() {
-    const type = this.$route.query && this.$route.query.type;
+    this.type = this.$route.query && this.$route.query.type;
+    if (this.type === '1') {
+      this.columns =
+        [
+          {key: 0, label: `仓库名称`, visible: true},
+          {key: 1, label: `仓库楼层`, visible: true},
+          {key: 2, label: `库位编码`, visible: true},
+          {key: 3, label: `物料编号`, visible: true},
+          {key: 4, label: `物料名称`, visible: true},
+          {key: 5, label: `入库批次号`, visible: true},
+          {key: 6, label: `托盘RFID代码`, visible: true},
+          {key: 7, label: `总数量`, visible: true},
+          {key: 8, label: `占用数量`, visible: true},
+          {key: 9, label: `创建时间`, visible: true},
+          {key: 10, label: `成品编号`, visible: false},
+          {key: 11, label: `成品名称`, visible: false},
+          {key: 12, label: `计划编号`, visible: false},
+          {key: 13, label: `计划明细编号`, visible: false},
+          {key: 14, label: `销售订单编号`, visible: false},
+        ]
+    }
+    if (this.type === '3') {
+      this.columns =
+        [
+          {key: 0, label: `仓库名称`, visible: true},
+          {key: 1, label: `仓库楼层`, visible: true},
+          {key: 2, label: `库位编码`, visible: true},
+          {key: 3, label: `物料编号`, visible: false},
+          {key: 4, label: `物料名称`, visible: false},
+          {key: 5, label: `入库批次号`, visible: false},
+          {key: 6, label: `托盘RFID代码`, visible: true},
+          {key: 7, label: `总数量`, visible: true},
+          {key: 8, label: `占用数量`, visible: true},
+          {key: 9, label: `创建时间`, visible: true},
+          {key: 10, label: `成品编号`, visible: true},
+          {key: 11, label: `成品名称`, visible: true},
+          {key: 12, label: `计划编号`, visible: true},
+          {key: 13, label: `计划明细编号`, visible: true},
+          {key: 14, label: `销售订单编号`, visible: true},
+        ]
+    }
+    this.getWarehouseList();
     this.getList();
+    this.getTwoList();
   },
 
   methods: {
@@ -300,6 +383,29 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询库位库存明细列表 */
+    getTwoList() {
+      this.loadingTwo = true;
+      this.queryTwoParams.params = {};
+      if (null != this.daterangeCreateDate && '' != this.daterangeCreateDate) {
+        this.queryTwoParams.params["beginCreateDate"] = this.daterangeCreateDate[0];
+        this.queryTwoParams.params["endCreateDate"] = this.daterangeCreateDate[1];
+      }
+      if (this.type === '1') {
+        listRawstock(this.queryTwoParams).then(response => {
+          this.rawstockList = response.rows;
+          this.twoPTotal = response.total;
+          this.loadingTwo = false;
+        });
+      }
+      if (this.type === '3') {
+        listProductstock(this.queryTwoParams).then(response => {
+          this.rawstockList = response.rows;
+          this.twoPTotal = response.total;
+          this.loadingTwo = false;
+        });
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -327,7 +433,9 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      this.queryTwoParams.pageNum = 1;
       this.getList();
+      this.getTwoList();
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -337,7 +445,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.stockTotalId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -346,6 +454,32 @@ export default {
       this.open = true;
       this.title = "添加原材料库存";
     },
+
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.warehouseName.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.warehouseId = data.warehouseId;
+      this.queryTwoParams.warehouseId = data.warehouseId;
+      this.handleQuery();
+    },
+
+    // 获取仓库List
+    getWarehouseList() {
+      this.loading = true;
+      this.loadingTwo = true;
+      getWarehouses({warehouseInstockType: this.type}).then(response => {
+        this.warehouseList = response.data;
+        // this.queryParams.warehouseId = this.warehouseList[0].warehouseId;
+        // this.queryTwoParams.warehouseId = this.warehouseList[0].warehouseId;
+        this.loading = false;
+        this.loadingTwo = false;
+      });
+    },
+
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -376,15 +510,17 @@ export default {
         }
       });
     },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const stockTotalIds = row.stockTotalId || this.ids;
-      this.$modal.confirm('是否确认删除原材料库存编号为"' + stockTotalIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除原材料库存编号为"' + stockTotalIds + '"的数据项？').then(function () {
         return delStocktotal(stockTotalIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {