Skip to content

V
vue-gjjs
Commit cabad5f3 by huangxin
Options

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
parents fb8225bc b2a5ade4
Showing with 132 additions and 89 deletions
src/config/CodeTable/index.js
......@@ -4897,6 +4897,11 @@ const CodeTable = {
{ label: "08350012 中国光大银行北京分行", value: "08350012" },
{ label: "08357113 LM ADD", value: "08357113" },
],
ownextkey5: [
{ label: "全部", value: "<ALL>" },
{ label: "中国光大银行北京分行", value: "08350012" },
{ label: "LM ADD", value: "08357113" },
],
ownexttyp: [
{ label: "手工录入", value: "OE" },
{ label: "分行", value: "OB" },
......@@ -7627,5 +7632,24 @@ const CodeTable = {
{ label: '资本市场', value: '20001800' },
{ label: '其他', value: '20009900' },
],
changtype:[
{ label: '提款-资金', value: '1101' },
{ label: '提款-实物', value: '1102' },
{ label: '提款-利息本金化', value: '1103' },
{ label: '提款-其他', value: '1104' },
{ label: '还本-资金', value: '1201' },
{ label: '还本-债务减免本金', value: '1202' },
{ label: '还本-转增资（债转股）', value: '1203' },
{ label: '还本-担保履约', value: '1204' },
{ label: '还本-境外偿还', value: '1205' },
{ label: '还本-其他', value: '1206' },
{ label: '付息-资金', value: '1301' },
{ label: '付息-减免利息', value: '1302' },
{ label: '付息-境外偿还', value: '1303' },
{ label: '付息-其他', value: '1304' },
{ label: '付费', value: '1401' },
{ label: '付罚金', value: '1501' },
],
}
export default CodeTable;
src/model/Gctcan/Pattern.js
......@@ -21,9 +21,9 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gidgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{type: "string", required: false, message: "必输项"},
{max: 17,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gcdgrp.rec.ownref":[
{type: "string", required: false, message: "必输项"},
......@@ -46,9 +46,9 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gcdgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{type: "string", required: false, message: "必输项"},
{max: 17,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"gcdgrp.apl.pts.ref":[
{type: "string", required: false, message: "必输项"},
......@@ -64,9 +64,9 @@ export default {
{max: 3,message:"长度不能超过3"}
],
"gcdgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
{type: "string", required: false, message: "必输项"},
{max: 17,message:"整数位不能超过14位"},
// {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
......
src/views/Business/Cfasel/Errp.vue
......@@ -25,7 +25,7 @@
</c-col>
<c-col :span="8">
<el-form-item label="业务所属行" prop="cfaquep.ownextkey" style="width: 100%">
<c-select v-model="model.cfaquep.ownextkey" style="width:100%" placeholder="请选择业务所属行">
<c-select v-model="model.cfaquep.ownextkey" style="width:100%" placeholder="请选择业务所属行" :code="codes.ownextkey5">
</c-select>
</el-form-item>
</c-col>
......
src/views/Business/Cfasel/Selp.vue
......@@ -255,84 +255,91 @@ export default {
stmDataEaf: {
columns: [
"0 1 \"业务流水\" 100 1 0:2 1 ",
"2 2 \"申报号码\" 180 1 0:0 1 ",
"2 2 \"申报号码\" 220 1 0:0 1 ",
"3 3 \"业务参考号\" 120 1 0:0 1 ",
"4 4 \"柜员\" 80 1 0:2 1 ",
"5 5 \"日期\" 85 4 7:2 1 ",
"6 6 \"申报类型\" 120 1 0:2 1 CFATYP",
"5 5 \"日期\" 160 4 7:2 1 ",
// "6 6 \"申报类型\" 120 1 0:2 1 CFATYP",
{ index: 6, position: 6, width: 120, pattern: 'code', label: '申报类型', code: this.codes.cfatyp1 },
"7 7 \"信息类型\" 100 1 0:2 1 ",
"8 8 \"操作类型\" 100 1 0:2 1 ",
"9 9 \"状态\" 80 1 20:0 1 TransCFASTA",
"13 10 \"操作原因\" 150 1 0:0 1 ",
"14 11 \"债务人代码\" 120 1 0:2 1 ",
"15 12 \"债务类型\" 100 1 0:2 1 DEBTYP",
"16 13 \"起息日\" 100 4 7:2 1 ",
"17 14 \"签约币种\" 100 1 0:2 1 ",
"18 15 \"签约金额\" 100 2 8:1 2 4",
"19 16 \"到期日\" 100 4 7:2 1 ",
"20 17 \"开证申请人代码\" 160 1 0:2 1 ",
"21 18 \"开证申请人名称\" 180 1 0:0 1 ",
"22 19 \"债权人代码\" 120 1 0:0 1 ",
"23 20 \"债权人中文名称\" 180 1 0:0 1 ",
"24 21 \"债权人英文名称\" 180 1 0:0 1 ",
"25 22 \"债权人类型代码\" 140 1 0:2 1 ",
"26 23 \"债权人总部所在国家（地区）代码\" 240 1 0:2 1 ",
"27 24 \"债权人经营地所在国家（地区）代码\" 240 1 0:2 1 ",
"28 25 \"是否经外汇局特批不需占用指标\" 240 1 0:2 1 ",
"29 26 \"银行业务参号\" 130 1 0:0 1 ",
"30 27 \"变动编号\" 100 1 0:2 1 ",
"31 28 \"变动类型\" 100 1 0:2 1 CHGTXT",
"32 29 \"变动日期\" 100 4 7:2 1 ",
"33 30 \"变动币种\" 100 1 0:2 1 ",
"34 31 \"变动金额\" 100 2 8:1 2 4",
// "9 9 \"状态\" 80 1 20:0 1 TransCFASTA",
{ index: 9, position: 9, width: 100, pattern: 'code', label: '状态', code: this.codes.staflg1 },
"31 10 \"操作原因\" 150 1 0:0 1 ",
"13 11 \"债务人代码\" 120 1 0:2 1 ",
// "14 12 \"债务类型\" 100 1 0:2 1 DEBTYP",
{ index: 14, position: 12, width: 100, pattern: 'code', label: '债务类型', code: this.codes.debtype },
"15 13 \"起息日\" 160 4 7:2 1 ",
"16 14 \"签约币种\" 100 1 0:2 1 ",
"17 15 \"签约金额\" 100 2 8:1 2 4",
"18 16 \"到期日\" 160 4 7:2 1 ",
"19 17 \"开证申请人代码\" 160 1 0:2 1 ",
"20 18 \"开证申请人名称\" 180 1 0:0 1 ",
"23 19 \"债权人代码\" 120 1 0:0 1 ",
"22 20 \"债权人中文名称\" 180 1 0:0 1 ",
"21 21 \"债权人英文名称\" 180 1 0:0 1 ",
"24 22 \"债权人类型代码\" 140 1 0:2 1 ",
"25 23 \"债权人总部所在国家（地区）代码\" 240 1 0:2 1 ",
"26 24 \"债权人经营地所在国家（地区）代码\" 240 1 0:2 1 ",
"27 25 \"是否经外汇局特批不需占用指标\" 240 1 0:2 1 ",
"38 26 \"银行业务参号\" 130 1 0:0 1 ",
"39 27 \"变动编号\" 100 1 0:2 1 ",
// "31 28 \"变动类型\" 100 1 0:2 1 CHGTXT",
{ index: 14, position: 28, width: 100, pattern: 'code', label: '变动类型', code: this.codes.changtype },
"29 29 \"变动日期\" 160 4 7:2 1 ",
"37 30 \"变动币种\" 100 1 0:2 1 ",
"30 31 \"变动金额\" 100 2 8:1 2 4",
"35 32 \"公允价值\" 100 2 8:1 2 4",
"36 33 \"备注\" 180 1 0:0 1 ",
"37 34 \"相关业务类型\" 120 1 0:0 1 ",
"38 35 \"是否附有银行承兑汇票\" 180 1 0:0 1 ",
"39 36 \"对方与本机构的关系\" 180 1 0:2 1 EXDTYP",
"32 34 \"相关业务类型\" 120 1 0:0 1 ",
"33 35 \"是否附有银行承兑汇票\" 180 1 0:0 1 ",
// "34 36 \"对方与本机构的关系\" 180 1 0:2 1 EXDTYP",
{ index: 34, position: 36, width: 180, pattern: 'code', label: '对方与本机构的关系', code: this.codes.exdtyp },
],
data: [],
},
stmDataEba: {
columns: [
"0 1 \"业务流水\" 100 1 0:2 1 ",
"2 2 \"申报号码\" 180 1 0:0 1 ",
"2 2 \"申报号码\" 220 1 0:0 1 ",
"3 3 \"业务参考号\" 120 1 0:0 1 ",
"4 4 \"柜员\" 80 1 0:2 1 ",
"5 5 \"日期\" 80 4 7:2 1 ",
"6 6 \"申报类型\" 100 1 0:2 1 CFATYP",
"5 5 \"日期\" 160 4 7:2 1 ",
// "6 6 \"申报类型\" 100 1 0:2 1 CFATYP",
{ index: 6, position: 6, width: 120, pattern: 'code', label: '申报类型', code: this.codes.cfatyp1 },
"7 7 \"信息类型\" 100 1 0:2 1 ",
"8 8 \"操作类型\" 100 1 0:2 1 ",
"9 9 \"状态\" 80 1 20:0 1 TransCFASTA",
"13 10 \"操作原因\" 130 1 0:0 1 ",
"14 11 \"担保人代码\" 120 1 0:2 1 ",
"15 12 \"签约日期\" 100 4 7:2 1 ",
"16 13 \"保函金额\" 100 2 8:1 2 4",
"17 14 \"保函币种\" 100 1 0:2 1 ",
"18 15 \"到期日\" 100 4 7:2 1 ",
"19 16 \"担保类型\" 100 1 0:2 1 ",
"20 17 \"主债务币种\" 120 1 0:2 1 ",
"21 18 \"主债务金额\" 120 2 8:1 2 4",
"22 19 \"受益人代码\" 120 1 0:0 1 ",
"23 20 \"受益人中文名称\" 150 1 0:0 1 ",
// "9 9 \"状态\" 80 1 20:0 1 TransCFASTA",
{ index: 9, position: 9, width: 100, pattern: 'code', label: '状态', code: this.codes.staflg1 },
"14 10 \"操作原因\" 130 1 0:0 1 ",
"13 11 \"担保人代码\" 120 1 0:2 1 ",
"17 12 \"签约日期\" 160 7:2 1 ",
"15 13 \"保函金额\" 100 2 8:1 2 4",
"16 14 \"保函币种\" 100 1 0:2 1 ",
"17 15 \"到期日\" 160 4 7:2 1 ",
"18 16 \"担保类型\" 100 1 0:2 1 ",
"19 17 \"主债务币种\" 120 1 0:2 1 ",
"20 18 \"主债务金额\" 120 2 8:1 2 4",
"23 19 \"受益人代码\" 120 1 0:0 1 ",
"22 20 \"受益人中文名称\" 150 1 0:0 1 ",
"24 21 \"受益人英文名称\" 150 1 0:0 1 ",
"25 22 \"受益人类型\" 120 1 0:2 1 ",
"26 23 \"受益人国别/地区\" 140 1 0:2 1 ",
"24 22 \"受益人类型\" 120 1 0:2 1 ",
"25 23 \"受益人国别/地区\" 140 1 0:2 1 ",
"27 24 \"被担保人代码\" 120 1 0:0 1 ",
"28 25 \"被担保人中文名称\" 150 1 0:0 1 ",
"27 25 \"被担保人中文名称\" 150 1 0:0 1 ",
"29 26 \"被担保人英文名称\" 150 1 0:0 1 ",
"30 27 \"被担保人类型\" 120 1 0:2 1 ",
"31 28 \"被担保人国别/地区代码\" 200 1 0:2 1 ",
"29 27 \"被担保人类型\" 120 1 0:2 1 ",
"30 28 \"被担保人国别/地区代码\" 200 1 0:2 1 ",
"32 29 \"担保申请人代码\" 140 1 0:0 1 ",
"33 30 \"担保申请人中文名称\" 170 1 0:0 1 ",
"32 30 \"担保申请人中文名称\" 170 1 0:0 1 ",
"34 31 \"担保申请人英文名称\" 170 1 0:0 1 ",
"35 32 \"核准文件号\" 120 1 0:0 1 ",
"36 33 \"担保责任余额变动日期\" 200 4 7:2 1 ",
"37 34 \"担保责任余额\" 120 2 8:1 2 4",
"37 32 \"核准文件号\" 120 1 0:0 1 ",
"35 33 \"担保责任余额变动日期\" 180 4 7:2 1 ",
"36 34 \"担保责任余额\" 120 2 8:1 2 4",
"38 35 \"履约编号\" 100 1 0:2 1 ",
"39 36 \"担保人代码\" 120 1 0:2 1 ",
"40 37 \"银行业务参号\" 120 1 0:0 1 ",
"41 38 \"履约日期\" 100 4 7:2 1 ",
"41 38 \"履约日期\" 160 4 7:2 1 ",
"42 39 \"履约币种\" 100 1 0:2 1 ",
"43 40 \"履约金额\" 100 2 8:1 2 4",
"44 41 \"购汇履约金额\" 120 2 8:1 2 4",
......@@ -343,30 +350,32 @@ export default {
stmDataEca: {
columns: [
"0 1 \"业务流水\" 100 1 0:2 1 ",
"2 2 \"申报号码\" 180 1 0:0 1 ",
"2 2 \"申报号码\" 220 1 0:0 1 ",
"3 3 \"业务参考号\" 120 1 0:0 1 ",
"4 4 \"柜员\" 80 1 0:2 1 ",
"5 5 \"日期\" 85 4 7:2 1 ",
"6 6 \"申报类型\" 120 1 0:2 1 CFATYP",
"5 5 \"日期\" 160 4 7:2 1 ",
// "6 6 \"申报类型\" 120 1 0:2 1 CFATYP",
{ index: 6, position: 6, width: 120, pattern: 'code', label: '申报类型', code: this.codes.cfatyp1 },
"7 7 \"信息类型\" 100 1 0:2 1 ",
"8 8 \"操作类型\" 100 1 0:2 1 ",
"9 9 \"状态\" 80 1 20:0 1 TransCFASTA",
// "9 9 \"状态\" 80 1 20:0 1 TransCFASTA",
{ index: 9, position: 9, width: 100, pattern: 'code', label: '状态', code: this.codes.staflg1 },
"13 10 \"操作原因\" 150 1 0:0 1 ",
"14 11 \"债权人代码\" 110 1 0:2 1 ",
"15 12 \"债务人代码\" 110 1 0:2 1 ",
"16 13 \"债务人中文名称\" 180 1 0:0 1 ",
"13 11 \"债权人代码\" 110 1 0:2 1 ",
"14 12 \"债务人代码\" 110 1 0:2 1 ",
"15 13 \"债务人中文名称\" 180 1 0:0 1 ",
"17 14 \"国内外汇贷款类型\" 150 1 0:0 1 DOFTYP",
"18 15 \"转贷项目名称\" 180 1 0:0 1 ",
"19 16 \"转贷协议号\" 120 1 0:0 1 ",
"20 17 \"起息日\" 100 4 7:2 1 ",
"21 18 \"到期日\" 100 4 7:2 1 ",
"22 19 \"货款币种\" 100 1 0:2 1 ",
"23 20 \"签约金额\" 100 2 8:1 2 4",
"24 21 \"年化利率值\" 120 2 8:1 2 4",
"25 22 \"银行业务参号\" 120 1 0:0 1 ",
"26 23 \"变动编号\" 100 1 0:2 1 ",
"27 24 \"期初余额\" 100 2 8:1 2 4",
"28 25 \"变动日期\" 100 4 7:2 1 ",
"19 17 \"起息日\" 160 4 7:2 1 ",
"20 18 \"到期日\" 160 4 7:2 1 ",
"21 19 \"货款币种\" 100 1 0:2 1 ",
"22 20 \"签约金额\" 100 2 8:1 2 4",
"23 21 \"年化利率值\" 120 2 8:1 2 4",
"27 22 \"银行业务参号\" 120 1 0:0 1 ",
"28 23 \"变动编号\" 100 1 0:2 1 ",
"25 24 \"期初余额\" 100 2 8:1 2 4",
"26 25 \"变动日期\" 160 4 7:2 1 ",
"29 26 \"提款币种\" 100 1 0:2 1 ",
"30 27 \"提款金额\" 100 2 8:1 2 4",
"31 28 \"结汇金额\" 100 2 8:1 2 4",
......@@ -455,7 +464,7 @@ export default {
this.stmData.data = rtnmsg.data.ecastm.rows;
break;
}
console.log(stmData.data);
this.updateModel(rtnmsg.data);
if (this.stmData.data.length == 0) {
this.$notify({
title: '成功',
......
src/views/Business/Eadadd/Sel.vue
......@@ -24,7 +24,7 @@
<!-- 新增接口数据 -->
<c-col :span="12">
<el-form-item>
<c-checkbox v-model="model.cfabut.addnew">新增接口数据</c-checkbox>
<c-checkbox v-model="model.cfabut.addnew" class="checkbox-left">新增接口数据</c-checkbox>
</el-form-item>
</c-col>
</c-col>
......
src/views/Business/Letdav/Davp.vue
......@@ -384,7 +384,7 @@
style="width: 100%"
value-format="yyyy-MM-dd"
placeholder="请选择付款通知日期"
disabled
:disabled="model.bedgrp.rec.advtyp=='750'"
></c-date-picker>
</el-form-item>
</c-col>
......@@ -400,6 +400,7 @@
style="width: 100%"
value-format="yyyy-MM-dd"
placeholder="请选择不符点通知日期"
:disabled="model.bedgrp.rec.advtyp=='754'"
></c-date-picker>
</el-form-item>
</c-col>
......
src/views/Business/Letdrw/Detp.vue
......@@ -268,8 +268,8 @@
<c-col :span="24">
<el-form-item label="" prop="ledgrp.rec.prepertxts18">
<c-input
v-model.number="model.ledgrp.rec.prepertxts18"
placeholder="请输入"
v-model="model.ledgrp.rec.prepertxts18"
placeholder="请输入交单期天数"
></c-input>
</el-form-item>
</c-col>
......
src/views/Business/Letdrw/Ovwp1.vue
......@@ -389,6 +389,7 @@
grp: 'ledgrp',
rol: 'apl',
}"
:disabled="true"
@onSeainf="onSeainf"
@onAplpDet="onAplpDet"
>
......
src/views/Business/Letopn/Ovwp1.vue
......@@ -131,9 +131,10 @@
v-model.number="model.ledgrp.rec.nomtop"
maxlength="2"
style="width: 100%"
placeholder="请输入上浮比例"
placeholder="0"
@change="nomtopChange"
@keyup.enter.native="$event.target.blur()"
class="m-input-currency"
></c-input>
</c-form-item>
</c-col>
......@@ -143,9 +144,9 @@
v-model.number="model.ledgrp.rec.nomton"
maxlength="2"
style="width: 100%"
placeholder="请输入下浮比例"
placeholder="0"
@keyup.enter.native="$event.target.blur()"
class="m-input-currency"
></c-input>
</el-form-item>
</c-col>
......@@ -450,6 +451,13 @@ export default {
},
methods: {
...Event,
nomtopChange(){
this.executeDefault("ledgrp.cbs.max.amt").then((res) => {
if ((res.respCode == SUCCESS)) {
Utils.copyValueFromVO(this.model, res.data);
}
});
},
apprulChange(v) {
if (v !== "OTHR") {
this.model.ledgrp.rec.apprultxt = "";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment