Brtset,Cptati,Cptrep交易BUG修改

src/model/Brtset/index.js

@@ -11,6 +11,8 @@ export default class Brtset{
 		const pub = new Public()
         this.data = {
 						cnybop:{
+							brtadvl1blk:"",
+							brtapll2blk:"",
 							cnyflg:"",			//  是否报送跨境人民币2101表		.cnybop.cnyflg
 							traflg:"",			//  是否报送跨境人民币2107表		.cnybop.traflg
 							outflg:"",			//  是否报送跨境人民币2111表		.cnybop.outflg
@@ -145,7 +147,7 @@ export default class Brtset{
 							bptbckg:[],			//  		.bptbck.bptbckg
 							dscbckcur:"",			//  currency discount paid back		.bptbck.dscbckcur
 						},
-						trnmod:new Trnmod().data,
+						trnmod: new Pub().data.Trnmod,
 						dftcre:{
 							dfflag:"",			//  同业代付		.dftcre.dfflag
 							dfdgrp:{

src/model/Brtsnd/index.js

@@ -12,6 +12,9 @@ export default class Brtsnd{
 						setmod: new Setmod().data ,
 						mtabut:new Mtabut().data,
 						trnmod:new Trnmod().data,
+						brtapll1blk:"",
+						brtapll2blk:"",
+						brtapll4blk:"",
 						brdgrp:{
 							rec:{
 								ownref:"",			//  单据参考号		.brdgrp.rec.ownref

src/model/Cptati/Event.js

@@ -7,7 +7,7 @@ export default {
                 if(rtnmsg.respCode == SUCCESS)
                 {
                 //TODO 处理数据逻辑
-
+                        Utils.copyValueFromVO(this.model, rtnmsg.data);
                 }
                 else
                 {
@@ -326,30 +326,6 @@ export default {
                 this.$notify.error({title: '错误',message: '服务请求失败！'});
                 }
             },
-        async onCan(){
-                let rtnmsg = await this.executeRule("can")
-                if(rtnmsg.respCode == SUCCESS)
-                {
-                //TODO 处理数据逻辑
-
-                }
-                else
-                {
-                this.$notify.error({title: '错误',message: '服务请求失败！'});
-                }
-            },
-        async onChk(){
-                let rtnmsg = await this.executeRule("chk")
-                if(rtnmsg.respCode == SUCCESS)
-                {
-                //TODO 处理数据逻辑
-
-                }
-                else
-                {
-                this.$notify.error({title: '错误',message: '服务请求失败！'});
-                }
-            },
         async onChk(){
                 let rtnmsg = await this.executeRule("chk")
                 if(rtnmsg.respCode == SUCCESS)
@@ -374,18 +350,6 @@ export default {
                 this.$notify.error({title: '错误',message: '服务请求失败！'});
                 }
             },
-        async onButpErr(){
-                let rtnmsg = await this.executeRule("butp.err")
-                if(rtnmsg.respCode == SUCCESS)
-                {
-                //TODO 处理数据逻辑
-
-                }
-                else
-                {
-                this.$notify.error({title: '错误',message: '服务请求失败！'});
-                }
-            },
         async onCodsel1Selbut(){
                 let rtnmsg = await this.executeRule("codsel1.selbut")
                 if(rtnmsg.respCode == SUCCESS)
@@ -422,30 +386,6 @@ export default {
                 this.$notify.error({title: '错误',message: '服务请求失败！'});
                 }
             },
-        async onSav(){
-                let rtnmsg = await this.executeRule("sav")
-                if(rtnmsg.respCode == SUCCESS)
-                {
-                //TODO 处理数据逻辑
-
-                }
-                else
-                {
-                this.$notify.error({title: '错误',message: '服务请求失败！'});
-                }
-            },
-        async onCan(){
-                let rtnmsg = await this.executeRule("can")
-                if(rtnmsg.respCode == SUCCESS)
-                {
-                //TODO 处理数据逻辑
-
-                }
-                else
-                {
-                this.$notify.error({title: '错误',message: '服务请求失败！'});
-                }
-            },
         async onBasppGetreftmp(){
                 let rtnmsg = await this.executeRule("baspp.getreftmp")
                 if(rtnmsg.respCode == SUCCESS)
@@ -470,30 +410,7 @@ export default {
                 this.$notify.error({title: '错误',message: '服务请求失败！'});
                 }
             },
-        async onChk(){
-                let rtnmsg = await this.executeRule("chk")
-                if(rtnmsg.respCode == SUCCESS)
-                {
-                //TODO 处理数据逻辑
-
-                }
-                else
-                {
-                this.$notify.error({title: '错误',message: '服务请求失败！'});
-                }
-            },
-        async onChk(){
-                let rtnmsg = await this.executeRule("chk")
-                if(rtnmsg.respCode == SUCCESS)
-                {
-                //TODO 处理数据逻辑
 
-                }
-                else
-                {
-                this.$notify.error({title: '错误',message: '服务请求失败！'});
-                }
-            },
         async onButpErr(){
                 let rtnmsg = await this.executeRule("butp.err")
                 if(rtnmsg.respCode == SUCCESS)
@@ -506,17 +423,5 @@ export default {
                 this.$notify.error({title: '错误',message: '服务请求失败！'});
                 }
             },
-        async onCan(){
-                let rtnmsg = await this.executeRule("can")
-                if(rtnmsg.respCode == SUCCESS)
-                {
-                //TODO 处理数据逻辑
-
-                }
-                else
-                {
-                this.$notify.error({title: '错误',message: '服务请求失败！'});
-                }
-            },
 
 }
\ No newline at end of file

src/model/Cptati/Pattern.js

@@ -91,7 +91,7 @@ export default {
         {max: 65,message:"长度不能超过65"}
     ],
     "attp.sndbchnam":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 42,message:"长度不能超过42"}
     ],
     "attp.sndbch":[
@@ -569,7 +569,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "lendoc.account":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 25,message:"长度不能超过25"}
     ],
 

src/model/Cptrep/Pattern.js

@@ -29,7 +29,7 @@ export default {
 
 
     "cpdgrp.cbs.nom1.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -366,12 +366,12 @@ export default {
         {max: 1,message:"长度不能超过1"}
     ],
     "lendoc.account":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 25,message:"长度不能超过25"}
     ],
 
     "lendoc.vercerref":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 20,message:"长度不能超过20"}
     ],
     "lendoc.decnum":[

src/views/Business/Brtset/index.vue

@@ -250,7 +250,7 @@ export default {
               handler(){
                 let cur = this.model.setmod.doccur;
                 let amt = this.model.setmod.docamt;
-                let doc = this.model.gcdgrp.rec.docprbrol
+                let doc = this.model.brdgrp.rec.docprbrol
                 this.det202cvName= "Payment 202 "+ doc +" "+cur+" "+ amt;
                 this.det756Name  = "Payment 756 "+ doc +" "+cur+" "+ amt;
               }
@@ -260,7 +260,7 @@ export default {
                   handler(){
                     let cur = this.model.setmod.doccur;
                     let amt = this.model.setmod.docamt;
-                    let doc = this.model.gcdgrp.rec.docprbrol
+                    let doc = this.model.brdgrp.rec.docprbrol
                     this.det202cvName= "Payment 202 "+ doc +" "+cur+" "+ amt;
                     this.det756Name  = "Payment 756 "+ doc +" "+cur+" "+ amt;
               }

src/views/Business/Cptati/Docpan.vue

@@ -25,7 +25,7 @@
             <c-col :span="20">
                 <el-form-item label="ACT" prop="lendoc.account">
                     <c-input type="textarea" v-model="model.lendoc.account" maxlength="25" show-word-limit placeholder="请输入ACT" 
-                    :disabled="model.lendoc.actflg==''"
+                    :disabled=this.flag
                     ></c-input>
                 </el-form-item>
             </c-col>
@@ -52,7 +52,7 @@ export default {
     mixins: [commonProcess],
     data(){
         return {
-
+            flag:true,
         }
     },
     methods:{...Event},
@@ -63,8 +63,12 @@ export default {
         "model.lendoc.actflg":{
             immediate:true,
             handler(){
-                if(this.model.lendoc.actflg==false){
-                    this.model.lendoc.account==""
+                   console.log(this.model.lendoc.actflg);
+                if(this.model.lendoc.actflg ==''){
+                    this.model.lendoc.account='';
+                    this.flag=true;
+                }else{
+                    this.flag=false;
                 }
             }
         }

src/views/Business/Cptati/Opnp1.vue

@@ -66,12 +66,7 @@
               v-model="model.cpdgrp.cbs.nom1.amt"
               style="text-align: left; width: 100%"
               placeholder="请输入汇款金额"
-              @keyup.enter.native="
-                defaultFunction(
-                  'cpdgrp.cbs.nom1.amt',
-                  model.cpdgrp.cbs.nom1.amt
-                )
-              "
+              @change="commonExecuteNotify()"
             ></c-input-currency>
           </el-form-item>
         </c-col>
@@ -979,6 +974,7 @@ import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Cptati/Event";
+import Utils from "~/utils/index";
 
 export default {
   inject: ["root"],
@@ -998,7 +994,15 @@ export default {
     ],
     };
   },
-  methods: { ...Event },
+  methods: { ...Event,
+        commonExecuteNotify(){
+        this.executeNotify().then((res) => {
+           if ((res.respCode == SUCCESS)) {
+             Utils.copyValueFromVO(this.model, res.data);
+           }
+         });
+       },
+      },
   created: function () {},
   computed: {
     flag() {

src/views/Business/Cptrep/Docpan.vue

@@ -41,6 +41,7 @@
             maxlength="25"
             show-word-limit
             placeholder="请输入ACT"
+            :disabled=this.flag
           ></c-input>
         </el-form-item>
       </c-col>
@@ -83,9 +84,25 @@ export default {
   props: ["model", "codes"],
   mixins: [commonProcess],
   data() {
-    return {};
+    return {
+         flag:true,
+    };
   },
   methods: { ...Event },
+  watch:{
+          "model.lendoc.actflg":{
+              immediate:true,
+              handler(){
+                     console.log(this.model.lendoc.actflg);
+                  if(this.model.lendoc.actflg ==''){
+                      this.model.lendoc.account='';
+                      this.flag=true;
+                  }else{
+                      this.flag=false;
+                  }
+              }
+          }
+      },
   created: function () {},
 };
 </script>

src/views/Business/Cptrep/Opnp1.vue

@@ -434,6 +434,7 @@
             <c-input
               type="textarea"
               v-model="model.cpdgrp.orc.pts.adrblk"
+              disabled
             ></c-input>
           </el-form-item>
         </c-col>
@@ -460,8 +461,8 @@
           </c-col>
           <!-- 第九行 -->
           <c-col :span="24">
-            <el-form-item label="" prop="">
-              <c-input v-model="model.cpdgrp.snd.pts.name"></c-input>
+            <el-form-item label="" prop="cpdgrp.snd.pts.nam">
+              <c-input v-model="model.cpdgrp.snd.pts.nam" disabled></c-input>
             </el-form-item>
           </c-col>
           <!-- 第十行 -->
@@ -575,7 +576,7 @@
           <c-col :span="24">
             <el-form-item label="收款人" prop="">
               <c-fullbox>
-                <c-input v-model="model.cpdgrp.pye.pts.extkey"></c-input>
+                <c-input v-model="model.cpdgrp.pye.pts.extkey" disabled></c-input>
                 <template slot="footer">
                   <c-button type="primary"
                     ><span style="font-family: '宋体'; font-weight: bold"
@@ -593,6 +594,7 @@
               <c-input
                 type="textarea"
                 v-model="model.cpdgrp.pye.pts.adrblk"
+                disabled
               ></c-input>
             </el-form-item>
           </c-col>