Skip to content

I
isc-web-vue
Commit d0b167ad by huangshunlin
Options

重复码表删除，即期结汇注释面函，界面调用接口

parent 14481c37
Showing with 89 additions and 44 deletions
src/config/CodeTable/index.js
...@@ -9825,22 +9825,6 @@ const CodeTable = { ...@@ -9825,22 +9825,6 @@ const CodeTable = {
{label: "头寸调拨", value: "PT"}, {label: "头寸调拨", value: "PT"},
{label: "资金拆出", value: "LO"}, {label: "资金拆出", value: "LO"},
], ],
fxt_fxtyp: [
{label: "远期结汇", value: "UB"},
{label: "即期结汇", value: "SB"},
{label: "择期结汇", value: "NB"},
{label: "代客外汇买入", value: "XB"},
{label: "外汇平盘买入", value: "BX"},
{label: "择期售汇", value: "NS"},
{label: "兑换平盘卖出", value: "FS"},
{label: "平盘买入", value: "LB"},
{label: "远期售汇", value: "US"},
{label: "代客外汇卖出", value: "XS"},
{label: "即期售汇", value: "SS"},
{label: "外汇平盘卖出", value: "SX"},
{label: "平盘卖出", value: "LS"},
{label: "兑换平盘买入", value: "FB"},
],
mttyp: [ mttyp: [
{label: "100", value: "100"}, {label: "100", value: "100"},
{label: "103", value: "103"}, {label: "103", value: "103"},
......
src/page/Funds/Fxtssb/event/buildCommons.js
...@@ -24,9 +24,18 @@ export default { ...@@ -24,9 +24,18 @@ export default {
let ptsptaList = Utils.formatPtspta(model.fxdgrp, this.buildPtspta); let ptsptaList = Utils.formatPtspta(model.fxdgrp, this.buildPtspta);
return { return {
rec: { rec: {
objtyp: "FXT", objtyp: "FXD",
objinr: model.fxdgrp.rec.inr, objinr: model.fxdgrp.rec.inr,
ownref: model.fxdgrp.rec.ownref, ownref: model.fxdgrp.rec.ownref,
fxtyp: model.fxdgrp.rec.fxtyp,
acc: model.fxdgrp.rec.acc,
acc2: model.fxdgrp.rec.acc2,
dsp: model.fxdgrp.rec.dsp,
dsp2: model.fxdgrp.rec.dsp2,
trdint: model.fxdgrp.rec.trdint,
trdout: model.fxdgrp.rec.trdout,
trnman: model.fxdgrp.rec.trnman,
rat: model.fxdgrp.rec.rat,
}, },
cbsMap: { cbsMap: {
MAX: model.fxdgrp.cbs.max, MAX: model.fxdgrp.cbs.max,
......
src/page/Funds/Fxtssb/event/index.js
...@@ -13,7 +13,7 @@ export default { ...@@ -13,7 +13,7 @@ export default {
return; return;
} }
const loading = this.loading(); const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtssb/getRef`, this.model); let res = await Api.post(`/${this.moduleRouter()}/fxtssb/getRef`, this.model);
loading.close(); loading.close();
if (res.respCode !== SUCCESS) { if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg); this.$message.error(res.respMsg);
...@@ -45,5 +45,56 @@ export default { ...@@ -45,5 +45,56 @@ export default {
this.model.fxdgrp.rec.acc = res.data.fxdgrp.rec.acc; this.model.fxdgrp.rec.acc = res.data.fxdgrp.rec.acc;
this.model.fxdgrp.rec.acc2 = res.data.fxdgrp.rec.acc2; this.model.fxdgrp.rec.acc2 = res.data.fxdgrp.rec.acc2;
}, },
async defaultRateN1000() {
if (this.model.fxdgrp.rec.fxtyp == "") {
return;
}
if (this.model.fxdgrp.cbs.max.cur == "") {
return;
}
if (this.model.fxdgrp.apl.pts.ptyinr == "") {
return;
}
const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtssb/defaultRateN1000`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
}
this.model.fxdgrp.rec.rat = res.data.fxdgrp.rec.rat;
this.model.fxdgrp.rec.midrat = res.data.fxdgrp.rec.midrat;
},
async defaultAccAndRate() {
this.defaultAccountsN1000();
this.defaultRateN1000();
console.log("defaultAccAndRate")
this.defaultCalculateN1100();
},
async defaultCalculateN1100() {
console.log("defaultCalculateN1100")
if (this.model.fxdgrp.rec.rat == "") {
return;
}
if (this.model.fxdgrp.cbs.max.cur == "") {
return;
}
if (this.model.fxdgrp.cbs.max.amt == "" || this.model.fxdgrp.cbs.max.amt == 0) {
return;
}
const loading = this.loading();
let res = await Api.post(`/${this.moduleRouter()}/fxtssb/defaultCalculateN1100`, this.model);
loading.close();
if (res.respCode !== SUCCESS) {
this.$message.error(res.respMsg);
return;
}
this.model.fxdgrp.cbs.max.amt = res.data.fxdgrp.cbs.max.amt;
this.model.fxdgrp.cbs.nom1.amt = res.data.fxdgrp.cbs.nom1.amt;
},
} }
} }
\ No newline at end of file
src/page/Funds/Fxtssb/model/Check.js
...@@ -33,36 +33,28 @@ export default { ...@@ -33,36 +33,28 @@ export default {
{max: 18, message: "整数位不能超过14位"}, {max: 18, message: "整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位"} {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位"}
], ],
"fxdgrp.rec.rat": [
{type: "string", required: false, message: "必输项"},
{max: 12, message: "长度不能超过12"}
],
"fxdgrp.rec.quoref": [ "fxdgrp.rec.quoref": [
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16, message: "长度不能超过16"} {max: 16, message: "长度不能超过16"}
], ],
"fxdgrp.rec.midrat": [
{type: "string", required: false, message: "必输项"},
{max: 12, message: "长度不能超过12"}
],
"fxdgrp.rec.fudref": [ "fxdgrp.rec.fudref": [
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16, message: "长度不能超过16"} {max: 16, message: "长度不能超过16"}
], ],
"fxdgrp.rec.opndat": [ "fxdgrp.rec.opndat": [
{type: "date", required: true, message: "输入正确的日期"} {required: true, message: "输入正确的日期"}
], ],
"fxdgrp.rec.valdat": [ "fxdgrp.rec.valdat": [
{type: "date", required: true, message: "输入正确的日期"} {required: true, message: "输入正确的日期"}
], ],
"fxdgrp.rec.setdat": [ "fxdgrp.rec.setdat": [
{type: "date", required: false, message: "输入正确的日期"} {required: false, message: "输入正确的日期"}
], ],
"fxdgrp.rec.setdatto": [ "fxdgrp.rec.setdatto": [
{type: "date", required: false, message: "输入正确的日期"} {required: false, message: "输入正确的日期"}
], ],
"fxdgrp.rec.setdatfrm": [ "fxdgrp.rec.setdatfrm": [
{type: "date", required: false, message: "输入正确的日期"} {required: false, message: "输入正确的日期"}
], ],
"fxdgrp.blk.remark": [ "fxdgrp.blk.remark": [
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
......
src/page/Funds/Fxtssb/views/Ovwp.vue
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item :label="$t('fxtp.结售汇类型')" prop="fxdgrp.rec.fxtyp"> <el-form-item :label="$t('fxtp.结售汇类型')" prop="fxdgrp.rec.fxtyp">
<c-select v-model="model.fxdgrp.rec.fxtyp" :code="codes.fxt_fxtyp" style="width:100%" <c-select v-model="model.fxdgrp.rec.fxtyp" :code="codes.fxt_fxtyp" style="width:100%"
:filterKey="['SB']"
@change="defaultAccountsN1000"> @change="defaultAccountsN1000">
</c-select> </c-select>
</el-form-item> </el-form-item>
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
<c-col :span="12"> <c-col :span="12">
<el-form-item label="Purchase Amount" prop="fxdgrp.cbs.max.cur"> <el-form-item label="Purchase Amount" prop="fxdgrp.cbs.max.cur">
<c-select-cur v-model="model.fxdgrp.cbs.max.cur" style="width: 100%" <c-select-cur v-model="model.fxdgrp.cbs.max.cur" style="width: 100%"
dbCode="curtxt" @change="defaultAccountsN1000" dbCode="curtxt" @change="defaultAccAndRate"
></c-select-cur> ></c-select-cur>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -48,7 +49,8 @@ ...@@ -48,7 +49,8 @@
<el-form-item label-width="5px" prop="fxdgrp.cbs.max.amt"> <el-form-item label-width="5px" prop="fxdgrp.cbs.max.amt">
<c-input-currency <c-input-currency
:currency="model.fxdgrp.cbs.max.cur" :currency="model.fxdgrp.cbs.max.cur"
v-model="model.fxdgrp.cbs.max.amt"></c-input-currency> v-model="model.fxdgrp.cbs.max.amt"
@change="defaultCalculateN1100"></c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -124,7 +126,9 @@ ...@@ -124,7 +126,9 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item :label="$t('fxtp.外币结算账号')" prop="fxdgrp.rec.dsp"> <el-form-item :label="$t('fxtp.外币结算账号')" prop="fxdgrp.rec.dsp">
<c-select v-model="model.fxdgrp.rec.dsp" :code="codes.fxt_dsp" style="width:100%" @change="defaultAccountsN1000"> <c-select v-model="model.fxdgrp.rec.dsp" :code="codes.fxt_dsp" style="width:100%"
:filterKey="['SP','HA','VT','LO']"
@change="defaultAccountsN1000">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -217,7 +221,9 @@ ...@@ -217,7 +221,9 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="12">
<el-form-item :label="$t('fxtp.本币结算账号')" prop="fxdgrp.rec.dsp2"> <el-form-item :label="$t('fxtp.本币结算账号')" prop="fxdgrp.rec.dsp2">
<c-select v-model="model.fxdgrp.rec.dsp2" :code="codes.fxt_dsp2" style="width:100%" @change="defaultAccountsN1000"> <c-select v-model="model.fxdgrp.rec.dsp2" :code="codes.fxt_dsp2" style="width:100%"
:filterKey="['SP','LO']"
@change="defaultAccountsN1000">
</c-select> </c-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -240,7 +246,8 @@ ...@@ -240,7 +246,8 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item :label="$t('fxtp.结售汇类型')" prop="fxdgrp.rec.trdint"> <el-form-item :label="$t('fxtp.结售汇类型')" prop="fxdgrp.rec.trdint">
<c-select v-model="model.fxdgrp.rec.trdint" style="width:100%" dbCode="TRAINT"> <c-select v-model="model.fxdgrp.rec.trdint" style="width:100%" dbCode="TRAINT"
:filterKey="['110','121','122','123','124','125','126','12X','131','132','210','220','221','222','223','231','232','240','241','242','250','260','261','262','270']">
</c-select> </c-select>
</el-form-item> </el-form-item>
<el-form-item prop="fxdgrp.rec.trdout" style="display:none"> <el-form-item prop="fxdgrp.rec.trdout" style="display:none">
...@@ -267,10 +274,11 @@ ...@@ -267,10 +274,11 @@
}, },
computed: { computed: {
getOwnrefFlg: function () { getOwnrefFlg: function () {
return this.model.fxdgrp.rec.fxtyp == '' || this.model.fxdgrp.rec.ownref != ''; let flg = this.model.fxdgrp.rec.fxtyp == '' || this.model.fxdgrp.apl.pts.ptainr == ''
|| this.model.fxdgrp.cbs.max.cur == '' || this.model.fxdgrp.rec.ownref != ''
return flg;
}, },
defaultNam950: function () { defaultNam950: function () {
debugger;
let amount = this.moneyFormat(this.model.fxdgrp.cbs.max.amt, this.model.fxdgrp.cbs.max.cur) let amount = this.moneyFormat(this.model.fxdgrp.cbs.max.amt, this.model.fxdgrp.cbs.max.cur)
return this.getCodelabel(this.model.fxdgrp.rec.fxtyp, "fxt_fxtyp") + "," return this.getCodelabel(this.model.fxdgrp.rec.fxtyp, "fxt_fxtyp") + ","
+ this.model.fxdgrp.cbs.max.cur + " " + amount; + this.model.fxdgrp.cbs.max.cur + " " + amount;
...@@ -297,7 +305,7 @@ ...@@ -297,7 +305,7 @@
this.model.accLst2 = []; this.model.accLst2 = [];
return return
} }
this.defaultAccountsN1000(); this.defaultAccAndRate();
}, },
}, },
} }
......
src/page/Funds/Fxtssb/views/index.vue
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
<m-setpan :codes="codes" :model="model" /> <m-setpan :codes="codes" :model="model" />
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="报文/面函" name="docpan"> <!-- <el-tab-pane label="报文/面函" name="docpan">-->
<c-content> <!-- <c-content>-->
<m-docpan :codes="codes" :model="model" /> <!-- <m-docpan :codes="codes" :model="model" />-->
</c-content> <!-- </c-content>-->
</el-tab-pane> <!-- </el-tab-pane>-->
</c-tabs> </c-tabs>
</el-form> </el-form>
<c-function-btn <c-function-btn
......
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