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/model/check.js

@@ -117,10 +117,10 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
-    "brdgrp.rec.totamt":[
-        {max: 18,required: true,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],
+    // "brdgrp.rec.totamt":[
+    //     {max: 18,required: true,message:"整数位不能超过14位"},
+    //     {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+    // ],
     "brdgrp.prb.pts.adrblk":[
         {type: "string", required: false, message: "必输项"},
         {max: 140,message:"长度不能超过140"}

src/business/inflid/event/index.js

@@ -82,7 +82,8 @@ export default {
     },
     toLitopn() {
       // 点击开立，清空从待经办进来的时候带的行参数
-      localStorage.setItem('row_gitopn', null)
+      localStorage.setItem('row_litopn', null)
+      localStorage.setItem('review_litopn',null)
       this.$router.history.push('/business-new/litopn');
     },
     toLetopn() {

src/business/letopn/event/index.js

@@ -129,8 +129,8 @@ export default {
     async onLitpButgetref() {
       let params = {
         ptainr: this.model.ledgrp.apl.pts.ptainr,
-        businessType: 'LC',
-        tbl: 'LC',
+        businessType: 'AD',
+        tbl: 'AD',
       };
       const loading = this.loading();
       let res = await Api.post('/service/letopn/getOwnRef', params);

src/business/letopn/views/Ovwp1.vue

@@ -445,6 +445,18 @@ export default {
     return {};
   },
   watch:{
+    "model.ledgrp":{
+     immediate: true,
+     deep: true,
+     handler(val,oldval){
+      const res = this.model.ledgrp
+       if(res.cbs.nom1.cur !== "" || res.cbs.nom1.amt !== "" || res.apl.pts.adrblk !== ""){
+        this.model.ledgrp.cbs.max.cur=this.model.ledgrp.cbs.nom1.cur;
+        this.model.ledgrp.cbs.max.amt=this.model.ledgrp.cbs.nom1.amt;
+        this.model.ledgrp.rec.nam = `${res.apl.pts.adrblk.substring(0,15)}${res.cbs.nom1.cur}${res.cbs.nom1.amt}`
+       }
+     }
+   },
     "model.ledgrp.rec.nomtop":{
       immediate:true,
       handler(val,old) {

src/business/litame/model/check.js

@@ -37,11 +37,11 @@ export default {
   ],
   'oldlidgrp.rec.nomtop':[
     {required: false, message: '必输项'},
-    {type: 'string',max: 99,message:'只能输入数字,长度不能超过2'}
+    {type: 'number',max: 99,message:'只能输入数字,长度不能超过2'}
   ],
   'oldlidgrp.rec.nomton':[
     {required: false, message: '必输项'},
-    {type: 'string', max: 99,message:'只能输入数字,长度不能超过2'}
+    {type: 'number', max: 99,message:'只能输入数字,长度不能超过2'}
   ],
   'oldlidgrp.cbs.max.cur':[
     {type: 'string', required: false, message: '必输项'},
@@ -67,11 +67,11 @@ export default {
   ],
   'swiadd.newnomtop':[
     {required: false, message: '必输项'},
-    {type: 'string', max: 99,message:'只能输入数字,长度不能超过2'}
+    {type: 'number', max: 99,message:'只能输入数字,长度不能超过2'}
   ],
   'swiadd.newnomton':[
     { required: false, message: '必输项'},
-    {type: 'string', max: 99,message:'只能输入数字,长度不能超过2'}
+    {type: 'number', max: 99,message:'只能输入数字,长度不能超过2'}
   ],
   'litamep.maxcur':[
     {type: 'string', required: false, message: '必输项'},
@@ -189,11 +189,11 @@ export default {
   ],
   'lidgrp.rec.nomtop':[
     {required: false, message: '必输项'},
-    {type: 'string', max: 99,message:'只能输入数字,长度不能超过2'}
+    {type: 'number', max: 99,message:'只能输入数字,长度不能超过2'}
   ],
   'lidgrp.rec.nomton':[
     { required: false, message: '必输项'},
-    {type: 'string', max: 99,message:'只能输入数字,长度不能超过2'}
+    {type: 'number', max: 99,message:'只能输入数字,长度不能超过2'}
   ],
   'lidgrp.apl.adrelc':[
     {type: 'string', required: true, message: '必输项'},

src/business/litame/views/Amep.vue

@@ -43,7 +43,7 @@
             v-model="model.lidgrp.cbs.nom1.cur"
             maxlength="3"
             placeholder="请输入金额"
-            disabled
+            
           ></c-input>
         </el-form-item>
       </c-col>
@@ -59,7 +59,7 @@
       </c-col>
 
       <c-col :span="12">
-        <el-form-item label="溢短装上浮" prop="oldlidgrp.rec.nomtop">
+        <el-form-item label="金额上浮" prop="oldlidgrp.rec.nomtop">
           <c-input
             v-model.number="model.oldlidgrp.rec.nomtop"
             placeholder="请输入上浮比例"
@@ -69,7 +69,7 @@
       </c-col>
 
       <c-col :span="12">
-        <el-form-item label="溢短装下浮" prop="oldlidgrp.rec.nomton">
+        <el-form-item label="金额下浮" prop="oldlidgrp.rec.nomton">
           <c-input
             v-model.number="model.oldlidgrp.rec.nomton"
             placeholder="请输入下浮比例"

src/business/litdav/model/index.js

@@ -91,11 +91,11 @@ export default class Litdav {
                     },
                     max: {
                         cur: '',
-                        amt: ''
+                        amt: '0'
                     },
                     max2: {
                         cur:'',
-                        amt: ''
+                        amt: '0'
                     }
                 },
                 rmb: {

src/business/litdav/views/Mt750p.vue

@@ -134,6 +134,25 @@ export default {
   },
   methods: {},
   created: function() {},
+
+  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
+            }
+        }
+    }
+  }
   
 };
 </script>

src/business/litopn/event/index.js

@@ -21,7 +21,7 @@ export default {
     ...doctre,
     async init() {
       const params = {
-        // spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
+        spt: JSON.parse(localStorage.getItem('row_' + this.trnName)),
         trnmod:{
                   trn:JSON.parse(localStorage.getItem('review_'+this.trnName))
                 }

src/business/litopn/model/check.js

@@ -463,8 +463,8 @@ export default {
   'lidgrp.rec.stagod': [{ required: true, message: '必输项' }],
 
   'lidgrp.rec.tenmaxday': [
-    { type: 'string', required: true, message: '请输入数字' },
-    { type: 'string', max: 999, message: '不能超过999' },
+    { type: 'number', required: true, message: '请输入数字' },
+    { type: 'number', max: 999, message: '不能超过999' },
     { pattern: /(^-?[1-9][0-9]{0,2}$)|0/, message: '-999至999之间' },
     // ^-?[1-9]\d*$　　 //匹配整数
   ],

src/business/litopn/views/Detp.vue

@@ -336,6 +336,7 @@ export default {
       flag4: true,
       flag5: false,
       flag6: false,
+     
     };
   },
   methods: {
@@ -392,6 +393,7 @@ export default {
           this.flag1 = true;
           this.flag2 = false;
           this.flag3 = true;
+          this.model.lidgrp.rec.tenmaxday == 0
         }
         if (val == "M") {
           this.flag1 = true;
@@ -405,13 +407,15 @@ export default {
         }
       },
     },
- "model.lidgrp.rec.tenmaxday":{
-     immediate: true,
-     handler(val,oldval){
-       if(this.model.lidgrp.rec.tenmaxday==""){}
-        this.model.lidgrp.rec.tenmaxday='0';
-     }
-   } 
+//  "model.lidgrp.rec.tenmaxday":{
+//      immediate: true,
+//      handler(val,oldval){
+//       console.log(val);
+      
+//        if(this.model.lidgrp.rec.avbby !== 'P'){}
+//         // this.model.lidgrp.rec.tenmaxday='0';
+//      }
+//    } 
   }, 
 };
 </script>

src/business/litopn/views/Ovwp1.vue

@@ -114,7 +114,7 @@
         </c-col>
       </el-col>
       <c-col :span="14">
-        <el-form-item label="溢短装" prop="lidgrp.rec.nomtop">
+        <el-form-item label="浮动金额" prop="lidgrp.rec.nomtop">
           <c-input
             v-model="model.lidgrp.rec.nomtop"
             maxlength="2"