给采购、销售明细和汇总报表增加机构参数

jshERP-web/src/api/api.js

@@ -20,6 +20,7 @@ const getUserBtnByCurrentUser = (params)=>getAction("/user/getUserBtnByCurrentUs
 const queryPermissionsByUser = (params)=>postAction("/function/findMenuByPNumber",params);
 //机构管理
 const queryOrganizationTreeList = (params)=>getAction("/organization/getOrganizationTree",params);
+const getAllOrganizationTreeByUser = (params)=>getAction("/organization/getAllOrganizationTreeByUser",params);
 const queryOrganizationById = (params)=>getAction("/organization/findById",params);
 const checkOrganization = (params)=>getAction("/organization/checkIsNameExist",params);
 //经手人管理
@@ -127,6 +128,7 @@ export {
   getUserBtnByCurrentUser,
   queryPermissionsByUser,
   queryOrganizationTreeList,
+  getAllOrganizationTreeByUser,
   queryOrganizationById,
   checkOrganization,
   addPerson,

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

@@ -73,6 +73,13 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24" v-if="orgaTree.length">
+                  <a-form-item label="机构" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-tree-select style="width:100%" allow-clear :treeData="orgaTree"
+                                   v-model="queryParam.organizationId" 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>
@@ -130,7 +137,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectSup, findBillDetailByNumber} from '@/api/api'
+  import {findBySelectSup, findBillDetailByNumber, getAllOrganizationTreeByUser} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -157,6 +164,7 @@
           materialParam:'',
           depotId: '',
           depotIdF: '',
+          organizationId: '',
           beginTime: getNowFormatYear() + '-01-01',
           endTime: moment().format('YYYY-MM-DD'),
           subType: "调拨",
@@ -171,6 +179,7 @@
         defaultTimeStr: '',
         supList: [],
         depotList: [],
+        orgaTree: [],
         tabKey: "1",
         // 表头
         columns: [
@@ -205,6 +214,7 @@
     created () {
       this.getDepotData()
       this.initSupplier()
+      this.loadAllOrgaData()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
     mounted () {
@@ -241,6 +251,15 @@
           }
         })
       },
+      loadAllOrgaData(){
+        let that = this
+        let params = {}
+        getAllOrganizationTreeByUser(params).then((res)=>{
+          if(res){
+            that.orgaTree = res
+          }
+        })
+      },
       myHandleDetail(record) {
         findBillDetailByNumber({ number: record.number }).then((res) => {
           if (res && res.code === 200) {

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

@@ -65,6 +65,13 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24" v-if="orgaTree.length">
+                  <a-form-item label="机构" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-tree-select style="width:100%" allow-clear :treeData="orgaTree"
+                                   v-model="queryParam.organizationId" placeholder="请选择机构">
+                    </a-tree-select>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -111,7 +118,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectSup} from '@/api/api'
+  import {findBySelectSup, getAllOrganizationTreeByUser} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -136,6 +143,7 @@
           endTime: moment().format('YYYY-MM-DD'),
           organId: '',
           depotId: '',
+          organizationId: '',
           mpList: getMpListShort(Vue.ls.get('materialPropertyList'))
         },
         ipagination:{
@@ -147,6 +155,7 @@
         defaultTimeStr: '',
         supList: [],
         depotList: [],
+        orgaTree: [],
         realityPriceTotal: '',
         tabKey: "1",
         // 表头
@@ -177,6 +186,7 @@
     created () {
       this.initSupplier()
       this.getDepotData()
+      this.loadAllOrgaData()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
     mounted () {
@@ -234,6 +244,15 @@
           }
         })
       },
+      loadAllOrgaData(){
+        let that = this
+        let params = {}
+        getAllOrganizationTreeByUser(params).then((res)=>{
+          if(res){
+            that.orgaTree = res
+          }
+        })
+      },
       searchQuery() {
         if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){
           this.$message.warning('请选择单据日期！')

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

@@ -74,6 +74,13 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24" v-if="orgaTree.length">
+                  <a-form-item label="机构" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-tree-select style="width:100%" allow-clear :treeData="orgaTree"
+                                   v-model="queryParam.organizationId" 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>
@@ -131,7 +138,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectOrgan, findBillDetailByNumber, getUserList} from '@/api/api'
+  import {findBySelectOrgan, findBillDetailByNumber, getUserList, getAllOrganizationTreeByUser} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -161,6 +168,7 @@
           endTime: moment().format('YYYY-MM-DD'),
           type: "入库",
           creator: "",
+          organizationId: '',
           remark: '',
         },
         ipagination:{
@@ -173,6 +181,7 @@
         organList: [],
         depotList: [],
         userList: [],
+        orgaTree: [],
         tabKey: "1",
         // 表头
         columns: [
@@ -210,6 +219,7 @@
       this.getDepotData()
       this.initSupplier()
       this.initUser()
+      this.loadAllOrgaData()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
     mounted () {
@@ -253,6 +263,15 @@
           }
         });
       },
