Merge remote-tracking branch 'origin/master'

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

@@ -125,7 +125,7 @@
           <el-col :span="4" class="tleftb">
             <span>采购系统</span>
           </el-col>
-          <el-col>
+          <el-col :span="4">
             <el-form-item>
               <span>{{ formobj.purchaseSystemName }}</span>
             </el-form-item>

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java

@@ -82,6 +82,11 @@ public interface FinManufacturerBankFeign {
     @ResponseBody
     public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(@PathVariable("userSid") String userSid);
 
+    @ApiOperation("获取该分公司下的开户账号:切换机构")
+    @GetMapping("/selectAccountByUseOrgSid")
+    @ResponseBody
+    public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(@RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath);
+
     @ApiOperation("获取该本分公司下的开户账号")
     @GetMapping("/selAccountByOrgSid")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java

@@ -75,6 +75,11 @@ public class FinManufacturerBankFeignFallback implements FinManufacturerBankFeig
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid, String orgPath) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<FinManufacturerVo>> selAccountByOrgSid(FinManufacturerOrgPathQuery query) {
 		return null;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java

@@ -26,13 +26,11 @@
 package com.yxt.anrui.fin.biz.finmanufacturerbank;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo;
 import com.yxt.anrui.fin.api.finmanufacturerbank.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -88,7 +86,12 @@ public class FinManufacturerBankRest implements FinManufacturerBankFeign {
 
     @Override
     public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid) {
-        return finManufacturerBankService.selectAccountByUseOrgSid(userSid);
+        return finManufacturerBankService.selectAccountByUseOrgSid(userSid,"");
+    }
+
+    @Override
+    public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid, String orgPath) {
+        return finManufacturerBankService.selectAccountByUseOrgSid(userSid,orgPath);
     }
 
     @Override

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java

@@ -194,9 +194,14 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
         return rb.success().setData(vo);
     }
 
-    public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid) {
+    public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid,String orgPath) {
         ResultBean<List<FinManufacturerVo>> rb = ResultBean.fireFail();
-        String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        String useOrgSid = "";
+        if(StringUtils.isNotBlank(orgPath)){
+            useOrgSid = sysStaffOrgFeign.getOrgSidByPath(userSid).getData();
+        }else{
+            useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        }
         List<FinManufacturerVo> list = baseMapper.selectAccountByUseOrgSid(useOrgSid);
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue

@@ -196,7 +196,7 @@ import { pagerList } from '@/api/cheliang/cheliangxiaoshou'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { typeValues, getPathSidByUserSid, selectOrgList, selectOrgByLevel } from '@/api/cheliang/dictcommons'
+import { typeValues, getOrgSidByPath, selectOrgList, selectOrgByLevel } from '@/api/cheliang/dictcommons'
 import chelaingxiaoshouInfo from './chelaingxiaoshouInfo'
 import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration'
 
@@ -269,18 +269,18 @@ export default {
           this.payType_list = res.data
         }
       })
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.listQuery.params.createOrgSid = resp.data
           this.getList()
         }
       })
-      selectOrgList({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+      selectOrgList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.org_list = res.data
         }
       })
-      selectOrgByLevel({ orgSidPath: window.sessionStorage.getItem('orgSidPath') }).then((resp) => {
+      selectOrgByLevel({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.userOrg_list = resp.data
         }
@@ -314,7 +314,7 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      this.listQuery.params.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+      this.listQuery.params.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
       pagerList(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false