Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/views/Business/Cctset/Incp.vue

@@ -237,28 +237,60 @@
         </c-form-item>
       </c-col>
 
-      <c-col :span="21">
+      <c-col :span="24">
         <c-form-item
           label="付款人常驻国家（地区）代码"
           prop="cnybop.cnyinc.spayercountrycode"
         >
-          <c-input
-            v-model="model.cnybop.cnyinc.spayercountrycode"
-            maxlength="3"
-            placeholder=""
-          ></c-input>
+          <c-fullbox>
+            <c-input
+              v-model="model.cnybop.cnyinc.spayercountrycode"
+              maxlength="3"
+              placeholder=""
+              @keyup.enter.native="
+                showGridPromptDialog('cnybop.cnyinc.spayercountrycode')
+              "
+            ></c-input>
+            <template slot="footer">
+              <c-button
+                size="small"
+                type="primary"
+                icon="el-icon-search"
+                @click="
+                  showGridPromptDialog(
+                    'cnybop.inccty.selbut1',
+                    null,
+                    null,
+                    { COD: 'cnybop.cnyinc.spayercountrycode' },
+                    { COD: true },
+                    'doxpDialog'
+                  )
+                "
+              >
+              </c-button>
+            </template>
+          </c-fullbox>
         </c-form-item>
       </c-col>
 
-      <c-col :span="3">
+      <!-- <c-col :span="3">
         <c-button
           size="small"
           type="primary"
           icon="el-icon-search"
-          @click="onIncctySelbut1"
+          @click="
+            showGridPromptDialog(
+              'cnybop.inccty.selbut1',
+              null,
+              null,
+              { COD: 'cnybop.cnyinc.spayercountrycode' },
+              { COD: true },
+              'doxpDialog'
+            )
+          "
         >
         </c-button>
-      </c-col>
+      </c-col> -->
 
       <c-col :span="24">
         <c-form-item label="付款行SWIFT BIC" prop="cnybop.cnyinc.sswiftbic">

src/views/Business/Cctset/index.vue

@@ -106,6 +106,20 @@
         </el-tab-pane>
       </c-tabs>
     </el-form>
+
+    <c-grid-ety-prompt-dialog
+      ref="doxpDialog"
+      :isPty="false"
+      :promptData="promptData"
+      @select-ety="selectMsg"
+    >
+    </c-grid-ety-prompt-dialog>
+
+    <c-grid-ety-prompt-dialog
+      ref="etyDialog"
+      :promptData="promptData"
+      v-on:select-ety="selectEty"
+    ></c-grid-ety-prompt-dialog>
   </div>
 </template>
 <script>
@@ -124,7 +138,7 @@ import Trap from "./Trap";
 import Docpan1 from "./Docpan1";
 import Basp2 from "./Basp2";
 import Basp3 from "./Basp3";
-import Incp from "./Incp"
+import Incp from "./Incp";
 
 import Docpan from "~/views/Public/Docpan";
 import Doctre from "~/views/Public/Doctre";
@@ -149,7 +163,7 @@ export default {
     "m-engp": Engp,
     "m-basp2": Basp2,
     "m-basp3": Basp3,
-    "m-incp"  : Incp,
+    "m-incp": Incp,
   },
   provide() {
     return {