Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -31,6 +31,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
@@ -127,6 +129,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
     private LoanFinPolicyFeign loanFinPolicyFeign;
     @Autowired
     private LoanFinBankFeign loanFinBankFeign;
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
 
     private QueryWrapper<BusSalesOrderLoancontract> createQueryWrapper(BusSalesOrderLoancontractQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -379,10 +383,16 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                 List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSidAndXdConSid(saleOrderSid, loanOtherReceivablePush.getLoanContractSid());
                 if (!busSalesOrderVehicleList.isEmpty()) {
                     for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicleList) {
+                        String vinNoCode = "";
+                        if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) {
+                            BaseVehicleSelectVo data = baseVehicleFeign.details(busSalesOrderVehicle.getLinkSid()).getData();
+                            if (null != data) {
+                                vinNoCode = data.getVinNo();
+                            }
+                        }
                         String customerNumber = "";
                         //判断财务系统是否有客户
                         Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
-                        String vinNoCode = "";
                         String linkNo = "";
                         if (!aBoolean) {
                             //  List<BdCustomer> bdCustomers = new ArrayList<>();

anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue

@@ -55,7 +55,7 @@
             <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column fixed label="操作" align="center" width="80">
               <template slot-scope="scope">
-                <el-button type="primary" :disabled="submitdisabled" size="mini" @click="handleConfirm(scope.row)">确认</el-button>
+                <el-button type="primary" size="mini" @click="handleConfirm(scope.row)">确认</el-button>
               </template>
             </el-table-column>
             <el-table-column label="资方信审时间" align="center" width="180">
@@ -186,7 +186,6 @@ export default {
     return {
       viewState: 1,
       btndisabled: false,
-      submitdisabled: false,
       dialogVisible: false,
       btnList: [
         {
@@ -310,17 +309,22 @@ export default {
         isCompInvoic: row.isCompInvoic,
         sid: row.sid
       }
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       req.save(params).then((resp) => {
-        this.submitdisabled = true
         if (resp.success) {
-          this.submitdisabled = false
+          loading.close()
           this.$message({ showClose: true, type: 'success', message: '操作成功' })
           this.getList()
         } else {
-          this.submitdisabled = false
+          loading.close()
         }
       }).catch(() => {
-        this.submitdisabled = false
+        loading.close()
       })
     },
     uploadFile(val, sid) {