+      loadAllOrgaData(){
+        let that = this
+        let params = {}
+        getAllOrganizationTreeByUser(params).then((res)=>{
+          if(res){
+            that.orgaTree = res
+          }
+        })
+      },
       myHandleDetail(record) {
         findBillDetailByNumber({ number: record.number }).then((res) => {
           if (res && res.code === 200) {

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

@@ -59,6 +59,13 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24" v-if="orgaTree.length">
+                  <a-form-item label="机构" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-tree-select style="width:100%" allow-clear :treeData="orgaTree"
+                                   v-model="queryParam.organizationId" placeholder="请选择机构">
+                    </a-tree-select>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -105,7 +112,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectOrgan} from '@/api/api'
+  import {findBySelectOrgan, getAllOrganizationTreeByUser} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -129,6 +136,7 @@
           organId: '',
           materialParam:'',
           depotId: '',
+          organizationId: '',
           beginTime: getNowFormatYear() + '-01-01',
           endTime: moment().format('YYYY-MM-DD'),
           type: "入库",
@@ -142,6 +150,7 @@
         defaultTimeStr: '',
         organList: [],
         depotList: [],
+        orgaTree: [],
         tabKey: "1",
         // 表头
         columns: [
@@ -168,6 +177,7 @@
     created () {
       this.getDepotData()
       this.initSupplier()
+      this.loadAllOrgaData()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
     methods: {
@@ -201,6 +211,15 @@
           }
         })
       },
+      loadAllOrgaData(){
+        let that = this
+        let params = {}
+        getAllOrganizationTreeByUser(params).then((res)=>{
+          if(res){
+            that.orgaTree = res
+          }
+        })
+      },
       searchQuery() {
         if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){
           this.$message.warning('请选择单据日期！')

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

@@ -74,6 +74,13 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24" v-if="orgaTree.length">
+                  <a-form-item label="机构" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-tree-select style="width:100%" allow-clear :treeData="orgaTree"
+                                   v-model="queryParam.organizationId" 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>
@@ -131,7 +138,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectOrgan, findBillDetailByNumber, getUserList} from '@/api/api'
+  import {findBySelectOrgan, findBillDetailByNumber, getUserList, getAllOrganizationTreeByUser} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -161,6 +168,7 @@
           endTime: moment().format('YYYY-MM-DD'),
           type: "出库",
           creator: "",
+          organizationId: '',
           remark: ''
         },
         ipagination:{
@@ -173,6 +181,7 @@
         organList: [],
         depotList: [],
         userList: [],
+        orgaTree: [],
         tabKey: "1",
         // 表头
         columns: [
@@ -210,6 +219,7 @@
       this.getDepotData()
       this.initSupplier()
       this.initUser()
+      this.loadAllOrgaData()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
     mounted () {
@@ -253,6 +263,15 @@
           }
         });
       },
