Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue

@@ -752,6 +752,7 @@ export default {
             this.finance.offsetTotal = resp.data.offsetTotal
             this.finance.realTotal = resp.data.realTotal
             this.finance.vehTotalPrice = resp.data.vehTotalPrice
+            this.finance.isShowMore = this.isShowMore
             this.$emit('backData', this.finance)
             this.handleColse()
           } else {

anrui-riskcenter-ui/src/views/creditauditmanagement/creditauditmanagementAdd.vue

@@ -379,8 +379,10 @@ export default {
       const choose = this.customer_list.filter((item) => item.name === value)
       if (choose.length > 0) {
         this.formobj.custSid = choose[0].sid
+        this.formobj.phone = choose[0].mobile
       } else {
         this.formobj.custSid = ''
+        this.formobj.phone = ''
       }
     },
     capitalChange(value) {

anrui-riskcenter-ui/src/views/financialclerkbycreditvetting/financialclerkbycreditvettingAdd.vue

@@ -323,36 +323,78 @@ export default {
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
-          this.getUrl()
+          if (this.formobj.zffkjg === '' || this.formobj.gsfkjg === '') {
-          this.submitdisabled = true
+            this.$confirm('仅填写了部分审核结果,是否继续提交', '提示', {
-          req.saveOrUpdate(this.formobj).then((res) => {
+              confirmButtonText: '确定',
-            if (res.success) {
+              cancelButtonText: '取消',
-              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              type: 'warning'
-              this.handleReturn('true')
+            }).then(() => {
-            } else {
+              this.getUrl()
+              this.submitdisabled = true
+              req.saveOrUpdate(this.formobj).then((res) => {
+                if (res.success) {
+                  this.$message({ showClose: true, type: 'success', message: '保存成功' })
+                  this.handleReturn('true')
+                } else {
+                  this.submitdisabled = false
+                }
+              }).catch(() => {
+                this.submitdisabled = false
+              })
+            })
+          } else {
+            this.getUrl()
+            this.submitdisabled = true
+            req.saveOrUpdate(this.formobj).then((res) => {
+              if (res.success) {
+                this.$message({ showClose: true, type: 'success', message: '保存成功' })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
               this.submitdisabled = false
-            }
+            })
-          }).catch(() => {
+          }
-            this.submitdisabled = false
-          })
         }
       })
     },
     handleConfirm() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
-          this.getUrl()
+          if (this.formobj.zffkjg === '' || this.formobj.gsfkjg === '') {
-          this.submitdisabled = true
+            this.$confirm('仅填写了部分审核结果,是否继续提交', '提示', {
-          req.finStaffConfirm(this.formobj).then((res) => {
+              confirmButtonText: '确定',
-            if (res.success) {
+              cancelButtonText: '取消',
-              this.$message({ showClose: true, type: 'success', message: '操作成功' })
+              type: 'warning'
-              this.handleReturn('true')
+            }).then(() => {
-            } else {
+              this.getUrl()
+              this.submitdisabled = true
+              req.finStaffConfirm(this.formobj).then((res) => {
+                if (res.success) {
+                  this.$message({ showClose: true, type: 'success', message: '操作成功' })
+                  this.handleReturn('true')
+                } else {
+                  this.submitdisabled = false
+                }
+              }).catch(() => {
+                this.submitdisabled = false
+              })
+            })
+          } else {
+            this.getUrl()
+            this.submitdisabled = true
+            req.finStaffConfirm(this.formobj).then((res) => {
+              if (res.success) {
+                this.$message({ showClose: true, type: 'success', message: '操作成功' })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
               this.submitdisabled = false
-            }
+            })
-          }).catch(() => {
+          }
-            this.submitdisabled = false
-          })
         }
       })
     },

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java

@@ -54,6 +54,7 @@ public class LoanSolutionsOtherpolicy extends BaseEntity {
 
     @ApiModelProperty("主产品方案sid")
     private String solutionsSid;
+    private String otherPolicySid;
     @ApiModelProperty("其它融名称")
     private String otherPolicyName;
     @ApiModelProperty("其它融金额")