brtsnd、Cptadv、Cptopn、Infcpd交易BUG修改

src/views/Business/Brtsnd/Payp.vue

@@ -226,7 +226,14 @@
                           <c-col :span="24">
                                  <c-col :span="21">
                                      <el-form-item label="External Key of Address" prop="brdgrp.prb.pts.extkey">
-                                         <c-input  v-model="model.brdgrp.prb.pts.extkey" maxlength="16"  placeholder="请输入External Key of Address"></c-input>
+                                         <c-input
+                                         v-model="model.brdgrp.prb.pts.extkey"
+                                         maxlength="16"
+                                         placeholder="请输入External Key of Address"
+                                         @keyup.enter.native="
+                                                          showGridPromptDialog('brdgrp.prb.pts.extkey')
+                                                        "
+                                         ></c-input>
                                      </el-form-item>
                                  </c-col>
                                 <c-col :span="3">

src/views/Business/Brtsnd/index.vue

@@ -99,7 +99,7 @@
 
        </c-tabs>
     </el-form>
-
+        <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty"></c-grid-ety-prompt-dialog>
        <c-grid-ety-prompt-dialog
                            ref="doxpDialog"
                            :isPty="false"

src/views/Business/Cptadv/index.vue

@@ -37,11 +37,9 @@
             </c-content>
           </el-tab-pane>
 
-          <!--
            <el-tab-pane label="分录" name="glepan">
             <m-glepan :model="model" :codes="codes" ref="glepan" />
           </el-tab-pane>
-          -->
 
 
           <el-tab-pane label="附言" name="coninfp">

src/views/Business/Cptopn/CptOpnp1Common.vue

@@ -11,6 +11,7 @@
                         v-model="model.cpdgrp.ori.pts.ref"
                         maxlength="16"
                         placeholder=""
+                         :disabled=this.flag1
                     ></c-input>
                 </el-form-item>
             </c-col>
@@ -25,7 +26,8 @@
                             style="width:100%"
                             @keyup.enter.native="
                                 showGridPromptDialog('cpdgrp.ori.pts.extkey')
-                            "   
+                            "
+                             :disabled=this.flag1
                         ></c-input>
                     </el-form-item>
                   <template slot="footer">
@@ -78,6 +80,7 @@
                         v-model="model.cpdgrp.orc.pts.ref"
                         maxlength="16"
                         placeholder=""
+                         :disabled=this.flag1
                     ></c-input>
                 </el-form-item>
             </c-col>
@@ -88,6 +91,7 @@
                         v-model="model.cpdgrp.rec.orcact"
                         maxlength="35"
                         placeholder="汇款人账号"
+                         :disabled=this.flag1
                     ></c-input>
                 </el-form-item>
             </c-col>
@@ -101,6 +105,7 @@
                             @keyup.enter.native="
                                 showGridPromptDialog('cpdgrp.orc.pts.extkey')
                             "
+                            :disabled=this.flag1
                         >
                         </c-input>
                     </el-form-item>
@@ -1123,7 +1128,7 @@
                 <c-col :span="24">
                     <c-col :span="17">
                         <el-form-item label="">
-                            <c-input placeholder=""></c-input>
+                            <c-input placeholder="" ></c-input>
                         </el-form-item>
                     </c-col>
                     <c-col :span="7">
@@ -1166,6 +1171,7 @@
                             style="width: 90%"
                             maxlength="16"
                             placeholder=""
+                             :disabled=this.flag1
                         ></c-input>
                     </el-form-item>
                 </c-col>
@@ -1177,6 +1183,7 @@
                             style="width: 90%"
                             maxlength="35"
                             placeholder=""
+                             :disabled=this.flag1
                         ></c-input>
                     </el-form-item>
                 </c-col>
@@ -1403,6 +1410,7 @@
                         style="width: 90%"
                         maxlength="16"
                         placeholder=""
+                         :disabled=this.flag1
                     ></c-input>
                 </el-form-item>
             </c-col>
@@ -1414,6 +1422,7 @@
                         style="width: 90%"
                         maxlength="35"
                         placeholder=""
+                         :disabled=this.flag1
                     ></c-input>
                 </el-form-item>
             </c-col>
@@ -2408,6 +2417,7 @@ export default {
     data() {
         return {
             infptaVisible: false,
+            flag1:true,
         };
     },
     watch:{
@@ -2418,7 +2428,17 @@ export default {
                 this.model.cptp.fwtgyh = 'CHASUS33XXX';
                 console.log(this.model.cptp.fwtgyh)
             }
-      }
+      },
+       "model.cpdgrp.rec.swftyp":{
+         immediate:true,
+         handler(val ,oldVal){
+             if(this.model.cpdgrp.rec.swftyp == ''){
+                 this.flag1=true;
+             }else{
+                this.flag1=false;
+             }
+         }
+     }
     },
     methods: {
         onSndpDet() {

src/views/Business/Cptopn/Opnp1.vue

@@ -110,12 +110,13 @@
                             label="汇款金额"
                             previewLabel="汇款金额币种"
                             prop="cpdgrp.cbs.nom1.cur"
+
                         >
                             <c-select
                                 v-model="model.cpdgrp.cbs.nom1.cur"
                                 style="width: 100%"
                                 placeholder=""
-                                @change="onNom1CurChange"
+                                 @change="commonExecuteRule('cpdgrp.cbs.nom1.cur')"
                             >
                                 <el-option
                                     v-for="item in codes.currencycode"
@@ -475,6 +476,13 @@ export default {
         ...Event,
         onCptpGetref() {},
         onCptpGetmod() {},
+        commonExecuteRule(ruleName) {
+              this.executeRule(ruleName).then((res) => {
+                if ((res.respCode == SUCCESS)) {
+                  Utils.copyValueFromVO(this.model, res.data);
+                }
+              });
+            },
     },
     watch:{
         "model.cpdgrp.rec.ischktyp":{

src/views/Business/Cptopn/index.vue

@@ -32,9 +32,9 @@
             </c-content>
           </el-tab-pane>
 
-          <!-- <el-tab-pane label="Additional Info" name="AdditionalInfo">
+          <el-tab-pane label="Additional Info" name="AdditionalInfo" v-if="this.model.cpdgrp.rec.swftyp  != ''">
             <m-AdditionalInfo :model="model" :codes="codes" />
-          </el-tab-pane> -->
+          </el-tab-pane>
 
           <el-tab-pane label="费用及账务" name="setpan">
             <!--PD000000 -->

src/views/Business/Infcpd/Infsea.vue

@@ -506,8 +506,8 @@ export default {
             label: "Closed",
           },
           '20 18 "1.Cur" 80',
-          '22 19 "2.Cur" 80',
-          '21 20 "Paym.Amount" 150',
+          '21 19 "Paym.Amount" 150',
+          '22 20 "2.Cur" 80',
           '23 21 "Amount rcvd." 150',
           '6 22 "Pyectycod" 120',
           '7 23 "Orcctycod" 120',