diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
index 08347798ba..b43ebcc4e7 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
@@ -235,4 +235,15 @@ public interface BaseManufacturerFeign {
     @GetMapping("/selectByInternalPurchaseSid/{buyerOrgSid}/{sellerOrgName}")
     @ResponseBody
     ResultBean<String> selectByInternalPurchaseSid(@PathVariable("buyerOrgSid")String buyerOrgSid,@PathVariable("sellerOrgName") String sellerOrgName);
+
+    @ApiOperation("查询分公司下的供应商信息和主机厂信息")
+    @GetMapping("/getDetailsList")
+    @ResponseBody
+    ResultBean<List<ManufacturerVo>> getDetailsList(@RequestParam("orgSid")String orgSid);
+
+    @ApiOperation("查询供应商下的开户行信息")
+    @GetMapping("/getBankList")
+    @ResponseBody
+    ResultBean<List<ManBankVo>> getBankList(@RequestParam("sid")String sid);
+
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
index 3cd43bfee9..5cffb7268e 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
@@ -145,4 +145,14 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
     public ResultBean<String> selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<ManufacturerVo>> getDetailsList(String orgSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<ManBankVo>> getBankList(String sid) {
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/ManBankVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/ManBankVo.java
new file mode 100644
index 0000000000..603c81cc31
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/ManBankVo.java
@@ -0,0 +1,22 @@
+package com.yxt.anrui.base.api.basemanufacturer;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/7 16:40
+ * @Description
+ */
+@Data
+public class ManBankVo implements Vo {
+    private static final long serialVersionUID = 7602748514129847222L;
+    @ApiModelProperty("收款银行名称")
+    private String receiveBank;
+    @ApiModelProperty("收款银行账号")
+    private String receiveBankAccount;
+
+
+
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/ManufacturerVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/ManufacturerVo.java
new file mode 100644
index 0000000000..2cfdcbf5ab
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/ManufacturerVo.java
@@ -0,0 +1,23 @@
+package com.yxt.anrui.base.api.basemanufacturer;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/7 16:39
+ * @Description
+ */
+@Data
+public class ManufacturerVo implements Vo {
+    private static final long serialVersionUID = 6527095329799323031L;
+    @ApiModelProperty("供应商sid")
+    private String sid;
+    @ApiModelProperty("供应商编码")
+    private String payCode;
+    @ApiModelProperty("供应商名称")
+    private String name;
+
+
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java
index 2affb82760..c2d029a3a8 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java
@@ -37,4 +37,6 @@ public class BusVehicleApplyQuery implements Query {
 
     @ApiModelProperty("采购原因")
     private String schedulingTypeKey;
+
+    private String applicationCode;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
index 336434f485..300f1d50f0 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
@@ -149,4 +149,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
     List<BaseManufacturerVo> getGysByOrgSid(String orgSid);
 
     List<BaseManufacturerVo> getGysTypeByOrgSid(@Param("orgSid") String orgSid,@Param("supplierType") String supplierType);
+
+    List<ManufacturerVo> getDetailsList(String orgSid);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
index ad7babfcdb..b2548c3985 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
@@ -339,4 +339,15 @@
         WHERE createOrg = #{orgSid}
         AND supplierType = #{supplierType}
     </select>
+
+    <select id="getDetailsList" resultType="com.yxt.anrui.base.api.basemanufacturer.ManufacturerVo">
+        SELECT bm.manufacturerName name,bm.manufacturerCode payCode,bm.sid
+        FROM base_manufacturer bm
+        where bm.createOrg = #{orgSid} and bm.isDelete = 0
+        union all
+        SELECT bm.manufacturerName name,bm.manufacturerCode payCode,bm.sid
+        FROM base_manufacturer bm
+        left join base_vehicle_brand bb on bb.manufacturerSid = bm.sid
+        where bm.supplierType = '0001' and bm.isDelete = 0 and bb.useOrg like concat('%',#{orgSid},'%')
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
index ba5f285313..46a7007616 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
@@ -5,7 +5,6 @@ import com.yxt.anrui.base.api.basemanufacturer.*;
 import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
 import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -20,8 +19,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -236,4 +237,14 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
     public ResultBean<String> selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) {
         return baseManufacturerService.selectByInternalPurchaseSid(buyerOrgSid,sellerOrgName);
     }
+
+    @Override
+    public ResultBean<List<ManufacturerVo>> getDetailsList(String orgSid) {
+        return baseManufacturerService.getDetailsList(orgSid);
+    }
+
+    @Override
+    public ResultBean<List<ManBankVo>> getBankList(String sid) {
+        return baseManufacturerService.getBankList(sid);
+    }
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
index c3ce6b3cbb..3f39139e1f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
@@ -734,4 +734,19 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         List<BaseManufacturerVo> baseManufacturerVos = baseMapper.getGysTypeByOrgSid(orgSid,supplierType);
         return rb.success().setData(baseManufacturerVos);
     }
+
+    public ResultBean<List<ManufacturerVo>> getDetailsList(String orgSid) {
+        ResultBean<List<ManufacturerVo>> rb = ResultBean.fireFail();
+        List<ManufacturerVo> voList = baseMapper.getDetailsList(orgSid);
+        if(voList.size() == 0){
+            voList = new ArrayList<>();
+        }
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean<List<ManBankVo>> getBankList(String sid) {
+        ResultBean<List<ManBankVo>> rb = ResultBean.fireFail();
+        List<ManBankVo> bankVoList = baseManufacturerBankService.getBankList(sid);
+        return rb.success().setData(bankVoList);
+    }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java
index f6e67b37b1..f911ddd477 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java
@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.biz.basemanufacturerbank;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.base.api.basemanufacturer.ManBankVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
@@ -73,4 +74,11 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
     BaseManufacturerBankVo details(String sid);
 
     String selectBankAccount(@Param("brandSid") String brandSid,@Param("manufaSaleChannelValue") String manufaSaleChannelValue);
+
+    /**
+     * 根据供应商sid获取开户行信息
+     * @param sid 供应商sid
+     * @return
+     */
+    List<ManBankVo> getBankList(String sid);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
index a8fe6d7530..e6a4ca8925 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
@@ -162,4 +162,8 @@
           AND bm.isDelete = 0
           AND bmb.actualPay != ""
     </select>
+
+    <select id="getBankList" resultType="com.yxt.anrui.base.api.basemanufacturer.ManBankVo">
+        select depositBank as receiveBank,bankAccount as receiveBankAccount from base_manufacturer_bank where manufacturerSid = #{sid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java
index 409b200527..60914fa74f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java
@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.biz.basemanufacturerbank;
 
+import com.yxt.anrui.base.api.basemanufacturer.ManBankVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank;
@@ -97,4 +98,8 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
         String bankAccount = baseMapper.selectBankAccount(brandSid, manufaSaleChannelValue);
         return rb.success().setData(bankAccount);
     }
+
+    public List<ManBankVo> getBankList(String sid) {
+        return baseMapper.getBankList(sid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
index 5a1a63a8ec..d5bfee2989 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
@@ -152,6 +152,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if (StringUtils.isNotBlank(query.getSchedulingTypeKey())) {
                 qw.eq("bva.schedulingTypeKey", query.getSchedulingTypeKey());
             }
+            if(StringUtils.isNotBlank(query.getApplicationCode())){
+                qw.like("bva.applicationCode", query.getApplicationCode());
+            }
 
             //查询分公司sid
 //            if (StringUtils.isNotBlank(query.getUserSid())) {
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml
index ac06c46d52..ec965f6dc7 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml
@@ -58,7 +58,7 @@
         where bd.vehicleSid = #{modelSid}
           and bd.configSid = #{configSid} and length(bo.orderNo)>0
           and length (bo.platformNo)
-            > 0
+            > 0 and bo.platformNo != bo.lockingNum
     </select>
 
     <select id="getVehicleApply" resultType="com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyListVo">
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js
index a22e56b195..56117fc3d1 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js
+++ b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js
@@ -107,3 +107,20 @@ export function fetchDetailsByUseOrgSid(data) {
   })
 }
 
+// 根据分公司Sid获取供应商（暂时只适用于出纳付款--办理）
+export function getDetailsList(data) {
+  return request({
+    url: '/base/v1/basemanufacturer/getDetailsList',
+    params: data,
+    method: 'GET'
+  })
+}
+// 根据供应商sid获取开户行账号下拉框
+export function getBankList(data) {
+  return request({
+    url: '/base/v1/basemanufacturer/getBankList',
+    params: data,
+    method: 'GET'
+  })
+}
+
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
index 779a8a59d5..26cc17886b 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue
@@ -148,9 +148,49 @@
     <el-dialog :visible.sync="dialogUrlVisible" :append-to-body="true">
       <img width="100%" :src="dialogUrl" alt="">
     </el-dialog>
-    <el-dialog :visible.sync="dialogVisible" width="50%" center :show-close="false">
+    <el-dialog :visible.sync="dialogVisible" width="60%" center :show-close="false">
       <el-form ref="form_obj" :rules="rules" :model="formobj" class="formadd">
         <el-row style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4">
+            <span><span class="icon">*</span>收款单位名称</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="receiveCompany">
+              <el-select v-model="formobj.receiveCompany" placeholder="请选择" @change="changerRceiveCompany" clearable>
+                <el-option v-for="item in receiveCompany_list" :key="item.sid" :label="item.name" :value="item.name"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <span><span class="icon">*</span>收款银行账号</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="receiveBankAccount">
+              <el-select v-model="formobj.receiveBankAccount" placeholder="请选择" @change="changeReceiveBankAccount" clearable>
+                <el-option v-for="item in receiveBankAccount_list" :key="item.receiveBankAccount" :label="item.receiveBankAccount" :value="item.receiveBankAccount"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4">
+            <span>收款账户开户行</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ formobj.receiveBank }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <span><span class="icon">*</span>付款金额</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="cost">
+              <el-input v-model="formobj.cost" clearable placeholder="" class="addinputw" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="4">
             <span><span class="icon">*</span>付款方式</span>
           </el-col>
@@ -225,12 +265,12 @@ 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 } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, selectAccountByUseOrgSid, getDetailsList, getPathSidByUserSid, getBankList } from '@/api/jichuxinxi/dictcommons'
 import req from '@/api/anruifinmanagement/chunafukuan/cashier'
 import { getStorage } from '@/utils/auth'
 
 export default {
-  name: 'cashier',
+  name: 'Cashier',
   components: {
     Pagination,
     pageye,
@@ -302,6 +342,8 @@ export default {
       costType_list: [],
       costTitle_list: [],
       payWay_list: [],
+      receiveCompany_list: [],
+      receiveBankAccount_list: [],
       FormLoading: false,
       listLoading: false,
       listQuery: {
@@ -327,13 +369,21 @@ export default {
         payWayKey: '',
         payWayValue: '',
         sids: [],
-        userSid: ''
+        userSid: '',
+        receiveCompany: '', // 供应商名称
+        receiveBank: '', // 收款银行名称
+        receiveBankAccount: '', // 收款银行账号
+        payCode: '', // 供应商编码
+        cost: ''
       },
       imgList: [],
       rules: {
         payWayValue: [{ required: true, message: '请选择付款方式', trigger: 'change' }],
         payDate: [{ required: true, message: '请选择付款日期', trigger: 'blur' }],
-        payBankAccount: [{ required: true, message: '请选择付款账号', trigger: 'change' }]
+        payBankAccount: [{ required: true, message: '请选择付款账号', trigger: 'change' }],
+        receiveCompany: [{ required: true, message: '收款单位不能为空', trigger: 'change' }],
+        receiveBankAccount:  [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }],
+        cost: [{ required: true, message: '付款金额不能为空', trigger: 'blur' }]
       }
     }
   },
@@ -394,6 +444,15 @@ export default {
           this.payBankAccount_list = resp.data
         }
       })
+      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          getDetailsList({ orgSid: res.data }).then((resp) => {
+            if (resp.success) {
+              this.receiveCompany_list = resp.data
+            }
+          })
+        }
+      })
       this.getList()
     },
     changePayBankAccount(value) {
@@ -414,7 +473,10 @@ export default {
       const bb = []
       row.forEach(element => {
         aa.push(element.sid)
-        bb.push(element.state)
+        bb.push({
+          state: element.state,
+          receiveBankAccount: element.receiveBankAccount
+        })
       })
       this.sids = aa
       this.nodeState_list = bb
@@ -475,6 +537,19 @@ export default {
       })
       this.formobj.payWayKey = bb.key
     },
