Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@@ -69,8 +69,9 @@ export function selectByOrgSid(data) {
 // 获取该分公司下的开户账号
 export function selectAccountByUseOrgSid(data) {
   return request({
-    url: '/fin/v1/finmanufacturerbank/selectAccountByUseOrgSid/' + data,
-    method: 'get'
+    url: '/fin/v1/finmanufacturerbank/selectAccountByUseOrgSid',
+    method: 'get',
+    params: data
   })
 }
 

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaipiaoxinxiAdd.vue

@@ -132,7 +132,7 @@ export default {
           this.bank_list = res.data
         }
       })
-      selectOrgByLevel({ orgSidPath: window.sessionStorage.getItem('orgSidPath') }).then((resp) => {
+      selectOrgByLevel({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.org_list = resp.data
         }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaixiaoxinxiguanli.vue

@@ -161,7 +161,7 @@ export default {
   },
   methods: {
     init() {
-      selectOrgByLevel({ orgSidPath: window.sessionStorage.getItem('orgSidPath') }).then((resp) => {
+      selectOrgByLevel({ orgSidPath: window.sessionStorage.getItem('defauleOrgPath') }).then((resp) => {
         if (resp.success) {
           this.org_list = resp.data
         }
@@ -209,7 +209,7 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      this.listQuery.params.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+      this.listQuery.params.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
       req.listPage(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.success) {

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue

@@ -265,7 +265,7 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import upload from '@/components/uploadFile/upload'
-import { typeValues, selectAccountByUseOrgSid, getDetailsList, getPathSidByUserSid, getBankList } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, selectAccountByUseOrgSid, getDetailsList, getOrgSidByPath, getBankList } from '@/api/jichuxinxi/dictcommons'
 import req from '@/api/anruifinmanagement/chunafukuan/cashier'
 import { getStorage } from '@/utils/auth'
 
@@ -353,7 +353,8 @@ export default {
           createEndDate: '',
           createStartDate: '',
           state: '',
-          userSid: ''
+          userSid: '',
+          orgPath: ''
         },
         current: 1,
         size: 10,
@@ -439,12 +440,12 @@ export default {
           this.payWay_list = res.data
         }
       })
-      selectAccountByUseOrgSid(window.sessionStorage.getItem('userSid')).then((resp) => {
+      selectAccountByUseOrgSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.payBankAccount_list = resp.data
         }
       })
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           getDetailsList({ orgSid: res.data }).then((resp) => {
             if (resp.success) {
@@ -492,6 +493,7 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
@@ -517,7 +519,8 @@ export default {
           createEndDate: '',
           createStartDate: '',
           state: '',
-          userSid: ''
+          userSid: '',
+          orgPath: ''
         },
         current: 1,
         size: 10,

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@@ -422,7 +422,7 @@ export default {
           }
         })
       })
-      selAccountByOrgSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: '' }).then((resp) => {
+      selAccountByOrgSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.collectionBankNum_list = resp.data
         }

anrui-scm/anrui-scm-ui/src/views/othermenu/affichetype/gonggaoAdd.vue

@@ -86,7 +86,7 @@
 
 <script>
 import req from '@/api/othermenu/gonggaoxinghao'
-import { getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'gongggaoxinghaoAdd',
@@ -123,7 +123,7 @@ export default {
           this.tyre_list = res.data
         }
       })
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.formobj.createOrgSid = resp.data
           this.formobj.useOrgSid = resp.data

anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtaizhangchoose.vue

@@ -104,7 +104,7 @@
 import req from '@/api/othermenu/shangzhuangtiaojia'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
-import { getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'shangzhuangtaizhangchoose',
@@ -148,7 +148,7 @@ export default {
   },
   methods: {
     init() {
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.queryParams.params.createOrgSid = res.data
           this.loadList()