Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue

@@ -159,7 +159,7 @@ import req from '@/api/purchasingchannels/purchasingchannels'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { getPathSidByUserSid, selectOrgLists, typeValues } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, selectOrgLists, typeValues } from '@/api/cheliang/dictcommons'
 import { getStorage } from '@/utils/auth'
 import saleOrder from '@/components/publicPage/saleOrder'
 
@@ -296,7 +296,7 @@ export default {
           this.orgDept_list = res.data
         }
       })
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.listQuery.params.useOrgSid = res.data
           // 加载列表

anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue

@@ -143,7 +143,7 @@
 
 <script>
 import req from '@/api/purchasingchannels/purchasingchannels'
-import { getPathSidByUserSid, selectOrgLists, typeValues } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, selectOrgLists, typeValues } from '@/api/cheliang/dictcommons'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
@@ -290,7 +290,7 @@ export default {
           this.orgDept_list = res.data
         }
       })
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.listQuery.params.useOrgSid = res.data
           // 加载列表