Skip to content

V
vue-gjjs
Commit 4bca847e by 杜大兵
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents ab864d55 c5f13e9b
Showing with 200 additions and 193 deletions
src/config/CodeTable/index.js
...@@ -103,9 +103,8 @@ const CodeTable = { ...@@ -103,9 +103,8 @@ const CodeTable = {
{ label: "正常还款", value: "0" }, { label: "正常还款", value: "0" },
], ],
acttyp: [ acttyp: [
{ label: "储蓄存款账户", value: "3" }, { label: "境外", value: "(JW)" },
{ label: "支票存款账户", value: "2" }, { label: "境内非居民", value: "(JN)" },
{ label: "活期存款账户", value: "1" },
], ],
addamtflg: [ addamtflg: [
{ label: "No", value: "" }, { label: "No", value: "" },
...@@ -4107,9 +4106,7 @@ const CodeTable = { ...@@ -4107,9 +4106,7 @@ const CodeTable = {
{ label: "N", value: "N" }, { label: "N", value: "N" },
], ],
ownextkey: [ ownextkey: [
{ label: "修改", value: "C" }, { label: "08350012北京分行", value: "08350012" },
{ label: "新建", value: "A" },
{ label: "删除", value: "D" },
], ],
ownexttyp: [ ownexttyp: [
{ label: "手工录入", value: "OE" }, { label: "手工录入", value: "OE" },
...@@ -5207,9 +5204,10 @@ const CodeTable = { ...@@ -5207,9 +5204,10 @@ const CodeTable = {
{ label: "新系统", value: "N" }, { label: "新系统", value: "N" },
], ],
szflg: [ szflg: [
{ value: "1", label: "境外汇款申请书" }, { value: "1", label: "跨境收支" },
{ value: "2", label: "境内汇款申请书" }, { value: "2", label: "境内收支" },
{ value: "3", label: "不申报" }, { value: "3", label: "不申报" },
// { value: "4", label: "买方信贷" },
], ],
sztyp: [ sztyp: [
{ label: "跨境收支", value: "1" }, { label: "跨境收支", value: "1" },
......
src/mixin/commonFuncs.js
...@@ -85,7 +85,7 @@ export default { ...@@ -85,7 +85,7 @@ export default {
message: "校验成功", message: "校验成功",
type: "success", type: "success",
}); });
reutrn return
} }
const tab = this.showBackendErrors(fieldErrors) const tab = this.showBackendErrors(fieldErrors)
......
src/model/Cptadv/Pattern.js
...@@ -228,7 +228,7 @@ export default { ...@@ -228,7 +228,7 @@ export default {
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"cpdgrp.orc.pts.ref":[ "cpdgrp.orc.pts.ref":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"cpdgrp.pye.pts.ref":[ "cpdgrp.pye.pts.ref":[
...@@ -332,16 +332,16 @@ export default { ...@@ -332,16 +332,16 @@ export default {
{max: 1,message:"长度不能超过1"} {max: 1,message:"长度不能超过1"}
], ],
"mtabut.coninf.oitinf.oit.inftxt":[ // "mtabut.coninf.oitinf.oit.inftxt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 60,message:"长度不能超过60"} // {max: 60,message:"长度不能超过60"}
], // ],
"mtabut.coninf.oitset.oit.inftxt":[ // "mtabut.coninf.oitset.oit.inftxt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 60,message:"长度不能超过60"} // {max: 60,message:"长度不能超过60"}
], // ],
"mtabut.coninf.conexedat":[ "mtabut.coninf.conexedat":[
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: false, message: "输入正确的日期"}
......
src/model/Cptopn/Check.js
...@@ -86,7 +86,7 @@ let checkObj = { ...@@ -86,7 +86,7 @@ let checkObj = {
"cnybop.libflg" :null, "cnybop.libflg" :null,
"cpdgrp.cbs.max.cur" :null, "cpdgrp.cbs.max.cur" :null,
"cpdgrp.rec.prechkdat" :null, "cpdgrp.rec.prechkdat" :null,
"bopmod.ownextkey" :null, // "bopmod.ownextkey" :null,
"cpdgrp.rec.sysno" :null, "cpdgrp.rec.sysno" :null,
"setmod.docamt" :null, "setmod.docamt" :null,
"bopmod.acttyp" :null, "bopmod.acttyp" :null,
......
src/model/Cptopn/Default.js
...@@ -88,7 +88,7 @@ export default { ...@@ -88,7 +88,7 @@ export default {
"mtabut.coninf.oitset.oit.inflev" :Utils.defaultFunction, "mtabut.coninf.oitset.oit.inflev" :Utils.defaultFunction,
"finmod.intdat" :Utils.defaultFunction, "finmod.intdat" :Utils.defaultFunction,
"trdgrp.rec.ownref" :Utils.defaultFunction, "trdgrp.rec.ownref" :Utils.defaultFunction,
"cptp.payeecountcode" :Utils.defaultFunction, // "cptp.payeecountcode" :Utils.defaultFunction,
"cpdgrp.rec.ischktyp" :Utils.defaultFunction, "cpdgrp.rec.ischktyp" :Utils.defaultFunction,
} }
//你可以添加自动default处理 //你可以添加自动default处理
src/model/Cptopn/Event.js
...@@ -247,4 +247,15 @@ export default { ...@@ -247,4 +247,15 @@ export default {
this.$notify.error({ title: '错误', message: '服务请求失败！' }); this.$notify.error({ title: '错误', message: '服务请求失败！' });
} }
}, },
async onCptpGetInfpta() {
let rtnmsg = await this.executeRule("cptp.payeecountcode")
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
},
} }
\ No newline at end of file
src/model/Cptopn/Pattern.js
...@@ -353,16 +353,16 @@ export default { ...@@ -353,16 +353,16 @@ export default {
{max: 1,message:"长度不能超过1"} {max: 1,message:"长度不能超过1"}
], ],
"mtabut.coninf.oitinf.oit.inftxt":[ // "mtabut.coninf.oitinf.oit.inftxt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 60,message:"长度不能超过60"} // {max: 60,message:"长度不能超过60"}
], // ],
"mtabut.coninf.oitset.oit.inftxt":[ // "mtabut.coninf.oitset.oit.inftxt":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 60,message:"长度不能超过60"} // {max: 60,message:"长度不能超过60"}
], // ],
"mtabut.coninf.conexedat":[ "mtabut.coninf.conexedat":[
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: false, message: "输入正确的日期"}
......
src/model/Cptopn/index.js
...@@ -144,7 +144,7 @@ export default class Cptopn{ ...@@ -144,7 +144,7 @@ export default class Cptopn{
payeecountcode:"", // 收款人常驻国家/地区代码 .cptp.payeecountcode payeecountcode:"", // 收款人常驻国家/地区代码 .cptp.payeecountcode
uetr:"", // Uetr .cptp.uetr uetr:"", // Uetr .cptp.uetr
}, },
pyenam:"",// 收款人名称 pyenam
setmod:{ setmod:{
docamttyplab:"", // settled amount description as label .setmod.docamttyplab docamttyplab:"", // settled amount description as label .setmod.docamttyplab
retmsg:"", // Label showing Retry overflow condition .setmod.retmsg retmsg:"", // Label showing Retry overflow condition .setmod.retmsg
......
src/views/Business/Cptadv/CptAdvChangePanel.vue
...@@ -358,33 +358,31 @@ ...@@ -358,33 +358,31 @@
style="margin-top: 10px" style="margin-top: 10px"
> >
<c-col :span="24"> <c-col :span="24">
<c-col :span="18"> <c-fullbox>
<el-form-item label="发报行" prop="cpdgrp.snd.pts.extkey"> <el-form-item label="发报行" prop="cpdgrp.snd.pts.extkey">
<c-input placeholder="请输入发报行" v-model="model.cpdgrp.snd.pts.extkey" @keyup.enter.native="showGridPromptDialog('cpdgrp.snd.pts.extkey')"></c-input> <c-input placeholder="请输入发报行" v-model="model.cpdgrp.snd.pts.extkey" @keyup.enter.native="showGridPromptDialog('cpdgrp.snd.pts.extkey')"></c-input>
</el-form-item> </el-form-item>
</c-col>
<c-col :span="6" style="text-align: right"> <template slot="footer">
<el-form-item label="" label-width="15px"> <c-button
<c-col :span="12"> style="margin:0 10px 0 10;padding: 0 12px;"
<c-button size="small"
size="small" type="primary"
type="primary" icon="el-icon-search"
icon="el-icon-search" >
> </c-button>
</c-button>
</c-col> <c-button
<c-col :span="12"> style="margin:0 0"
<c-button size="small"
size="small" type="primary"
type="primary" @click="onSndpDet"
@click="onSndpDet" disabled
disabled >
> 详情
详情 </c-button>
</c-button> </template>
</c-col> </c-fullbox>
</el-form-item>
</c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -424,7 +422,7 @@ ...@@ -424,7 +422,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="18"> <c-fullbox>
<el-form-item label=""> <el-form-item label="">
<c-input <c-input
v-model="model.cpdgrp.pye.pts.extkey" v-model="model.cpdgrp.pye.pts.extkey"
...@@ -432,29 +430,26 @@ ...@@ -432,29 +430,26 @@
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> <template slot="footer">
<c-col :span="6" style="text-align: right"> <c-button
<el-form-item label="" label-width="15px"> style="margin:0 10px 0 10;padding: 0 12px;"
<c-col :span="12"> size="small"
<c-button type="primary"
size="small" icon="el-icon-search"
type="primary" >
icon="el-icon-search" </c-button>
>
</c-button> <c-button
</c-col> style="margin:0 0"
<c-col :span="12"> size="small"
<c-button type="primary"
size="small" @click="onSndpDet"
type="primary" disabled
@click="onSndpDet" >
disabled 详情
> </c-button>
详情 </template>
</c-button> </c-fullbox>
</c-col>
</el-form-item>
</c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -479,23 +474,21 @@ ...@@ -479,23 +474,21 @@
style="margin-top: 10px" style="margin-top: 10px"
> >
<c-col :span="24"> <c-col :span="24">
<c-col :span="18"> <c-fullbox>
<el-form-item label="发报行" prop="cpdgrp.snd.pts.extkey"> <el-form-item label="发报行" prop="cpdgrp.snd.pts.extkey">
<c-input placeholder="请输入发报行" v-model="model.cpdgrp.snd.pts.extkey" @keyup.enter.native="showGridPromptDialog('cpdgrp.snd.pts.extkey')"></c-input> <c-input placeholder="请输入发报行" v-model="model.cpdgrp.snd.pts.extkey" @keyup.enter.native="showGridPromptDialog('cpdgrp.snd.pts.extkey')"></c-input>
</el-form-item> </el-form-item>
</c-col> <template slot="footer">
<c-col :span="6" style="text-align: right">
<el-form-item label="" label-width="15px">
<c-col :span="12">
<c-button <c-button
style="margin:0 10px 0 10;padding: 0 12px;"
size="small" size="small"
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
> >
</c-button> </c-button>
</c-col>
<c-col :span="12">
<c-button <c-button
style="margin:0 0"
size="small" size="small"
type="primary" type="primary"
@click="onSndpDet" @click="onSndpDet"
...@@ -503,9 +496,8 @@ ...@@ -503,9 +496,8 @@
> >
详情 详情
</c-button> </c-button>
</c-col> </template>
</el-form-item> </c-fullbox>
</c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
...@@ -554,7 +546,7 @@ ...@@ -554,7 +546,7 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="18"> <c-fullbox>
<el-form-item label="" prop="cpdgrp.pye.pts.extkey"> <el-form-item label="" prop="cpdgrp.pye.pts.extkey">
<c-input <c-input
v-model="model.cpdgrp.pye.pts.extkey" v-model="model.cpdgrp.pye.pts.extkey"
...@@ -562,29 +554,26 @@ ...@@ -562,29 +554,26 @@
> >
</c-input> </c-input>
</el-form-item> </el-form-item>
</c-col> <template slot="footer">
<c-col :span="6" style="text-align: right"> <c-button
<el-form-item label="" label-width="15px"> style="margin:0 10px 0 10;padding: 0 12px;"
<c-col :span="12"> size="small"
<c-button type="primary"
size="small" icon="el-icon-search"
type="primary" >
icon="el-icon-search" </c-button>
>
</c-button> <c-button
</c-col> style="margin:0 0"
<c-col :span="12"> size="small"
<c-button type="primary"
size="small" @click="onSndpDet"
type="primary" disabled
@click="onSndpDet" >
disabled 详情
> </c-button>
详情 </template>
</c-button> </c-fullbox>
</c-col>
</el-form-item>
</c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
......
src/views/Business/Cptadv/Opnp1.vue
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</c-col> </c-col>
<c-col :span="13"> <c-col :span="13">
<el-form-item label="汇款金额" prop="cpdgrp.cbs.nom1.cur"> <c-form-item label="汇款金额" previewLabel="汇款金额币种" prop="cpdgrp.cbs.nom1.cur">
<c-select <c-select
v-model="model.cpdgrp.cbs.nom1.cur" v-model="model.cpdgrp.cbs.nom1.cur"
style="width: 100%" style="width: 100%"
...@@ -92,10 +92,10 @@ ...@@ -92,10 +92,10 @@
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="" label-width="8px" prop="cpdgrp.cbs.nom1.amt"> <c-form-item label="" previewLabel="汇款金额" label-width="8px" prop="cpdgrp.cbs.nom1.amt">
<c-input <c-input
class="m-input-currency" class="m-input-currency"
v-model="model.cpdgrp.cbs.nom1.amt" v-model="model.cpdgrp.cbs.nom1.amt"
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
placeholder="请输入汇款金额" placeholder="请输入汇款金额"
@change="commonExecuteNotify()" @change="commonExecuteNotify()"
></c-input> ></c-input>
</el-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="13"> <c-col :span="13">
<el-form-item label="所属行" prop="cpdgrp.rec.othbch"> <el-form-item label="所属行" prop="cpdgrp.rec.othbch">
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="汇款语种" label-width="40%" style="margin-left: 12px" prop="cptp.payuil"> <el-form-item label="汇款语种" label-width="40%" prop="cptp.payuil">
<c-select <c-select
v-model="model.cptp.payuil" v-model="model.cptp.payuil"
style="width: 100%" style="width: 100%"
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="汇款方式" label-width="40%" prop="cpdgrp.rec.paytype"> <c-form-item label="汇款方式" label-width="40%" prop="cpdgrp.rec.paytype">
<c-select <c-select
v-model="model.cpdgrp.rec.paytype" v-model="model.cpdgrp.rec.paytype"
style="width: 100%" style="width: 100%"
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="13"> <c-col :span="13">
<el-form-item label="收款对象" prop="cpdgrp.rec.gors"> <el-form-item label="收款对象" prop="cpdgrp.rec.gors">
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="收支类型" label-width="40%" prop="cpdgrp.rec.sztyp"> <c-form-item label="收支类型" label-width="40%" prop="cpdgrp.rec.sztyp">
<c-select <c-select
v-model="model.cpdgrp.rec.sztyp" v-model="model.cpdgrp.rec.sztyp"
style="width: 100%" style="width: 100%"
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Uetr" prop="cptp.uetr"> <el-form-item label="Uetr" prop="cptp.uetr">
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="报文类型" label-width="40%" prop="cpdgrp.rec.swftyp"> <c-form-item label="报文类型" label-width="40%" prop="cpdgrp.rec.swftyp">
<c-select <c-select
v-model="model.cpdgrp.rec.swftyp" v-model="model.cpdgrp.rec.swftyp"
style="width: 100%" style="width: 100%"
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
:key="item.value" :key="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
......
src/views/Business/Cptopn/Opnp1.vue
...@@ -106,8 +106,9 @@ ...@@ -106,8 +106,9 @@
<c-col :span="24"> <c-col :span="24">
<c-col :span="13"> <c-col :span="13">
<el-form-item <c-form-item
label="汇款金额" label="汇款金额"
previewLabel="汇款金额币种"
prop="cpdgrp.cbs.nom1.cur" prop="cpdgrp.cbs.nom1.cur"
> >
<c-select <c-select
...@@ -123,11 +124,12 @@ ...@@ -123,11 +124,12 @@
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </c-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item <c-form-item
label="" label=""
previewLabel="汇款金额"
label-width="8px" label-width="8px"
prop="cpdgrp.cbs.nom1.amt" prop="cpdgrp.cbs.nom1.amt"
> >
...@@ -137,7 +139,7 @@ ...@@ -137,7 +139,7 @@
placeholder="请输入汇款金额" placeholder="请输入汇款金额"
@keyup.enter.native="defaultFunction('cpdgrp.cbs.nom1.amt', model.cpdgrp.cbs.nom1.amt)" @keyup.enter.native="defaultFunction('cpdgrp.cbs.nom1.amt', model.cpdgrp.cbs.nom1.amt)"
></c-input> ></c-input>
</el-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -248,7 +250,7 @@ ...@@ -248,7 +250,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item <c-form-item
label="汇款方式" label="汇款方式"
prop="cpdgrp.rec.paytype" prop="cpdgrp.rec.paytype"
label-width="40%" label-width="40%"
...@@ -265,7 +267,7 @@ ...@@ -265,7 +267,7 @@
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -287,7 +289,7 @@ ...@@ -287,7 +289,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="收支类型" prop="cpdgrp.rec.sztyp" label-width="40%"> <c-form-item label="收支类型" prop="cpdgrp.rec.sztyp" label-width="40%">
<c-select <c-select
v-model="model.cpdgrp.rec.sztyp" v-model="model.cpdgrp.rec.sztyp"
placeholder="请选择收支类型" placeholder="请选择收支类型"
...@@ -300,7 +302,7 @@ ...@@ -300,7 +302,7 @@
:value="item.value" :value="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -322,7 +324,7 @@ ...@@ -322,7 +324,7 @@
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="11"> <c-col :span="11">
<el-form-item label="报文类型" prop="cpdgrp.rec.swftyp" label-width="40%"> <c-form-item label="报文类型" prop="cpdgrp.rec.swftyp" label-width="40%">
<c-select <c-select
style="width: 100%" style="width: 100%"
placeholder="" placeholder=""
...@@ -340,7 +342,7 @@ ...@@ -340,7 +342,7 @@
:key="item.value" :key="item.value"
></el-option> ></el-option>
</c-select> </c-select>
</el-form-item> </c-form-item>
</c-col> </c-col>
</c-col> </c-col>
......
src/views/Business/Cptopn/Outp.vue
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
<c-button <c-button
size="small" size="small"
type="primary" type="primary"
@click="onCptpGetInfpta"
icon="el-icon-search" icon="el-icon-search"
></c-button> ></c-button>
</c-col> </c-col>
......
src/views/Business/Cptopn/Sbxx.vue
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
v-model="model.bopmod.acttyp" v-model="model.bopmod.acttyp"
style="width: 100%" style="width: 100%"
placeholder="请选择" placeholder="请选择"
:disabled="model.bopmod.szflg==='2'" :disabled="model.bopmod.szflg==='3' || model.bopmod.szflg==='2'"
> >
<el-option <el-option
v-for="item in codes.acttyp" v-for="item in codes.acttyp"
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
v-model="model.bopmod.ownextkey" v-model="model.bopmod.ownextkey"
style="width: 100%" style="width: 100%"
placeholder="请选择" placeholder="请选择"
:disabled="model.bopmod.szflg==='3'"
> >
<el-option <el-option
v-for="item in codes.ownextkey" v-for="item in codes.ownextkey"
......
src/views/Business/Infcpd/BusNavbar.vue
...@@ -32,7 +32,6 @@ export default { ...@@ -32,7 +32,6 @@ export default {
async onNarBtnClick(code,i){ async onNarBtnClick(code,i){
this.model.cfgfil.subtrn1= code this.model.cfgfil.subtrn1= code
let rtnmsg = await this.executeRule("cfgfil.hotsub1") let rtnmsg = await this.executeRule("cfgfil.hotsub1")
console.log("cfgfil.code:" + this.model.cfgfil.subtrn1);
if(rtnmsg.respCode == SUCCESS){ if(rtnmsg.respCode == SUCCESS){
this.navcode = [] this.navcode = []
this.$emit("onChoose",code.toLowerCase()); this.$emit("onChoose",code.toLowerCase());
...@@ -71,8 +70,6 @@ export default { ...@@ -71,8 +70,6 @@ export default {
this.navcode = [] this.navcode = []
//请求按钮数据 //请求按钮数据
this.model.cpdgrp.rec.ownref = this.ownref this.model.cpdgrp.rec.ownref = this.ownref
console.log("ownref:" + this.ownref );
let rtnmsg = await this.executeRule("cpdgrp.rec.ownref");//didgrp_rec_ownref let rtnmsg = await this.executeRule("cpdgrp.rec.ownref");//didgrp_rec_ownref
if(rtnmsg.respCode == SUCCESS){ if(rtnmsg.respCode == SUCCESS){
//重置数组 //重置数组
...@@ -84,39 +81,39 @@ export default { ...@@ -84,39 +81,39 @@ export default {
const length = this.model.cfgfil.btnstm.rows.length const length = this.model.cfgfil.btnstm.rows.length
let btnStr = this.model.cfgfil.btnstm.rows let btnStr = this.model.cfgfil.btnstm.rows
// let j = 0; // let j = 0;
// let m = 0; let m = 0;
// const buttonIndex = ['信用证修改','减额修改接受','到单','修改通知行'] // const buttonIndex = ['信用证修改','减额修改接受','到单','修改通知行']
for(let i=0; i < length; i++){ for(let i=0; i < length; i++){
//获取数组中每行的数据 //获取数组中每行的数据
// if(!( btnStr[i].indexOf("保证金") >= 0) && !(btnStr[i].indexOf("开立信用证") >= 0)){ if(!( btnStr[i].indexOf("payment") >= 0) && !(btnStr[i].indexOf("境内外币") >= 0)){
// let arr = btnStr[i].split("\t"); let arr = btnStr[i].split("\t");
// let newList = { let newList = {
// code:arr[0], code:arr[0],
// label:arr[1], label:arr[1],
// isDis:arr[2], isDis:arr[2],
// title:arr[3] title:arr[3]
// } }
// m++; m++;
// j = buttonIndex.indexOf(arr[1].replace(/(^\s*)|(\s*$)/g, "")); // j = buttonIndex.indexOf(arr[1].replace(/(^\s*)|(\s*$)/g, ""));
// if(j<0){ // if(j<0){
// j = m; // j = m;
// } // }
// //添加到navcode数组中 // //添加到navcode数组中
// this.navcode.splice(j,0,newList) this.navcode.splice(m,0,newList)
// }
let arr = btnStr[i].split("\t");
let newList = {
code:arr[0],
label:arr[1],
isDis:arr[2],
title:arr[3]
} }
this.navcode.splice(i,0,newList) // let arr = btnStr[i].split("\t");
// let newList = {
// code:arr[0],
// label:arr[1],
// isDis:arr[2],
// title:arr[3]
// }
// this.navcode.splice(i,0,newList)
} }
this.navcode.push({code:"",label:"退汇",isDis:"N",title:""}) this.navcode.push({code:"",label:"退汇",isDis:"N",title:""})
//屏蔽cptsel sptcpt //屏蔽cptsel sptcpt
this.navcode.splice(5,2) this.navcode.splice(1,2)
}else{ }else{
......
src/views/Business/Infcpd/Infsea.vue
...@@ -303,7 +303,19 @@ ...@@ -303,7 +303,19 @@
<!-- </c-infsearch-group> --> <!-- </c-infsearch-group> -->
<c-col style="margin-top: 10px"> <c-col style="margin-top: 10px">
<c-button size="small" type="primary" style="margin-left: 0" <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0"
@click="toCptopn">swift汇入</c-button
>
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0"
@click="toCptadv">swift汇出</c-button
>
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0"
>境内外币汇入</c-button
>
<c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0"
>境内外币汇出</c-button
>
<c-button class="medium_bcs" size="medium" type="primary" style="float:right;margin-right:10px;"
>导Excel</c-button >导Excel</c-button
> >
<!-- <c-button size="small" type="primary" style="margin-left: 0" <!-- <c-button size="small" type="primary" style="margin-left: 0"
...@@ -503,7 +515,6 @@ export default { ...@@ -503,7 +515,6 @@ export default {
async getButtons(ownref){ async getButtons(ownref){
this.initdialog = true this.initdialog = true
this.ownref = ownref this.ownref = ownref
console.log("ownref:" +ownref);
setTimeout(()=>{ setTimeout(()=>{
this.$refs.childs.$emit("childmethods") this.$refs.childs.$emit("childmethods")
},10) },10)
...@@ -514,8 +525,6 @@ export default { ...@@ -514,8 +525,6 @@ export default {
this.initdialog = false this.initdialog = false
} , } ,
async getTrnInfo(idx, row) { async getTrnInfo(idx, row) {
console.log(row)
this.model.infcon.objinr = row["INR"]; this.model.infcon.objinr = row["INR"];
this.model.cpdgrp.rec.inr = row["INR"]; this.model.cpdgrp.rec.inr = row["INR"];
this.model.infcon.chksubcon = "X"; this.model.infcon.chksubcon = "X";
...@@ -531,9 +540,18 @@ export default { ...@@ -531,9 +540,18 @@ export default {
this.$refs[refId].doClose(); this.$refs[refId].doClose();
}, },
handleReset() {}, handleReset() {},
toCptopn(){
this.$router.history.push("/business/cptopn")
},
toCptadv(){
this.$router.history.push("/business/cptadv")
}
}, },
created: function () {}, created: function () {},
}; };
</script> </script>
<style> <style>
.el-dialog__body {
padding: 10px 5px 50px;
}
</style> </style>
\ No newline at end of file
src/views/Business/Trnrel/InftrnpsDetail.vue
...@@ -81,27 +81,27 @@ ...@@ -81,27 +81,27 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="13">
<el-form-item label="Relevant Amount"> <el-form-item label="Relevant Amount">
<c-input v-model="model.trn.reloricur" maxlength="3" disabled placeholder="请输入Relevant Amount"></c-input> <c-input v-model="model.trn.reloricur" maxlength="3" disabled placeholder="请输入Relevant Amount"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="11">
<el-form-item label="" label-width="2%"> <el-form-item label="" label-width="8px">
<c-input v-model="model.trn.reloriamt" disabled placeholder="请输入Relevant Amount for Release in Original Currency"></c-input> <c-input v-model="model.trn.reloriamt" disabled placeholder="请输入Relevant Amount for Release in Original Currency"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="13">
<el-form-item label="Responsible"> <el-form-item label="Responsible">
<c-input v-model="model.trn.usr" maxlength="8" disabled placeholder="请输入Responsible"></c-input> <c-input v-model="model.trn.usr" maxlength="8" disabled placeholder="请输入Responsible"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="11">
<el-form-item label-width="35%" label="Group"> <el-form-item label-width="40%" label="Group">
<!-- <c-input v-model="model.trn.usg" maxlength="6" disabled placeholder="请输入Responsible Group"></c-input> --> <!-- <c-input v-model="model.trn.usg" maxlength="6" disabled placeholder="请输入Responsible Group"></c-input> -->
<el-select v-model="model.trn.usg" style="width: 100%" disabled> <el-select v-model="model.trn.usg" style="width: 100%" disabled>
<el-option <el-option
...@@ -116,14 +116,14 @@ ...@@ -116,14 +116,14 @@
</c-col> </c-col>
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="24">
<el-form-item label="Based on Ident No."> <el-form-item label="Based on Ident No.">
<c-input v-model="model.trn.cortrninr" maxlength="8" disabled placeholder="请输入Based on Ident No."></c-input> <c-input v-model="model.trn.cortrninr" maxlength="8" disabled placeholder="请输入Based on Ident No."></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="24">
<el-form-item label-width="35%" label="Execution Date"> <el-form-item label="Execution Date">
<c-date-picker type="date" v-model="model.trn.exedat" style="width:100%" disabled placeholder="请选择Execution Date"></c-date-picker> <c-date-picker type="date" v-model="model.trn.exedat" style="width:100%" disabled placeholder="请选择Execution Date"></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
...@@ -224,14 +224,14 @@ ...@@ -224,14 +224,14 @@
</el-form-item> </el-form-item>
</c-col> --> </c-col> -->
<c-col :span="24"> <c-col :span="24">
<c-col :span="12"> <c-col :span="24">
<el-form-item label="Entered by"> <el-form-item label="Entered by">
<c-input v-model="model.recpan.cretrs.usr" maxlength="8" disabled placeholder="请输入Entered by"></c-input> <c-input v-model="model.recpan.cretrs.usr" maxlength="8" disabled placeholder="请输入Entered by"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
<c-col :span="12"> <c-col :span="24">
<el-form-item label-width="35%" label="Timestamp"> <el-form-item label="Timestamp">
<c-input v-model="model.recpan.cretrs.dattim" disabled placeholder="请输入Timestamp"></c-input> <c-input v-model="model.recpan.cretrs.dattim" disabled placeholder="请输入Timestamp"></c-input>
</el-form-item> </el-form-item>
</c-col> </c-col>
......
src/views/Public/Doctre.vue
...@@ -15,22 +15,7 @@ ...@@ -15,22 +15,7 @@
> >
<el-table-column label="Type" width="auto"> <el-table-column label="Type" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<c-select <span>{{ getType(scope.row.index) }}</span>
v-model="
model.trnmod.trndoc.doceot[scope.row.index].cortyp
"
style="width: 100%"
disabled
placeholder="请选择"
>
<el-option
v-for="item in codes.doceotCortyp"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</c-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="Document" width="auto"> <el-table-column label="Document" width="auto">
...@@ -44,8 +29,6 @@ ...@@ -44,8 +29,6 @@
<span>{{ getNow() }}</span> <span>{{ getNow() }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="" width="auto"></el-table-column>
<el-table-column label="" width="auto"></el-table-column>
</c-istream-table-docpan> </c-istream-table-docpan>
</c-col> </c-col>
...@@ -65,8 +48,6 @@ ...@@ -65,8 +48,6 @@
<el-table-column label="Document" width="auto"></el-table-column> <el-table-column label="Document" width="auto"></el-table-column>
<el-table-column label="Cre.TRN" width="auto"></el-table-column> <el-table-column label="Cre.TRN" width="auto"></el-table-column>
<el-table-column label="Date" width="auto"></el-table-column> <el-table-column label="Date" width="auto"></el-table-column>
<el-table-column label="" width="auto"></el-table-column>
<el-table-column label="" width="auto"></el-table-column>
</c-table> </c-table>
</c-col> </c-col>
...@@ -200,6 +181,15 @@ export default { ...@@ -200,6 +181,15 @@ export default {
} }
}, },
methods:{ methods:{
getType(idx) {
for (let i = 0; i < this.codes.doceotCortyp.length; i++) {
const c = this.codes.doceotCortyp[i];
if (this.model.trnmod.trndoc.doceot[idx].cortyp === c.value) {
return c.label;
}
}
return "";
},
getNow() { getNow() {
return moment().format('yyyy-MM-DD') return moment().format('yyyy-MM-DD')
}, },
......
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