Merge remote-tracking branch 'origin/master'

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

@@ -538,9 +538,17 @@ export default {
         // 贴息用途赋值
         this.finance.factoryDiscountUse = '抵利息'
         this.finance.factoryDiscountUseKey = '02'
-        // 当融资项目总额不为空且不为0时，如果更换产品政策（则需要重新计算首付金额、贷款金额等一系列需要计算的费用）
+        // 当融资项目总额不为空且不为0时，如果更换产品政策（需要重新计算首付金额、产品贷款金额、贷款保证金等，重置其它融模块的内容）
         if (this.finance.loanTotal !== '' && this.finance.loanTotal !== '0') {
+          // 重新计算
           this.financingProject()
+          // 重置其它融模块的内容
+          this.finance.otherPolicyState = false
+          this.finance.otherPolicyName = ''
+          this.finance.otherPolicySid = ''
+          this.finance.otherPolicyAmount = ''
+          this.finance.otherPolicyPeriod = ''
+          this.finance.otherPolicyYearRatio = ''
         }
         selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => {
           if (res.success) {

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue

@@ -421,14 +421,14 @@ export default {
       this.finance = JSON.parse(JSON.stringify(value))
       this.orgPath = orgSidPath
       if (this.finance.isPack !== '' && this.finance.isPack !== null) {
-        selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
+        selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
           if (resp.success) {
             this.policy_list = resp.data
           }
         })
       }
       if (this.finance.policySid !== '' && this.finance.isPack !== null) {
-        selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => {
+        selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => {
           if (res.success) {
             this.other_list = res.data
           }
@@ -535,9 +535,17 @@ export default {
         this.finance.nominalPrice = choose[0].nominalPrice
         // 从金融产品政策中-- 获取代收意外险
         this.finance.proxyAccidentPremium = choose[0].vehAccidentAmount
-        // 当融资项目总额不为空且不为0时，如果更换产品政策（则需要重新计算首付金额、贷款金额等一系列需要计算的费用）
+        // 当融资项目总额不为空且不为0时，如果更换产品政策（需要重新计算首付金额、产品贷款金额、贷款保证金等，重置其它融模块的内容）
         if (this.finance.loanTotal !== '' && this.finance.loanTotal !== '0') {
+          // 重新计算
           this.financingProject()
+          // 重置其它融模块的内容
+          this.finance.otherPolicyState = false
+          this.finance.otherPolicyName = ''
+          this.finance.otherPolicySid = ''
+          this.finance.otherPolicyAmount = ''
+          this.finance.otherPolicyPeriod = ''
+          this.finance.otherPolicyYearRatio = ''
         }
         selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => {
           if (res.success) {

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

@@ -498,9 +498,17 @@ export default {
         // 贴息用途赋值
         this.finance.factoryDiscountUse = '抵利息'
         this.finance.factoryDiscountUseKey = '02'
-        // 当融资项目总额不为空且不为0时，如果更换产品政策（则需要重新计算首付金额、贷款金额等一系列需要计算的费用）
+        // 当融资项目总额不为空且不为0时，如果更换产品政策（需要重新计算首付金额、产品贷款金额、贷款保证金等，重置其它融模块的内容）
         if (this.finance.loanTotal !== '' && this.finance.loanTotal !== '0') {
+          // 重新计算
           this.financingProject()
+          // 重置其它融模块的内容
+          this.finance.otherPolicyState = false
+          this.finance.otherPolicyName = ''
+          this.finance.otherPolicySid = ''
+          this.finance.otherPolicyAmount = ''
+          this.finance.otherPolicyPeriod = ''
+          this.finance.otherPolicyYearRatio = ''
         }
         selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => {
           if (res.success) {

anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue

@@ -384,14 +384,14 @@ export default {
       this.finance = JSON.parse(JSON.stringify(value))
       this.orgPath = orgPath
       if (this.finance.isPack !== '' && this.finance.isPack !== null) {
-        selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
+        selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
           if (resp.success) {
             this.policy_list = resp.data
           }
         })
       }
       if (this.finance.policySid !== '' && this.finance.isPack !== null) {
-        selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => {
+        selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => {
           if (res.success) {
             this.other_list = res.data
           }
@@ -500,9 +500,17 @@ export default {
         // 贴息用途赋值
         this.finance.factoryDiscountUse = '抵利息'
         this.finance.factoryDiscountUseKey = '02'
-        // 当融资项目总额不为空且不为0时，如果更换产品政策（则需要重新计算首付金额、贷款金额等一系列需要计算的费用）
+        // 当融资项目总额不为空且不为0时，如果更换产品政策（需要重新计算首付金额、产品贷款金额、贷款保证金等，重置其它融模块的内容）
         if (this.finance.loanTotal !== '' && this.finance.loanTotal !== '0') {
+          // 重新计算
           this.financingProject()
+          // 重置其它融模块的内容
+          this.finance.otherPolicyState = false
+          this.finance.otherPolicyName = ''
+          this.finance.otherPolicySid = ''
+          this.finance.otherPolicyAmount = ''
+          this.finance.otherPolicyPeriod = ''
+          this.finance.otherPolicyYearRatio = ''
         }
         selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => {
           if (res.success) {