Merge branch 'development-202206' into 'development-202206'

Development 202206

See merge request !17

src/model/Bctdav/Pattern.js

@@ -45,7 +45,7 @@ export default {
 
 
     "bcdgrp.cbs.max.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位" }
     ],
@@ -55,7 +55,7 @@ export default {
     ],
 
     "bcdgrp.cbs.opn1.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位" }
     ],
@@ -116,8 +116,8 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "bcdgrp.rec.matpercnt":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 3,message:"长度不能超过3"}
+        {type: "number", required: false, message: "必输项"},
+        {type: "number",max: 999,message:"长度不能超过3"}
     ],
 
 

src/model/Bctset/Pattern.js

@@ -17,7 +17,7 @@ export default {
     ],
 
     "bcdgrp.cbs.max.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位" }
     ],
@@ -27,7 +27,7 @@ export default {
     ],
 
     "bcdgrp.cbs.opn1.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位" }
     ],
@@ -84,7 +84,7 @@ export default {
 
 
     "setmod.docamt":[
-        {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位" }
     ],

src/model/Litame/index.js

@@ -157,7 +157,7 @@ export default class Litame{
 								spcben:"",			//  Special Payment Conditions for Beneficiary		.lidgrp.blk.spcben
 								spcbename:"",			//  Special payment Conditions for beneficiary History		.lidgrp.blk.spcbename
 								spcrcb:"",			//  Special Payment Conditions for Bank Only		.lidgrp.blk.spcrcb
-								spcrcbame:"",	
+								spcrcbame:"",	 //Historic Overview   .lidgrp.blk.spcrcbame
 							},
 							drw:{
 								pts:new Pts().data,

src/model/Trnrel/Event.js

@@ -99,8 +99,8 @@ export default {
             pass: this.onRelrow.bind(this, idx),
             refuse: this.onReprow.bind(this, idx),
         });
-
-        this.$router.push({ path: viewurl, query: { trn: row['INR'],  operateId: operateId } });
+        // this.$router.push({ path: viewurl, query: { trn: row['INR'],  operateId: operateId } });
+        this.$router.push({ name: 'Review' + trnName.charAt(0).toUpperCase() + trnName.substring(1), query: { trn: row['INR'],  operateId: operateId }, params: { prePageId: this.model.pageId } });
     },
 
     async onWaitDetail(idx, row) {

src/service/test/smh.js

+import Api from "~/service/Api"
+
+export function queryByPage(data) {
+    return Api.post("/manager/smh/queryByPage", data)
+}
+
+export function queryOwnrefDetail(ownref) {
+    return Api.post(`/manager/smh/queryOwnrefDetail?ownref=${ownref}`)
+}

src/views/Business/Bctdav/Ovwp1.vue

@@ -171,7 +171,7 @@
       <c-col :span="12">
         <el-form-item label="单据期限" prop="bcdgrp.rec.matpercnt">
           <c-input
-            v-model="model.bcdgrp.rec.matpercnt"
+            v-model.number="model.bcdgrp.rec.matpercnt"
             placeholder="请输入单据期限"
             :disabled="model.bcdgrp.rec.doctypcod === 'P'"
           ></c-input>

src/views/Business/Cptati/Dbe.vue

@@ -174,6 +174,7 @@
 </template>
 <script>
 import Api from "~/service/Api"
+import Utils from "~/utils/index";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable"
 import Event from "~/model/Cptati/Event"
@@ -191,7 +192,7 @@ export default {
 	created: function () {
 		this.executeRule("bopmod.dbdp.basp").then((res) => {
 			if (res.respCode == SUCCESS) {
-				this.copyValueFromVO(res.data);
+				Utils.copyValueFromVO(res.data);
 			}
 		});
 	}

src/views/Business/Cptati/index.vue

@@ -21,7 +21,7 @@
               <m-ovwp :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
-          <el-tab-pane label="费用/账务" name="setpan">
+          <el-tab-pane label="费用/账务" name="setpan,glepan">
             <c-content>
               <div class="eibs-tab">
                 <el-collapse v-model="activeNames">
@@ -29,6 +29,10 @@
                     <!-- 结算 -->
                     <m-setpan :model="model" :codes="codes" />
                   </el-collapse-item>
+                  <el-collapse-item title="会计分录" name="glepan">
+                    <!-- 会计分录 -->
+                    <m-glepan :model="model" :codes="codes" />
+                  </el-collapse-item>
                 </el-collapse>
               </div>
             </c-content>
@@ -97,6 +101,7 @@ import Addbcb from "./Addbcb.vue";
 import Doctre from "~/views/Public/Doctre";
 import Docpan from "~/views/Public/Docpan";
 import Setpan from "~/views/Public/Setpan";
+import Glepan from "~/views/Public/Glepan";
 
 export default {
   name: "Cptati",
@@ -104,6 +109,7 @@ export default {
     "m-ovwp": Ovwp,
     "m-pardet": Pardet,
     "m-setpan": Setpan,
+    "m-glepan": Glepan,
     "m-addbcb": Addbcb,
     "m-doctre": Doctre,
     "m-docpan": Docpan,

src/views/Business/Cptato/Wg.vue

 <template>
   <div class="eibs">
-    <c-col :span="12" style="padding-right: 20px;">
+    <c-col :span="12" style="padding-right: 20px">
       <c-col :span="24">
         <el-form-item label="申报类型" prop="bopmod.szflg">
-          <c-select v-model="model.bopmod.szflg" style="width:100%" placeholder="请选择申报类型">
-            <el-option v-for="item in codes.szflg" :key="item.value" :label="item.label" :value="item.value">
+          <c-select
+            v-model="model.bopmod.szflg"
+            style="width: 100%"
+            placeholder="请选择申报类型"
+            @change="selectOrCheckboxRule('bopmod.szflg')"
+          >
+            <el-option
+              v-for="item in codes.szflg"
+              :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="bopmod.acttyp">
-          <c-select v-model="model.bopmod.acttyp" style="width:100%" placeholder="请选择地区机构号"
-            :disabled="model.bopmod.szflg==='3' || model.bopmod.szflg==='2' ||model.bopmod.szflg===''">
-            <el-option v-for="item in codes.acttyp" :key="item.value" :label="item.label" :value="item.value">
+          <c-select
+            v-model="model.bopmod.acttyp"
+            style="width: 100%"
+            placeholder="请选择地区机构号"
+            :disabled="
+              model.bopmod.szflg === '3' ||
+              model.bopmod.szflg === '2' ||
+              model.bopmod.szflg === ''
+            "
+          >
+            <el-option
+              v-for="item in codes.acttyp"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </c-select>
         </el-form-item>
@@ -23,17 +45,30 @@
 
       <c-col :span="24">
         <el-form-item label="地区机构号" prop="bopmod.ownextkey">
-          <c-select v-model="model.bopmod.ownextkey" style="width:100%" placeholder="请选择地区机构号"
-            :disabled="model.bopmod.szflg==='3' ||model.bopmod.szflg===''">
-            <el-option v-for="item in ownextkey" :key="item.value" :label="item.label" :value="item.value"></el-option>
+          <c-select
+            v-model="model.bopmod.ownextkey"
+            style="width: 100%"
+            placeholder="请选择地区机构号"
+            :disabled="model.bopmod.szflg === '3' || model.bopmod.szflg === ''"
+          >
+            <el-option
+              v-for="item in ownextkey"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </c-select>
         </el-form-item>
       </c-col>
     </c-col>
 
-    <c-col :span="12" style="padding-left: 20px;">
+    <c-col :span="12" style="padding-left: 20px">
       <c-col :span="14">
-        <c-checkbox style="float: left;" v-model="model.bopmod.basflg" :disabled="model.bopmod.szflg==='3'||model.bopmod.szflg===''">基础数据
+        <c-checkbox
+          style="float: left"
+          v-model="model.bopmod.basflg"
+          :disabled="model.bopmod.szflg === '3' || model.bopmod.szflg === ''"
+          >基础数据
         </c-checkbox>
       </c-col>
 
@@ -48,26 +83,25 @@
   </div>
 </template>
 <script>
-import Api from "~/service/Api"
+import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
-import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Cptato/Event"
+import CodeTable from "~/config/CodeTable";
+import Event from "~/model/Cptato/Event";
 
 export default {
-  inject: ['root'],
+  inject: ["root"],
   props: ["model", "codes"],
   mixins: [commonProcess],
   data() {
     return {
-      ownextkey: []
-    }
+      ownextkey: [],
+    };
   },
-  methods: { ...Event },
-  created: function () {
-
+  methods: {
+    ...Event,
   },
-}
+  created: function () {},
+};
 </script>
 <style>
-
 </style>

src/views/Business/Dbeame/Selection.vue

@@ -16,7 +16,7 @@
 
       <c-col :span="24">
         <el-form-item
-          label="请选择接口数据"
+          label="请选择需要修改的接口数据"
           prop="bopbut.basflg"
           class="checkbox-left"
         >

src/views/Business/Dbedel/Selection.vue

@@ -16,7 +16,7 @@
 
       <c-col :span="24">
         <el-form-item
-          label="请选择接口数据"
+          label="请选择需要删除的接口数据"
           prop="bopbut.basflg"
           class="checkbox-left"
         >

src/views/Business/Dbfame/Basp.vue

@@ -168,16 +168,6 @@
           </el-form-item>
         </c-col>
       </c-col>
-
-      <c-col :span="24">
-        <el-form-item label="开证日期" prop="recgrp.bas.issdate">
-          <c-input
-            v-model="model.recgrp.bas.issdate"
-            placeholder="请输入开证日期"
-            :disabled="!(model.recgrp.bas.methods=='L'||model.recgrp.bas.methods=='G')"
-          ></c-input>
-        </el-form-item>
-      </c-col>
     </c-col>
 
     <!-- ======================= 右边 ========================= -->
@@ -310,6 +300,15 @@
           ></c-input>
         </el-form-item>
       </c-col>
+      <c-col :span="24">
+        <el-form-item label="开证日期" prop="recgrp.bas.issdate">
+          <c-input
+            v-model="model.recgrp.bas.issdate"
+            placeholder="请输入开证日期"
+            :disabled="!(model.recgrp.bas.methods=='L'||model.recgrp.bas.methods=='G')"
+          ></c-input>
+        </el-form-item>
+      </c-col>
     </c-col>
   </div>
 </template>

src/views/Business/Dbfdel/Basp.vue

@@ -190,16 +190,6 @@
           </el-form-item>
         </c-col>
       </c-col>
-
-      <c-col :span="24">
-        <el-form-item label="开证日期" prop="recgrp.bas.issdate">
-          <c-input
-            v-model="model.recgrp.bas.issdate"
-            placeholder="请输入开证日期"
-            disabled
-          ></c-input>
-        </el-form-item>
-      </c-col>
     </c-col>
 
     <!-- ======================= 右边 ========================= -->
@@ -336,6 +326,15 @@
           ></c-input>
         </el-form-item>
       </c-col>
+      <c-col :span="24">
+        <el-form-item label="开证日期" prop="recgrp.bas.issdate">
+          <c-input
+            v-model="model.recgrp.bas.issdate"
+            placeholder="请输入开证日期"
+            disabled
+          ></c-input>
+        </el-form-item>
+      </c-col>
     </c-col>
   </div>
 </template>

src/views/Business/Dbfdel/Selection.vue

@@ -16,7 +16,7 @@
 
       <c-col :span="24">
         <el-form-item
-          label="请选择需要修改的接口数据"
+          label="请选择需要删除的接口数据"
           prop="bopbut.basflg"
           class="checkbox-left"
         >

src/views/Business/Dbfinf/Basp.vue

@@ -190,16 +190,6 @@
           </el-form-item>
         </c-col>
       </c-col>
-
-      <c-col :span="24">
-        <el-form-item label="开证日期" prop="recgrp.bas.issdate">
-          <c-input
-            v-model="model.recgrp.bas.issdate"
-            placeholder="请输入开证日期"
-            disabled
-          ></c-input>
-        </el-form-item>
-      </c-col>
     </c-col>
 
     <!-- ======================= 右边 ========================= -->
@@ -337,6 +327,15 @@
           ></c-input>
         </el-form-item>
       </c-col>
+      <c-col :span="24">
+        <el-form-item label="开证日期" prop="recgrp.bas.issdate">
+          <c-input
+            v-model="model.recgrp.bas.issdate"
+            placeholder="请输入开证日期"
+            disabled
+          ></c-input>
+        </el-form-item>
+      </c-col>
     </c-col>
   </div>
 </template>

src/views/Business/Dbfinf/Selection.vue

@@ -16,7 +16,7 @@
 
       <c-col :span="24">
         <el-form-item
-          label="请选择需要修改的接口数据"
+          label="请选择接口数据"
           prop="bopbut.basflg"
           class="checkbox-left"
         >

src/views/Business/Gitopn/Ovwp1.vue

@@ -83,12 +83,7 @@
                 style="width: 80%"
                 placeholder="请输入保函金额"
                 @blur="defaultFunction('gidgrp.cbs.opn1.amt')"
-                @keyup.enter.native="
-                  defaultFunction(
-                    'gidgrp.cbs.opn1.amt',
-                    model.gidgrp.cbs.opn1.amt
-                  )
-                "
+                @keyup.enter.native="$event.target.blur()"
               ></c-input>
             </el-form-item>
           </c-col>
@@ -119,12 +114,7 @@
                 style="width: 100%"
                 placeholder="请输入保函金额"
                 @blur="defaultFunction('gidgrp.cbs.opn1.amt')"
-                @keyup.enter.native="
-                  defaultFunction(
-                    'gidgrp.cbs.opn1.amt',
-                    model.gidgrp.cbs.opn1.amt
-                  )
-                "
+                @keyup.enter.native="$event.target.blur()"
               ></c-input>
             </el-form-item>
           </c-col>

src/views/Business/Trnrel/index.vue

@@ -88,7 +88,7 @@ export default {
   },
   created() {
     const that = this;
-      that.init(that.model).then((res) => {
+      that.init().then((res) => {
         //TODO 处理数据逻辑
 
         that.model = Utils.copyValueFromVO(that.model, res.data);

src/views/Statics/Dbacur/Currency.vue

-<template>
-    <div class="eibs-tab">
-        <!-- 左边 -->
-        <c-col :span="12" class="col-left">
-            <!-- <c-col :span="24">
-                <el-form-item label="inr" prop="inr">
-                    <c-input v-model="model.inr" placeholder="请输入inr">
-                    </c-input>
-                </el-form-item>
-            </c-col> -->
-            <c-col :span="24">
-                <el-form-item label="货币种类" prop="cod">
-                    <!-- <c-select v-model="model.cod" style="width: 100%" placeholder="请输入cod">
-                        <el-option v-for="item in codes.currencycode" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </c-select> -->
-                    <c-input v-model="model.cod" style="width: 100%" placeholder="请输入货币种类">
-                    </c-input>
-                    <!-- <c-select v-model="model.cod" placeholder="请输入cod" code="codes.currencycode"
-                        style="width: 100%;">
-                    </c-select> -->
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <el-form-item label="舍入货币单位" prop="rndunt">
-                    <c-input-currency-min v-model="model.rndunt" placeholder="请输入舍入货币单位">
-                    </c-input-currency-min>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <el-form-item label="基础汇率" prop="bas">
-                    <c-input v-model="model.bas" placeholder="请输入基础汇率">
-                    </c-input>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <el-form-item label="账户兑换币种" prop="acc1">
-                    <c-input v-model="model.acc1" placeholder="请输入账户兑换币种">
-                    </c-input>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <el-form-item label="柜台账户兑换币种" prop="acc2">
-                    <c-input v-model="model.acc2" placeholder="请输入柜台账户兑换币种">
-                    </c-input>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <c-col :span="12">
-                    <el-form-item label="利率录入操作列表" prop="seq" style="width: 100%">
-                        <c-input v-model="model.seq" placeholder="请输入利率录入操作列表" style="width: 100%">
-                        </c-input>
-                    </el-form-item>
-                </c-col>
-                <c-col :span="12">
-                    <el-form-item label="自定义的货币种类" prop="newcur" style="width: 100%">
-                        <c-select v-model="model.newcur" placeholder="请输入自定义的货币种类" style="width: 100%">
-                            <el-option v-for="item in codes.currencycode" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </c-select>
-                    </el-form-item>
-                </c-col>
-            </c-col>
-            <c-col :span="24">
-                <c-col :span="12">
-                    <el-form-item label="开始时间" prop="begdat" style="width: 100%">
-                        <c-date-picker type="date" v-model="model.begdat" placeholder="请输入开始时间"
-                            style="width: 100%">
-                        </c-date-picker>
-                    </el-form-item>
-                </c-col>
-                <c-col :span="12">
-                    <el-form-item label="结束时间" prop="enddat" style="width: 100%">
-                        <c-date-picker type="date" v-model="model.enddat" placeholder="请输入结束时间"
-                            style="width: 100%">
-                        </c-date-picker>
-                    </el-form-item>
-                </c-col>
-            </c-col>
-            <c-col :span="12">
-                <el-form-item label="借贷起息日" prop="dbtday">
-                    <c-input v-model="model.dbtday" placeholder="请输入借贷起息日">
-                    </c-input>
-                </el-form-item>
-            </c-col>
-            <c-col :span="12">
-                <el-form-item label="信贷起息日" prop="cdtday">
-                    <c-input v-model="model.cdtday" placeholder="请输入信贷起息日">
-                    </c-input>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <c-col :span="12">
-                    <el-form-item label="币种" prop="maxcur" style="width: 100%">
-                        <c-select v-model="model.maxcur" placeholder="请输入币种" style="width: 100%">
-                            <el-option v-for="item in codes.currencycode" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </c-select>
-                    </el-form-item>
-                </c-col>
-                <c-col :span="12">
-                    <el-form-item label="最大金额" prop="maxamt">
-                        <c-input-currency v-model="model.maxamt" placeholder="请输入最大金额">
-                        </c-input-currency>
-                    </el-form-item>
-                </c-col>
-            </c-col>
-        </c-col>
-        <!-- 右边 -->
-        <c-col :span="12" class="col-right">
-            <c-col :span="24">
-                <el-form-item label="可替换币种" prop="altcod">
-                    <c-input v-model="model.altcod" placeholder="请输入可替换币种">
-                    </c-input>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <el-form-item label="货币小数位" prop="dec">
-                    <c-input v-model="model.dec" placeholder="请输入货币小数位">
-                    </c-input>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <el-form-item label="汇率最大浮动值" prop="dif">
-                    <c-input v-model="model.dif" placeholder="请输入汇率最大浮动值">
-                    </c-input>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <el-form-item label="账户平均汇率" prop="glbrat">
-                    <c-input-currency v-model="model.glbrat" placeholder="请输入账户平均汇率">
-                    </c-input-currency>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <el-form-item label="与中间价的差数" prop="bsrmar">
-                    <c-input-currency v-model="model.bsrmar" placeholder="请输入与中间价的差数">
-                    </c-input-currency>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <el-form-item label="与调整价的差数" prop="sqrmar">
-                    <c-input-currency v-model="model.sqrmar" placeholder="请输入与调整价的差数">
-                    </c-input-currency>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <el-form-item label="汇率插入日期" prop="odrintday">
-                    <c-input v-model="model.odrintday" placeholder="汇率插入日期">
-                    </c-input>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24" style="padding-left: 120px">
-                <el-table :data="stmData.data" border>
-                    <el-table-column prop="uilcod" label="Language" sortable width="220">
-                    </el-table-column>
-                    <el-table-column prop="nam" label="Description" sortable width="300">
-                    </el-table-column>
-                </el-table>
-            </c-col>
-
-            <!-- <c-col :span="24">
-                <el-form-item label="ver" prop="ver">
-                    <c-input v-model="model.ver" placeholder="请输入ver">
-                    </c-input>
-                </el-form-item>
-            </c-col>
-            <c-col :span="24">
-                <el-form-item label="etgextkey" prop="etgextkey">
-                    <c-input v-model="model.etgextkey" placeholder="请输入etgextkey">
-                    </c-input>
-                </el-form-item>
-            </c-col> -->
-        </c-col>
-    </div>
-</template>
-
-<script>
-
-export default {
-    name: "",
-    inject: ["root"],
-    props: ["model",],
-    data() {
-        return {
-            stmData: {
-                data: [],
-            },
-            codes: {
-                currencycode: [
-                    { label: "人民币", value: "CNY" },
-                    { label: "韩圆", value: "KRW" },
-                    { label: "新西兰元", value: "NZD" },
-                    { label: "美元", value: "USD" },
-                ],
-            }
-        };
-    },
-    mounted() {
-        // console.log(codes);
-    }
-};
-
-</script>
\ No newline at end of file

src/views/Statics/Dbacur/index.vue

 <template>
-  <div class="eContainer">
-    <c-page title="货币查询">
-      <el-form :model="model" ref="modelForm" label-width="120px" label-position="right" size="small">
-        <c-content>
-          <m-currency :model="model" ref="currency" />
-        </c-content>
-      </el-form>
-      <div style="text-align: center">
-        <c-button type="primary" style="margin-right: 10px" @click="commitAdd">提 交</c-button>
-        <c-button type="primary" @click="goBack">返 回</c-button>
-      </div>
-    </c-page>
-  </div>
+<!--  <div class="eContainer">-->
+<!--    <c-page title="货币查询">-->
+<!--      <el-form :model="model" ref="modelForm" label-width="120px" label-position="right" size="small">-->
+<!--        <c-content>-->
+<!--          <m-currency :model="model" ref="currency" />-->
+<!--        </c-content>-->
+<!--      </el-form>-->
+<!--      <div style="text-align: center">-->
+<!--        <c-button type="primary" style="margin-right: 10px" @click="commitAdd">提 交</c-button>-->
+<!--        <c-button type="primary" @click="goBack">返 回</c-button>-->
+<!--      </div>-->
+<!--    </c-page>-->
+<!--  </div>-->
+  <m-cur title="dbacur" type="add"></m-cur>
 </template>
 
 <script>
-import Utils from "~/utils";
-import commonFuncs from "~/mixin/commonFuncs";
-import Cur, { Pattern } from "../Infcur/Cur.js";
-
-import Currency from "./Currency";
-
-import { curInfo, add, edit, curDelete } from "~/service/test/cur.js";
+import Dbicur from "~/views/Statics/Dbicur"
 
 export default {
   name: "StaticsDbacur",
   components: {
-    "m-currency": Currency
-  },
-  provide() {
-    return {
-      root: this,
-    };
+    "m-cur": Dbicur
   },
-  mixins: [commonFuncs],
   data() {
     return {
-      tabVal: "",
-      model: new Cur().data,
-      rules: Pattern,
     };
   },
-  methods: {
-    commitAdd() {
-      this.$refs.modelForm.validate((validated) => {
-        if (validated) {
-          add(this.model)
-            .then((res) => {
-              console.log(this.model);
-              this.$message.success("保存成功！");
-              this.goBack(true)
-            })
-            .catch((err) => {
-              this.$message.error("保存失败！");
-            });
-        } else {
-          Utils.formValidateTips(this.$refs.modelForm.fields)
-        }
-      });
-    },
-    goBack(update) {
-      this.$store.dispatch("TagsView/delView", this.$route);
-      this.$router.push({ name: "StaticsInfcur", params: { update } });
-    },
-  },
-  mounted() {
-    // this.$refs.cur.rules['ptaList'] = [
-    //   { type: 'array', required: true, min: 1, message: '地址信息栏不能为空' }
-    // ]
-    console.log(this.$refs.modelForm);
-  }
 };
 </script>
 

src/views/Statics/Dbecur/index.vue

 <template>
-  <div class="eContainer">
-    <c-page title="货币查询">
-      <el-form :model="model" ref="modelForm" label-width="120px" label-position="right" size="small">
-        <c-content>
-          <m-currency :model="model" ref="currency" />
-        </c-content>
-      </el-form>
-      <div style="text-align: center">
-        <c-button type="primary" style="margin-right: 10px" @click="commitEdit">提 交</c-button>
-        <c-button type="primary" @click="goBack">返 回</c-button>
-      </div>
-    </c-page>
-  </div>
+<!--  <div class="eContainer">-->
+<!--    <c-page title="货币查询">-->
+<!--      <el-form :model="model" ref="modelForm" label-width="120px" label-position="right" size="small">-->
+<!--        <c-content>-->
+<!--          <m-currency :model="model" ref="currency" />-->
+<!--        </c-content>-->
+<!--      </el-form>-->
+<!--      <div style="text-align: center">-->
+<!--        <c-button type="primary" style="margin-right: 10px" @click="commitEdit">提 交</c-button>-->
+<!--        <c-button type="primary" @click="goBack">返 回</c-button>-->
+<!--      </div>-->
+<!--    </c-page>-->
+<!--  </div>-->
+  <m-cur title="dbecur" type="edit"></m-cur>
 </template>
 
 <script>
-import Utils from "~/utils";
+// import Utils from "~/utils";
 // import commonFuncs from "~/mixin/commonFuncs";
-import Cur, { Pattern } from "../Infcur/Cur.js";
+// import Cur, { Pattern } from "../Infcur/Cur.js";
+import Dbicur from "@/views/Statics/Dbicur";
 
-import Currency from "../Dbacur/Currency";
-
-import { curInfo, add, edit, curDelete } from "~/service/test/cur.js";
+// import { curInfo, add, edit, curDelete } from "~/service/test/cur.js";
 
 export default {
   name: "StaticsDbacur",
   components: {
-    "m-currency": Currency
-  },
-  provide() {
-    return {
-      root: this,
-    };
+    // "m-currency": Currency
+    "m-cur": Dbicur,
   },
+  // provide() {
+  //   return {
+  //     root: this,
+  //   };
+  // },
   // mixins: [commonFuncs],
   data() {
     return {
-      tabVal: "",
-      model: new Cur().data,
-      rules: Pattern,
+      // tabVal: "",
+      // model: new Cur().data,
+      // rules: Pattern,
     };
   },
-  methods: {
-    async goin(){
-      this.model = await curInfo(this.$route.params.inr);
-    },
-    commitEdit() {
-      this.model.inr = this.$route.params.inr
-      this.$refs.modelForm.validate((validated) => {
-        if (validated) {
-          edit(this.model)
-            .then((res) => {
-              this.$message.success("保存成功！");
-              this.goBack()
-            })
-            .catch((err) => {
-              this.$message.error("保存失败！");
-            });
-        } else {
-          Utils.formValidateTips(this.$refs.modelForm.fields)
-        }
-      });
-    },
-    goBack(update) {
-      this.$store.dispatch("TagsView/delView", this.$route);
-      this.$router.push({ name: "StaticsInfcur", params: { update } });
-    },
-  },
-  created () {
-    this.goin(this.$route.params.inr);
-  },
-  mounted() {
-    // this.$refs.cur.rules['ptaList'] = [
-    //   { type: 'array', required: true, min: 1, message: '地址信息栏不能为空' }
-    // ]
-    console.log(this.$refs.modelForm);
-  }
+  // methods: {
+  //   async goin(){
+  //     this.model = await curInfo(this.$route.params.inr);
+  //   },
+  //   commitEdit() {
+  //     this.model.inr = this.$route.params.inr
+  //     this.$refs.modelForm.validate((validated) => {
+  //       if (validated) {
+  //         edit(this.model)
+  //           .then((res) => {
+  //             this.$message.success("保存成功！");
+  //             this.goBack()
+  //           })
+  //           .catch((err) => {
+  //             this.$message.error("保存失败！");
+  //           });
+  //       } else {
+  //         Utils.formValidateTips(this.$refs.modelForm.fields)
+  //       }
+  //     });
+  //   },
+  //   goBack(update) {
+  //     this.$store.dispatch("TagsView/delView", this.$route);
+  //     this.$router.push({ name: "StaticsInfcur", params: { update } });
+  //   },
+  // },
+  // created () {
+  //   this.goin(this.$route.params.inr);
+  // },
+  // mounted() {
+  //   // this.$refs.cur.rules['ptaList'] = [
+  //   //   { type: 'array', required: true, min: 1, message: '地址信息栏不能为空' }
+  //   // ]
+  //   console.log(this.$refs.modelForm);
+  // }
 };
 </script>
 

src/views/Statics/Dbiatx/Atx.js

@@ -65,8 +65,9 @@ export const Pattern = {
 		{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
 	],
 	"atxcod": [
-		{ "type": "string", "trigger": "blur" },
-		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+		{required: false, message: "必输项"}
+		// { "type": "string", "trigger": "blur" },
+		// { "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
 	],
 	"atxtxt": [
 	],
@@ -86,20 +87,23 @@ export const Pattern = {
 		{ "type": "string", "trigger": "blur" }
 	],
 	"uil": [
-		{ "type": "string", "trigger": "blur" },
-		{ "max": 2, "message": "最大长度2个字符", "trigger": "blur" }
+		{required: false, message: "必输项"}
+		// { "type": "string", "trigger": "blur" },
+		// { "max": 2, "message": "最大长度2个字符", "trigger": "blur" }
 	],
 	"gtxlegfrm": [
-		{ "type": "string", "trigger": "blur" },
-		{ "max": 4, "message": "最大长度4个字符", "trigger": "blur" }
+		{required: false, message: "必输项"}
+		// { "type": "string", "trigger": "blur" },
+		// { "max": 4, "message": "最大长度4个字符", "trigger": "blur" }
 	],
 	"covgodsrvdft": [
 		{ "type": "string", "trigger": "blur" },
 		{ "max": 3300, "message": "最大长度3300个字符", "trigger": "blur" }
 	],
 	"gtxexpflg": [
-		{ "type": "string", "trigger": "blur" },
-		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+		{required: false, message: "必输项"}
+		// { "type": "string", "trigger": "blur" },
+		// { "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
 	],
 	"labaddinf": [
 		{ "type": "string", "trigger": "blur" },
@@ -110,8 +114,9 @@ export const Pattern = {
 		{ "max": 15, "message": "最大长度15个字符", "trigger": "blur" }
 	],
 	"gtxpri": [
-		{ "type": "string", "trigger": "blur" },
-		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+		{required: false, message: "必输项"}
+		// { "type": "string", "trigger": "blur" },
+		// { "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
 	],
 	"expliatxt": [
 		{ "type": "string", "trigger": "blur" },
@@ -147,6 +152,9 @@ export const Pattern = {
 		{ "type": "string", "trigger": "blur" },
 		{ "max": 4, "message": "最大长度4个字符", "trigger": "blur" }
 	],
+	"gtxpurpos": [
+		{required: false, message: "必输项"}
+	],
 }
 
 

src/views/Statics/Dbiatx/AtxInfo.vue

@@ -12,11 +12,17 @@
     </c-col> -->
     <c-col :span="24">
         <el-form-item label="保函文本用途" prop="atxcod">
-            <c-input
-                v-model="model.atxcod"
-                placeholder="请输入保函文本用途"
-            >
-            </c-input>
+          <c-select style="width: 100%"
+                    v-model="model.atxcod"
+                    placeholder="请选择保函文本用途"
+                    :code="getCodesByKey('atxcod')"
+          >
+          </c-select>
+<!--            <c-input-->
+<!--                v-model="model.atxcod"-->
+<!--                placeholder="请输入保函文本用途"-->
+<!--            >-->
+<!--            </c-input>-->
         </el-form-item>
     </c-col>
     <c-col :span="24">
@@ -58,11 +64,17 @@
     </c-col>
     <c-col :span="24">
         <el-form-item label="出具目的" prop="gtxpurpos">
-            <c-input
-                v-model="model.gtxpurpos"
-                placeholder="请输入出具目的"
-            >
-            </c-input>
+          <c-select style="width: 100%"
+                    v-model="model.gtxpurpos"
+                    placeholder="请选择出具目的"
+                    :code="getCodesByKey('gtxpurpos')"
+          >
+          </c-select>
+<!--            <c-input-->
+<!--                v-model="model.gtxpurpos"-->
+<!--                placeholder="请输入出具目的"-->
+<!--            >-->
+<!--            </c-input>-->
         </el-form-item>
     </c-col>
     <c-col :span="24">
@@ -76,20 +88,33 @@
     </c-col>
     <c-col :span="24">
         <el-form-item label="保函格式" prop="gtxlegfrm">
-            <c-input
-                v-model="model.gtxlegfrm"
-                placeholder="请输入保函格式"
-            >
-            </c-input>
+          <c-select style="width: 100%"
+                    v-model="model.gtxlegfrm"
+                    placeholder="请选择保函格式"
+                    :code="getCodesByKey('gtxlegfrm')"
+          >
+          </c-select>
+<!--            <c-input-->
+<!--                v-model="model.gtxlegfrm"-->
+<!--                placeholder="请输入保函格式"-->
+<!--            >-->
+<!--            </c-input>-->
         </el-form-item>
     </c-col>
     <c-col :span="24">
         <el-form-item label="上一级文本" prop="atxtxt">
-            <c-input
-                v-model="model.atxtxt"
-                placeholder="请输入上一级文本"
-            >
-            </c-input>
+          <c-mul-row-input
+              v-model="model.atxtxt"
+              :rows="4"
+              :cols="35"
+              placeholder="请输入上一级文本"
+          >
+          </c-mul-row-input>
+<!--            <c-input-->
+<!--                v-model="model.atxtxt"-->
+<!--                placeholder="请输入上一级文本"-->
+<!--            >-->
+<!--            </c-input>-->
         </el-form-item>
     </c-col>
     </c-col>
@@ -107,20 +132,32 @@
     </c-col>
     <c-col :span="24">
         <el-form-item label="优先级" prop="gtxpri">
-            <c-input
-                v-model="model.gtxpri"
-                placeholder="请输入优先级"
-            >
-            </c-input>
+          <c-select style="width: 100%"
+                    v-model="model.gtxpri"
+                    placeholder="请选择优先级"
+                    :code="getCodesByKey('gtxpri')"
+          >
+          </c-select>
+<!--            <c-input-->
+<!--                v-model="model.gtxpri"-->
+<!--                placeholder="请输入优先级"-->
+<!--            >-->
+<!--            </c-input>-->
         </el-form-item>
     </c-col>
     <c-col :span="24">
         <el-form-item label="保函无责任担保标志" prop="gtxexpflg">
-            <c-input
-                v-model="model.gtxexpflg"
-                placeholder="请输入保函无责任担保标志"
-            >
-            </c-input>
+          <c-select style="width: 100%"
+                    v-model="model.gtxexpflg"
+                    placeholder="请选择保函无责任担保标志"
+                    :code="getCodesByKey('gtxexpflg')"
+          >
+          </c-select>
+<!--            <c-input-->
+<!--                v-model="model.gtxexpflg"-->
+<!--                placeholder="请输入保函无责任担保标志"-->
+<!--            >-->
+<!--            </c-input>-->
         </el-form-item>
     </c-col>
     <c-col :span="24">

src/views/Statics/Dbicur/Currency.vue

@@ -15,7 +15,7 @@
                             :value="item.value">
                         </el-option>
                     </c-select> -->
-                    <c-input v-model="model.cod" style="width: 100%" placeholder="请输入货币种类" disabled>
+                    <c-input v-model="model.cod" style="width: 100%" placeholder="请输入货币种类" >
                     </c-input>
                     <!-- <c-select v-model="model.cod" placeholder="请输入cod" code="codes.currencycode"
                         style="width: 100%;">
@@ -23,39 +23,39 @@
                 </el-form-item>
             </c-col>
             <c-col :span="24">
-                <el-form-item label="舍入货币单位" prop="rndunt">
-                    <c-input-currency-min v-model="model.rndunt" placeholder="请输入舍入货币单位" disabled>
+                  <el-form-item label="舍入货币单位" prop="rndunt">
+                    <c-input-currency-min v-model="model.rndunt" placeholder="请输入舍入货币单位" >
                     </c-input-currency-min>
                 </el-form-item>
             </c-col>
             <c-col :span="24">
                 <el-form-item label="基础汇率" prop="bas">
-                    <c-input v-model="model.bas" placeholder="请输入基础汇率" disabled>
+                    <c-input v-model="model.bas" placeholder="请输入基础汇率" >
                     </c-input>
                 </el-form-item>
             </c-col>
             <c-col :span="24">
                 <el-form-item label="账户兑换币种" prop="acc1">
-                    <c-input v-model="model.acc1" placeholder="请输入账户兑换币种" disabled>
+                    <c-input v-model="model.acc1" placeholder="请输入账户兑换币种" >
                     </c-input>
                 </el-form-item>
             </c-col>
             <c-col :span="24">
                 <el-form-item label="柜台账户兑换币种" prop="acc2">
-                    <c-input v-model="model.acc2" placeholder="请输入柜台账户兑换币种" disabled>
+                    <c-input v-model="model.acc2" placeholder="请输入柜台账户兑换币种" >
                     </c-input>
                 </el-form-item>
             </c-col>
             <c-col :span="24">
                 <c-col :span="12">
                     <el-form-item label="利率录入操作列表" prop="seq" style="width: 100%">
-                        <c-input v-model="model.seq" placeholder="请输入利率录入操作列表" style="width: 100%" disabled>
+                        <c-input v-model="model.seq" placeholder="请输入利率录入操作列表" style="width: 100%" >
                         </c-input>
                     </el-form-item>
                 </c-col>
                 <c-col :span="12">
                     <el-form-item label="自定义的货币种类" prop="newcur" style="width: 100%">
-                        <c-select v-model="model.newcur" placeholder="请输入自定义的货币种类" style="width: 100%" disabled>
+                        <c-select v-model="model.newcur" placeholder="请输入自定义的货币种类" style="width: 100%" >
                             <el-option v-for="item in codes.currencycode" :key="item.value" :label="item.label"
                                 :value="item.value">
                             </el-option>
@@ -67,34 +67,34 @@
                 <c-col :span="12">
                     <el-form-item label="开始时间" prop="begdat" style="width: 100%">
                         <c-date-picker type="date" v-model="model.begdat" placeholder="请输入开始时间"
-                            style="width: 100%" disabled>
+                            style="width: 100%" >
                         </c-date-picker>
                     </el-form-item>
                 </c-col>
                 <c-col :span="12">
                     <el-form-item label="结束时间" prop="enddat" style="width: 100%">
                         <c-date-picker type="date" v-model="model.enddat" placeholder="请输入结束时间"
-                            style="width: 100%" disabled>
+                            style="width: 100%" >
                         </c-date-picker>
                     </el-form-item>
                 </c-col>
             </c-col>
             <c-col :span="12">
                 <el-form-item label="借贷起息日" prop="dbtday">
-                    <c-input v-model="model.dbtday" placeholder="请输入借贷起息日" disabled>
+                    <c-input v-model="model.dbtday" placeholder="请输入借贷起息日" >
                     </c-input>
                 </el-form-item>
             </c-col>
             <c-col :span="12">
                 <el-form-item label="信贷起息日" prop="cdtday">
-                    <c-input v-model="model.cdtday" placeholder="请输入信贷起息日" disabled>
+                    <c-input v-model="model.cdtday" placeholder="请输入信贷起息日" >
                     </c-input>
                 </el-form-item>
             </c-col>
             <c-col :span="24">
                 <c-col :span="12">
                     <el-form-item label="币种" prop="maxcur" style="width: 100%">
-                        <c-select v-model="model.maxcur" placeholder="请输入币种" style="width: 100%" disabled>
+                        <c-select v-model="model.maxcur" placeholder="请输入币种" style="width: 100%" >
                             <el-option v-for="item in codes.currencycode" :key="item.value" :label="item.label"
                                 :value="item.value">
                             </el-option>
@@ -103,7 +103,7 @@
                 </c-col>
                 <c-col :span="12">
                     <el-form-item label="最大金额" prop="maxamt">
-                        <c-input-currency v-model="model.maxamt" placeholder="请输入最大金额" disabled>
+                        <c-input-currency v-model="model.maxamt" placeholder="请输入最大金额" >
                         </c-input-currency>
                     </el-form-item>
                 </c-col>
@@ -113,43 +113,43 @@
         <c-col :span="12" class="col-right">
             <c-col :span="24">
                 <el-form-item label="可替换币种" prop="altcod">
-                    <c-input v-model="model.altcod" placeholder="请输入可替换币种" disabled>
+                    <c-input v-model="model.altcod" placeholder="请输入可替换币种" >
                     </c-input>
                 </el-form-item>
             </c-col>
             <c-col :span="24">
                 <el-form-item label="货币小数位" prop="dec">
-                    <c-input v-model="model.dec" placeholder="请输入货币小数位" disabled>
+                    <c-input v-model="model.dec" placeholder="请输入货币小数位" >
                     </c-input>
                 </el-form-item>
             </c-col>
             <c-col :span="24">
                 <el-form-item label="汇率最大浮动值" prop="dif">
-                    <c-input v-model="model.dif" placeholder="请输入汇率最大浮动值" disabled>
+                    <c-input v-model="model.dif" placeholder="请输入汇率最大浮动值" >
                     </c-input>
                 </el-form-item>
             </c-col>
             <c-col :span="24">
                 <el-form-item label="账户平均汇率" prop="glbrat">
-                    <c-input-currency v-model="model.glbrat" placeholder="请输入账户平均汇率" disabled>
+                    <c-input-currency v-model="model.glbrat" placeholder="请输入账户平均汇率" >
                     </c-input-currency>
                 </el-form-item>
             </c-col>
             <c-col :span="24">
                 <el-form-item label="与中间价的差数" prop="bsrmar">
-                    <c-input-currency v-model="model.bsrmar" placeholder="请输入与中间价的差数" disabled>
+                    <c-input-currency v-model="model.bsrmar" placeholder="请输入与中间价的差数" >
                     </c-input-currency>
                 </el-form-item>
             </c-col>
             <c-col :span="24">
                 <el-form-item label="与调整价的差数" prop="sqrmar">
-                    <c-input-currency v-model="model.sqrmar" placeholder="请输入与调整价的差数" disabled>
+                    <c-input-currency v-model="model.sqrmar" placeholder="请输入与调整价的差数" >
                     </c-input-currency>
                 </el-form-item>
             </c-col>
             <c-col :span="24">
                 <el-form-item label="汇率插入日期" prop="odrintday" disabled>
-                    <c-input v-model="model.odrintday" placeholder="汇率插入日期" disabled>
+                    <c-input v-model="model.odrintday" placeholder="汇率插入日期" >
                     </c-input>
                 </el-form-item>
             </c-col>

src/views/Statics/Dbicur/index.vue

 <template>
   <div class="eContainer">
     <c-page :title="title">
-      <el-form ref="modelForm" label-width="120px" size="small" label-position="right" :model="model" :rules="rules">
+      <el-form ref="modelForm" label-width="120px" size="small" label-position="right" :model="model" :rules="rules" :disabled="isDisabled">
         <c-content>
           <m-cur-info :model="model" />
         </c-content>
@@ -42,13 +42,13 @@ export default {
     },
     title: {
       type: String,
-      default: "dbipty"
+      default: "dbicur"
     }
   },
   data() {
     return {
       model: new Cur().data,
-      tabVal: "pty",
+      tabVal: "cur",
       rules: Pattern,
     };
   },

src/views/Statics/Dbigtx/Gtx.js

@@ -46,24 +46,20 @@ export const Pattern = {
 		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
 	],
 	"hndtyp": [
-		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
-		{ "max": 2, "message": "最大长度2个字符", "trigger": "blur" }
+		{ "required": true, "message": "必输项", "type": "string" }
 	],
 	"objtyp": [
-		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
-		{ "max": 6, "message": "最大长度6个字符", "trigger": "blur" }
+		{ "required": true, "message": "必输项", "type": "string" },
 	],
 	"objinr": [
 		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
 		{ "max": 8, "message": "最大长度8个字符", "trigger": "blur" }
 	],
 	"gtxpri": [
-		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
-		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+		{ required: true, message: "必输项", type: "string" }
 	],
 	"expflg": [
-		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
-		{ "max": 1, "message": "最大长度1个字符", "trigger": "blur" }
+		{ required: false, "message": "必输项", "type": "string" },
 	],
 	"uil": [
 		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
@@ -78,13 +74,16 @@ export const Pattern = {
 		{ "max": 15, "message": "最大长度15个字符", "trigger": "blur" }
 	],
 	"legfrm": [
-		{ "required": true, "message": "必输项", "type": "string", "trigger": "blur" },
-		{ "max": 4, "message": "最大长度4个字符", "trigger": "blur" }
+		{ "required": true, "message": "必输项", "type": "string" }
 	],
 	"covgodsrvdft": [
 		{ "type": "string", "trigger": "blur" },
 		{ "max": 420, "message": "最大长度420个字符", "trigger": "blur" }
 	],
+	"etgextkey": [
+		{"required": true, "type": "string", "message": "必输项", "trigger": "blur"},
+		{ "max": 8, "message": "最大长度8个字符", "trigger": "blur" }
+	]
 }
 
 

src/views/Statics/Dbigtx/GtxInfo.vue

@@ -39,17 +39,17 @@
         </c-col> -->
       <c-col :span="24">
             <el-form-item label="保函文本" prop="gidtxt">
-              <c-input
-                v-model="model.gidtxt"
-                placeholder="请输入保函文本">
-              </c-input>
-<!--              <c-mul-row-input-->
-<!--                  v-model="model.gidtxt"-->
-<!--                  :rows="4"-->
-<!--                  :cols="35"-->
-<!--                  placeholder="请输入保函文本"-->
-<!--              >-->
-<!--              </c-mul-row-input>-->
+<!--              <c-input-->
+<!--                v-model="model.gidtxt"-->
+<!--                placeholder="请输入保函文本">-->
+<!--              </c-input>-->
+              <c-mul-row-input
+                  v-model="model.gidtxt"
+                  :rows="4"
+                  :cols="35"
+                  placeholder="请输入保函文本"
+              >
+              </c-mul-row-input>
             </el-form-item>
         </c-col>
       <c-col :span="24">
@@ -63,20 +63,32 @@
         </c-col>
       <c-col :span="24">
             <el-form-item label="处理类型" prop="hndtyp">
-                <c-input
-                    v-model="model.hndtyp"
-                    placeholder="请输入处理类型"
-                >
-                </c-input>
+              <c-select style="width: 100%"
+                        v-model="model.hndtyp"
+                        placeholder="请选择处理类型"
+                        :code="getCodesByKey('hndtyp')"
+              >
+              </c-select>
+<!--                <c-input-->
+<!--                    v-model="model.hndtyp"-->
+<!--                    placeholder="请输入处理类型"-->
+<!--                >-->
+<!--                </c-input>-->
             </el-form-item>
         </c-col>
       <c-col :span="24">
             <el-form-item label="对象类型" prop="objtyp">
-                <c-input
-                    v-model="model.objtyp"
-                    placeholder="请输入对象类型"
-                >
-                </c-input>
+              <c-select style="width: 100%"
+                        v-model="model.objtyp"
+                        placeholder="请选择对象类型"
+                        :code="getCodesByKey('objtyp')"
+              >
+              </c-select>
+<!--                <c-input-->
+<!--                    v-model="model.objtyp"-->
+<!--                    placeholder="请输入对象类型"-->
+<!--                >-->
+<!--                </c-input>-->
             </el-form-item>
         </c-col>
       <c-col :span="24">
@@ -92,20 +104,32 @@
     <c-col :span="12" class="col-right">
       <c-col :span="24">
             <el-form-item label="优先级" prop="gtxpri">
-                <c-input
-                    v-model="model.gtxpri"
-                    placeholder="请输入优先级"
-                >
-                </c-input>
+              <c-select style="width: 100%"
+                        v-model="model.gtxpri"
+                        placeholder="请选择优先级"
+                        :code="getCodesByKey('gtxpri')"
+              >
+              </c-select>
+<!--                <c-input-->
+<!--                    v-model="model.gtxpri"-->
+<!--                    placeholder="请输入优先级"-->
+<!--                >-->
+<!--                </c-input>-->
             </el-form-item>
         </c-col>
       <c-col :span="24">
             <el-form-item label="无责任担保标志" prop="expflg">
-                <c-input
-                    v-model="model.expflg"
-                    placeholder="请输入无责任担保标志"
-                >
-                </c-input>
+              <c-select style="width: 100%"
+                        v-model="model.expflg"
+                        placeholder="请选择无责任担保标志"
+                        :code="getCodesByKey('expflg')"
+              >
+              </c-select>
+<!--                <c-input-->
+<!--                    v-model="model.expflg"-->
+<!--                    placeholder="请输入无责任担保标志"-->
+<!--                >-->
+<!--                </c-input>-->
             </el-form-item>
         </c-col>
       <c-col :span="24">
@@ -137,11 +161,17 @@
         </c-col>
       <c-col :span="24">
             <el-form-item label="格式" prop="legfrm">
-                <c-input
-                    v-model="model.legfrm"
-                    placeholder="请输入格式"
-                >
-                </c-input>
+              <c-select style="width: 100%"
+                        v-model="model.legfrm"
+                        placeholder="请选择格式"
+                        :code="getCodesByKey('legfrm')"
+              >
+              </c-select>
+<!--                <c-input-->
+<!--                    v-model="model.legfrm"-->
+<!--                    placeholder="请输入格式"-->
+<!--                >-->
+<!--                </c-input>-->
             </el-form-item>
         </c-col>
       <c-col :span="24">
@@ -167,12 +197,20 @@
 </template>
 
 <script>
+import codes from "@/config/CodeTable";
+
 export default {
   name: "",
+  inject: ["root"],
   props: ["model"],
   data() {
     return {};
   },
+  methods: {
+    getCodesByKey(key) {
+      return codes[key] ?? [];
+    },
+  }
 };
 </script>
 

src/views/Statics/Infatx/Infsea.vue

@@ -34,7 +34,7 @@
             <c-select style="width: 100%"
                 v-model="model.gtxpurpos"
                placeholder="请选择出具目的"
-                :code="getCodesByKey('gtxpurpos')"
+                :code="getCodesByKey('gtxpurpos') "
             >
             </c-select>
         </el-form-item>

src/views/Statics/Infcur/Infsea.vue

@@ -3,8 +3,8 @@
     <!-- ----------左 ---------->
     <c-col :span="12" class="col-left">
       <c-col :span="24">
-        <el-form-item label="货币代码" prop="cod">
-          <c-input v-model="model.cod" placeholder="请输入货币代码" style="width: 100%">
+        <el-form-item label="货币种类" prop="cod">
+          <c-input v-model="model.cod" placeholder="请输入货币种类" style="width: 100%">
           </c-input>
         </el-form-item>
       </c-col>
@@ -21,7 +21,7 @@
 
     <c-col :span="24" style="text-align: right; height: 36.8px">
       <el-button size="small" @click="handleReset">重置</el-button>
-      <el-button type="primary" icon="el-icon-search" size="small" @click="onInfcurSearch">查询
+      <el-button type="primary" icon="el-icon-search" size="small" @click="onSearch()">查询
       </el-button>
     </c-col>
 
@@ -87,6 +87,11 @@ export default {
       this.model.cod = ""
       this.model.seanam = ""
     },
+    onSearch() {
+      this.model.pageSize = 5;
+      this.model.pageNum = 1;
+      this.onInfcurSearch();
+    },
     onInfcurSearch() {
       queryByPage(this.model).then(res => {
         /**

src/widget/Account/index.vue

@@ -3,7 +3,7 @@
     <el-form
       :model="model"
       ref="modelForm"
-      label-width="120px"
+      label-width="100px"
       label-position="right"
       size="small"
     >

src/widget/MsgReceived/index.vue

 <template>
-  <div></div>
+  <m-msg :model="model"></m-msg>
 </template>
 
 <script>
+import Msg from "../MsgSent/Msg.vue";
 
 /**
  * 收报查询
  */
 export default {
-	name: 'MsgReceivedQuery'
-}
+  name: "MsgReceivedQuery",
+  components: {
+    "m-msg": Msg,
+  },
+  data() {
+    return {
+      model: {
+        dir: "<",
+        cortyp: "",
+        beginDate: "",
+        endDate: "",
+        msgTyp: "",
+        sndkey: "",
+        extkey: "",
+        relcur: "",
+        relamt: "",
+        judgeFlag: "",
+        // 分页参数
+        page: 1,
+        pageSize: 5,
+      },
+    };
+  },
+};
 </script>
 
 <style>
-
 </style>
\ No newline at end of file

src/widget/MsgSent/Msg.vue

+<template>
+  <div>
+    <el-form
+      :model="model"
+      ref="modelForm"
+      label-width="100px"
+      label-position="right"
+      size="small"
+    >
+      <c-col :span="8" class="col-left">
+        <!-- <c-col :span="24">
+          <el-form-item label="dir" prop="dir">
+            <c-input v-model="model.dir" placeholder="请输入dir"> </c-input>
+          </el-form-item>
+        </c-col> -->
+        <c-col :span="24">
+          <el-form-item label="报文大类型" prop="cortyp">
+            <c-input v-model="model.cortyp" placeholder="请输入报文大类型">
+            </c-input>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="报文类型" prop="msgTyp">
+            <c-input v-model="model.msgTyp" placeholder="请输入报文类型">
+            </c-input>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="收/发报行" prop="sndkey">
+            <c-input v-model="model.sndkey" placeholder="请输入收/发报行">
+            </c-input>
+          </el-form-item>
+        </c-col>
+      </c-col>
+      <c-col :span="8" class="col-left col-right">
+        <c-col :span="24">
+          <el-form-item label="开始日期" prop="beginDate">
+            <c-input v-model="model.beginDate" placeholder="请输入开始日期">
+            </c-input>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="币种" prop="relcur">
+            <c-input v-model="model.relcur" placeholder="请输入币种">
+            </c-input>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="业务编号" prop="extkey">
+            <c-input v-model="model.extkey" placeholder="请输入业务编号">
+            </c-input>
+          </el-form-item>
+        </c-col>
+      </c-col>
+      <c-col :span="8" class="col-right">
+        <c-col :span="24">
+          <el-form-item label="结束日期" prop="endDate">
+            <c-input v-model="model.endDate" placeholder="请输入结束日期">
+            </c-input>
+          </el-form-item>
+        </c-col>
+        <c-col :span="24">
+          <el-form-item label="金额" prop="relamt">
+            <c-input v-model="model.relamt" placeholder="请输入金额">
+            </c-input>
+          </el-form-item>
+        </c-col>
+      </c-col>
+      <c-col :span="24" style="text-align: right">
+        <el-button size="small" @click="handleReset">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="small"
+          @click="doSearch()"
+          >查询
+        </el-button>
+      </c-col>
+    </el-form>
+    <c-col :span="24">
+      <c-paging-table
+        :data="tableData"
+        :columns="tableColumns"
+        :pageNumber="model.page"
+        :pageSize="model.pageSize"
+        :total="total"
+        v-on:queryFunc="queryFunc"
+        :border="true"
+      >
+      </c-paging-table>
+    </c-col>
+  </div>
+</template>
+
+<script>
+import codes from "~/config/CodeTable";
+import { queryByPage } from "~/service/test/smh.js";
+
+export default {
+  name: "Msg",
+  props: ["model"],
+  data() {
+    return {
+      tableColumns: [
+        // { label: "inr", prop: "inr", width: "auto" },
+        // { label: "objtyp", prop: "objtyp", width: "auto" },
+        // { label: "objinr", prop: "objinr", width: "auto" },
+        // { label: "trntyp", prop: "trntyp", width: "auto" },
+        // { label: "trninr", prop: "trninr", width: "auto" },
+        // { label: "trnsub", prop: "trnsub", width: "auto" },
+        { label: "extkey", prop: "extkey", width: "240px" },
+        { label: "nam", prop: "nam", width: "300px" },
+        { label: "creusr", prop: "creusr", width: "100px" },
+        { label: "crefrm", prop: "crefrm", width: "200px" },
+        { label: "创建时间", prop: "credattim", width: "150px" },
+        { label: "dir", prop: "dir", width: "auto" },
+        { label: "docpth", prop: "docpth", width: "150px" },
+        { label: "docfil", prop: "docfil", width: "150px" },
+        { label: "docfxt", prop: "docfxt", width: "auto" },
+        { label: "docmac", prop: "docmac", width: "auto" },
+        { label: "msgpos", prop: "msgpos", width: "auto" },
+        { label: "msglen", prop: "msglen", width: "auto" },
+        { label: "grpinr", prop: "grpinr", width: "auto" },
+        { label: "grpseq", prop: "grpseq", width: "auto" },
+        { label: "报文大类型", prop: "cortyp", width: "auto" },
+        { label: "cortypsub", prop: "cortypsub", width: "auto" },
+        { label: "apf", prop: "apf", width: "auto" },
+        { label: "收/发报行", prop: "sndkey", width: "150px" },
+        { label: "apfcnt", prop: "apfcnt", width: "auto" },
+        { label: "ptainr", prop: "ptainr", width: "auto" },
+        { label: "oriflg", prop: "oriflg", width: "auto" },
+        { label: "orismhinr", prop: "orismhinr", width: "auto" },
+        { label: "partflg", prop: "partflg", width: "auto" },
+        { label: "报文类型", prop: "msgtyp", width: "auto" },
+        { label: "币种", prop: "relcur", width: "auto" },
+        { label: "金额", prop: "relamt", width: "auto" },
+        { label: "sysno", prop: "sysno", width: "150px" },
+        { label: "staflg", prop: "staflg", width: "auto" },
+        { label: "clndat", prop: "clndat", width: "auto" },
+        { label: "f20", prop: "f20", width: "auto" },
+        { label: "stp", prop: "stp", width: "auto" },
+        { label: "etyextkey", prop: "etyextkey", width: "auto" },
+        { label: "chlflg", prop: "chlflg", width: "auto" },
+      ],
+      tableData: [],
+      // 总条数
+      total: 0,
+    };
+  },
+  methods: {
+    handleReset() {
+      this.$refs.modelForm.resetFields();
+    },
+    doSearch() {
+      queryByPage(this.model).then((res) => {
+        const list = res.list;
+        this.tableData = list;
+        this.model.page = res.pageNumber;
+        this.model.pageSize = res.pageSize;
+        this.total = res.total;
+      });
+    },
+    queryFunc(pageNumber, pageSize) {
+      this.model.page = pageNumber;
+      this.model.pageSize = pageSize;
+      this.doSearch();
+    },
+    getCodesByKey(key) {
+      return codes[key] ?? [];
+    },
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/widget/MsgSent/index.vue

 <template>
-  <div></div>
+  <m-msg :model="model"></m-msg>
 </template>
 
 <script>
+import Msg from "./Msg.vue";
 
 /**
  * 发报查询
  */
 export default {
-	name: 'MsgSentQuery'
-}
+  name: "MsgSentQuery",
+  components: {
+    "m-msg": Msg,
+  },
+  data() {
+    return {
+      model: {
+        dir: ">",
+        cortyp: "",
+        beginDate: "",
+        endDate: "",
+        msgTyp: "",
+        sndkey: "",
+        extkey: "",
+        relcur: "",
+        relamt: "",
+        judgeFlag: "",
+        // 分页参数
+        page: 1,
+        pageSize: 5,
+      },
+    };
+  },
+};
 </script>
 
 <style>
-
 </style>
\ No newline at end of file

src/widget/SwiftCode/index.vue

@@ -10,36 +10,34 @@
       <c-col :span="8" class="col-left">
         <c-col :span="24">
           
-          <el-form-item label="银行名称" prop="nam1">
-            <c-input v-model="model.nam1" placeholder="请输入银行名称">
+          <el-form-item label="银行中文" prop="nam">
+            <c-input v-model="model.nam" placeholder="请输入银行中文">
             </c-input>
           </el-form-item>
         </c-col>
         <c-col :span="24">
-          <el-form-item label="银行编号" prop="extkey">
-            <c-input v-model="model.extkey" placeholder="请输入银行编号"></c-input>
+          
+          <el-form-item label="银行英文" prop="nam1">
+            <c-input v-model="model.nam1" placeholder="请输入银行英文">
+            </c-input>
           </el-form-item>
         </c-col>
         
       </c-col>
       <c-col :span="8" class="col-left col-right">
         <c-col :span="24">
-          <el-form-item label="街道" prop="str1">
-            <c-input
-              v-model="model.str1"
-              maxlength="34"
-              placeholder="请输入街道"
-            ></c-input>
+          <el-form-item label="银行编号" prop="extkey">
+            <c-input v-model="model.extkey" placeholder="请输入银行编号"></c-input>
           </el-form-item>
         </c-col>
 
         <c-col :span="24">
-          <el-form-item label="BIC" prop="bic">
-            <c-select
+          <el-form-item label="SwiftCode" prop="bic">
+            <c-input
               v-model="model.bic"
-              placeholder="请输入BIC"
+              placeholder="请输入SwiftCode"
               style="width: 100%"
-            ></c-select>
+            ></c-input>
           </el-form-item>
         </c-col>
         
@@ -47,21 +45,21 @@
       <c-col :span="8" class="col-right">
         
         <c-col :span="24">
-          <el-form-item label="城市" prop="loctxt">
+          <el-form-item label="客户类型" prop="ptytyp">
             <c-select
-              v-model="model.loctxt"
+              v-model="model.ptytyp"
               style="width: 100%"
-              placeholder="请输入城市"
+              placeholder="请输入客户类型"
             >
             </c-select>
           </el-form-item>
         </c-col>
 
-        <c-col :span="24">
+        <!-- <c-col :span="24">
           <el-form-item label="ZIP-Code" prop="loczip">
             <c-input v-model="model.loczip" placeholder="请输入ZIP-Code"> </c-input>
           </el-form-item>
-        </c-col>
+        </c-col> -->
       </c-col>
       <c-col :span="24" style="text-align: right">
         <el-button size="small" @click="handleReset">重置</el-button>
@@ -91,8 +89,7 @@
 
 <script>
 import codes from "~/config/CodeTable";
-import { queryByPage } from "~/service/test/act.js";
-
+import { queryByPage } from "~/service/test/pty.js";
 /**
  * SwiftCode查询
  */
@@ -102,21 +99,25 @@ export default {
     return {
       tableData: [],
       tableColumns: [
-        { label: "银行编号", prop: "extkey", width: "200" },
-        { label: "银行名称", prop: "nam1", width: "200" },
-        { label: "街道", prop: "str1", width: "100" },
-        { label: "ZIP", prop: "loczip", width: "200" },
-        { label: "城市", prop: "loctxt", width: "200" },
-        { label: "BIC", prop: "bic", width: "100" },
+        { label: "银行编号", prop: "extkey", width: "auto" },
+        { label: "银行中文", prop: "nam", width: "auto" },
+        { label: "银行英文", prop: "nam1", width: "auto" },
+        { label: "SwiftCode", prop: "bic", width: "auto" },
+        // { label: "街道", prop: "str1", width: "auto" },
+        { label: "邮政编码", prop: "loczip", width: "auto" },
+        { label: "城市名称", prop: "loctxt", width: "auto" },  
+        
       ],
       model: {
         // adr，查询条件的字段
-        nam1: "",
         extkey: "",
+        nam:"",
+        nam1: "",
         str1: "",
         bic: "",
         loctxt: "",
         loczip: "",
+        ptytyp:"",//客户类型
         pageNum: 1,
         pageSize: 5,
         total: 0,