Merge remote-tracking branch 'origin/master'

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

@@ -75,6 +75,14 @@ export function selectByOrgSid(data) {
     params: data
   })
 }
+// 根据分公司sid获取该分公司下的所有供应商以及厂商
+export function getGysByOrgSid(data) {
+  return request({
+    url: '/base/v1/basemanufacturer/getGysByOrgSid',
+    method: 'post',
+    params: data
+  })
+}
 // 获取该分公司下的开户账号
 export function selectAccountByUseOrgSid(data) {
   return request({

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@@ -210,7 +210,7 @@ import {
   typeValues,
   getOrgSidByPath,
   fetchBySid,
-  selectByOrgSid,
+  getGysByOrgSid,
   getListOrg,
   brandDown,
   selectNameByOrg
@@ -312,7 +312,7 @@ export default {
     getPathSidByUserSid() {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((response) => {
         if (response.success) {
-          selectByOrgSid({ orgSid: response.data }).then((resp) => {
+          getGysByOrgSid({ orgSid: response.data }).then((resp) => {
             if (resp.success) {
               this.formobj.payCompanySid = response.data
               this.receiveCompany_list = resp.data

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@@ -205,7 +205,7 @@
 
 <script>
 import req from '@/api/anruifinmanagement/payment'
-import { typeValues, getOrgSidByPath, fetchBySid, selectByOrgSid, getListOrg, brandDown, selectNameByOrg } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, getOrgSidByPath, fetchBySid, getGysByOrgSid, getListOrg, brandDown, selectNameByOrg } from '@/api/jichuxinxi/dictcommons'
 import vehcile from './relation/vehcile'
 export default {
   name: 'fukuanEdit',
@@ -307,7 +307,7 @@ export default {
     getPathSidByUserSid() {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((response) => {
         if (response.success) {
-          selectByOrgSid({ orgSid: response.data }).then((resp) => {
+          getGysByOrgSid({ orgSid: response.data }).then((resp) => {
             if (resp.success) {
               this.formobj.payCompanySid = response.data
               this.receiveCompany_list = resp.data