Skip to content

V
vue-gjjs
Commit b40dce1f by WuBing
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 5dbe89c3 328ffba6
Showing with 169 additions and 148 deletions
src/components/FunctionBtn.vue
......@@ -88,10 +88,10 @@ export default {
// },
start: async function() {
this.handleSubmit && (await this.handleSubmit('bopbut.sav'));
this.handleSubmit && (await this.handleSubmit());
},
check: async function() {
this.handleCheck && (await this.handleCheck('bopbut.chk'));
this.handleCheck && (await this.handleCheck());
},
save: async function() {
this.handleStash && (await this.handleStash());
......
src/config/CodeTable/index.js
......@@ -6963,6 +6963,11 @@ const CodeTable = {
{ label: "对私中国非居民", value: "F" },
],
zhbchinr: [
{ label: "08350012 中国光大银行北京分行", value: "08350012" },
{ label: "08357113 LM ADD", value: "08357113" },
],
label5: [
{ label: "额度已切分,结算系统将自动扣减额度,保证金（如需）符合要求;", value: "A" },
{ label: "额度未切分,《信贷业务通知书》符合要求;", value: "B" },
......@@ -7494,9 +7499,13 @@ const CodeTable = {
{ label: "TP 国际结算临时帐", value: "TP" },
],
jyzt: [
{ label: '01', value: '01' },
{ label: '02', value: '02' },
{ label: '03', value: '03' },
{ label: '01银行自身', value: '01' },
{ label: '02金融机构', value: '02' },
{ label: '03中资机构', value: '03' },
{ label: '04外资机构', value: '04' },
{ label: '05居民个人', value: '05' },
{ label: '06非居民个人', value: '06' },
{ label: '99境外机构', value: '99' },
],
jzllgz: [
{ label: '央视基准', value: '0' },
......
src/mixin/commonFuncs.js
......@@ -4,13 +4,12 @@ export default {
methods: {
// 表单提交
async handleSubmit(rulePath) {
let result;
let result;let result1;
if(rulePath==""){
result = await this.save();
}else{
result = await this.executeRule(rulePath);
result1 = await this.executeRule(rulePath);
}
// let result = await this.save();
if (result.respCode == SUCCESS && Object.keys(result.fieldErrors).length == 0) {
this.$notify({
title: "成功",
......@@ -43,6 +42,38 @@ export default {
});
}
if (result1.respCode == SUCCESS && Object.keys(result1.fieldErrors).length == 0) {
this.$notify({
title: "成功",
message: "保存成功",
type: "success",
});
this.$store.dispatch("TagsView/delView", this.$route)
this.$router.history.push("/taskList", () => {
this.$store.commit("setTaskListTabVal", 'bopsel')
//修改待复核界面刷新状态为需要刷新
this.$store.commit("setLoadingFreshReview", true)
});
}else if(result1.fieldErrors && Object.keys(result1.fieldErrors).length > 0 ){
const tab = this.showBackendErrors(result1.fieldErrors)
if (tab) {
// tab切换之后，需出发tab-click的事件
this.tabClick(tab);
}
this.$notify({
title: "错误",
message: "检核失败！",
type: "error",
});
}
else{
this.$notify({
title: "失败",
message: "保存失败",
type: "error",
});
}
},
async handleConfirm() {
......
src/service/Api.js
......@@ -78,7 +78,7 @@ export default class Api
axios.post(url,data,{
headers,
method,
timeout: 50000,
timeout: 120000,
})
.then(response=>{
const {data} = response;
......
src/service/test/fec.js
......@@ -20,11 +20,11 @@ export function deleteById(inr) {
return Api.post(`/test/fec/deleteById?inr=${inr}`)
}
export function addFeeData(data) {
return Api.post(`/test/fec/addFeeData`, data)
export function addFeeData(inr,data) {
return Api.post(`/test/fec/addFeeData?inr=${inr}`, data)
}
export function editFeeData(data) {
export function editFeeData(inr,data) {
return Api.post(`/test/fec/editFeeData?inr=${inr}`, data)
}
......
src/views/Business/Bopsel/Selp.vue
......@@ -308,7 +308,8 @@ export default {
'0 1 "申报号码" 170 ',
'1 2 "客户" 100',
'16 3 "组织机构代码" 120',
'2 4 "基础" 80',
// '2 4 "基础" 80',
{index:2,position:4,width:80,pattern:'code',label:'基础',code:this.codes.staflg},
'5 5 "银行业务编号" 150',
//'6 6, "收付汇日期" 200',
{index:6,position:6,width:150,pattern:'date',label:'收付汇日期'},
......
src/views/Business/Cptopn/Outp.vue
......@@ -26,10 +26,28 @@
<c-col :span="24">
<el-form-item label="收款人常驻国家/地区编号" prop="cnybop.cnyout.spayercountrycode">
<c-col :span="21">
<c-input v-model="model.cnybop.cnyout.spayercountrycode" maxlength="3" placeholder=""></c-input>
<c-input v-model="model.cnybop.cnyout.spayercountrycode" maxlength="3" placeholder=""
@keyup.enter.native="
showGridPromptDialog('cnybop.cnyout.spayercountrycode')
"
style="width: 100%"></c-input>
</c-col>
<c-col :span="3" style="text-align: right">
<c-button size="small" type="primary" icon="el-icon-search"></c-button>
<c-button
size="small"
type="primary"
icon="el-icon-search"
@click="
showGridPromptDialog(
'cnybop.outcty',
null,
null,
{ TXT: 'cnybop.cnyout.spayercountrycode' },
{ TXT: false },
'doxpDialog'
)
"
></c-button>
</c-col>
</el-form-item>
</c-col>
......
src/views/Business/Dbcadd/index.vue
......@@ -31,8 +31,8 @@
</c-tabs>
</el-form>
<c-function-btn
:handleSubmit="handleSubmit"
:handleCheck="handleCheck"
:handleSubmit="handleSubmit('bopbut.sav')"
:handleCheck="handleCheck('bopbut.chk')"
:handleStash="handleStash"
>
<!-- ('bopbut.chk') -->
......
src/views/Business/Dbcame/Basp.vue
......@@ -30,7 +30,6 @@
v-model="model.recgrp.bas.ownextkey"
style="width: 100%"
placeholder="请选择地区机构号"
:code="codes.ownextkey3"
disabled
>
</c-select>
......@@ -166,6 +165,7 @@
v-model="model.recgrp.bas.issdate"
style="width: 100%"
placeholder="请选择开证日期"
disabled
></c-date-picker>
</el-form-item>
</c-col>
......@@ -176,6 +176,7 @@
v-model="model.recgrp.bas.lcbgno"
maxlength="20"
placeholder="请输入信用证/保函编号"
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -296,6 +297,7 @@
<c-input
v-model="model.recgrp.bas.tenor"
placeholder="请输入期限"
disabled
></c-input>
</el-form-item>
</c-col>
......
src/views/Statics/Dbiusr/UbrInfo.vue
......@@ -10,17 +10,18 @@ export default {
data() {
return {
columns: [
{ label: 'inr', prop: 'inr', width: 'auto' },
{ label: 'usrinr', prop: 'usrinr', width: 'auto' },
{ label: 'bussec', prop: 'bussec', width: 'auto' },
{ label: 'relcur', prop: 'relcur', width: 'auto' },
{ label: 'relamt', prop: 'relamt', width: 'auto' },
{ label: 'relamt2nd', prop: 'relamt2nd', width: 'auto' },
{ label: 'relgrp', prop: 'relgrp', width: 'auto' },
{ label: 'trncod', prop: 'trncod', width: 'auto' },
{ label: 'branchinr', prop: 'branchinr', width: 'auto' },
{ label: 'autcur', prop: 'autcur', width: 'auto' },
{ label: 'autamt', prop: 'autamt', width: 'auto' },
// 表结构说明:
// { label: '唯一ID', prop: 'inr', width: 'auto' },
{ label: '用户ID', prop: 'usrinr', width: 'auto' },
{ label: '交易名', prop: 'bussec', width: 'auto' },
{ label: '授权币种', prop: 'relcur', width: 'auto' },
{ label: '授权金额', prop: 'relamt', width: 'auto' },
{ label: '第二授权金额', prop: 'relamt2nd', width: 'auto' },
{ label: '授权状态', prop: 'relgrp', width: 'auto' },
{ label: '交易代码', prop: 'trncod', width: 'auto' },
{ label: '交易所属机构', prop: 'branchinr', width: 'auto' },
{ label: '一次性授权', prop: 'autcur', width: 'auto' },
{ label: '一次性释放授权', prop: 'autamt', width: 'auto' },
],
};
},
......
src/views/Statics/Dbiusr/UclInfo.vue
......@@ -10,12 +10,12 @@ export default {
data() {
return {
columns: [
{ label: 'usrdef', prop: 'usrdef', width: 'auto' },
{ label: 'usr', prop: 'usr', width: 'auto' },
{ label: 'mannam', prop: 'mannam', width: 'auto' },
{ label: 'branchinr', prop: 'branchinr', width: 'auto' },
{ label: 'objlst', prop: 'objlst', width: 'auto' },
{ label: 'assignflg', prop: 'assignflg', width: 'auto' },
{ label: '默认的机构标志', prop: 'usrdef', width: 'auto' },
{ label: '用户ID', prop: 'usr', width: 'auto' },
{ label: '用户所在机构和用户名称', prop: 'mannam', width: 'auto' },
{ label: '机构INR', prop: 'branchinr', width: 'auto' },
{ label: '用户可作业务的列表', prop: 'objlst', width: 'auto' },
{ label: '是否参与任务分配', prop: 'assignflg', width: 'auto' },
],
};
},
......
src/views/Statics/Dbiusr/UsrInfo.vue
......@@ -2,7 +2,7 @@
<div class="eibs-tab">
<c-col :span="12" class="col-left">
<c-col :span="24">
<el-form-item label="inr" prop="inr">
<el-form-item label="ID" prop="inr">
<c-input
v-model="model.inr"
placeholder="请输入inr"
......@@ -11,7 +11,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="extkey" prop="extkey">
<el-form-item label="用户ID" prop="extkey">
<c-input
v-model="model.extkey"
placeholder="请输入extkey"
......@@ -20,7 +20,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="nam" prop="nam">
<el-form-item label="用户名" prop="nam">
<c-input
v-model="model.nam"
placeholder="请输入nam"
......@@ -29,7 +29,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="lgiflg" prop="lgiflg">
<el-form-item label="禁止登录" prop="lgiflg">
<c-input
v-model="model.lgiflg"
placeholder="请输入lgiflg"
......@@ -38,7 +38,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="ssnbegdattim" prop="ssnbegdattim">
<el-form-item label="最近登录时间" prop="ssnbegdattim">
<c-date-picker
v-model="model.ssnbegdattim"
placeholder="请输入ssnbegdattim"
......@@ -47,7 +47,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="ssninr" prop="ssninr">
<el-form-item label="SSN ID" prop="ssninr">
<c-input
v-model="model.ssninr"
placeholder="请输入ssninr"
......@@ -55,17 +55,17 @@
</c-input>
</el-form-item>
</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="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="pri" prop="pri">
<el-form-item label="实体标志" prop="pri">
<c-input
v-model="model.pri"
placeholder="请输入pri"
......@@ -74,7 +74,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="ety" prop="ety">
<el-form-item label="实体" prop="ety">
<c-input
v-model="model.ety"
placeholder="请输入ety"
......@@ -83,7 +83,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="usg" prop="usg">
<el-form-item label="用户组" prop="usg">
<c-input
v-model="model.usg"
placeholder="请输入usg"
......@@ -92,7 +92,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="lstdiadat" prop="lstdiadat">
<el-form-item label="最近DIA查看时间" prop="lstdiadat">
<c-date-picker
v-model="model.lstdiadat"
placeholder="请输入lstdiadat"
......@@ -101,7 +101,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="relcur" prop="relcur">
<el-form-item label="授权币种" prop="relcur">
<c-input
v-model="model.relcur"
placeholder="请输入relcur"
......@@ -110,7 +110,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="relamt" prop="relamt">
<el-form-item label="授权金额" prop="relamt">
<c-input
v-model="model.relamt"
placeholder="请输入relamt"
......@@ -119,7 +119,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="relamt2nd" prop="relamt2nd">
<el-form-item label="第二授权金额" prop="relamt2nd">
<c-input
v-model="model.relamt2nd"
placeholder="请输入relamt2nd"
......@@ -131,7 +131,7 @@
<c-col :span="12" class="col-right">
<c-col :span="24">
<el-form-item label="relgrp" prop="relgrp">
<el-form-item label="授权组" prop="relgrp">
<c-input
v-model="model.relgrp"
placeholder="请输入relgrp"
......@@ -140,7 +140,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="tel" prop="tel">
<el-form-item label="电话" prop="tel">
<c-input
v-model="model.tel"
placeholder="请输入tel"
......@@ -149,7 +149,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="fax" prop="fax">
<el-form-item label="传真" prop="fax">
<c-input
v-model="model.fax"
placeholder="请输入fax"
......@@ -158,7 +158,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="eml" prop="eml">
<el-form-item label="电子邮箱" prop="eml">
<c-input
v-model="model.eml"
placeholder="请输入eml"
......@@ -167,7 +167,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="quepow" prop="quepow">
<el-form-item label="可用时间" prop="quepow">
<c-input
v-model="model.quepow"
placeholder="请输入quepow"
......@@ -176,7 +176,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="etyextkey" prop="etyextkey">
<el-form-item label="实体名称" prop="etyextkey">
<c-input
v-model="model.etyextkey"
placeholder="请输入etyextkey"
......@@ -185,7 +185,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="oenr" prop="oenr">
<el-form-item label="组织" prop="oenr">
<c-input
v-model="model.oenr"
placeholder="请输入oenr"
......@@ -194,7 +194,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="etaextkey" prop="etaextkey">
<el-form-item label="实体地址" prop="etaextkey">
<c-input
v-model="model.etaextkey"
placeholder="请输入etaextkey"
......@@ -203,7 +203,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="resusrflg" prop="resusrflg">
<el-form-item label="客户经理" prop="resusrflg">
<c-input
v-model="model.resusrflg"
placeholder="请输入resusrflg"
......@@ -212,7 +212,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="secsta" prop="secsta">
<el-form-item label="用户状态" prop="secsta">
<c-input
v-model="model.secsta"
placeholder="请输入secsta"
......@@ -221,7 +221,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="letoenr" prop="letoenr">
<el-form-item label="信件的组织单位" prop="letoenr">
<c-input
v-model="model.letoenr"
placeholder="请输入letoenr"
......
src/views/Statics/Dbiusr/index.vue
......@@ -45,7 +45,7 @@
style="margin-right: 10px"
@click="commitAdd"
v-if="type === 'add'"
>提 交</c-button
>提 1</c-button
>
<c-button
type="primary"
......
src/views/Statics/Infpty/Infsea.vue
......@@ -229,16 +229,16 @@ export default {
ptyData: [],
ptyColumns: [
{ label: '客户号', prop: 'extkey', width: '120' },
{ label: '中文名称', prop: '', width: '150' },
{ label: '中文名称', prop: 'nam1', width: '150' },
{ label: 'Name', prop: 'nam', width: '200' },
{ label: '客户类别', prop: 'idtype', width: '100' },
{ label: 'Street', prop: '', width: '200' },
{ label: '支行名称', prop: '', width: '98' },
{ label: 'ZIP', prop: '', width: '98' },
{ label: '支行行号', prop: '', width: '200' },
{ label: 'City', prop: '', width: '120' },
{ label: '组织机构代码', prop: '', width: '200' },
{ label: 'BIC', prop: '', width: '70' },
{ label: 'Street', prop: 'str', width: '200' },
{ label: '支行名称', prop: 'bchname', width: '98' },
{ label: 'ZIP', prop: 'loczip', width: '98' },
{ label: '支行行号', prop: 'branch', width: '200' },
{ label: 'City', prop: 'loctxt', width: '120' },
{ label: '组织机构代码', prop: 'juscod', width: '200' },
{ label: 'BIC', prop: 'bic', width: '70' },
{ label: '统一社会信用代码', prop: 'idcode', width: '200' },
{ label: '交易主体', prop: 'trnman', width: '98' },
],
......
src/views/Statics/Infusr/Infsea.vue
......@@ -3,7 +3,7 @@
<!-- ----------左 ---------->
<c-col :span="12" class="col-left">
<c-col :span="24">
<el-form-item label="User-id" prop="extkey">
<el-form-item label="用户ID" prop="extkey">
<c-input
v-model="model.extkey"
placeholder="请输入user-id"
......@@ -14,7 +14,7 @@
<!------------- 右 ---------->
<c-col :span="12" class="col-right">
<c-col :span="24">
<el-form-item label="Name" prop="name">
<el-form-item label="用户名" prop="name">
<c-input
v-model="model.nam"
placeholder="请输入name"
......@@ -106,78 +106,37 @@ export default {
return {
usrData: [],
usrColumns: [
{ label: 'inr', prop: 'inr', width: 'auto' },
{ label: 'extkey', prop: 'extkey', width: 'auto' },
{ label: 'nam', prop: 'nam', width: 'auto' },
{ label: 'lgiflg', prop: 'lgiflg', width: 'auto' },
{ label: 'ssnbegdattim', prop: 'ssnbegdattim', width: 'auto' },
{ label: 'ssninr', prop: 'ssninr', width: 'auto' },
{ label: 'ver', prop: 'ver', width: 'auto' },
{ label: 'pri', prop: 'pri', width: 'auto' },
{ label: 'ety', prop: 'ety', width: 'auto' },
{ label: 'usg', prop: 'usg', width: 'auto' },
{ label: 'lstdiadat', prop: 'lstdiadat', width: 'auto' },
{ label: 'relcur', prop: 'relcur', width: 'auto' },
{ label: 'relamt', prop: 'relamt', width: 'auto' },
{ label: 'relamt2nd', prop: 'relamt2nd', width: 'auto' },
{ label: 'relgrp', prop: 'relgrp', width: 'auto' },
{ label: 'tel', prop: 'tel', width: 'auto' },
{ label: 'fax', prop: 'fax', width: 'auto' },
{ label: 'eml', prop: 'eml', width: 'auto' },
{ label: 'quepow', prop: 'quepow', width: 'auto' },
{ label: 'etyextkey', prop: 'etyextkey', width: 'auto' },
{ label: 'oenr', prop: 'oenr', width: 'auto' },
{ label: 'etaextkey', prop: 'etaextkey', width: 'auto' },
{ label: 'resusrflg', prop: 'resusrflg', width: 'auto' },
{ label: 'secsta', prop: 'secsta', width: 'auto' },
{ label: 'letoenr', prop: 'letoenr', width: 'auto' },
{ label: 'ubrList', prop: 'ubrList', width: 'auto' },
{ label: 'uclList', prop: 'uclList', width: 'auto' },
// { label: 'inr', prop: 'inr', width: 'auto' },
{ label: '用户ID', prop: 'extkey', width: 'auto' },
{ label: '用户名称', prop: 'nam', width: 'auto' },
// { label: '禁止登录', prop: 'lgiflg', width: 'auto' },
// { label: '最近登录时间', prop: 'ssnbegdattim', width: 'auto' },
// { label: 'SSN ID', prop: 'ssninr', width: 'auto' },
// { label: '版本号', prop: 'ver', width: 'auto' },
// { label: '实体标志', prop: 'pri', width: 'auto' },
// { label: '实体', prop: 'ety', width: 'auto' },
{ label: '用户组', prop: 'usg', width: 'auto' },
// { label: '
// ', prop: 'lstdiadat', width: 'auto' },
{ label: '授权币种', prop: 'relcur', width: 'auto' },
{ label: '授权金额', prop: 'relamt', width: 'auto' },
// { label: '第二授权金额', prop: 'relamt2nd', width: 'auto' },
// { label: '授权组', prop: 'relgrp', width: 'auto' },
// { label: '电话', prop: 'tel', width: 'auto' },
// { label: '传真', prop: 'fax', width: 'auto' },
// { label: '电子信箱', prop: 'eml', width: 'auto' },
// { label: '可用时间', prop: 'quepow', width: 'auto' },
// { label: '实体名称', prop: 'etyextkey', width: 'auto' },
// { label: '组织', prop: 'oenr', width: 'auto' },
{ label: '实体地址', prop: 'etaextkey', width: 'auto' },
{ label: '客户经理', prop: 'resusrflg', width: 'auto' },
// { label: 'secsta', prop: 'secsta', width: 'auto' },
// { label: 'letoenr', prop: 'letoenr', width: 'auto' },
// { label: 'ubrList', prop: 'ubrList', width: 'auto' },
// { label: 'uclList', prop: 'uclList', width: 'auto' },
],
};
},
computed: {
seatypb: {
get: function () {
return this.model.ptytyp === "B";
},
set: function (val) {
this.model.ptytyp = val ? "B" : "";
},
},
seatypc: {
get: function () {
return this.model.ptytyp === "C";
},
set: function (val) {
this.model.ptytyp = val ? "C" : "";
},
},
seatypa: {
get: function () {
return this.model.ptytyp === "A";
},
set: function (val) {
this.model.ptytyp = val ? "A" : "";
},
},
seatypo: {
get: function () {
return this.model.ptytyp === "O";
},
set: function (val) {
this.model.ptytyp = val ? "O" : "";
},
},
seatyph: {
get: function () {
return this.model.ptytyp === "H";
},
set: function (val) {
this.model.ptytyp = val ? "H" : "";
},
},
},
// activated:已进入页面便可触发
activated() {
const { update } = this.$route.params
......
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