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/brtacp/views/Mt750p.vue

@@ -20,16 +20,16 @@
 
             <c-col :span="24">
                 <c-col :span="13">
-                    <el-form-item label="提取附加金额" prop="brdgrp.cbs.opn1.cur">
-                        <c-select v-model="model.brdgrp.cbs.opn2.cur" style="width: 100%" placeholder="请选择附加金额" disabled>
+                    <el-form-item label="提取附加金额" prop="brdgrp.cbs.max2.cur">
+                        <c-select v-model="max2cur" style="width: 100%" placeholder="请选择附加金额" disabled>
                             <el-option v-for="item in codes.cur" :key="item.value" :label="item.label" :value="item.value">
                             </el-option>
                         </c-select>
                     </el-form-item>
                 </c-col>
                 <c-col :span="11">
-                    <el-form-item label="" label-width="5px" prop="brdgrp.cbs.opn1.amt">
-                        <c-input v-model="model.brdgrp.cbs.opn1.amt" placeholder="请输入附加金额" disabled></c-input>
+                    <el-form-item label="" label-width="5px" prop="brdgrp.cbs.max2.amt">
+                        <c-input v-model="model.brdgrp.cbs.max2.amt" placeholder="请输入附加金额" disabled></c-input>
                     </el-form-item>
                 </c-col>
             </c-col>
@@ -111,6 +111,12 @@ export default {
     },
     methods: {},
     created: function () { },
+    computed: {
+    max2cur() {
+      this.model.brdgrp.cbs.max2.cur = this.model.brdgrp.cbs.max.cur
+      return this.model.brdgrp.cbs.max2.cur
+    }
+  }
 };
 </script>
 <style></style>

src/business/brtdck/views/Brtdckp.vue

@@ -268,9 +268,9 @@
         <!-- S0000006 : 附加金额 -->
         <c-col :span="24">
           <c-col :span="13">
-            <el-form-item label="提取附加金额" prop="brdgrp.cbs.opn2.cur">
+            <el-form-item label="提取附加金额" prop="brdgrp.cbs.max2.cur">
               <c-select
-                  v-model="opn2cur"
+                  v-model="max2cur"
                   disabled
                   style="width: 100%"
                   placeholder="请选择币种"
@@ -623,9 +623,9 @@ export default {
   created: function () {
   },
   computed: {
-    opn2cur() {
-      this.model.brdgrp.cbs.opn2.cur = this.model.brdgrp.cbs.max.cur
-      return this.model.brdgrp.cbs.opn2.cur
+    max2cur() {
+      this.model.brdgrp.cbs.max2.cur = this.model.brdgrp.cbs.max.cur
+      return this.model.brdgrp.cbs.max2.cur
     }
   }
 

src/business/brtlat/model/index.js

@@ -35,6 +35,7 @@ export default class Brtlat{
 					blnum: "",			//  B/L Number		.bddgrp.rec.blnum
 					totcur: "",			//  Total Amount Claimed		.bddgrp.rec.totcur
 					totamt: "",			//  Total Amount to be Paid		.bddgrp.rec.totamt
+					ver: "",
 				},
 				cbs:{
 					max:{