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

src/business/litame/model/index.js

@@ -82,6 +82,10 @@ export default class Litame {
 					max2: {
 						cur: '',
 						amt: '0.00',
+					},
+					opn2: {
+						cur: '',
+						amt: '0',
 					}
 				}
 			},
@@ -162,6 +166,9 @@ export default class Litame {
 				ini: {
 					pts: new Pts().data,
 				},
+				cmb: {
+					pts: new Pts().data,
+				},
 				cbs: {
 					opn2: {
 						cur: '',
@@ -206,7 +213,7 @@ export default class Litame {
 				prepers18: '',
 				amenbr: '',
 				nartxt: '',
-				addamt: '',
+				addamt: '0',
 				amecur: '',
 				newshpdat: '',
 				newamt: '',

src/business/litame/views/Aamp.vue

@@ -20,7 +20,7 @@
           prop="lidgrp.cbs.max2.amt"
         >
           <c-input
-            v-model="model.lidgrp.cbs.max2.amt"
+            v-model="max2amt"
             style="text-align: left; width: 100%"
             placeholder="请输入附加金额"
             disabled
@@ -48,7 +48,7 @@
           prop="lidgrp.cbs.opn2.amt"
         >
           <c-input
-            v-model="model.lidgrp.cbs.opn2.amt"
+            v-model="opn2amt"
             style="text-align: left; width: 100%"
             placeholder="请输入附加金额余额"
             disabled
@@ -60,7 +60,7 @@
         <el-form-item label="39C场" prop="lidgrp.blk.addamtcov">
           <c-input
             type="textarea"
-            v-model="model.lidgrp.blk.addamtcov"
+            v-model="blkaddamtcov"
             maxlength="35"
             :rows="4"
             show-word-limit
@@ -84,6 +84,24 @@ export default {
   },
   methods: {},
   created: function () {},
+  computed: {
+    opn2amt(){
+      this.model.lidgrp.cbs.opn2.amt = parseInt(this.model.oldlidgrp.cbs.opn2.amt)+
+                                      parseInt(this.model.lidgrp.cbs.max2.amt)-
+                                      parseInt(this.model.oldlidgrp.cbs.max2.amt)
+        return this.model.lidgrp.cbs.opn2.amt
+    },
+    max2amt(){
+      this.model.lidgrp.cbs.max2.amt = this.model.swiadd.addamt
+      return this.model.lidgrp.cbs.max2.amt
+    },
+    blkaddamtcov(){
+      if(this.model.litp.aamp.aammod.addamtflg==='X'){
+        this.model.lidgrp.blk.addamtcov = this.model.lidgrp.cbs.max2.cur + '' + this.model.lidgrp.cbs.max2.amt
+        return this.model.lidgrp.blk.addamtcov
+      }
+    }
+  }
 };
 </script>
 <style>

src/business/litame/views/Amep.vue

@@ -400,7 +400,7 @@
         <el-form-item label="附加金额覆盖" prop="swiadd.addamtcov">
           <c-input
             type="textarea"
-            v-model="model.swiadd.addamtcov"
+            v-model="swiaddaddamtcov"
             maxlength="140"
             show-word-limit
             placeholder="请输入附加金额"
@@ -452,7 +452,15 @@ export default {
     litamepengamt(){
     this.model.litamep.engamt = new Number(  parseFloat(new Number(this.model.swiadd.ameamt) + new Number(this.model.swiadd.newamt) * new Number(this.model.swiadd.newnomtop)/100).toFixed(2) );
       return this.model.litamep.engamt
-    }
+    },
+    swiaddaddamtcov(){
+      if(this.model.litp.aamp.aammod.addamtflg==='X'){
+        this.model.swiadd.addamtcov = this.model.lidgrp.cbs.max2.cur + '' + this.model.swiadd.addamt
+        return this.model.swiadd.addamtcov
+      }else{
+        this.model.swiadd.addamt = '0.00'
+      }
+    },
   },
   created: function () {},
 };

src/business/litame/views/Detp.vue

@@ -372,16 +372,30 @@ export default {
           this.flag4 = true;
           this.flag5 = false;
           this.flag6 = true;
-        } //Confirming Bank
+        } //Confirming Bank 保兑行
         else if (val == 'C') {
           this.flag4 = true;
           this.flag5 = true;
           this.flag6 = true;
-        } //Specified Bank
+          // this.model.lidgrp.avb.pts.adrblk = null
+          // this.model.lidgrp.avb.pts.extkey = null
+        } //Specified Bank 指定银行
         else if (val == 'S') {
           this.flag4 = true;
           this.flag5 = false;
-          this.flag6 = false;
+          this.flag6 = true;
+        }
+        //Reimbursing Bank 偿付行
+        else if (val == 'R') {
+          this.flag4 = true;
+          this.flag5 = true;
+          this.flag6 = true;
+        }
+        //Transferring Bank 转让行
+        else if (val == 'T') {
+          this.flag4 = true;
+          this.flag5 = true;
+          this.flag6 = true;
         }
       },
     },

