bctdav修改

src/views/Business/Bctdav/Detp.vue

@@ -20,7 +20,18 @@
         </c-col>
         
          <c-col :span="4">
-        <c-button size="small" type="primary" icon="el-icon-search" @click="onColinsButtxmsel">
+        <c-button size="small" type="primary" icon="el-icon-search" 
+           @click="
+                  showGridPromptDialog(
+                    'bctp.colins.buttxmsel',
+                    null,
+                    null,
+                    { TXT: 'bcdgrp.blk.colins' },
+                    { TXT: false },
+                    'doxpDialog'
+                  )
+                "
+        >
             ...
         </c-button>
        </c-col>
@@ -38,7 +49,17 @@
         
                   
        <c-col :span="4">
-        <c-button size="small" type="primary" icon="el-icon-search" @click="onDftinsButtxmsel">
+        <c-button size="small" type="primary" icon="el-icon-search"  
+          @click="
+                  showGridPromptDialog(
+                    'bctp.dftins.buttxmsel',
+                    null,
+                    null,
+                    { TXT: 'bcdgrp.blk.dftins' },
+                    { TXT: false },
+                    'doxpDialog'
+                  )
+                ">
             ...
         </c-button>
        </c-col>
@@ -66,7 +87,17 @@
         </c-col>
                   
        <c-col :span="4">
-        <c-button size="small" type="primary" icon="el-icon-search" @click="onOthins1Buttxmsel">
+        <c-button size="small" type="primary" icon="el-icon-search" 
+        @click="
+                  showGridPromptDialog(
+                    'bctp.othins.buttxmsel',
+                    null,
+                    null,
+                    { TXT: 'bcdgrp.blk.othins' },
+                    { TXT: false },
+                    'doxpDialog'
+                  )
+                ">
             ...
         </c-button>
        </c-col>
@@ -106,7 +137,7 @@
             :code="codes.chadet"
             >
               </c-select>
-            </el-option>
+            
        </c-col>  
       
                                    
@@ -124,12 +155,12 @@
        </c-col>
                                                     
        <c-col :span="24">
-       <c-col :span="5">
+       <c-col :span="4">
         <el-form-item label="Waive Collecting">
         </el-form-item>
        </c-col>
        <c-col :span="4">
-        <el-form-item label="Bank Charges" style="margin-left:-42px">
+        <el-form-item label="Bank Charges" style="margin-left:15px">
         </el-form-item>
        </c-col>
        </c-col>
@@ -147,7 +178,7 @@
         </el-form-item>
        </c-col>
         <c-col :span="4">
-        <el-form-item label="Bank Charges" style="margin-left:-18px">
+        <el-form-item label="Bank Charges" style="margin-left:15px">
         </el-form-item>
        </c-col>
 

src/views/Business/Bctdav/index.vue

@@ -83,6 +83,13 @@
         v-on:select-ety="selectEty"
       >
       </c-grid-ety-prompt-dialog>
+      <c-grid-ety-prompt-dialog
+        ref="doxpDialog"
+        :isPty="false"
+        :promptData="promptData"
+        @select-ety="selectMsg"
+      >
+      </c-grid-ety-prompt-dialog>
     </div>
   </c-page>
 </template>

src/views/Business/Bctset/Bctsus.vue

@@ -269,6 +269,42 @@
         >
       </c-col>
       
+<c-col :span="24">
+        <el-form-item
+          label="跨境人民币清算模式"
+          prop="trnmod.cmtflg"
+          v-if="model.setmod.doccur == 'CNY'"
+          style="margin-top: 15px"  
+        >
+          <c-select
+            v-model="model.trnmod.cmtflg"
+            style="width: 100%"
+            placeholder=""
+            :disabled="model.gcdgrp.rec.frepaylg=='X'"
+          >
+          <el-option
+              v-for="item in codes.cmtflg"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+              
+            ></el-option>
+          </c-select>
+        </el-form-item>
+      </c-col>
+      <c-col :span="24">
+        <el-form-item
+          label="报文类型"
+          prop="trnmod.swftyp"
+          v-if="model.trnmod.cmtflg =='P'||model.trnmod.cmtflg =='X'"
+        >
+          <c-select v-model="model.trnmod.swftyp" disabled  placeholder="" 
+          :code="codes.swftyp1"
+          style="width: 100%"
+          >
+          </c-select>
+        </el-form-item>
+      </c-col>
       <c-col :span="12">
         <el-form-item label="Settle Amt." prop="setmod.doccur">
           <c-select

src/views/Business/Gitset/Gitsetp.vue

@@ -429,7 +429,7 @@
       <c-col
         :span="12"
         class="centerLable marginLable"
-        v-if="model.gcdgrp.cbs.max.cur == 'CNY'"
+        v-if="model.setmod.doccur == 'CNY'"
       >
         <c-checkbox v-model="model.gidgrp.rec.cmtflg"
           >跨境人民币保函</c-checkbox