汇款查询信息界面调整

src/config/CodeTable/index.js

@@ -4165,6 +4165,12 @@ const CodeTable = {
 		{ label: "票汇", value: "2" },
 		{ label: "其他", value: "3" },
 	],
+	paytype1: [
+		{ label: "电汇", value: "0" },
+		{ label: "票汇", value: "1" },
+		{ label: "信汇", value: "2" },
+		{ label: "其他", value: "3" },
+	],
 	payuil: [
 		{ label: "English", value: "EN" },
 		{ label: "Chinese", value: "CN" },
@@ -5131,6 +5137,26 @@ const CodeTable = {
 		{ label: "MT103+MT910", value: "103910" },
 		{ label: "MT103", value: "103" },
 	],
+	swftyp1: [
+		{ label: "MT103", value: "103" },
+		{ label: "MT202 COV", value: "202" },
+		{ label: "MT910", value: "910" },
+		{ label: "Other", value: "OTH" },
+		{ label: "MT202", value: "200" },
+		{ label: "CMT100", value: "CMT" },
+		{ label: "hvps111", value: "HVP" },
+		{ label: "hvps112", value: "HVQ" },
+		{ label: "PKG001", value: "CMX" },
+		{ label: "PKG005", value: "CMY" },
+		{ label: "beps121", value: "BEP" },
+		{ label: "beps122", value: "BEQ" },
+		{ label: "beps125", value: "BES" },
+		{ label: "cips111", value: "CIU" },
+		{ label: "cips112", value: "CIV" },
+		{ label: "cips111", value: "CIW" },
+		{ label: "hvps115", value: "HVR" },
+		{ label: "FMT100", value: "FMS" },
+	],
 	swmfmt: [
 		{ label: "TradeConnect", value: "T" },
 		{ label: "DTA Import", value: "A" },
@@ -5345,6 +5371,12 @@ const CodeTable = {
 		{ label: "补充", value: "B" },
 		{ label: "替换", value: "T" },
 	],
+	trntyp1: [
+		{ label: "贸易", value: "0" },
+		{ label: "非贸易", value: "1" },
+		{ label: "资本", value: "2" },
+		{ label: "其他", value: "3" },
+	],
 	troflg: [
 		{ label: "TRO entries exist", value: "Y" },
 		{ label: "No TRO entries exist", value: "" },

src/views/Business/Infcpd/Infconp.vue

 <template>
   <div class="eibs-tab">
-    <el-form ref="modelForm" label-width="150px" label-position="right" size="small"
-            :validate-on-rule-change="false" disabled>
+    <el-form
+      ref="modelForm"
+      label-width="150px"
+      label-position="right"
+      size="small"
+      :validate-on-rule-change="false"
+      disabled
+    >
       <c-row>
         <!-- <div class="infTopBtn">
             <el-button-group>
@@ -81,7 +87,12 @@
                   placeholder="请输入清算编号"
                 ></c-input>
                 <template slot="footer">
-            <c-button size="small" type="primary" @click="onRecpanGetinf" style="padding: 0 12px">
+                  <c-button
+                    size="small"
+                    type="primary"
+                    @click="onRecpanGetinf"
+                    style="padding: 0 12px"
+                  >
                     Get
                   </c-button>
                 </template>
@@ -119,7 +130,11 @@
             </el-form-item>
           </c-col>
           <c-col :span="11">
-            <el-form-item label="汇款语种" prop="recpan.payuil" label-width="40%">
+            <el-form-item
+              label="汇款语种"
+              prop="recpan.payuil"
+              label-width="40%"
+            >
               <c-select
                 v-model="model.recpan.payuil"
                 style="width: 100%"
@@ -179,16 +194,22 @@
                 v-model="model.cpdgrp.rec.trntyp"
                 style="width: 100%"
                 placeholder="请选择汇款性质"
+                :code="codes.trntyp1"
               >
               </c-select>
             </el-form-item>
           </c-col>
           <c-col :span="11">
-            <el-form-item label="汇款方式" prop="cpdgrp.rec.paytype" label-width="40%">
+            <el-form-item
+              label="汇款方式"
+              prop="cpdgrp.rec.paytype"
+              label-width="40%"
+            >
               <c-select
                 v-model="model.cpdgrp.rec.paytype"
                 style="width: 100%"
                 placeholder="请选择汇款方式"
+                :code="codes.paytype1"
               >
               </c-select>
             </el-form-item>
@@ -199,16 +220,22 @@
                 v-model="model.cpdgrp.rec.gors"
                 style="width: 100%"
                 placeholder="请选择收款对象"
+                :code="codes.gors"
               >
               </c-select>
             </el-form-item>
           </c-col>
           <c-col :span="11">
-            <el-form-item label="收支类型" prop="cpdgrp.rec.sztyp" label-width="40%">
+            <el-form-item
+              label="收支类型"
+              prop="cpdgrp.rec.sztyp"
+              label-width="40%"
+            >
               <c-select
                 v-model="model.cpdgrp.rec.sztyp"
                 style="width: 100%"
                 placeholder="请选择收支类型"
+                :code="codes.sztyp"
               >
               </c-select>
             </el-form-item>
@@ -223,7 +250,11 @@
                 ></c-input>
 
                 <template slot="footer">
-            <c-button size="small" type="primary" @click="onRecpanGetuetr">
+                  <c-button
+                    size="small"
+                    type="primary"
+                    @click="onRecpanGetuetr"
+                  >
                     Get
                   </c-button>
                 </template>
@@ -241,7 +272,11 @@
             </el-form-item>
           </c-col>
           <c-col :span="11">
-            <el-form-item label="起息日" prop="cpdgrp.rec.valdat" label-width="40%">
+            <el-form-item
+              label="起息日"
+              prop="cpdgrp.rec.valdat"
+              label-width="40%"
+            >
               <c-date-picker
                 type="date"
                 v-model="model.cpdgrp.rec.valdat"
@@ -256,16 +291,22 @@
                 v-model="model.cpdgrp.rec.clityp"
                 style="width: 100%"
                 placeholder="请选择客户类型"
+                :code="codes.clityp"
               >
               </c-select>
             </el-form-item>
           </c-col>
           <c-col :span="11">
-            <el-form-item label="报文类型" prop="cpdgrp.rec.swftyp" label-width="40%">
+            <el-form-item
+              label="报文类型"
+              prop="cpdgrp.rec.swftyp"
+              label-width="40%"
+            >
               <c-select
                 v-model="model.cpdgrp.rec.swftyp"
                 style="width: 100%"
                 placeholder="请选择报文类型"
+                :code="codes.swftyp1"
               >
               </c-select>
             </el-form-item>
@@ -286,7 +327,7 @@
 
         <!-- =============左============= -->
         <c-col :span="11">
-          <c-col :span="24">
+          <!-- <c-col :span="24">
             <c-ptap
               :model="model"
               :argadr="{
@@ -299,6 +340,36 @@
               @onAplpDet="onOripDet"
             >
             </c-ptap>
+          </c-col> -->
+          <c-col :span="24">
+            <el-form-item label="Ordering institution (52a)">
+              <c-input v-model="model.cpdgrp.ori.ref"></c-input>
+            </el-form-item>
+          </c-col>
+          <c-col :span="24">
+            <c-ptap
+              :model="model"
+              :argadr="{
+                title: '',
+                grp: 'cpdgrp',
+                rol: 'orc',
+              }"
+              :noRef="true"
+              :editExtLabel="true"
+              :haveAdrLabel="false"
+              :isAdrblk="false"
+              @onAplpDet="onOripDet"
+            >
+            </c-ptap>
+          </c-col>
+          <c-col :span="24">
+            <el-form-item label="汇款人" prop="cpdgrp.orc.ref">
+              <c-input
+                v-model="model.cpdgrp.rec.ref"
+                maxlength="35"
+                placeholder="请输入汇款人"
+              ></c-input>
+            </el-form-item>
           </c-col>
           <c-col :span="24">
             <el-form-item label="汇款人账号" prop="cpdgrp.rec.orcact">
@@ -313,12 +384,14 @@
             <c-ptap
               :model="model"
               :argadr="{
-                title: '汇款人',
+                title: '',
                 grp: 'cpdgrp',
                 rol: 'orc',
               }"
-              :noRef="false"
-              :onlySearch="false"
+              :noRef="true"
+              :editExtLabel="true"
+              :haveAdrLabel="false"
+              :isAdrblk="false"
               @onAplpDet="onOrcpDet"
             >
             </c-ptap>
@@ -346,15 +419,17 @@
                 <c-input v-model="model.cpdgrp.orc.pts.extkey"></c-input>
                 <template slot="footer">
                   <c-button
-                style="margin:0px 10px 0 10;padding: 0 12px;"
+                    style="margin: 0px 10px 0 10; padding: 0 12px"
                     size="small"
                     type="primary"
                     @click="onSeainf"
                   >
-                <span style="font-family:'宋体';font-weight:bold">i</span>
+                    <span style="font-family: '宋体'; font-weight: bold"
+                      >i</span
+                    >
                   </c-button>
                   <c-button
-                style="margin:0 0"
+                    style="margin: 0 0"
                     size="small"
                     type="primary"
                     @click="onDetail"
@@ -454,13 +529,15 @@
                 rol: 'pye',
               }"
               :noRef="true"
