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

src/business/litdav/model/check.js

@@ -294,7 +294,7 @@ export default {
     ],
     
     "brdgrp.cbs.max.amt":[
-        { type: 'string', required: true, message: '必输项' },
+        //{ type: 'string', required: true, message: '必输项' },
         { max: 15, message: '整数位不能超过15位' },
         {
             pattern: /(^\d+$)|(^\.\d{1,2}$)|(^\d+\.\d{1,2}$)/,
@@ -302,7 +302,7 @@ export default {
         },
     ],
     "brdgrp.cbs.max2.amt":[
-        { type: 'string', required: false, message: '必输项' },
+        //{ type: 'string', required: false, message: '必输项' },
         { max: 15, message: '整数位不能超过15位' },
         {
             pattern: /(^\d+$)|(^\.\d{1,2}$)|(^\d+\.\d{1,2}$)/,

src/business/litdav/model/index.js

@@ -59,7 +59,7 @@ export default class Litdav {
                 cbs: {
                     opn2: {
                         cur: '',
-                        amt: ''
+                        amt: '0.00'
                     },
                     max: {
                         cur: '',
@@ -113,7 +113,11 @@ export default class Litdav {
                 cbs: {
                     opn1: {
                         cur: '',
-                        amt: ''
+                        amt: '0.00'
+                    },
+                    opn2: {
+                        cur: '',
+                        amt: '0.00'
                     },
                     nom1: {
                         cur: '',

src/business/litdav/views/Davp.vue

@@ -294,6 +294,7 @@ export default {
           this.model.brdgrp.blk.docdisflg=  'X'
         }else if(this.model.brdgrp.rec.advtyp == '754'){
           this.model.brdgrp.rec.disdat = ""
+          this.model.brdgrp.blk.docdisflg=  ''
         }else if( this.model.brdgrp.rec.advtyp == 'oth'){
           this.model.brdgrp.rec.advdat = ""
           this.model.brdgrp.rec.disdat = ""

src/business/litdav/views/Mt750p.vue

@@ -173,30 +173,30 @@ export default {
     //   return this.model.brdgrp.rec.totamt
     // } 
   },
-  // watch:{
-    // "model.brdgrp.cbs.max.amt":{
-    //     handler(val,oldVal){
-    //         this.model.brdgrp.rec.totamt = parseFloat(val)+parseFloat(this.model.brdgrp.cbs.max2.amt)
-    //         if(isNaN(this.model.brdgrp.rec.totamt)){
-    //             this.model.brdgrp.rec.totamt=0
-    //         }
-    //     }
-    // },
-  //   "model.brdgrp.cbs.max2.amt":{
-  //       handler(val,oldVal){
-  //           this.model.brdgrp.rec.totamt = parseFloat(val)+parseFloat(this.model.brdgrp.cbs.max.amt)
-  //           if(isNaN(this.model.brdgrp.rec.totamt)){
-  //               this.model.brdgrp.rec.totamt=0
-  //           }
-  //       }
-  //   }
-  // "model.brdgrp.cbs":{
-  //   handler(val,oldVal){
-  //     isNaN(this.model.brdgrp.cbs.max.amt) ? 0 : this.model.brdgrp.cbs.max.amt
-  //     isNaN(this.model.brdgrp.cbs.max2.amt) ? 0 : this.model.brdgrp.cbs.max2.amt
-  //   }
-  //   }
-  // }
+  watch:{
+    "model.brdgrp":{
+      immediate:true,
+      deep: true,
+        handler(val,oldVal){
+          const max2Amt = this.model.brdgrp.cbs.max2.amt
+          const opn2Amt = this.model.lidgrp.cbs.opn2.amt
+          const maxAmt = this.model.brdgrp.cbs.max.amt
+          const opn1Amt = this.model.lidgrp.cbs.opn1.amt
+          var docdis = this.model.brdgrp.blk.docdis
+          const amt2=parseFloat(isNaN(max2Amt) || !max2Amt ? 0 : max2Amt) -parseFloat(isNaN(opn2Amt) || !opn2Amt ? 0 : opn2Amt)
+          const amt1=parseFloat(isNaN(maxAmt) || !maxAmt ? 0 : maxAmt) -parseFloat(isNaN(opn1Amt) || !opn1Amt ? 0 : opn1Amt)
+          if(amt1>0)
+          {
+            docdis = `The LC is overdrawn by ${this.model.brdgrp.cbs.opn2.cur} ${amt1} \n`
+          }
+          if(amt2>0)
+          {
+            docdis = `${docdis}The Additional Amount is overdrawn by ${this.model.brdgrp.cbs.opn2.cur} ${amt2}`
+          }
+          this.model.brdgrp.blk.docdis=docdis
+        }
+    },
+  }
  };
 </script>
 <style>