src/business/litame/views/Ptyp.vue

@@ -256,18 +256,18 @@
       
     <c-col :span="24">
       <el-form-item label="附加当事人" >
-              <c-edit-table :model="model" v-bind="ptsaddg">
-            <el-table-column label="操作" align="center">
-              <template>
-                <el-button
-                  size="mini"
-                  type="primary"
-                  icon="el-icon-info"
-                  ></el-button
-                >
-              </template>
-            </el-table-column>
-          </c-edit-table>
+        <c-edit-table :model="model" v-bind="ptsaddg">
+          <el-table-column label="操作" align="center">
+            <template>
+              <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-info"
+                ></el-button
+              >
+            </template>
+          </el-table-column>
+        </c-edit-table>
       </el-form-item>
     </c-col>
     

src/business/litopn/event/index.js

@@ -197,6 +197,10 @@ export default {
       if (res.respCode == SUCCESS) {
         this.model.lidgrp.avb.pts.extkey=res.data.avbwth.pts.extkey;
         this.model.lidgrp.avb.pts.adrblk=res.data.avbwth.pts.adrblk;
+        this.model.lidgrp.avb.pts.nam=res.data.avbwth.pts.nam;
+        this.model.lidgrp.avb.pts.ptainr =res.data.avbwth.pts.ptainr;
+        this.model.lidgrp.avb.pts.ptyinr=res.data.avbwth.pts.ptyinr;
+        this.model.lidgrp.avb.pts.rol="AVB";
       }
     },
   },

src/business/litopn/model/check.js

@@ -442,7 +442,7 @@ export default {
     { max: 35, message: '长度不能超过35' },
   ],
   'lidgrp.blk.mixdet': [
-    { type: 'string', required: false, message: '必输项' },
+    { type: 'string', message: '必输项' },
     { max: 130, message: '长度不能超过130' },
   ],
   'lidgrp.drw.adrelc': [
@@ -1018,7 +1018,7 @@ export default {
     { max: 8, message: '长度不能超过8' },
   ],
   'lidgrp.cbs.nom1.cur': [
-    { type: 'string', required: true },
+    { type: 'string', required: true , message: '必输项' },
     { max: 8, message: '长度不能超过8' },
   ],
 };

src/business/litopn/views/Detp.vue

@@ -292,7 +292,13 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="混合付款指示" prop="lidgrp.blk.mixdet">
+        <el-form-item 
+        label="混合付款指示" 
+        prop="lidgrp.blk.mixdet" 
+        :rules="[
+          { max: 130, message: '长度不能超过130' },
+          { required:!flag3, message:'必输项'}
+          ]">
           <c-input
             type="textarea"
             v-model="model.lidgrp.blk.mixdet"
@@ -309,12 +315,18 @@
         <el-form-item
           label="远期汇票最大期限（天）"
           prop="lidgrp.rec.tenmaxday"
-          :required="flag8"
+          :rules="[
+            { required:flag8,pattern:/^((?!^-[1-9]\d*|0$).)*$/, message:'必输项'},
+            { type: 'number',  message: '请输入数字' },
+            { type: 'number', max: 999, message: '不能超过999' },
+            { pattern: /(^-?[1-9][0-9]{0,2}$)|0/, message: '-999至999之间' },
+        ]"
         >
           <c-input
             :disabled="!!(this.model.lidgrp.rec.avbby == 'P')"
             v-model.number="model.lidgrp.rec.tenmaxday"
             placeholder="请输入天数"
+            maxlength="3"
           ></c-input>
         </el-form-item>
       </c-col>

src/business/litopn/views/Ovwp1.vue

@@ -286,7 +286,14 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="其他适用规则" prop="lidgrp.rec.apprultxt">
+        <el-form-item 
+          label="其他适用规则" 
+          prop="lidgrp.rec.apprultxt"
+          :rules="[
+            { required:!flag, message:'必输项'},
+            { max: 35, message: '长度不能超过35' },
+        ]"
+        >
           <c-input
             v-model="model.lidgrp.rec.apprultxt"
             maxlength="35"
@@ -660,7 +667,27 @@ export default {
        }
      }
    },
