From 29feedd94088eec84afac0c0073a80080b787898 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 12 Sep 2023 11:36:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/publicPage/financialscheme.vue    | 16 +++++++++++-----
 .../publicPage/financialschemeEdit.vue           |  2 +-
 .../cheliangxuqiu/cheliangxuqiuAdd.vue           |  2 +-
 .../workflow/publicPage/financialscheme.vue      | 15 +++++++++------
 .../workflow/publicPage/financialschemeEdit.vue  |  6 ++++--
 .../xiaoshoudingdanByJinRong.vue                 |  2 +-
 6 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue
index 1f42097647..94d3d0ee19 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue
@@ -22,7 +22,7 @@
           <el-col :span="18">
             <div class="span-sty">产品政策</div>
             <el-form-item>
-              <el-select v-model="finance.policyName" placeholder="请选择" @change="changePolicy" filterable clearable class="addinputInfo">
+              <el-select v-model="finance.policyName" placeholder="请选择" @change="changePolicy" style="width: 60%" filterable clearable class="addinputInfo">
                 <el-option v-for="item in policy_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
@@ -311,6 +311,12 @@ import { calculate } from '@/api/salesManagement/orderManagement'
 
 export default {
   name: 'JinRongFangAn',
+  props: {
+    modelSid: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       viewTitle: '',
@@ -422,7 +428,7 @@ export default {
       this.finance = JSON.parse(JSON.stringify(value))
       this.isShowMore = this.finance.isShowMore
       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: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.modelSid }).then((resp) => {
           if (resp.success) {
             this.policy_list = resp.data
           }
@@ -508,7 +514,7 @@ export default {
         vehOtherPrice: '',
         vehTotalPrice: ''
       }
-      selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
+      selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.modelSid }).then((resp) => {
         if (resp.success) {
           this.policy_list = resp.data
         }
@@ -625,10 +631,10 @@ export default {
         // 应收明细 -- 根据金融产品政策获取的服务费类型计算服务费
         if (this.finance.serviceChargeTypeKey === '01') {
           // 融资项目总额 * 融资项目总额比例(金融产品政策中服务费)
-          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * (parseFloat(this.arguments(this.finance.serviceChargeTypeValue)) / 100))
         } else if (this.finance.serviceChargeTypeKey === '02') {
           // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
-          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * (parseFloat(this.arguments(this.finance.serviceChargeTypeValue)) / 100))
         } else if (this.finance.serviceChargeTypeKey === '03') {
           // 等于金融产品政策中服务费
           this.finance.serviceAmount = this.finance.serviceChargeTypeValue
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue
index 7b8ef6ad0e..ddb46bebd7 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue
@@ -308,7 +308,7 @@
         </div>
       </el-form>
     </div>
-    <financialscheme v-show="viewState == 2" ref="divCount" @backData="backData" @doback="resetState"/>
+    <financialscheme v-bind="$attrs" v-show="viewState == 2" ref="divCount" @backData="backData" @doback="resetState"/>
   </div>
 </template>
 <script>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue
index 21b21d9fb5..d35736137f 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue
@@ -106,7 +106,7 @@
               </el-col>
             </el-row>
             <div v-show="formobj.financePlan !== '1' && formobj.typeKey === '1'">
-              <financialschemeEdit ref="divJR" @backParameters="backJR"/>
+              <financialschemeEdit :modelSid="formobj.modelSid" ref="divJR" @backParameters="backJR"/>
             </div>
           </div>
         </el-form>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue
index fa3c66a052..ff1b1b19e9 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue
@@ -22,7 +22,7 @@
           <el-col :span="18">
             <div class="span-sty">产品政策</div>
             <el-form-item>
-              <el-select v-model="finance.policyName" placeholder="请选择" @change="changePolicy" filterable clearable class="addinputInfo">
+              <el-select v-model="finance.policyName" placeholder="请选择" @change="changePolicy" style="width: 60%" filterable clearable class="addinputInfo">
                 <el-option v-for="item in policy_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
@@ -389,6 +389,7 @@ export default {
         vehTotalPrice: ''
       },
       orgPath: '',
+      modelSid: '',
       rules: {}
     }
   },
@@ -416,12 +417,13 @@ export default {
       }
       return val
     },
-    showAdd(value, orgSidPath) {
+    showAdd(value, orgSidPath, modelSid) {
       this.init()
+      this.modelSid = modelSid
       this.finance = JSON.parse(JSON.stringify(value))
       this.orgPath = orgSidPath
       if (this.finance.isPack !== '' && this.finance.isPack !== null) {
-        selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
+        selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.modelSid }).then((resp) => {
           if (resp.success) {
             this.policy_list = resp.data
           }
@@ -508,7 +510,7 @@ export default {
         vehTotalPrice: ''
       }
       console.log(this.orgPath, window.sessionStorage.getItem('userSid'), this.finance.isPack, 88888)
-      selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
+      selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack, modelSid: this.modelSid }).then((resp) => {
         if (resp.success) {
           this.policy_list = resp.data
         }
@@ -622,10 +624,10 @@ export default {
         // 应收明细 -- 根据金融产品政策获取的服务费类型计算服务费
         if (this.finance.serviceChargeTypeKey === '01') {
           // 融资项目总额 * 融资项目总额比例(金融产品政策中服务费)
-          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * (parseFloat(this.arguments(this.finance.serviceChargeTypeValue)) / 100))
         } else if (this.finance.serviceChargeTypeKey === '02') {
           // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
-          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * (parseFloat(this.arguments(this.finance.serviceChargeTypeValue)) / 100))
         } else if (this.finance.serviceChargeTypeKey === '03') {
           // 等于金融产品政策中服务费
           this.finance.serviceAmount = this.finance.serviceChargeTypeValue
@@ -845,6 +847,7 @@ export default {
         vehTotalPrice: ''
       }
       this.orgPath = ''
+      this.modelSid = ''
       this.$emit('doback')
     }
   }
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue
index 8b6a5398d3..18995661f8 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue
@@ -395,22 +395,24 @@ export default {
         vehTotalPrice: ''
       },
       orgSidPath: '',
+      modelSid: '',
       rules: {}
     }
   },
   methods: {
-    showInfo(value, orgSidPath) {
+    showInfo(value, orgSidPath, modelSid) {
       selectDetailss({ businessSid: value }).then((res) => {
         if (res.success) {
           this.formobj = res.data
           this.formobj.saleOrderSid = res.data.salesOrderSid
+          this.modelSid = modelSid
         }
       })
       this.orgSidPath = orgSidPath
     },
     financialComputing() {
       this.viewState = 2
-      this.$refs['divCount'].showAdd(this.formobj, this.orgSidPath)
+      this.$refs['divCount'].showAdd(this.formobj, this.orgSidPath, this.modelSid)
     },
     backData(value) {
       this.viewState = 1
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
index ebb600576c..7d9894b311 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
@@ -465,7 +465,7 @@ export default {
     },
     handleLook() {
       this.viewState = 2
-      this.$refs['divAdd'].showInfo(this.linkByParameter.businessSid, this.formobj.orgSidPath)
+      this.$refs['divAdd'].showInfo(this.linkByParameter.businessSid, this.formobj.orgSidPath, this.formobj.busSalesOrderModel.modelSid)
     },
     // 合计
     getSummaries(param) {