+    changerRceiveCompany(value) {
+      const choose = this.receiveCompany_list.filter((item) => item.name === value)
+      this.formobj.payCode = choose[0].payCode
+      getBankList({ sid: choose[0].sid }).then((res) => {
+        if (res.success) {
+          this.receiveBankAccount_list = res.data
+        }
+      })
+    },
+    changeReceiveBankAccount(value) {
+      const choose = this.receiveBankAccount_list.filter((item) => item.receiveBankAccount === value)
+      this.formobj.receiveBank = choose[0].receiveBank
+    },
     handleGetCheck(row) {
       this.dialogImgVisible = true
       this.url_list = row.payFiles
@@ -533,6 +608,10 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      this.formobj.receiveCompany = row.receiveCompany
+      this.formobj.receiveBankAccount = row.receiveBankAccount
+      this.formobj.receiveBank = row.receiveBank
+      this.formobj.payCode = row.payCode
       const aa = []
       aa.push(row.sid)
       this.sids = aa
@@ -542,12 +621,17 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '请选择至少一条以上记录进行批量处理' })
         return
       } else {
+        console.log(this.nodeState_list)
         if (this.nodeState_list.length > 0) {
           for (var i = 0; i < this.nodeState_list.length; i++) {
-            if (this.nodeState_list[i] !== '未支付') {
+            if (this.nodeState_list[i].state !== '未支付') {
               this.$message({ showClose: true, type: 'error', message: '因选择的记录中包含已支付的,操作失败' })
               return
             }
+            if (this.nodeState_list[i].receiveBankAccount !== this.nodeState_list[this.nodeState_list.length - 1].receiveBankAccount) {
+              this.$message({ showClose: true, type: 'error', message: '因选择的记录中存在收款账号不一致的,操作失败' })
+              return
+            }
           }
           this.$nextTick(() => {
             this.$refs['form_obj'].clearValidate()
@@ -604,7 +688,7 @@ export default {
       }
       if (this.nodeState_list.length > 0) {
         for (var i = 0; i < this.nodeState_list.length; i++) {
-          if (this.nodeState_list[i] !== '未支付') {
+          if (this.nodeState_list[i].state !== '未支付') {
             this.$message({ showClose: true, type: 'error', message: '因选择的记录中包含已支付的,操作失败' })
             return
           }
@@ -645,7 +729,12 @@ export default {
         payWayKey: '',
         payWayValue: '',
         sids: [],
-        userSid: ''
+        userSid: '',
+        receiveCompany: '', // 供应商名称
+        receiveBank: '', // 收款银行名称
+        receiveBankAccount: '', // 收款银行账号
+        payCode: '', // 供应商编码
+        cost: ''
       }
       this.diploma_list = []
       this.$refs['form_obj'].resetFields()
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
index 5b6c4a8855..21f4779097 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
@@ -326,4 +326,7 @@ export default {
 </script>
 
 <style scoped>
+.titwu {
+  padding-bottom: 0;
+}
 </style>
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java
index 1360a0b51d..58cd60c4b3 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordUpdateDto.java
@@ -40,4 +40,14 @@ public class FinPaymentrecordUpdateDto implements Dto {
 
     @ApiModelProperty(value = "付款凭证")
     private List<String> payFiles;
+    @ApiModelProperty("收款单位名称")
+    private String receiveCompany;
+    @ApiModelProperty("收款账号")
+    private String receiveBankAccount;
+    @ApiModelProperty("收款银行名称")
+    private String receiveBank;
+    @ApiModelProperty("供应商编码")
+    private String payCode;
+    @ApiModelProperty("金额")
+    private String cost;
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java
index 01c8b400ac..0cefb03eab 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java
@@ -84,5 +84,7 @@ public class FinPaymentrecordVo implements Vo {
     private List<String> payFiles;
 
     private String payFile;
+    @ApiModelProperty("供应商编码")
+    private String payCode;
 
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
index 123870f420..b1c63fc43d 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
@@ -22,7 +22,8 @@
                fp.receiveBankAccount,
                fp.receiveBank,
                fp.cost,
-               fp.payFile
+               fp.payFile,
+               fp.payCode
         FROM fin_paymentrecord fp
         <where>
             ${ew.sqlSegment}
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
index 1c60e344da..d28bcb9219 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
@@ -83,7 +83,9 @@ public class SysUserVo implements Vo {
     private List<String> roleSids = new ArrayList<>();
 
     private List<OrgList> orgList = new ArrayList<>();
+    @ApiModelProperty("默认的组织机构sid全路径")
     private String defaultOrgPath;
+    @ApiModelProperty("默认的组织机构名称全路径")
     private String defaultOrgPathName;
 
     @ApiModelProperty("是否需要更换密码")
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysOrgPathList.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysOrgPathList.java
new file mode 100644
index 0000000000..a17d54ca25
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysOrgPathList.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.portal.api.sysuserdefaultorg;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/11 13:29
+ * @Description
+ */
+@Data
+public class SysOrgPathList implements Vo {
+    private static final long serialVersionUID = 2356384382464107570L;
+
+    @ApiModelProperty("组织机构全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty("组织机构全路径名称")
+    private String orgNamePath;
+}
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrg.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrg.java
new file mode 100644
index 0000000000..610196940d
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrg.java
@@ -0,0 +1,23 @@
+package com.yxt.anrui.portal.api.sysuserdefaultorg;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/11 11:23
+ * @Description
+ */
+@Data
+public class SysUserDefaultOrg extends BaseEntity {
+    private static final long serialVersionUID = 3567627566535174850L;
+
+    @ApiModelProperty("人员sid")
+    private String staffSid;
+    @ApiModelProperty("默认的组织机构sid")
+    private String orgSidPath;
+    @ApiModelProperty("默认的组织机构名称")
+    private String orgNamePath;
+
+}
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgDto.java
new file mode 100644
index 0000000000..61483c154b
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgDto.java
@@ -0,0 +1,22 @@
+package com.yxt.anrui.portal.api.sysuserdefaultorg;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/11 14:18
+ * @Description
+ */
+@Data
+public class SysUserDefaultOrgDto implements Dto {
+    private static final long serialVersionUID = 3069749900524077996L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("设置的默认组织全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty("设置的默认组织全路径名称")
+    private String orgNamePath;
+}
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgFeign.java
new file mode 100644
index 0000000000..8ad612b78d
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgFeign.java
@@ -0,0 +1,31 @@
+package com.yxt.anrui.portal.api.sysuserdefaultorg;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/11 11:24
+ * @Description
+ */
+@Api(tags = "用户默认的组织机构表")
+@FeignClient(
+        contextId = "anrui-portal-SysUserDefaultOrg",
+        name = "anrui-portal",
+        path = "v1/sysuserdefaultorg",
+        fallback = SysUserDefaultOrgFeignFallback.class)
+public interface SysUserDefaultOrgFeign {
+
+    @ApiOperation("获取用户的默认机构")
+    @GetMapping("/getList")
+    @ResponseBody
+    ResultBean<SysUserDefaultOrgVo> getList(@RequestParam("userSid") String userSid);
+
+    @ApiOperation("设置默认组织机构")
+    @PostMapping("/saveOrUpdate")
+    @ResponseBody
+    ResultBean saveOrUpdate(@RequestBody SysUserDefaultOrgDto dto);
+}
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgFeignFallback.java
new file mode 100644
index 0000000000..5c819e330c
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgFeignFallback.java
@@ -0,0 +1,22 @@
+package com.yxt.anrui.portal.api.sysuserdefaultorg;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/11 11:26
+ * @Description
+ */
+@Component
+public class SysUserDefaultOrgFeignFallback implements SysUserDefaultOrgFeign{
+    @Override
+    public ResultBean<SysUserDefaultOrgVo> getList(String userSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveOrUpdate(SysUserDefaultOrgDto dto) {
+        return null;
+    }
+}
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgQuery.java
new file mode 100644
index 0000000000..a1d7e4a052
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgQuery.java
@@ -0,0 +1,14 @@
+package com.yxt.anrui.portal.api.sysuserdefaultorg;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/11 11:52
+ * @Description
+ */
+@Data
+public class SysUserDefaultOrgQuery implements Query {
+    private static final long serialVersionUID = 549888513841147615L;
+}
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgVo.java
new file mode 100644
index 0000000000..6a369f694d
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserdefaultorg/SysUserDefaultOrgVo.java
@@ -0,0 +1,26 @@
+package com.yxt.anrui.portal.api.sysuserdefaultorg;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/11 11:52
+ * @Description
+ */
+@Data
+public class SysUserDefaultOrgVo implements Vo {
+    private static final long serialVersionUID = -4852902800844447195L;
+    
+    @ApiModelProperty("设置的默认的组织机构名称")
+    private String orgNamePath;
+    @ApiModelProperty("设置的默认的组织机构sid")
+    private String orgSidPath;
+    @ApiModelProperty("当前用户所有的组织机构list")
+    private List<SysOrgPathList> list;
+
+
+}
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java
index 3fe7530b9b..a0259e6b64 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDetailsVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
+import com.yxt.anrui.portal.api.sysuserdefaultorg.SysOrgPathList;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -106,4 +107,6 @@ public interface SysStaffOrgMapper extends BaseMapper<SysStaffOrg> {
     String selectByUserSid(String userSid);
 
     List<SysStaffOrg> selectOrgBySid(@Param("orgPath") String orgPath, @Param("staffSid") String staffSid);
+
+    List<SysOrgPathList> getList(String staffSid);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml
index 151ad28ede..5ca6083a21 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml
@@ -108,4 +108,8 @@
     <select id="selectOrgBySid" resultType="com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg">
         select * from sys_staff_org sso where sso.orgSidPath=#{orgPath} and sso.staffSid = #{staffSid}
     </select>
+
+    <select id="getList" resultType="com.yxt.anrui.portal.api.sysuserdefaultorg.SysOrgPathList">
+        select sid as staffOrgSid,orgSidPath,orgNamePath from sys_staff_org where staffSid = #{staffSid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
index 776726b07b..fe13b2a9e3 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysstafforg.*;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
+import com.yxt.anrui.portal.api.sysuserdefaultorg.SysOrgPathList;
 import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -303,4 +304,8 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
         orgPath = sysOrganizationService.getOrgSid(orgSid);
         return rb.success().setData(orgPath);
     }
+
+    public List<SysOrgPathList> getList(String staffSid) {
+        return baseMapper.getList(staffSid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
index 2a483270da..5e2370a928 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
@@ -19,11 +19,13 @@ import com.yxt.anrui.portal.api.sysuser.app.OrgList;
 import com.yxt.anrui.portal.api.sysuser.wx.WxHomePageVo;
 import com.yxt.anrui.portal.api.sysuser.wx.WxMySysUserInfoVo;
 import com.yxt.anrui.portal.api.sysuser.wx.WxSysUserVo;
+import com.yxt.anrui.portal.api.sysuserdefaultorg.SysUserDefaultOrg;
 import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService;
 import com.yxt.anrui.portal.biz.sysrole.SysRoleService;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysstaffpost.SysStaffPostService;
+import com.yxt.anrui.portal.biz.sysuserdefaultorg.SysUserDefaultOrgService;
 import com.yxt.anrui.portal.config.DictCommonType;
 import com.yxt.anrui.portal.utils.MsgWs;
 import com.yxt.common.base.config.RedisUtil;
@@ -101,6 +103,9 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     @Autowired
     private SysRoleService sysRoleService;
 
+    @Autowired
+    private SysUserDefaultOrgService sysUserDefaultOrgService;
+
 
     public PagerVo<SysUser> listPage(PagerQuery<SysUserQuery> pq) {
         SysUserQuery query = pq.getParams();
@@ -341,9 +346,6 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 userInfoOneVo.setName(staffVo.getName());
                 userInfoOneVo.setMobile(staffVo.getMobile());
                 userInfoOneVo.setStaffSid(staffVo.getSid());
-//                userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
-//                userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
-
             }
             // 尚无单位人员，没有单位和部门信息
             if ("3".equals(user.getIsAdmin())) {
@@ -372,16 +374,21 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                     userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath());
                     userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath());
                     //根据orgSidPath查询分公司sid=====
-                    userInfoOneVo.setDefaultOrgPath(sysStaffOrg.getOrgSidPath());
-                    userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath());
-                   /* String orgSid = sysStaffOrgService.getOrgByOrgSid(sysStaffOrgVo.getOrgSid());
-                    SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
-                    if (sysOrganization != null) {
-                        userInfoOneVo.setDefaultOrgPathName(sysOrganization.getName());
-                        userInfoOneVo.setDefaultOrgPath(sysOrganization.getSid());
-                    } else {
-                        userInfoOneVo.setDefaultOrgPathName("暂无组织机构");
-                    }*/
+                    //根据用户sid查询用户是否设置了默认的组织机构
+                    SysUserDefaultOrg sysUserDefaultOrg = sysUserDefaultOrgService.selectByUserSid(user.getSid());
+                    if(sysUserDefaultOrg == null){
+                        userInfoOneVo.setDefaultOrgPath(sysStaffOrg.getOrgSidPath());
+                        userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath());
+                    }else{
+                        List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(user.getStaffSid());
+                        sysStaffOrgVos.removeAll(Collections.singleton(null));
+                        List<String> orgSidPathList = sysStaffOrgVos.stream().map(v->v.getOrgSidPath()).collect(Collectors.toList());
+                        if(!orgSidPathList.contains(sysUserDefaultOrg.getOrgSidPath())){
+                            sysUserDefaultOrgService.deleteByUserSid(user.getSid());
+                        }
+                        userInfoOneVo.setDefaultOrgPath(sysUserDefaultOrg.getOrgSidPath());
+                        userInfoOneVo.setDefaultOrgPathName(sysUserDefaultOrg.getOrgNamePath());
+                    }
                 }
             }
         }
@@ -395,14 +402,6 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         if (sysStaffOrgVos.size() > 0) {
             for (SysStaffOrgVo vv : sysStaffOrgVos) {
                 OrgList orgList1 = new OrgList();
-                /*String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid());
-                SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid);
-                if (sysOrganization != null) {
-                    orgList1.setOrgName(sysOrganization.getName());
-                    orgList1.setOrgPath(sysOrganization.getSid());
-                } else {
-                    continue;
-                }*/
                 orgList1.setOrgPath(vv.getOrgSidPath());
                 orgList1.setOrgName(vv.getOrgNamePath());
                 orgList.add(orgList1);
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.java
new file mode 100644
index 0000000000..e761c95ad3
--- /dev/null
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.java
@@ -0,0 +1,17 @@
+package com.yxt.anrui.portal.biz.sysuserdefaultorg;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.portal.api.sysuserdefaultorg.SysUserDefaultOrg;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/11 11:27
+ * @Description
+ */
+@Mapper
+public interface SysUserDefaultOrgMapper extends BaseMapper<SysUserDefaultOrg> {
+    SysUserDefaultOrg selectByUserSid(String userSid);
+
+    int deleteByUserSid(String userSid);
+}
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.xml
new file mode 100644
index 0000000000..808e0ca72e
--- /dev/null
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yxt.anrui.portal.biz.sysuserdefaultorg.SysUserDefaultOrgMapper">
+    <select id="selectByUserSid" resultType="com.yxt.anrui.portal.api.sysuserdefaultorg.SysUserDefaultOrg">
+        select *
+        from sys_user_default_org
+        where createBySid = #{userSid}
+        order by id desc
+        limit 1
+    </select>
+
+    <delete id="deleteByUserSid">
+        delete
+        from sys_user_default_org
+        where createBySid = #{userSid}
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserdefaultorg/SysUserDefaultOrgRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserdefaultorg/SysUserDefaultOrgRest.java
new file mode 100644
index 0000000000..c6c3ee6511
--- /dev/null
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserdefaultorg/SysUserDefaultOrgRest.java
@@ -0,0 +1,34 @@
+package com.yxt.anrui.portal.biz.sysuserdefaultorg;
+
+import com.yxt.anrui.portal.api.sysuserdefaultorg.SysUserDefaultOrgDto;
+import com.yxt.anrui.portal.api.sysuserdefaultorg.SysUserDefaultOrgFeign;
+import com.yxt.anrui.portal.api.sysuserdefaultorg.SysUserDefaultOrgVo;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/11 11:26
+ * @Description
+ */
+@Api(tags = "用户默认的组织机构")
+@RestController
+@RequestMapping("v1/sysuserdefaultorg")
+public class SysUserDefaultOrgRest implements SysUserDefaultOrgFeign {
+
+    @Autowired
+    private SysUserDefaultOrgService sysUserDefaultOrgService;
+
+    @Override
+    public ResultBean<SysUserDefaultOrgVo> getList(String userSid) {
+        return sysUserDefaultOrgService.getList(userSid);
+    }
+
+    @Override
+    public ResultBean saveOrUpdate(SysUserDefaultOrgDto dto) {
+        return sysUserDefaultOrgService.saveDefaultOrg(dto);
+    }
+}
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserdefaultorg/SysUserDefaultOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserdefaultorg/SysUserDefaultOrgService.java
new file mode 100644
index 0000000000..1ac3434c83
--- /dev/null
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuserdefaultorg/SysUserDefaultOrgService.java
@@ -0,0 +1,81 @@
+package com.yxt.anrui.portal.biz.sysuserdefaultorg;
+
+import com.yxt.anrui.portal.api.sysuser.SysUser;
+import com.yxt.anrui.portal.api.sysuserdefaultorg.*;
+import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
+import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/1/11 11:27
+ * @Description
+ */
+@Service
+public class SysUserDefaultOrgService extends MybatisBaseService<SysUserDefaultOrgMapper, SysUserDefaultOrg> {
+
+    @Autowired
+    private SysStaffOrgService sysStaffOrgService;
+    @Autowired
+    private SysUserService sysUserService;
+
+    public ResultBean<SysUserDefaultOrgVo> getList(String userSid) {
+        ResultBean<SysUserDefaultOrgVo> rb = ResultBean.fireFail();
+        SysUserDefaultOrgVo sysUserDefaultOrgVo = new SysUserDefaultOrgVo();
+        //根据用户sid查询staffSid
+        SysUser sysUser = sysUserService.fetchBySid(userSid);
+        List<SysOrgPathList> list = sysStaffOrgService.getList(sysUser.getStaffSid());
+        list.removeAll(Collections.singleton(null));
+        sysUserDefaultOrgVo.setList(list);
+        //根据该用户名称查询是否设置了默认组织机构
+        SysUserDefaultOrg sysUserDefaultOrg = baseMapper.selectByUserSid(userSid);
+        if (sysUserDefaultOrg != null) {
+            sysUserDefaultOrgVo.setOrgSidPath(sysUserDefaultOrg.getOrgSidPath());
+            sysUserDefaultOrgVo.setOrgNamePath(sysUserDefaultOrg.getOrgNamePath());
+        }
+        return rb.success().setData(sysUserDefaultOrgVo);
+    }
+
+    public SysUserDefaultOrg selectByUserSid(String userSid) {
+        return baseMapper.selectByUserSid(userSid);
+    }
+
+    public ResultBean saveDefaultOrg(SysUserDefaultOrgDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String userSid = dto.getUserSid();
+        if (StringUtils.isBlank(userSid)) {
+            return rb.setMsg("参数错误：userSid是必传项");
+        }
+        String orgSidPath = dto.getOrgSidPath();
+        if (StringUtils.isNotBlank(orgSidPath)) {
+            //删除设置的默认组织机构
+            baseMapper.deleteByUserSid(userSid);
+            SysUserDefaultOrg sysUserDefaultOrg = new SysUserDefaultOrg();
+            String orgNamePath = dto.getOrgNamePath();
+            if (StringUtils.isBlank(orgNamePath)) {
+                return rb.setMsg("参数错误：orgNamePath是必传项");
+            }
+            SysUser sysUser = sysUserService.fetchBySid(userSid);
+            sysUserDefaultOrg.setOrgSidPath(orgSidPath);
+            sysUserDefaultOrg.setOrgNamePath(orgNamePath);
+            sysUserDefaultOrg.setCreateBySid(userSid);
+            sysUserDefaultOrg.setStaffSid(sysUser.getStaffSid());
+            baseMapper.insert(sysUserDefaultOrg);
+        } else {
+            //删除设置的默认组织机构
+            baseMapper.deleteByUserSid(userSid);
+        }
+        return rb.success();
+    }
+
+    public int deleteByUserSid(String sid) {
+        return baseMapper.deleteByUserSid(sid);
+    }
+}
diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
index 1c8f05e5fc..f04e9d5e65 100644
--- a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
+++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
@@ -161,6 +161,14 @@ export function getListDeptByOrgSid(data) {
   })
 }
 
+// 根据分公司Sid获取分公司下部门对应的采购系统
+export function fetchDetailsByUseOrgSid(data) {
+  return request({
+    url: '/base/v1/basepurchasesystem/fetchDetailsByUseOrgSid/' + data,
+    method: 'GET'
+  })
+}
+
 // 获取厂家回款通路
 export function selectNameByOrg(data) {
   return request({
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
index 18ad5a9127..cd1b0a7717 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
@@ -41,7 +41,7 @@
             <el-col :span="5">
               <el-form-item prop="purchaseSystemName">
                 <el-select v-model="formobj.purchaseSystemName" placeholder="请选择" @change="changeOrgDept" clearable>
-                  <el-option v-for="item in orgDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"></el-option>
+                  <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -355,7 +355,7 @@ import modellibrary from '@/views/baseoutsourcingapplication/relation/modellibra
 import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication'
 import configuration from './chexingbyconfiguration'
 import { getStorage } from '@/utils/auth'
-import { getPathSidByUserSid, brandDown, selectOrgLists, typeValues, selectSysUserList } from '@/api/cheliang/dictcommons'
+import { getPathSidByUserSid, brandDown, fetchDetailsByUseOrgSid, typeValues, selectSysUserList } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'BaseOutsourcingApplicationAdd',
@@ -496,11 +496,6 @@ export default {
           this.depositUseRule_list = res.data
         }
       })
-      selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.orgDept_list = res.data
-        }
-      })
       selectSysUserList({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
         if (resp.success) {
           this.user_list = resp.data
@@ -514,6 +509,11 @@ export default {
               this.formobj.useOrgName = resp.data.name
             }
           })
+          fetchDetailsByUseOrgSid(this.formobj.useOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
           brandDown({ useOrg: res.data }).then((resp) => {
             if (resp.success) {
               this.carBrand_list = resp.data
@@ -661,8 +661,8 @@ export default {
       })
     },
     changeOrgDept(value) {
-      const choosetItem = this.orgDept_list.filter((item) => item.orgDeptName === value)
-      this.formobj.purchaseSystemSid = choosetItem[0].orgDeptSid
+      const choosetItem = this.orgDept_list.filter((item) => item.purchaseSystemName === value)
+      this.formobj.purchaseSystemSid = choosetItem[0].deptSid
     },
     carBrandChange(value) {
       const choosetItem = this.carBrand_list.filter((item) => item.brandName === value)
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
index 86697ef262..df07ea4b01 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
@@ -40,7 +40,7 @@
             <el-col :span="5">
               <el-form-item prop="purchaseSystemName">
                 <el-select v-model="formobj.purchaseSystemName" placeholder="请选择" @change="changeOrgDept" clearable>
-                  <el-option v-for="item in orgDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"></el-option>
+                  <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -363,7 +363,7 @@ import modellibrary from '@/views/baseoutsourcingapplication/relation/modellibra
 import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication'
 import configuration from './chexingbyconfiguration'
 import { getStorage } from '@/utils/auth'
-import { getPathSidByUserSid, brandDown, selectOrgLists, typeValues, selectSysUserList } from '@/api/cheliang/dictcommons'
+import { getPathSidByUserSid, brandDown, fetchDetailsByUseOrgSid, typeValues, selectSysUserList } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'BaseOutsourcingApplicationAdd',
@@ -501,11 +501,6 @@ export default {
           this.depositUseRule_list = res.data
         }
       })
-      selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.orgDept_list = res.data
-        }
-      })
       selectSysUserList({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
         if (resp.success) {
           this.user_list = resp.data
@@ -519,6 +514,11 @@ export default {
               this.formobj.useOrgName = resp.data.name
             }
           })
+          fetchDetailsByUseOrgSid(this.formobj.useOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
           brandDown({ useOrg: res.data }).then((resp) => {
             if (resp.success) {
               this.carBrand_list = resp.data
@@ -772,8 +772,8 @@ export default {
       })
     },
     changeOrgDept(value) {
-      const choosetItem = this.orgDept_list.filter((item) => item.orgDeptName === value)
-      this.formobj.purchaseSystemSid = choosetItem[0].orgDeptSid
+      const choosetItem = this.orgDept_list.filter((item) => item.purchaseSystemName === value)
+      this.formobj.purchaseSystemSid = choosetItem[0].deptSid
     },
     carBrandChange(value) {
       const choosetItem = this.carBrand_list.filter((item) => item.brandName === value)
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
index 9b140fa3cb..9d49974abd 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
@@ -18,7 +18,7 @@
             <el-form-item prop="purchaseSystemName">
               <span slot="label">采购系统：</span>
               <el-select v-model="temp.purchaseSystemName" class="addinputw" clearable placeholder="" filterable @change="orgDeptChange">
-                <el-option v-for="item in orgDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"/>
+                <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -293,7 +293,7 @@
 
 <script>
 import { SaveList, Update, selVehModelByUseOrgSidAll, details, selectSupplier } from '@/api/cheliang/basevehicle'
-import { typeValues, selectOrgLists, getPathSidByUserSid, fetchByUseOrgSid, fetchBySid, selectNameByOrg, brandDown } from '@/api/cheliang/dictcommons'
+import { typeValues, fetchDetailsByUseOrgSid, getPathSidByUserSid, fetchByUseOrgSid, fetchBySid, selectNameByOrg, brandDown } from '@/api/cheliang/dictcommons'
 import Pagination from '@/components/pagination'
 
 export default {
@@ -473,8 +473,6 @@ export default {
       this.temp.settlementStatusValue = '未买断'
       this.temp.freight = 0
       this.temp.isProblemVeh = '0'
-      this.temp.purchaseSystemName = window.sessionStorage.getItem('departmentName')
-      this.temp.purchaseSystemSid = window.sessionStorage.getItem('departmentSid')
     },
     showEdit(sid) {
       this.getType()
@@ -508,6 +506,11 @@ export default {
               this.temp.useOrgName = respsone.data.name
             }
           })
+          fetchDetailsByUseOrgSid(this.temp.useOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
           fetchByUseOrgSid({ sid: res.data }).then((resp) => {
             if (resp.success) {
               this.location_list = resp.data
@@ -556,15 +559,10 @@ export default {
           this.settlementStatus_list = res.data
         }
       })
-      selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.orgDept_list = res.data
-        }
-      })
     },
     orgDeptChange(val) {
-      const choosetItem = this.orgDept_list.filter((item) => item.orgDeptName === val)
-      this.temp.purchaseSystemSid = choosetItem[0].orgDeptSid
+      const choosetItem = this.orgDept_list.filter((item) => item.purchaseSystemName === val)
+      this.temp.purchaseSystemSid = choosetItem[0].deptSid
     },
     carBrandChange(val) {
       const choosetItem = this.carBrand_list.filter((item) => item.brandName === val)
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
index 1e9870fddd..74a83458d9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
@@ -177,9 +177,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="name !== ''">
+        <el-row v-show="temp.trailerOrInstallName !== ''">
           <el-col :span="4" class="tleftb">
-            <span>{{ name }}</span>
+            <span>{{ temp.trailerOrInstallName }}</span>
           </el-col>
           <el-col :span="20">
             <el-form-item>
@@ -187,9 +187,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-show="name !== ''">
+        <el-row v-show="temp.trailerOrInstallName !== ''">
           <el-col :span="4" class="tleftb">
-            <span><span class="icon">*</span>{{ name }}成交价</span>
+            <span><span class="icon">*</span>{{ temp.trailerOrInstallName }}成交价</span>
           </el-col>
           <el-col :span="8">
             <el-form-item prop="trailerOrInstallDealPrice">
@@ -272,7 +272,6 @@ export default {
       },
       dialogVisible: false,
       disabledBtn: false,
-      name: '',
       temp: {
         vinNo: '',
         vinSid: '',
@@ -304,9 +303,12 @@ export default {
         remarks: '',
         isUpdateOrInsertCrm: '',
         trailerOrInstall: '',
+        trailerOrInstallName: '',
         trailerOrInstallDealPrice: '',
         totalDealPrice: '',
-        szOrGCSid: ''
+        szOrGCSid: '',
+        createBySid: '',
+        createByName: ''
       },
       payType_list: [], // 出库类型
       org_list: [], // 销售部门
@@ -403,13 +405,15 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
-      this.name = multipleSelection[0].szOrGC
+      this.temp.trailerOrInstallName = multipleSelection[0].szOrGC
       this.temp.szOrGCSid = multipleSelection[0].szOrGCSid
       this.temp.trailerOrInstall = multipleSelection[0].trailerOrInstall
       this.temp.trailerOrInstallDealPrice = multipleSelection[0].trailerOrInstallDealPrice
       this.temp.vinNo = multipleSelection[0].vinNo
       this.temp.vinSid = multipleSelection[0].sid
       this.temp.createOrgSid = createOrgSid
+      this.temp.createBySid = window.sessionStorage.getItem('userSid')
+      this.temp.createByName = window.sessionStorage.getItem('name')
       this.temp.giftsDescription = '0'
       this.temp.rebateMoneyOne = '0'
       this.temp.rebateMoneyTwo = '0'
@@ -426,7 +430,7 @@ export default {
     },
     // 保存
     handleCreate() {
-      if (this.temp.trailerOrInstallDealPrice === '' && this.name !== '') {
+      if (this.temp.trailerOrInstallDealPrice === '' && this.temp.trailerOrInstallName !== '') {
         this.$message({ showClose: true, type: 'error', message: '成交价不能为空' })
         return
       }
@@ -516,11 +520,13 @@ export default {
         createOrgSid: '',
         isUpdateOrInsertCrm: '',
         trailerOrInstall: '',
+        trailerOrInstallName: '',
         trailerOrInstallDealPrice: '',
         totalDealPrice: '',
-        szOrGCSid: ''
+        szOrGCSid: '',
+        createBySid: '',
+        createByName: ''
       }
-      this.name = ''
       this.disabledBtn = false
       this.$refs['dataForm'].resetFields()
       this.$emit('doback')
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/chelaingxiaoshouInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/chelaingxiaoshouInfo.vue
index 887315e6c4..9d421ade19 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/chelaingxiaoshouInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/chelaingxiaoshouInfo.vue
@@ -161,6 +161,34 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-show="temp.trailerOrInstallName !== ''">
+          <el-col :span="4" class="tleftb">
+            <span>{{ temp.trailerOrInstallName }}</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item>
+              <span>{{ temp.trailerOrInstall }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="temp.trailerOrInstallName !== ''">
+          <el-col :span="4" class="tleftb">
+            <span><span class="icon">*</span>{{ temp.trailerOrInstallName }}成交价</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.trailerOrInstallDealPrice }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>总成交价</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.totalDealPrice }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </div>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
index 0c40798113..414e4bc18d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
@@ -133,6 +133,21 @@
                 <span>{{ scope.row.mobile }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="上装/挂车" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.trailerOrInstallName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="物料编码" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.trailerOrInstallCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="上装/挂车成交价" align="center" width="140">
+              <template slot-scope="scope">
+                <span>{{ scope.row.trailerOrInstallDealPrice }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="赠品价值(元)" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.giftsDescription }}</span>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
index 96f29ee962..be938c5e25 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
@@ -33,7 +33,7 @@
               <div class="span-sty spanOneWidth"><span>采购系统:</span></div>
               <el-form-item>
                 <el-select v-model="formobj.orgDeptName" placeholder="请选择" @change="changeOrgDept" clearable class="addinputInfo addinputOne">
-                  <el-option v-for="item in orgDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"></el-option>
+                  <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -187,7 +187,7 @@ import configuration from './chexingbyconfiguration'
 import shangzhuangpeizhi from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhi'
 import shangzhuangpeizhiAdd from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiAdd'
 import vehicleconfiguration from '@/views/cheliang/cheliangcaigou/relation/vehicleconfiguration'
-import { getPathSidByUserSid, fetchBySid, selectSysUserList, selectOrgLists, brandDown, selectNameByOrg } from '@/api/cheliang/dictcommons'
+import { getPathSidByUserSid, fetchBySid, selectSysUserList, fetchDetailsByUseOrgSid, brandDown, selectNameByOrg } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'cheliangpaichanAdd',
@@ -263,11 +263,6 @@ export default {
       })
     },
     getUserOrg() {
-      selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.orgDept_list = res.data
-        }
-      })
       getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
         if (resp.success) {
           this.formobj.createOrgSid = resp.data
@@ -276,6 +271,11 @@ export default {
               this.formobj.createOrgName = response.data.name
             }
           })
+          fetchDetailsByUseOrgSid(this.formobj.createOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
           brandDown({ useOrg: resp.data }).then((res) => {
             if (res.success) {
               this.carBrand_list = res.data
@@ -355,8 +355,6 @@ export default {
       this.viewTitle = '【新增】厂家采购'
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       this.formobj.createByName = window.sessionStorage.getItem('name')
-      this.formobj.orgDeptName = window.sessionStorage.getItem('departmentName')
-      this.formobj.orgDeptSid = window.sessionStorage.getItem('departmentSid')
     },
     showEdit(sid, row) {
       this.init()
@@ -417,10 +415,10 @@ export default {
     changeOrgDept(value) {
       let bb = null
       this.orgDept_list.forEach((e) => {
-        if (e.name === value) {
+        if (e.purchaseSystemName === value) {
           bb = {
-            name: e.orgDeptName,
-            sid: e.orgDeptSid
+            name: e.purchaseSystemName,
+            sid: e.deptSid
           }
         }
       })
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
index 25cab842fa..97a5a6bc5d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
@@ -32,7 +32,7 @@
               <div class="span-sty spanOneWidth"><span>采购系统:</span></div>
               <el-form-item>
                 <el-select v-model="formobj.orgDeptName" placeholder="请选择" @change="changeOrgDept" clearable class="addinputInfo addinputOne">
-                  <el-option v-for="item in orgDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"></el-option>
+                  <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -186,7 +186,7 @@ import configuration from './chexingbyconfiguration'
 import shangzhuangpeizhi from '../../../workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi'
 import shangzhuangpeizhiAdd from '../../../workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiAdd'
 import vehicleconfiguration from '@/views/cheliang/cheliangcaigou/relation/vehicleconfiguration'
-import { selectSysUserList, selectOrgLists, brandDown, selectNameByOrg } from '@/api/cheliang/dictcommons'
+import { selectSysUserList, fetchDetailsByUseOrgSid, brandDown, selectNameByOrg } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'cheliangpaichanEdit',
@@ -279,11 +279,6 @@ export default {
           this.user_list = resp.data
         }
       })
-      selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.orgDept_list = res.data
-        }
-      })
     },
     init() {
 
@@ -344,6 +339,11 @@ export default {
               this.carBrand_list = res.data
             }
           })
+          fetchDetailsByUseOrgSid(this.formobj.createOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
           selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
             if (res.success) {
               this.actualPay_list = res.data
@@ -409,8 +409,8 @@ export default {
       this.orgDept_list.forEach((e) => {
         if (e.name === value) {
           bb = {
-            name: e.orgDeptName,
-            sid: e.orgDeptSid
+            name: e.purchaseSystemName,
+            sid: e.deptSid
           }
         }
       })
diff --git a/anrui-system-ui/src/api/User/login.js b/anrui-system-ui/src/api/User/login.js
index 6a7050d091..f12ed2314c 100644
--- a/anrui-system-ui/src/api/User/login.js
+++ b/anrui-system-ui/src/api/User/login.js
@@ -28,9 +28,12 @@ class user {
 
   reGetPwd(data) {
     return request({
-      url: `/system/user/reGetPwd/${data.userName}/${data.userPhone}`,
+      url: '/portal/v1/sysuser/reGetPwd',
       method: 'post',
-      data: qs.stringify(data)
+      params: data,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded'
+      }
     })
   }
   selectPasswordByUserSid(data) {
diff --git a/anrui-system-ui/src/api/system/personalization/personalization.js b/anrui-system-ui/src/api/system/personalization/personalization.js
new file mode 100644
index 0000000000..84a26082dd
--- /dev/null
+++ b/anrui-system-ui/src/api/system/personalization/personalization.js
@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+
+// 获取菜单 分页列表
+export function getList(data) {
+  return request({
+    url: '/portal/v1/sysuserdefaultorg/getList',
+    method: 'get',
+    params: data
+  })
+}
+
+// 新增插件
+export function saveOrUpdate(data) {
+  return request({
+    url: '/portal/v1/sysuserdefaultorg/saveOrUpdate',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
diff --git a/anrui-system-ui/src/router/index.js b/anrui-system-ui/src/router/index.js
index 9b2540d5af..6314f2495b 100644
--- a/anrui-system-ui/src/router/index.js
+++ b/anrui-system-ui/src/router/index.js
@@ -151,6 +151,19 @@ export const constantRoutes = [
       }
     }]
   },
+  {
+    path: '/personalization',
+    component: Layout,
+    redirect: '/personalization',
+    children: [{
+      path: '/personalization',
+      component: () => import('@/views/personalization/personalization.vue'),
+      name: 'personalization',
+      meta: {
+        title: '个性化设置'
+      }
+    }]
+  },
   {
     path: '/copyofprocess',
     component: Layout,
diff --git a/anrui-system-ui/src/views/login/login.vue b/anrui-system-ui/src/views/login/login.vue
index 494517055b..f2c318417a 100644
--- a/anrui-system-ui/src/views/login/login.vue
+++ b/anrui-system-ui/src/views/login/login.vue
@@ -13,10 +13,9 @@
             </el-input>
           </el-form-item>
           <el-form-item>
-            <el-input v-model="loginForm.password" autocomplete="off"
-                      placeholder="请输入密码" prefix-icon="el-icon-lock" show-password>
+            <el-input v-model="loginForm.password" autocomplete="off" placeholder="请输入密码" prefix-icon="el-icon-lock" show-password>
             </el-input>
-            <span class="nopsw register" @click="forgetPwd = true">忘记密码 ？</span>
+            <span class="nopsw register" @click="handleforgetPwd">忘记密码 ？</span>
           </el-form-item>
           <el-form-item v-show="showMsg" style="margin-bottom:0;">
             <span class="text-danger">提示：用户名或密码错误，请重试！</span>
@@ -38,12 +37,12 @@
       </div>
     </div>
 
-    <el-dialog title="忘记密码" :visible.sync="forgetPwd">
+    <el-dialog title="忘记密码" :visible.sync="forgetPwd" :close-on-click-modal="false">
       <el-form :model="nopassword">
         <el-form-item label="手机号">
           <el-input v-model="nopassword.userPhone" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="用户名">
+        <el-form-item label="姓名">
           <el-input v-model="nopassword.userName" autocomplete="off"></el-input>
         </el-form-item>
       </el-form>
@@ -57,208 +56,226 @@
 </template>
 
 <script>
-  import {
-    login,
-    imgCode
-  } from '@/api/user.js'
-  import user from '@/api/User/login.js'
-  import {setToken, getToken, setSession} from '@/utils/auth'
-  import imgCodeRole from '@/components/imgCodeRole/index.vue'
-  import qs from 'qs'
+import {
+  login,
+  imgCode
+} from '@/api/user.js'
+import user from '@/api/User/login.js'
+import {setToken, getToken, setSession} from '@/utils/auth'
+import imgCodeRole from '@/components/imgCodeRole/index.vue'
 
-  export default {
-    components: {imgCodeRole},
-    data() {
-      return {
-        loginForm: {
-          userName: '',
-          password: '',
-          verifyCode: '',
-          uuid: ''
-        },
-        imgCode: '',
-        loading: false,
-        loginCode: false,
-        showMsg: false,
-        forgetPwd: false,
-        nopassword: {
-          userPhone: '',
-          userName: ''
-        }
+export default {
+  components: {imgCodeRole},
+  data() {
+    return {
+      loginForm: {
+        userName: '',
+        password: '',
+        verifyCode: '',
+        uuid: ''
+      },
+      imgCode: '',
+      loading: false,
+      loginCode: false,
+      showMsg: false,
+      forgetPwd: false,
+      nopassword: {
+        userPhone: '',
+        userName: ''
       }
+    }
+  },
+  mounted() {
+    // window.loginIt = this.loginIt;
+  },
+  methods: {
+    // loginIt(data) {
+    //   alert(data);
+    // },
+    login(data) {
+      this.loading = true
+      this.loginForm.verifyCode = data.verifyCode
+      this.loginForm.uuid = data.uuid
+      this.$store.dispatch('user/login', this.loginForm).then((res) => {
+        // this.$store.dispatch('user/getInfo')
+        this.$router.push({path: '/home'})
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+        this.$refs.imgCodeRole.getCodeImage()
+      })
     },
-    mounted() {
-      // window.loginIt = this.loginIt;
+    codeShow() {
+      if (this.loginForm.password == '' || this.loginForm.userName == '') {
+        this.loginCode = false
+        this.showMsg = true
+        return;
+      }
+      this.$refs.imgCodeRole.getCodeImage()
     },
-    methods: {
-      // loginIt(data) {
-      //   alert(data);
-      // },
-      login(data) {
-        this.loading = true
-        this.loginForm.verifyCode = data.verifyCode
-        this.loginForm.uuid = data.uuid
-        this.$store.dispatch('user/login', this.loginForm).then((res) => {
-          //this.$store.dispatch('user/getInfo')
-          this.$router.push({path: '/home'})
-          this.loading = false
-        }).catch(() => {
-          this.loading = false
-          this.$refs.imgCodeRole.getCodeImage()
-        })
-      },
-      codeShow() {
-        if (this.loginForm.password == '' || this.loginForm.userName == '') {
-          this.loginCode = false
-          this.showMsg = true
-          return;
-        }
-        this.$refs.imgCodeRole.getCodeImage()
-      },
-      reGetPwd() {
-        user.reGetPwd(this.nopassword).then(res => {
-
-        })
+    handleforgetPwd() {
+      this.forgetPwd = true
+      this.nopassword = {
+        userPhone: '',
+        userName: ''
       }
+    },
+    reGetPwd() {
+      if (this.nopassword.userPhone === '') {
+        this.$message({ showClose: true, type: 'error', message: '手机号不能为空' })
+        return
+      }
+      if (this.nopassword.userName === '') {
+        this.$message({ showClose: true, type: 'error', message: '姓名不能为空' })
+        return
+      }
+      user.reGetPwd(this.nopassword).then((res) => {
+        if (res.success) {
+          this.$message({ showClose: true, type: 'success', message: '新密码已发送至手机，请查看短信' })
+          this.forgetPwd = false
+        } else {
+          this.$message({ showClose: true, type: 'error', message: res.msg })
+        }
+      })
     }
   }
+}
 </script>
 
-
 <style lang="scss">
-  .login {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    background-size: 100% 100%;
-    background-image: url(../../assets/loginImg/bgImg.png);
-    background-position: center;
-    overflow: hidden;
+.login {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  background-size: 100% 100%;
+  background-image: url(../../assets/loginImg/bgImg.png);
+  background-position: center;
+  overflow: hidden;
 
-    .logoTitle {
-      margin: 30px;
+  .logoTitle {
+    margin: 30px;
 
-      img {
-        width: 70px;
-      }
+    img {
+      width: 70px;
+    }
 
-      span {
-        font-size: 40px;
-        color: #191919;
-      }
+    span {
+      font-size: 40px;
+      color: #191919;
+    }
 
-      .title {
-        font-size: 25px;
-        font-family: Source Han Sans CN;
-        font-weight: 500;
-        color: #191919;
-        margin: 0;
-      }
+    .title {
+      font-size: 25px;
+      font-family: Source Han Sans CN;
+      font-weight: 500;
+      color: #191919;
+      margin: 0;
     }
+  }
 
-    .main {
-      width: 30%;
-      /*height: 640px;*/
-      background: #FFFFFF;
-      box-shadow: 0px 13px 12px 0px rgba(0, 0, 0, 0.15);
-      opacity: 0.9;
-      border-radius: 20px;
-      position: absolute;
-      right: 10%;
+  .main {
+    width: 30%;
+    /*height: 640px;*/
+    background: #FFFFFF;
+    box-shadow: 0px 13px 12px 0px rgba(0, 0, 0, 0.15);
+    opacity: 0.9;
+    border-radius: 20px;
+    position: absolute;
+    right: 10%;
 
-      .content {
-        position: relative;
-        /*.title-h3{
-          width: 100%;
-          text-align: center;
-          color: #FFFFFF;
-          font-size: 30px;
-          margin: 0;
-          position: absolute;
-          top: -65px;
+    .content {
+      position: relative;
+      /*.title-h3{
+        width: 100%;
+        text-align: center;
+        color: #FFFFFF;
+        font-size: 30px;
+        margin: 0;
+        position: absolute;
+        top: -65px;
 
-        }*/
-      }
+      }*/
     }
   }
+}
 
-  .login-form {
-    padding: 30px 50px;
+.login-form {
+  padding: 30px 50px;
 
-    .title1 {
-      margin: 0px auto 30px auto;
-      text-align: center;
-      font-size: 20px;
-      color: #191919;
-      font-size: 23px;
-      font-weight: 500;
-    }
+  .title1 {
+    margin: 0px auto 30px auto;
+    text-align: center;
+    font-size: 20px;
+    color: #191919;
+    font-size: 23px;
+    font-weight: 500;
+  }
 
-    .el-input {
-      border: none;
-      background-color: transparent;
-    }
+  .el-input {
+    border: none;
+    background-color: transparent;
+  }
 
-    .code {
-      position: absolute;
-      top: 3px;
-      right: 5px;
-      width: 35%;
-      height: 35px;
-      cursor: pointer;
-      z-index: 9;
-    }
+  .code {
+    position: absolute;
+    top: 3px;
+    right: 5px;
+    width: 35%;
+    height: 35px;
+    cursor: pointer;
+    z-index: 9;
+  }
 
-    .nopsw {
-      position: absolute;
-      bottom: -30px;
-      right: 5px;
-      color: #018ad2;
-      font-size: 15px;
-      line-height: 30px;
-    }
+  .nopsw {
+    position: absolute;
+    bottom: -30px;
+    right: 5px;
+    color: #018ad2;
+    font-size: 15px;
+    line-height: 30px;
+  }
 
-    .register {
-      color: #018ad2;
-    }
+  .register {
+    color: #018ad2;
+  }
 
-    .register:hover,
-    .nopsw:hover {
-      cursor: pointer;
-    }
+  .register:hover,
+  .nopsw:hover {
+    cursor: pointer;
+  }
 
-    .btn-eye {
-      cursor: pointer;
-    }
+  .btn-eye {
+    cursor: pointer;
+  }
 
-    .text-danger {
-      color: #F56C6C;
-    }
+  .text-danger {
+    color: #F56C6C;
+  }
 
-    .login-btn {
-      margin: 10px 0 10px 0;
-      width: 100%;
-      background-color: #007fff;
-      border: 0;
-    }
+  .login-btn {
+    margin: 10px 0 10px 0;
+    width: 100%;
+    background-color: #007fff;
+    border: 0;
+  }
 
-    .login-btn:hover {
-      background-color: #007fdd;
-      border: 0;
-    }
+  .login-btn:hover {
+    background-color: #007fdd;
+    border: 0;
+  }
 
-    .el-input--prefix .el-input__inner {
-      border: 1px solid #018ad2;
-      background: transparent;
-      color: #333 !important;
-    }
+  .el-input--prefix .el-input__inner {
+    border: 1px solid #018ad2;
+    background: transparent;
+    color: #333 !important;
+  }
 
-    .el-form-item {
-      margin-bottom: 40px;
-    }
+  .el-form-item {
+    margin-bottom: 40px;
+  }
 
-    .el-loading-mask {
-      background-color: rgba(255, 255, 255, .6);
-    }
+  .el-loading-mask {
+    background-color: rgba(255, 255, 255, .6);
   }
+}
 </style>
diff --git a/anrui-system-ui/src/views/personalization/personalization.vue b/anrui-system-ui/src/views/personalization/personalization.vue
new file mode 100644
index 0000000000..2d1a7e3792
--- /dev/null
+++ b/anrui-system-ui/src/views/personalization/personalization.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="content">
+    <div class="right_cont">
+      <table class="tishi" cellspacing="0" style="margin:0 auto 30px">
+        <tr>
+          <td style="border-right: none;">设置默认组织机构</td>
+          <td>
+            <el-select v-model="formobj.orgNamePath" filterable placeholder="请选择" @change="changeoOrgNamePath" clearable>
+              <el-option v-for="item in orgNamePath_list" :key="item.orgSidPath" :label="item.orgNamePath" :value="item.orgNamePath"/>
+            </el-select>
+          </td>
+        </tr>
+      </table>
+      <span slot="footer" class="dialog-footer" style="margin-left:40%;">
+        <el-button style=" margin-left: 8%; width: 100px;height: 40px;" type="primary" @click="handleConfirm()">确认</el-button>
+      </span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getList, saveOrUpdate } from '@/api/system/personalization/personalization'
+
+export default {
+  name: 'personalization',
+  data() {
+    return {
+      orgNamePath_list: [],
+      formobj: {
+        orgSidPath: '',
+        orgNamePath: '',
+        userSid: ''
+      }
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    init() {
+      getList({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          this.formobj.orgNamePath = res.data.orgNamePath
+          this.formobj.orgSidPath = res.data.orgSidPath
+          this.orgNamePath_list = res.data.list
+        }
+      })
+    },
+    changeoOrgNamePath(value) {
+      const choose = this.orgNamePath_list.filter((item) => item.orgNamePath === value)
+      this.formobj.orgSidPath = choose[0].orgSidPath
+    },
+    handleConfirm() {
+      if (this.formobj.orgNamePath === '') {
+        this.$message({ showClose: true, type: 'error', message: '默认组织机构不能为空' })
+        return
+      }
+      this.formobj.userSid = window.sessionStorage.getItem('userSid')
+      saveOrUpdate(this.formobj).then((res) => {
+        if (res.success) {
+          this.$message({ showClose: true, type: 'success', message: '操作成功' })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped="scoped" lang="scss">
+
+.content {
+  width: 100%;
+  padding-top: 10px;
+  font-size: 16px;
+  color: #fff;
+  box-sizing: border-box;
+}
+.right_cont {
+  width: 100%;
+  height: 645px;
+  background-color: #fff;
+  margin: 0;
+  padding: 15px;
+  box-sizing: border-box;
+}
+
+.tishi {
+  width: 560px;
+  color: #000;
+  padding-left: 1.5%;
+  margin-bottom: 50px;
+
+  tr {
+    height: 70px;
+  }
+
+  td {
+    border: 1px solid #e6e9f0;
+    text-align: center;
+  }
+
+  td:first-child {
+    background-color: #f7f9fc;
+  }
+
+  .el-input,
+  input {
+    width: 80%;
+  }
+
+  span {
+    font-size: 26px;
+    color: red;
+    margin-left: 10px;
+  }
+}
+</style>
diff --git a/doc/databases/portal_tables.sql b/doc/databases/portal_tables.sql
index fb19e80c6a..f5ac0d0e6d 100644
--- a/doc/databases/portal_tables.sql
+++ b/doc/databases/portal_tables.sql
@@ -639,7 +639,7 @@ CREATE TABLE `sys_mobile_menu`
     `iconUrl`     varchar(64)          DEFAULT NULL COMMENT '应用图标',
     `path`        varchar(64)          DEFAULT NULL COMMENT '应用路由',
     `sortNo`      int(32)              DEFAULT NULL COMMENT '排序',
-    `psid`      varchar(64)              DEFAULT NULL COMMENT '父级sid',
+    `psid`        varchar(64)          DEFAULT NULL COMMENT '父级sid',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = InnoDB
@@ -660,10 +660,35 @@ CREATE TABLE `sys_mobile_menu_role`
     `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注信息',
     `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建者',
     `updateBySid` varchar(64)          DEFAULT NULL COMMENT '更新者',
-    `menuSid`  varchar(64)          DEFAULT NULL COMMENT '菜单sid',
-    `roleSid`       varchar(64)          DEFAULT NULL COMMENT '角色sid',
+    `menuSid`     varchar(64)          DEFAULT NULL COMMENT '菜单sid',
+    `roleSid`     varchar(64)          DEFAULT NULL COMMENT '角色sid',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = InnoDB
   AUTO_INCREMENT = 18
   DEFAULT CHARSET = utf8 COMMENT ='移动端用户授权表';
+
+
+DROP TABLE IF EXISTS `sys_user_default_org`;
+CREATE TABLE `sys_user_default_org`
+(
+    `id`          int(11)     NOT NULL AUTO_INCREMENT,
+    `sid`         varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion` int(11)     NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
+    `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+    `modifyTime`  timestamp   NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+    `isEnable`    int(11)     NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
+    `state`       int(11)              DEFAULT '1' COMMENT '隐藏本部门:隐藏本部门开启后，本部门将不会显示在公司通讯录中',
+    `isDelete`    int(11)              DEFAULT NULL COMMENT '记录是否被删除，0:未删除，1:已经删除',
+    `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注信息',
+    `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建者',
+    `updateBySid` varchar(64)          DEFAULT NULL COMMENT '更新者',
+    `userSid`     varchar(64)          DEFAULT NULL COMMENT '用户sid',
+    `orgSidPath`  varchar(500)         DEFAULT NULL COMMENT '默认组织机构sid',
+    `orgNamePath`  varchar(500)         DEFAULT NULL COMMENT '默认组织机构名称',
+    `staffSid`    varchar(64)          DEFAULT NULL COMMENT '人员sid',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 18
+  DEFAULT CHARSET = utf8 COMMENT ='用户默认的组织机构';