给报表里面增加商品类别的查询条件

jshERP-web/src/views/report/RetailOutReport.vue

@@ -71,6 +71,13 @@
                     </a-tree-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="商品类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <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>
               </template>
             </a-row>
           </a-form>
@@ -141,9 +148,9 @@
 </template>
 <script>
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getNowFormatYear, getMpListShort, getPrevMonthFormatDate, getFormatDate } from '@/utils/util'
+  import { getMpListShort, getPrevMonthFormatDate, getFormatDate } from '@/utils/util'
   import {getAction} from '@/api/manage'
-  import {findBySelectRetail, getAllOrganizationTreeByUser} from '@/api/api'
+  import {findBySelectRetail, queryMaterialCategoryTreeList, getAllOrganizationTreeByUser} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -170,6 +177,7 @@
           organId: undefined,
           depotId: undefined,
           organizationId: undefined,
+          categoryId: undefined,
           mpList: getMpListShort(Vue.ls.get('materialPropertyList')),
         },
         ipagination:{
@@ -180,6 +188,7 @@
         retailList: [],
         depotList: [],
         orgaTree: [],
+        categoryTree:[],
         realityPriceTotal: '',
         tabKey: "1",
         pageName: 'retailOutReport',
@@ -218,12 +227,11 @@
       this.initRetail()
       this.getDepotData()
       this.loadAllOrgaData()
+      this.loadCategoryTreeData()
       this.initColumnsSetting()
     },
     methods: {
       moment,
-      create(){
-      },
       getQueryParams() {
         let param = Object.assign({}, this.queryParam, this.isorter);
         param.monthTime = this.queryParam.monthTime;
@@ -286,6 +294,20 @@
           }
         })
       },
+      loadCategoryTreeData(){
+        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() {
         if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){
           this.$message.warning('请选择单据日期！')