- 
+    "model.litp.aamp.aammod.addamtflg":{
+        immediate: true,
+        deep: true,
+        handler(val, oldVal) {
+          if (val == "X") {
+            this.model.lidgrp.cbs.max2.cur = this.model.lidgrp.cbs.nom1.cur;
+            this.model.lidgrp.cbs.opn2.cur = this.model.lidgrp.cbs.nom1.cur;
+          } else {
+            this.model.lidgrp.cbs.max2.cur = "";
+            this.model.lidgrp.cbs.opn2.cur = "";
+          }
+      },
+    },
+    "model.lidgrp.cbs.max2.amt":{
+        immediate: true,
+        deep: true,
+        handler(val, oldVal) {
+            this.model.lidgrp.cbs.opn2.amt = val;
+            this.model.lidgrp.blk.addamtcov = `${this.model.lidgrp.cbs.opn2.cur} ${val} `
+      },
+    },
    
   },
   computed: {

src/business/trtset/model/index.js

@@ -20,6 +20,7 @@ export default class Trtset {
                     ovdflg: "",			//  Overdue Flag		.trdgrp.rec.ovdflg
                     actrat: "",			//  执行利率		.trdgrp.rec.actrat
                     branchinr: "",
+                    ver: "",
                 },
                 cbs: {
                     max: {
@@ -74,21 +75,22 @@ export default class Trtset {
                     reptyp: "",			//  还款方式		.trtmod.finmod.reptyp
                     cbs: {
                         cbb: {
-                            intamt1: "",			//  表外欠息利息		.trtmod.finmod.cbs.cbb.intamt1
-                            intamty1: "",			//  表外本年欠息		.trtmod.finmod.cbs.cbb.intamty1
-                            intamt2: "",			//  表内欠息利息		.trtmod.finmod.cbs.cbb.intamt2
-                            intamty2: "",			//  表内本年欠息		.trtmod.finmod.cbs.cbb.intamty2
-                            intamt: "",			//  利息		.trtmod.finmod.cbs.cbb.intamt
-                            amt: "",			//  本金		.trtmod.finmod.cbs.cbb.amt
+                            intamt1: "0.00",			//  表外欠息利息		.trtmod.finmod.cbs.cbb.intamt1
+                            intamty1: "0.00",			//  表外本年欠息		.trtmod.finmod.cbs.cbb.intamty1
+                            intamt2: "0.00",			//  表内欠息利息		.trtmod.finmod.cbs.cbb.intamt2
+                            intamty2: "0.00",			//  表内本年欠息		.trtmod.finmod.cbs.cbb.intamty2
+                            intamt: "0.00",			//  利息		.trtmod.finmod.cbs.cbb.intamt
+                            amt: "0.00",			//  本金		.trtmod.finmod.cbs.cbb.amt
                         },
                         cbe: {
-                            intamt1: "",			//  偿还表外欠息利息		.trtmod.finmod.cbs.cbe.intamt1
-                            intamty1: "",			//  偿还表外欠息		.trtmod.finmod.cbs.cbe.intamty1
-                            intamt2: "",			//  偿还表内欠息利息		.trtmod.finmod.cbs.cbe.intamt2
-                            intamty2: "",			//  偿还表内欠息		.trtmod.finmod.cbs.cbe.intamty2
-                            intamt: "",			//  偿还本金利息		.trtmod.finmod.cbs.cbe.intamt
-                            amt: "",			//  偿还本金		.trtmod.finmod.cbs.cbe.amt
+                            intamt1: "0.00",			//  偿还表外欠息利息		.trtmod.finmod.cbs.cbe.intamt1
+                            intamty1: "0.00",			//  偿还表外欠息		.trtmod.finmod.cbs.cbe.intamty1
+                            intamt2: "0.00",			//  偿还表内欠息利息		.trtmod.finmod.cbs.cbe.intamt2
+                            intamty2: "0.00",			//  偿还表内欠息		.trtmod.finmod.cbs.cbe.intamty2
+                            intamt: "0.00",			//  偿还本金利息		.trtmod.finmod.cbs.cbe.intamt
+                            amt: "0.00",			//  偿还本金		.trtmod.finmod.cbs.cbe.amt
                         },
+                        calflg: "",
                         totint: "",			//  偿还利息总额		.trtmod.finmod.cbs.totint
                     },
                     acttyp: "",			//  第三方还款方式		.trtmod.finmod.acttyp

src/config/CodeTable/index.js

@@ -602,7 +602,7 @@ const CodeTable = {
     avbwth: [
         { label: "开证行", value: "I" },
         { label: "指定银行", value: "S" },
-        { label: "保兌行", value: "C" },
+        { label: "保兑行", value: "C" },
         { label: "任何银行", value: "O" },
         { label: "偿付行", value: "R" },
         { label: "通知行", value: "A" },