LITDAV联动修改

src/business/litdav/event/buildCommons.js

@@ -28,6 +28,15 @@ export default {
     if (model.lidgrp.ben.pts.extkey) {
       ptsptaList.push(this.buildPtspta(model.lidgrp.ben));
     }
+    if (model.lidgrp.rmb.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.lidgrp.rmb));
+    }
+    if (model.lidgrp.acb.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.lidgrp.acb));
+    }
+    if (model.lidgrp.beb.pts.extkey) {
+      ptsptaList.push(this.buildPtspta(model.lidgrp.beb));
+    }
     let dataObj = {
       rec: {
         objtyp: 'BRD',

src/business/litdav/model/check.js

@@ -5,6 +5,7 @@ export default {
     "liaall.limmod.limpts.nonrevflg1"                      :null,
     "brdgrp.rec.docprbrol"                      :null,
     "brdgrp.rec.totamt"                      :null,
+    "brdgrp.cbs.max2.amt":null,
 
     "brtp.lidget.sdamod.dadsnd":[
         {type: "string", required: false, message: "必输项"},
@@ -291,17 +292,23 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
-    // "brdgrp.cbs.max.amt":[
-    //     {type: "number", required: false, message: "必输项"},
-    //     {max: 18,message:"整数位不能超过14位"},
-    //     {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    // ],
     
-    // "brdgrp.cbs.max2.amt":[
-    //     {type: "number", required: false, message: "必输项"},
-    //     {max: 18,message:"整数位不能超过14位"},
-    //     {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    // ],
+    "brdgrp.cbs.max.amt":[
+        { type: 'string', required: true, message: '必输项' },
+        { max: 15, message: '整数位不能超过15位' },
+        {
+            pattern: /(^\d+$)|(^\.\d{1,2}$)|(^\d+\.\d{1,2}$)/,
+            message: '小数位不能超过2位',
+        },
+    ],
+    "brdgrp.cbs.max2.amt":[
+        { type: 'string', required: false, message: '必输项' },
+        { max: 15, message: '整数位不能超过15位' },
+        {
+            pattern: /(^\d+$)|(^\.\d{1,2}$)|(^\d+\.\d{1,2}$)/,
+            message: '小数位不能超过2位',
+        },
+    ],
     "brdgrp.blk.chaded":[
         {type: "string", required: false, message: "必输项"},
         {max: 200,message:"长度不能超过200"}

src/business/litdav/model/index.js

@@ -30,6 +30,7 @@ export default class Litdav {
                     docsta: '',
                     orddat: '',
                     disdat: '',
+                    advdat: '',
                     invref: '',
                     rptref: '',
                     shpdat: '',
@@ -47,7 +48,7 @@ export default class Litdav {
                     branchinr: '',
                     invtyp: '',
                     bchkeyinr: '',
-                    totamt: '0',
+                    totamt: '0.00',
                     totcur: '',
                     rtoaplflg: '',
                     inr: '',
@@ -62,11 +63,11 @@ export default class Litdav {
                     },
                     max: {
                         cur: '',
-                        amt: '0'
+                        amt: '0.00'
                     },
                     max2: {
                         cur: '',
-                        amt: '0'
+                        amt: '0.00'
                     }
                 },
                 rmb: {

src/business/litdav/views/Davp.vue

@@ -119,7 +119,12 @@
 
          <c-col :span="24">
         <el-form-item label="通知类型" prop="brdgrp.rec.advtyp">
-            <c-select :code="codes.advtyp" v-model="model.brdgrp.rec.advtyp" style="width:100%" placeholder="请选择通知类型"> 
+            <c-select 
+              :code="codes.advtyp" 
+              v-model="model.brdgrp.rec.advtyp" 
+              style="width:100%" 
+              placeholder="请选择通知类型"
+            > 
             </c-select>
         </el-form-item>
        </c-col>
@@ -127,16 +132,26 @@
        <c-col :span="12">
         <el-form-item label="建议付款日期" prop="brdgrp.rec.advdat">
             <c-date-picker 
-            :disabled=" (this.model.brdgrp.rec.advtyp == '750' || this.model.brdgrp.rec.advtyp == 'OTH') "
-            type="date"  v-model="model.brdgrp.rec.advdat" style="width:100%"  placeholder="请选择建议付款日期"></c-date-picker>
+              :disabled=" (this.model.brdgrp.rec.advtyp == '750' || this.model.brdgrp.rec.advtyp == 'oth') "
+              type="date"  
+              v-model="model.brdgrp.rec.advdat" 
+              style="width:100%"  
+              placeholder="请选择建议付款日期"
+              value-format="yyyy-MM-dd"
+            ></c-date-picker>
         </el-form-item>
        </c-col>
                                    
        <c-col :span="12">
         <el-form-item label="不符点通知日期" prop="brdgrp.rec.disdat">
             <c-date-picker 
-            :disabled=" (this.model.brdgrp.rec.advtyp == '754' || this.model.brdgrp.rec.advtyp == 'OTH') "
-            type="date"  v-model="model.brdgrp.rec.disdat" style="width:100%"  placeholder="请选择不符点通知日期"></c-date-picker>
+              :disabled=" (this.model.brdgrp.rec.advtyp == '754' || this.model.brdgrp.rec.advtyp == 'oth') "
+              type="date"  
+              v-model="model.brdgrp.rec.disdat" 
+              style="width:100%"  
+              placeholder="请选择不符点通知日期"
+              value-format="yyyy-MM-dd"
+            ></c-date-picker>
         </el-form-item>
        </c-col>
     </el-col>
@@ -176,19 +191,24 @@
         </el-form-item>
        </c-col>
         <c-col :span="24">
-        <el-form-item label="寄单行参考号" prop="brdgrp.prb.pts.ref">
+        <el-form-item label="交单行参考号" prop="brdgrp.prb.pts.ref">
             <c-input   :disabled="true" v-model="model.brdgrp.prb.pts.ref" maxlength="16"  placeholder="请输入编号"></c-input>
         </el-form-item>
        </c-col>
        <c-col :span="24">
-        <el-form-item  prop="brdgrp.prb.pts.nam" label="寄单行名称">
+        <el-form-item  prop="brdgrp.prb.pts.nam" label="交单行名称">
             <c-input  :disabled="true"  v-model="model.brdgrp.prb.pts.nam" maxlength="40"  placeholder="请输入名称"></c-input>
         </el-form-item>
        </c-col>
 
        <c-col :span="24">
         <el-form-item label="简略信息" prop="brdgrp.rec.nam">
-            <c-input  :disabled="true"  v-model="model.brdgrp.rec.nam" maxlength="40"  placeholder="请输入简略信息"></c-input>
+            <c-input  
+            :disabled="true"  
+            v-model="model.brdgrp.rec.nam" 
+            maxlength="40"  
+            placeholder="请输入简略信息"
+            ></c-input>
         </el-form-item>
        </c-col>
        <c-col :span="24">
@@ -270,19 +290,28 @@ export default {
       immediate:true,
       handler(){
         if(this.model.brdgrp.rec.advtyp == '750' ){
-          this.model.brdgrp.rec.advdat = ' '
+          this.model.brdgrp.rec.advdat = ""
           this.model.brdgrp.blk.docdisflg=  'X'
-
-
         }else if(this.model.brdgrp.rec.advtyp == '754'){
-          this.model.brdgrp.rec.disdat = ' '
-        }else if( this.model.brdgrp.rec.advtyp == 'OTH'){
-          this.model.brdgrp.rec.advdat = ' '
-          this.model.brdgrp.rec.disdat = ' '
+          this.model.brdgrp.rec.disdat = ""
+        }else if( this.model.brdgrp.rec.advtyp == 'oth'){
+          this.model.brdgrp.rec.advdat = ""
+          this.model.brdgrp.rec.disdat = ""
         }
       }
+    },
+    "model.brdgrp":{
+     immediate: true,
+     deep: true,
+     handler(val,oldval){
+      const res = this.model.brdgrp
+       if(res.cbs.max.cur !== "" || res.cbs.max.amt !== "" || this.model.lidgrp.apl.pts.adrblk !== ""){
+        this.model.brdgrp.cbs.max.cur=this.model.lidgrp.cbs.nom1.cur;
+        this.model.brdgrp.rec.nam = `${res.cbs.max.cur} ${res.cbs.max.amt} ${this.model.lidgrp.apl.pts.adrblk.substring(0,16)}`
+       }
      }
    },
+  },
   methods: {},
   created: function() {}
 };

src/business/litdav/views/Mt750p.vue

@@ -68,12 +68,14 @@
                                   
        <c-col :span="24">
         <c-col :span="12">
-        <el-form-item label="账户号地址编号" prop="brdgrp.acb.pts.extkey">
+        <el-form-item label="账户行" prop="brdgrp.acb.pts.extkey">
             <c-fullbox>
             <c-input  
             v-model="model.brdgrp.acb.pts.extkey" 
             maxlength="16"  
             placeholder="请输入地址编码"
+            @keyup.enter.native="
+                queryGridEtyPromptDialogData('ACB', 'B')"
             ></c-input>
             <template slot="footer">
                 <c-button size="small" type="primary">

src/business/litdav/views/Mt754p.vue

@@ -5,7 +5,7 @@
         <el-form-item label="单据金额" prop="brdgrp.cbs.max.cur">
           <c-input
             disabled
-            v-model="model.brdgrp.cbs.max.cur"
+            v-model="maxcur"
             maxlength="3"
             placeholder="请输入单据金额"
           ></c-input>
@@ -25,7 +25,7 @@
         <el-form-item label="提取附加金额" prop="brdgrp.cbs.opn2.cur">
           <c-select
             disabled
-            v-model="model.brdgrp.cbs.opn2.cur"
+            v-model="opn2cur"
             style="width: 100%"
             placeholder="请选择附加金额"
           >
@@ -72,7 +72,7 @@
         <el-form-item label="待支付金额" prop="brdgrp.rec.totcur">
           <c-input
             disabled
-            v-model="model.brdgrp.rec.totcur"
+            v-model="rectotcur"
             maxlength="3"
             placeholder="请选择币种"
           ></c-input>
@@ -82,7 +82,7 @@
       <c-col :span="12">
         <el-form-item label="" label-width="10px" prop="brdgrp.rec.totamt">
           <c-input
-            v-model="model.brdgrp.rec.totamt"
+            v-model="totamt"
             placeholder="请输入金额"
           ></c-input>
         </el-form-item>
@@ -94,6 +94,8 @@
             v-model="model.brdgrp.rmb.pts.extkey"
             maxlength="16"
             placeholder="请输入地址编号"
+            @keyup.enter.native="
+                queryGridEtyPromptDialogData('RMB', 'B')"
           ></c-input>
 
           <template slot="footer">
@@ -124,6 +126,8 @@
               v-model="model.brdgrp.acb.pts.extkey"
               maxlength="16"
               placeholder="请输入地址编号"
+              @keyup.enter.native="
+                queryGridEtyPromptDialogData('ACB', 'B')"
             ></c-input>
 
             <template slot="footer">
@@ -182,6 +186,8 @@
               v-model="model.brdgrp.beb.pts.extkey"
               maxlength="16"
               placeholder="请输入地址编号"
+              @keyup.enter.native="
+                queryGridEtyPromptDialogData('BEB', 'B')"
             ></c-input>
 
             <template slot="footer">
@@ -221,6 +227,28 @@ export default {
   },
   methods: {},
   created: function () {},
+  computed: {
+    totamt(){
+      const maxAmt = this.model.brdgrp.cbs.max.amt
+      const max2Amt = this.model.brdgrp.cbs.max2.amt
+      this.model.brdgrp.rec.totamt = 
+      parseFloat(isNaN(maxAmt) || !maxAmt ? 0 : maxAmt) + 
+      parseFloat(isNaN(max2Amt) || !max2Amt ? 0 : max2Amt)
+      return this.model.brdgrp.rec.totamt
+    } ,
+    maxcur(){
+      this.model.brdgrp.cbs.max.cur = this.model.lidgrp.cbs.nom1.cur
+      return this.model.brdgrp.cbs.max.cur
+    },
+    opn2cur(){
+      this.model.brdgrp.cbs.opn2.cur = this.model.lidgrp.cbs.nom1.cur
+      return this.model.brdgrp.cbs.opn2.cur
+    },
+    rectotcur(){
+      this.model.brdgrp.rec.totcur = this.model.lidgrp.cbs.nom1.cur
+      return this.model.brdgrp.rec.totcur
+    }
+  }
 };
 </script>
 <style></style>

src/business/litdav/views/Othadvtypp.vue

@@ -5,7 +5,7 @@
         <el-form-item label="单据金额" prop="brdgrp.cbs.max.cur">
           <c-input
             disabled
-            v-model="model.brdgrp.cbs.max.cur"
+            v-model="maxcur"
             maxlength="3"
             placeholder="请输入单据金额"
           ></c-input>
@@ -26,7 +26,7 @@
           <el-form-item label="提取附加金额" prop="brdgrp.cbs.opn2.cur">
             <c-select
               disabled
-              v-model="model.brdgrp.cbs.opn2.cur"
+              v-model="opn2cur"
               style="width: 100%"
               placeholder="请选择附加金额"
             >
@@ -69,7 +69,7 @@
           <el-form-item label="待支付总额" prop="brdgrp.rec.totcur">
             <c-input
               disabled
-              v-model="model.brdgrp.rec.totcur"
+              v-model="rectotcur"
               maxlength="3"
               placeholder="请输入待支付总额"
             ></c-input>
@@ -79,7 +79,7 @@
         <c-col :span="12">
           <el-form-item label="" label-width="10px" prop="brdgrp.rec.totamt">
             <c-input
-              v-model="model.brdgrp.rec.totamt"
+              v-model="totamt"
               placeholder="请输入待支付总额"
             ></c-input>
           </el-form-item>
@@ -87,12 +87,14 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="账户银行" prop="brdgrp.acb.pts.extkey">
+        <el-form-item label="账户行" prop="brdgrp.acb.pts.extkey">
           <c-fullbox>
             <c-input
               v-model="model.brdgrp.acb.pts.extkey"
               maxlength="16"
               placeholder="请输入账户银行"
+              @keyup.enter.native="
+                queryGridEtyPromptDialogData('ACB', 'B')"
             ></c-input>
 
             <template slot="footer">
@@ -124,6 +126,8 @@
               v-model="model.brdgrp.beb.pts.extkey"
               maxlength="16"
               placeholder="请输入受益人银行"
+              @keyup.enter.native="
+                queryGridEtyPromptDialogData('BEB', 'B')"
             ></c-input>
 
             <template slot="footer">
@@ -162,6 +166,28 @@ export default {
   },
   methods: {},
   created: function () {},
+  computed: {
+    totamt(){
+      const maxAmt = this.model.brdgrp.cbs.max.amt
+      const max2Amt = this.model.brdgrp.cbs.max2.amt
+      this.model.brdgrp.rec.totamt = 
+      parseFloat(isNaN(maxAmt) || !maxAmt ? 0 : maxAmt) + 
+      parseFloat(isNaN(max2Amt) || !max2Amt ? 0 : max2Amt)
+      return this.model.brdgrp.rec.totamt
+    } ,
+    maxcur(){
+      this.model.brdgrp.cbs.max.cur = this.model.lidgrp.cbs.nom1.cur
+      return this.model.brdgrp.cbs.max.cur
+    },
+    opn2cur(){
+      this.model.brdgrp.cbs.opn2.cur = this.model.lidgrp.cbs.nom1.cur
+      return this.model.brdgrp.cbs.opn2.cur
+    },
+    rectotcur(){
+      this.model.brdgrp.rec.totcur = this.model.lidgrp.cbs.nom1.cur
+      return this.model.brdgrp.rec.totcur
+    }
+  }
 };
 </script>
 <style>