+      loadAllOrgaData(){
+        let that = this
+        let params = {}
+        getAllOrganizationTreeByUser(params).then((res)=>{
+          if(res){
+            that.orgaTree = res
+          }
+        })
+      },
       myHandleDetail(record) {
         findBillDetailByNumber({ number: record.number }).then((res) => {
           if (res && res.code === 200) {

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

@@ -59,6 +59,13 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24" v-if="orgaTree.length">
+                  <a-form-item label="机构" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-tree-select style="width:100%" allow-clear :treeData="orgaTree"
+                                   v-model="queryParam.organizationId" placeholder="请选择机构">
+                    </a-tree-select>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -105,7 +112,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectOrgan} from '@/api/api'
+  import {findBySelectOrgan, getAllOrganizationTreeByUser} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -129,6 +136,7 @@
           organId: '',
           materialParam:'',
           depotId: '',
+          organizationId: '',
           beginTime: getNowFormatYear() + '-01-01',
           endTime: moment().format('YYYY-MM-DD'),
           type: "出库",
@@ -142,6 +150,7 @@
         defaultTimeStr: '',
         organList: [],
         depotList: [],
+        orgaTree: [],
         tabKey: "1",
         // 表头
         columns: [
@@ -168,6 +177,7 @@
     created () {
       this.getDepotData()
       this.initSupplier()
+      this.loadAllOrgaData()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
     methods: {
@@ -201,6 +211,15 @@
           }
         })
       },
+      loadAllOrgaData(){
+        let that = this
+        let params = {}
+        getAllOrganizationTreeByUser(params).then((res)=>{
+          if(res){
+            that.orgaTree = res
+          }
+        })
+      },
       searchQuery() {
         if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){
           this.$message.warning('请选择单据日期！')

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

@@ -65,6 +65,13 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24" v-if="orgaTree.length">
+                  <a-form-item label="机构" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-tree-select style="width:100%" allow-clear :treeData="orgaTree"
+                                   v-model="queryParam.organizationId" placeholder="请选择机构">
+                    </a-tree-select>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -111,7 +118,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectRetail} from '@/api/api'
+  import {findBySelectRetail, getAllOrganizationTreeByUser} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -136,6 +143,7 @@
           endTime: moment().format('YYYY-MM-DD'),
           organId: '',
           depotId: '',
+          organizationId: '',
           mpList: getMpListShort(Vue.ls.get('materialPropertyList')),
         },
         ipagination:{
@@ -147,6 +155,7 @@
         defaultTimeStr: '',
         retailList: [],
         depotList: [],
+        orgaTree: [],
         realityPriceTotal: '',
         tabKey: "1",
         // 表头
@@ -177,6 +186,7 @@
     created () {
       this.initRetail()
       this.getDepotData()
+      this.loadAllOrgaData()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
     mounted () {
@@ -236,6 +246,15 @@
           }
         })
       },
+      loadAllOrgaData(){
+        let that = this
+        let params = {}
+        getAllOrganizationTreeByUser(params).then((res)=>{
+          if(res){
+            that.orgaTree = res
+          }
+        })
+      },
       searchQuery() {
         if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){
           this.$message.warning('请选择单据日期！')

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

@@ -65,6 +65,13 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24" v-if="orgaTree.length">
+                  <a-form-item label="机构" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-tree-select style="width:100%" allow-clear :treeData="orgaTree"
+                                   v-model="queryParam.organizationId" placeholder="请选择机构">
+                    </a-tree-select>
+                  </a-form-item>
+                </a-col>
               </template>
             </a-row>
           </a-form>
@@ -111,7 +118,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
   import {getAction} from '@/api/manage'
-  import {findBySelectCus} from '@/api/api'
+  import {findBySelectCus, getAllOrganizationTreeByUser} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   import Vue from 'vue'
@@ -136,6 +143,7 @@
           endTime: moment().format('YYYY-MM-DD'),
           organId: '',
           depotId: '',
+          organizationId: '',
           mpList: getMpListShort(Vue.ls.get('materialPropertyList')),
         },
         ipagination:{
@@ -147,6 +155,7 @@
         defaultTimeStr: '',
         cusList: [],
         depotList: [],
+        orgaTree: [],
         realityPriceTotal: '',
         tabKey: "1",
         // 表头
@@ -177,6 +186,7 @@
     created () {
       this.initCustomer()
       this.getDepotData()
+      this.loadAllOrgaData()
       this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
     },
     mounted () {
@@ -236,6 +246,15 @@
           }
         })
       },
+      loadAllOrgaData(){
+        let that = this
+        let params = {}
+        getAllOrganizationTreeByUser(params).then((res)=>{
+          if(res){
+            that.orgaTree = res
+          }
+        })
+      },
       searchQuery() {
         if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){
           this.$message.warning('请选择单据日期！')