diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
new file mode 100644
index 00000000..ec9a58a4
--- /dev/null
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -0,0 +1,200 @@
+<template>
+  <a-row :gutter="24">
+    <a-col :md="24">
+      <a-card :bordered="false">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row :gutter="24">
+              <a-col :md="4" :sm="24">
+                <a-form-item label="仓库">
+                  <a-select
+                    style="width: 100%"
+                    placeholder="请选择仓库"
+                    v-model="queryParam.depotId">
+                    <a-select-option v-for="(depot,index) in depotList" :value="depot.id">
+                      {{ depot.depotName }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类别">
+                  <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear
+                       :treeData="categoryTree" v-model="queryParam.categoryId" placeholder="请选择类别">
+                  </a-tree-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="商品信息">
+                  <a-input placeholder="条码、名称、规格、型号" v-model="queryParam.materialParam"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24" >
+                <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+                  <a-button type="primary" @click="searchQuery">查询</a-button>
+                  <a-button style="margin-left: 8px" v-print="'#materialStockPrint'" type="primary" icon="printer">打印</a-button>
+                </span>
+              </a-col>
+              <a-col :md="4" :sm="24" >
+                <a-form-item label="当前总库存">
+                  {{currentStock}}
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24" >
+                <a-form-item label="当前总库存金额">
+                  {{currentStockPrice}}
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+        <!-- table区域-begin -->
+        <section ref="print" id="materialStockPrint">
+          <a-table
+            bordered
+            ref="table"
+            size="middle"
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            @change="handleTableChange">
+          </a-table>
+        </section>
+        <!-- table区域-end -->
+      </a-card>
+    </a-col>
+  </a-row>
+</template>
+<script>
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getAction } from '@/api/manage'
+  import {queryMaterialCategoryTreeList} from '@/api/api'
+  import { getMpListShort } from "@/utils/util"
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+  import moment from 'moment'
+  import Vue from 'vue'
+  export default {
+    name: "MaterialStock",
+    mixins:[JeecgListMixin],
+    components: {
+      JEllipsis
+    },
+    data () {
+      return {
+        // 查询条件
+        queryParam: {
+          depotId:'',
+          categoryId:'',
+          materialParam:'',
+          mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
+        },
+        depotList: [],
+        categoryTree:[],
+        currentStock: '',
+        currentStockPrice: '',
+        // 表头
+        columns: [
+          {
+            title: '#', dataIndex: '', key:'rowIndex', width:40, align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {title: '条码', dataIndex: 'mBarCode', width: 80},
+          {title: '名称', dataIndex: 'name', width: 80},
+          {title: '规格', dataIndex: 'standard', width: 80},
+          {title: '型号', dataIndex: 'model', width: 80},
+          {title: '颜色', dataIndex: 'color', width: 80},
+          {title: '类别', dataIndex: 'categoryName', width: 80},
+          {title: '单位', dataIndex: 'unitName', width: 80},
+          {title: '单价', dataIndex: 'purchaseDecimal', width: 60},
+          {title: '初始库存', dataIndex: 'initialStock', width: 80},
+          {title: '当前库存', dataIndex: 'currentStock', width: 80},
+          {title: '当前库存金额', dataIndex: 'currentStockPrice', width: 80}
+        ],
+        labelCol: {
+          xs: { span: 1 },
+          sm: { span: 2 },
+        },
+        wrapperCol: {
+          xs: { span: 10 },
+          sm: { span: 16 },
+        },
+        url: {
+          list: "/material/getListWithStock"
+        }
+      }
+    },
+    created() {
+      this.getDepotData()
+      this.loadTreeData()
+    },
+    methods: {
+      moment,
+      getQueryParams() {
+        let param = Object.assign({}, this.queryParam, this.isorter);
+        param.field = this.getQueryField();
+        param.currentPage = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        return param;
+      },
+      getDepotData() {
+        getAction('/depot/findDepotByCurrentUser').then((res)=>{
+          if(res.code === 200){
+            this.depotList = res.data;
+          }else{
+            this.$message.info(res.data);
+          }
+        })
+      },
+      loadTreeData(){
+        let that = this;
+        let params = {};
+        params.id='';
+        queryMaterialCategoryTreeList(params).then((res)=>{
+          if(res){
+            that.categoryTree = [];
+            for (let i = 0; i < res.length; i++) {
+              let temp = res[i];
+              that.categoryTree.push(temp);
+            }
+          }
+        })
+      },
+      searchQuery() {
+        this.loadData(1);
+        this.getTotalCountMoney();
+      },
+      loadData(arg) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          if (res.code===200) {
+            this.dataSource = res.data.rows;
+            this.ipagination.total = res.data.total;
+            this.currentStock = res.data.currentStock;
+            this.currentStockPrice = res.data.currentStockPrice;
+          }
+          if(res.code===510){
+            this.$message.warning(res.data)
+          }
+          this.loading = false;
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>
\ No newline at end of file