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

2025-01-14 00:19:58 +08:00 · 2025-01-14 00:19:58 +08:00 · 9566071e91
commit 9566071e91
parent edcada7d16
10 changed files with 227 additions and 20 deletions
--- a/jshERP-web/src/views/report/AllocationDetail.vue
+++ b/jshERP-web/src/views/report/AllocationDetail.vue
@ -84,6 +84,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>
                <a-col :md="6" :sm="24">
                  <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
                    <a-input placeholder="请输入备注" v-model="queryParam.remark"></a-input>
@ -165,9 +172,9 @@
 <script>
  import BillDetail from '../bill/dialog/BillDetail'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getFormatDate, getNowFormatYear, getPrevMonthFormatDate } from '@/utils/util'
+  import { getFormatDate, getPrevMonthFormatDate } from '@/utils/util'
  import {getAction} from '@/api/manage'
-  import {findBySelectSup, findBillDetailByNumber, getAllOrganizationTreeByUser} from '@/api/api'
+  import {findBySelectSup, findBillDetailByNumber, queryMaterialCategoryTreeList, getAllOrganizationTreeByUser} from '@/api/api'
  import JEllipsis from '@/components/jeecg/JEllipsis'
  import moment from 'moment'
  import Vue from 'vue'
@ -208,6 +215,7 @@
        supList: [],
        depotList: [],
        orgaTree: [],
+        categoryTree:[],
        operNumberTotalStr: '0',
        allPriceTotalStr: '0',
        tabKey: "1",
@ -251,6 +259,7 @@
      this.getDepotData()
      this.initSupplier()
      this.loadAllOrgaData()