+              :editExtLabel="true"
+              :haveAdrLabel="false"
               :onlySearch="false"
+              :isAdrblk="false"
               @onAplpDet="onPyepDet"
             >
             </c-ptap>
           </c-col>
         </c-col>
-
       </c-row>
     </el-form>
   </div>
@@ -482,10 +559,7 @@ export default {
   data() {
     return {};
   },
-  methods: { ...Event,
-  onSeainf(){},
-  onDetail(){},
-  },
+  methods: { ...Event, onSeainf() {}, onDetail() {} },
   created: function () {},
 };
 </script>

src/views/Public/Ptap.vue

@@ -12,7 +12,7 @@
       </c-form-item>
     </c-col>
 
-    <c-col :span="24">
+    <c-col :span="24" v-if="!editExtLabel">
       <el-form-item
         :label="`${argadr.title}ID`"
         :prop="`${argadr.grp}.${argadr.rol}.pts.extkey`"
@@ -49,6 +49,43 @@
       </el-form-item>
     </c-col>
 
+    <c-col :span="24" v-else>
+      <el-form-item
+        :label="`${argadr.title}`"
+        :prop="`${argadr.grp}.${argadr.rol}.pts.extkey`"
+        style="width: 100%"
+      >
+        <c-fullbox>
+          <c-input
+            v-model="model[argadr.grp][argadr.rol].pts.extkey"
+            :placeholder="'请输入' + argadr.title + 'Extkey'"
+            @keyup.enter.native="
+              showGridPromptDialog(`${argadr.grp}.${argadr.rol}.pts.extkey`)
+            "
+            @change="valueChange"
+          ></c-input>
+          <template slot="footer">
+            <c-button
+              style="margin:0 10px 0 10;padding: 0 12px;"
+              size="small"
+              type="primary"
+              icon="el-icon-search"
+              @click="onSeainf(`${argadr.grp}.${argadr.rol}.pts.extkey`)"
+            >
+            </c-button>
+            <c-button
+              style="margin:0 0"
+              size="small"
+              type="primary"
+              @click="onAplpDet"
+            >
+              {{ $t('buttons.details') }}
+            </c-button>
+          </template>
+        </c-fullbox>
+      </el-form-item>
+    </c-col>
+
     <template v-if="!onlySearch">
       <c-col v-if="isAdrblk" :span="24">
         <el-form-item
@@ -59,7 +96,23 @@
             type="textarea"
             :rows="4"
             v-model="model[argadr.grp][argadr.rol].pts.adrblk"
-            maxlength="35"
+            maxlength="150"
+            show-word-limit
+            placeholder="请输入名称地址"
+            :disabled="disabled"
+          ></c-input>
+        </el-form-item>
+      </c-col>
+      <c-col v-else-if="!haveAdrLabel" :span="24">
+        <el-form-item
+          label=""
+          :prop="`${argadr.grp}.${argadr.rol}.pts.adrblk`"
+        >
+          <c-input
+            type="textarea"
+            :rows="4"
+            v-model="model[argadr.grp][argadr.rol].pts.adrblk"
+            maxlength="150"
             show-word-limit
             placeholder="请输入名称地址"
             :disabled="disabled"
@@ -148,6 +201,16 @@ export default {
       type: Boolean,
       default: false,
     },
+    editExtLabel: {
+      //自定义ID label
+      type: Boolean,
+      default: true,
+    },
+    haveAdrLabel: {
+      //有无名称地址 label
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {