Merge remote-tracking branch 'origin/settle-test-20230110' into settle-test-20230110

src/business/betsnd/event/buildCommons.js

@@ -59,7 +59,7 @@ export default {
         nam: model.bedgrp.rec.nam,
         docprbrol: model.bedgrp.rec.docprbrol,
         advdocflg: model.bedgrp.rec.advdocflg,
-
+        inr:model.bedgrp.rec.inr
       },
       cbsMap: {
         MAX: model.bedgrp.cbs.max,

src/business/betsnd/model/index.js

@@ -102,7 +102,8 @@ export default class Betsnd {
                     docrol: '',
                     matdat: '',
                     nam: '',
-                    docprbrol: ''
+                    docprbrol: '',
+                    inr: ''
                 },
                 prb: {
                     pts: new Pts().data,

src/business/betsnd/views/Rgfp.vue

@@ -227,7 +227,7 @@
       <c-col :span="24">
         <el-form-item label="付款人" prop="bedgrp.rec.payrol">
           <c-select v-model="model.bedgrp.rec.payrol" style="width: 100%" placeholder="请选择付款人"
-                    :code="codes.rolall"
+                    :code="codes.payrol"
                     @change="eventFunction(
               'bedgrp.rec.payrol'
             )">

src/business/letdrw/model/check.js

@@ -260,8 +260,8 @@ let checkObj = {
         {max: 65,message:"长度不能超过65"}
     ],
     "ledgrp.rec.tenmaxday":[
-        {type: "string", required: false, message: "必输项"},
-        {type: "string",max: 9999,message:"长度不能超过4"}
+        {type: "number", required: false, message: "必输项"},
+        {type: "number",max: 9999,message:"长度不能超过4"}
     ],
     "ledgrp.rec.porloa":[
         {type: "string", required: false, message: "必输项"},

src/business/letdrw/model/index.js

@@ -15,7 +15,7 @@ export default class Letdrw {
                     },
                     max2: {
                         cur: '',
-                        amt: ''
+                        amt: '0.0'
                     }
                 }
             },
@@ -124,7 +124,7 @@ export default class Letdrw {
                     },
                     max2: {
                         cur: '',
-                        amt: ''
+                        amt: '0.00'
                     }
                 },
                 iss: {
@@ -206,11 +206,11 @@ export default class Letdrw {
                     },
                     max: {
                         cur: '',
-                        amt: ''
+                        amt: '0.0'
                     },
                     max2: {
                         amt: '',
-                        cur: ''
+                        cur: '0.00'
                     }
                 },
                 srm: {

src/business/letdrw/views/Aamp.vue

@@ -5,7 +5,7 @@
       <c-col :span="13">
         <el-form-item label="附加金额" prop="ledgrp.cbs.max2.cur">
           <c-select
-            v-model="model.ledgrp.cbs.max2.cur"
+            v-model="max2cur"
             style="width: 100%"
             placeholder="请选择附加金额"
             disabled
@@ -26,7 +26,7 @@
       <c-col :span="13">
         <el-form-item label="开立附加金额" prop="ledgrp.cbs.opn2.cur">
           <c-select
-            v-model="model.ledgrp.cbs.opn2.cur"
+            v-model="opn2cur"
             style="width: 100%"
             placeholder="请选择币种"
             disabled
@@ -37,7 +37,7 @@
       <c-col :span="11">
         <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn2.amt">
           <c-input
-            v-model="model.ledgrp.cbs.opn2.amt"
+            v-model="opn2amt"
             placeholder="请输入"
             disabled
           ></c-input>
@@ -48,7 +48,7 @@
         <el-form-item label="覆盖" prop="ledgrp.blk.addamtcov">
           <c-input
             type="textarea"
-            v-model="model.ledgrp.blk.addamtcov"
+            v-model="getBlkAddamtcov"
             maxlength="140"
             show-word-limit
             placeholder="请输入"
@@ -70,6 +70,28 @@ export default {
   },
   methods: { },
   created: function () {},
+  computed:{
+    max2cur(){
+      this.model.ledgrp.cbs.max2.cur = this.model.ledgrp.cbs.max.cur
+      return this.model.ledgrp.cbs.max2.cur
+    },
+
+    opn2cur(){
+      this.model.ledgrp.cbs.opn2.cur = this.model.ledgrp.cbs.max.cur
+      return this.model.ledgrp.cbs.opn2.cur
+    },
+
+    opn2amt(){
+      this.model.ledgrp.cbs.opn2.amt = parseFloat(this.model.ledgrp.cbs.max2.amt).toFixed(3)
+      return this.model.ledgrp.cbs.opn2.amt
+    },
+
+    getBlkAddamtcov(){
+      this.model.ledgrp.blk.addamtcov = this.model.ledgrp.cbs.opn2.cur + " " +this.model.ledgrp.cbs.opn2.amt
+      return this.model.ledgrp.blk.addamtcov
+    }
+
+  }
 }
 </script>
 <style></style>

src/business/letdrw/views/Drv.vue

@@ -501,12 +501,12 @@ export default {
       return this.model.bedgrp.rec.doctypcod
     },
     maxcur(){
-      this.model.ledgrp.cbs.max.cur = this.model.ledgrp.cbs.opn1.cur
-      return this.model.ledgrp.cbs.max.cur
+      this.model.bedgrp.cbs.max.cur = this.model.ledgrp.cbs.opn1.cur
+      return this.model.bedgrp.cbs.max.cur
     },
     maxamt(){
-      this.model.ledgrp.cbs.max.amt = this.model.ledgrp.cbs.opn1.amt
-      return this.model.ledgrp.cbs.max.amt
+      this.model.bedgrp.cbs.max.amt = this.model.ledgrp.cbs.opn1.amt
+      return this.model.bedgrp.cbs.max.amt
     },
     docprbrol(){
       this.model.bedgrp.rec.docprbrol = 'BEB'

src/business/letdrw/views/Ovwp1.vue

@@ -446,10 +446,12 @@ export default {
   created: function () {},
   computed:{
     maxcur(){
-      return this.model.ledgrp.cbs.nom1.cur
+      this.model.ledgrp.cbs.max.cur = this.model.ledgrp.cbs.nom1.cur
+      return this.model.ledgrp.cbs.max.cur
     },
     maxamt(){
-      return this.model.ledgrp.cbs.nom1.amt * (1+this.model.ledgrp.rec.nomtop/100)
+      this.model.ledgrp.cbs.max.amt = this.model.ledgrp.cbs.nom1.amt * (1+this.model.ledgrp.rec.nomtop/100)
+      return this.model.ledgrp.cbs.max.amt
     }
   }
 }