+      this.loadCategoryTreeData()
      this.initColumnsSetting()
    },
    methods: {
@ -316,6 +325,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);
+            }
+          }
+        })
+      },
      myHandleDetail(record) {
        findBillDetailByNumber({ number: record.number }).then((res) => {
          if (res && res.code === 200) {
--- a/jshERP-web/src/views/report/BuyInReport.vue
+++ b/jshERP-web/src/views/report/BuyInReport.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 {findBySelectSup, getAllOrganizationTreeByUser} from '@/api/api'
+  import {findBySelectSup, queryMaterialCategoryTreeList, getAllOrganizationTreeByUser} from '@/api/api'
  import JEllipsis from '@/components/jeecg/JEllipsis'
  import moment from 'moment'
  import Vue from 'vue'
@ -179,6 +186,7 @@
        supList: [],
        depotList: [],
        orgaTree: [],
+        categoryTree:[],
        realityPriceTotal: '',
        tabKey: "1",
        pageName: 'buyInReport',
@ -217,6 +225,7 @@
      this.initSupplier()
      this.getDepotData()
      this.loadAllOrgaData()
+      this.loadCategoryTreeData()
      this.initColumnsSetting()
    },
    methods: {
@ -283,6 +292,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('请选择单据日期！')
--- a/jshERP-web/src/views/report/InDetail.vue
+++ b/jshERP-web/src/views/report/InDetail.vue
@ -85,6 +85,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>
                <a-col :md="6" :sm="24">
                  <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
                    <a-input placeholder="请输入备注" v-model="queryParam.remark"></a-input>
@ -166,9 +173,9 @@
 <script>
  import BillDetail from '../bill/dialog/BillDetail'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getFormatDate, getNowFormatYear, getPrevMonthFormatDate } from '@/utils/util'
+  import { getFormatDate, getPrevMonthFormatDate } from '@/utils/util'
  import {getAction} from '@/api/manage'
-  import {findBySelectOrgan, findBillDetailByNumber, getUserList, getAllOrganizationTreeByUser} from '@/api/api'
+  import {findBySelectOrgan, findBillDetailByNumber, getUserList, queryMaterialCategoryTreeList, getAllOrganizationTreeByUser } from '@/api/api'
  import JEllipsis from '@/components/jeecg/JEllipsis'
  import moment from 'moment'
  import Vue from 'vue'
@ -210,6 +217,7 @@
        depotList: [],
        userList: [],
        orgaTree: [],
+        categoryTree:[],
        operNumberTotalStr: '0',
        allPriceTotalStr: '0',
        tabKey: "1",
@ -258,6 +266,7 @@
      this.initSupplier()
      this.initUser()
      this.loadAllOrgaData()
+      this.loadCategoryTreeData()
      this.initColumnsSetting()
    },
    methods: {
@ -330,6 +339,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);
+            }
+          }
+        })
+      },
      myHandleDetail(record) {
        findBillDetailByNumber({ number: record.number }).then((res) => {
          if (res && res.code === 200) {
--- a/jshERP-web/src/views/report/InMaterialCount.vue
+++ b/jshERP-web/src/views/report/InMaterialCount.vue
@ -70,6 +70,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>
@ -140,9 +147,9 @@
 </template>
 <script>
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getFormatDate, getNowFormatYear, getPrevMonthFormatDate } from '@/utils/util'
+  import { getFormatDate, getPrevMonthFormatDate } from '@/utils/util'
  import {getAction} from '@/api/manage'
-  import {findBySelectOrgan, getAllOrganizationTreeByUser} from '@/api/api'
+  import {findBySelectOrgan, queryMaterialCategoryTreeList, getAllOrganizationTreeByUser} from '@/api/api'
  import JEllipsis from '@/components/jeecg/JEllipsis'
  import moment from 'moment'
  import Vue from 'vue'
@ -179,6 +186,7 @@
        organList: [],
        depotList: [],
        orgaTree: [],
+        categoryTree:[],
        numSumTotalStr: '0',
        priceSumTotalStr: '0',
        tabKey: "1",
@ -214,6 +222,7 @@
      this.getDepotData()
      this.initSupplier()
      this.loadAllOrgaData()
+      this.loadCategoryTreeData()
      this.initColumnsSetting()
    },
    methods: {
@ -279,6 +288,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('请选择单据日期！')
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@ -234,7 +234,7 @@
    },
    created() {
      this.getDepotData()
-      this.loadTreeData()
+      this.loadCategoryTreeData()
      this.initColumnsSetting()
    },
    methods: {
@ -266,7 +266,7 @@
          return ''
        }
      },
-      loadTreeData(){
+      loadCategoryTreeData(){
        let that = this;
        let params = {};
        params.id='';
--- a/jshERP-web/src/views/report/OutDetail.vue
+++ b/jshERP-web/src/views/report/OutDetail.vue
@ -85,6 +85,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>
                <a-col :md="6" :sm="24">
                  <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
                    <a-input placeholder="请输入备注" v-model="queryParam.remark"></a-input>
@ -166,9 +173,9 @@
 <script>
  import BillDetail from '../bill/dialog/BillDetail'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getFormatDate, getNowFormatYear, getPrevMonthFormatDate } from '@/utils/util'
+  import { getFormatDate, getPrevMonthFormatDate } from '@/utils/util'
  import {getAction} from '@/api/manage'
-  import {findBySelectOrgan, findBillDetailByNumber, getUserList, getAllOrganizationTreeByUser} from '@/api/api'
+  import {findBySelectOrgan, findBillDetailByNumber, getUserList, queryMaterialCategoryTreeList, getAllOrganizationTreeByUser} from '@/api/api'
  import JEllipsis from '@/components/jeecg/JEllipsis'
  import moment from 'moment'
  import Vue from 'vue'
@ -210,6 +217,7 @@
        depotList: [],
        userList: [],
        orgaTree: [],
+        categoryTree:[],
        operNumberTotalStr: '0',
        allPriceTotalStr: '0',
        tabKey: "1",
@ -258,6 +266,7 @@
      this.initSupplier()
      this.initUser()
      this.loadAllOrgaData()
+      this.loadCategoryTreeData()
      this.initColumnsSetting()
    },
    methods: {
@ -330,6 +339,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);
+            }
+          }
+        })
+      },
      myHandleDetail(record) {
        findBillDetailByNumber({ number: record.number }).then((res) => {
          if (res && res.code === 200) {
--- a/jshERP-web/src/views/report/OutMaterialCount.vue
+++ b/jshERP-web/src/views/report/OutMaterialCount.vue
@ -70,6 +70,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>
@ -140,9 +147,9 @@
 </template>
 <script>
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { getFormatDate, getNowFormatYear, getPrevMonthFormatDate } from '@/utils/util'
+  import { getFormatDate, getPrevMonthFormatDate } from '@/utils/util'
  import {getAction} from '@/api/manage'
-  import {findBySelectOrgan, getAllOrganizationTreeByUser} from '@/api/api'
+  import {findBySelectOrgan, queryMaterialCategoryTreeList, getAllOrganizationTreeByUser} from '@/api/api'
  import JEllipsis from '@/components/jeecg/JEllipsis'
  import moment from 'moment'
  import Vue from 'vue'
@ -179,6 +186,7 @@
        organList: [],
        depotList: [],
        orgaTree: [],
+        categoryTree:[],
        numSumTotalStr: '0',
        priceSumTotalStr: '0',
        tabKey: "1",
@ -214,6 +222,7 @@
      this.getDepotData()
      this.initSupplier()
      this.loadAllOrgaData()
+      this.loadCategoryTreeData()
      this.initColumnsSetting()
    },
    methods: {
@ -279,6 +288,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('请选择单据日期！')
--- a/jshERP-web/src/views/report/RetailOutReport.vue
+++ b/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('请选择单据日期！')
--- a/jshERP-web/src/views/report/SaleOutReport.vue
+++ b/jshERP-web/src/views/report/SaleOutReport.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 {findBySelectCus, getAllOrganizationTreeByUser} from '@/api/api'
+  import {findBySelectCus, queryMaterialCategoryTreeList, getAllOrganizationTreeByUser} from '@/api/api'
  import JEllipsis from '@/components/jeecg/JEllipsis'
  import moment from 'moment'
  import Vue from 'vue'
@ -179,6 +186,7 @@
        cusList: [],
        depotList: [],
        orgaTree: [],
+        categoryTree:[],
        realityPriceTotal: '',
        tabKey: "1",
        pageName: 'saleOutReport',
@ -217,6 +225,7 @@
      this.initCustomer()
      this.getDepotData()
      this.loadAllOrgaData()
+      this.loadCategoryTreeData()
      this.initColumnsSetting()
    },
    methods: {
@ -285,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('请选择单据日期！')
--- a/jshERP-web/src/views/report/StockWarningReport.vue
+++ b/jshERP-web/src/views/report/StockWarningReport.vue
@ -25,6 +25,13 @@
                  <a-input placeholder="请输入条码、名称、助记码、规格、型号等信息" v-model="queryParam.materialParam"></a-input>
                </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>
              <a-col :md="6" :sm="24">
                <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                  <a-button type="primary" @click="searchQuery">查询</a-button>
@ -103,6 +110,7 @@
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import JEllipsis from '@/components/jeecg/JEllipsis'
  import {getAction} from '@/api/manage'
+  import { queryMaterialCategoryTreeList } from '@/api/api'
  import { getMpListShort } from "@/utils/util"
  import Vue from 'vue'
  export default {
@ -131,6 +139,7 @@
          pageSizeOptions: ['11', '21', '31', '101', '201']
        },
        depotList: [],
+        categoryTree:[],
        tabKey: "1",
        pageName: 'stockWarningReport',
        // 默认索引
@ -167,6 +176,7 @@
    },
    created () {
      this.getDepotData()
+      this.loadCategoryTreeData()
      this.initColumnsSetting()
    },
    methods: {
@ -186,6 +196,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);
+            }
+          }
+        })
+      },
      exportExcel() {
        let list = []
        let head = '仓库,条码,名称,规格,型号,颜色,品牌,制造商,扩展信息,单位,库存,最低安全库存,最高安全库存,建议入库量,建议出库量'