Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

src/business/letdrw/model/check.js

@@ -457,7 +457,7 @@ let checkObj = {
         {max: 3,message:"长度不能超过3"}
     ],
     "ledgrp.cbs.opn1.amt":[
-        {type: "number", required: false, message: "必输项5"},
+        // {type: "number", required: false, message: "必输项5"},
         {pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "ledgrp.apl.pts.nam":[

src/business/letdrw/views/Drv.vue

@@ -56,7 +56,7 @@
         <c-col :span="12">
         <el-form-item label="信用证余额" prop="ledgrp.cbs.opn1.cur">
           <c-select
-            v-model="model.ledgrp.cbs.opn1.cur"
+            v-model="opn1cur"
             style="width: 100%"
             placeholder="请选择币种"
             disabled
@@ -67,7 +67,7 @@
       <c-col :span="7">
         <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt">
           <c-input
-            v-model="model.ledgrp.cbs.opn1.amt"
+            v-model="opn1amt"
             style="text-align: left; width: 100%"
             class="m-input-currency"
             placeholder="请输入金额"
@@ -483,6 +483,14 @@ export default {
   methods: {
   },
   created: function () {},
+  computed:{
+    opn1cur(){
+      return this.model.ledgrp.cbs.nom1.cur
+    },
+    opn1amt(){
+      return this.model.ledgrp.cbs.nom1.amt * (1+this.model.ledgrp.rec.nomtop/100)
+    }
+  }
 }
 </script>
 <style></style>