Skip to content

V
vue-gjjs
Commit 3721a3d4 by liuxin
Options

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

parents 0787048d f9fa78a6
Showing with 34 additions and 28 deletions
src/mixin/commonFuncs.js
...@@ -40,6 +40,18 @@ export default { ...@@ -40,6 +40,18 @@ export default {
}, },
// 表单暂存 // 表单暂存
async handleStash() { async handleStash() {
// 汇入汇款交易必须输入收款人信息才能暂存
if(this.trnName == 'cptadv'){
let extkey = this.model.cpdgrp.pye.pts.extkey;
if(extkey.replace(/(^\s*)|(\s*$)/g, '').length == 0){
this.$notify({
title: "失败",
message: "必须输入收款人信息才能暂存",
type: "error",
});
return;
}
}
let result = await this.pedding(); let result = await this.pedding();
if (result.respCode == SUCCESS) { if (result.respCode == SUCCESS) {
this.$notify({ this.$notify({
......
src/model/Cptadv/Pattern.js
...@@ -19,7 +19,7 @@ export default { ...@@ -19,7 +19,7 @@ export default {
"cpdgrp.rec.sysno":[ "cpdgrp.rec.sysno":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 21,message:"长度不能超过21"} {max: 21,message:"长度不能超过21"}
], ],
...@@ -29,12 +29,12 @@ export default { ...@@ -29,12 +29,12 @@ export default {
"cpdgrp.cbs.nom1.amt":[ "cpdgrp.cbs.nom1.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{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位" }
], ],
"cpdgrp.cbs.max.amt":[ "cpdgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{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位" }
], ],
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
], ],
"cptp.draweecountcode":[ "cptp.draweecountcode":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
...@@ -74,7 +74,7 @@ export default { ...@@ -74,7 +74,7 @@ export default {
"cpdgrp.rec.feeamt":[ "cpdgrp.rec.feeamt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"整数位不能超过12位"}, {max: 16,message:"整数位不能超过12位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
], ],
"cpdgrp.snd.pts.extkey":[ "cpdgrp.snd.pts.extkey":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"cptp.sndp.ptsget.sdamod.seainf":[ "cptp.sndp.ptsget.sdamod.seainf":[
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
], ],
"cpdgrp.rec.amtf33b":[ "cpdgrp.rec.amtf33b":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"整数位不能超过12位"}, {max: 16,message:"整数位不能超过12位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -219,7 +219,7 @@ export default { ...@@ -219,7 +219,7 @@ export default {
], ],
"cpdgrp.rec.amt71f":[ "cpdgrp.rec.amt71f":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"整数位不能超过12位"}, {max: 16,message:"整数位不能超过12位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -265,7 +265,7 @@ export default { ...@@ -265,7 +265,7 @@ export default {
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"cpdgrp.pye.pts.extkey":[ "cpdgrp.pye.pts.extkey":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"cptp.pyep.ptsget.sdamod.seainf":[ "cptp.pyep.ptsget.sdamod.seainf":[
...@@ -403,15 +403,18 @@ export default { ...@@ -403,15 +403,18 @@ export default {
{max: 22,message:"长度不能超过22"} {max: 22,message:"长度不能超过22"}
], ],
"bopmod.outchargeamt":[ "bopmod.outchargeamt":[
{type: "number", required: false, message: "必输项"} ], {type: "number", required: false, message: "必输项"} ],
"cpdgrp.rec.sztyp":[
{type: "string", required: true, message: "必输项"},
{max: 22,message:"长度不能超过22"}
],
"cnybop.cnyflg":[
{type: "string", required: true, message: "必输项"},
{max: 22,message:"长度不能超过22"}
],
......
src/views/Business/Cptadv/Sbxx.vue
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<c-col :span="12" style="margin-top: 20px;"> <c-col :span="12" style="margin-top: 20px;">
<c-col :span="24"> <c-col :span="24">
<el-form-item label="是否报送跨境人民币2101表" label-width="160px"> <el-form-item label="是否报送跨境人民币2101表" label-width="160px" prop="cnybop.cnyflg">
<c-select <c-select
v-model="model.cnybop.cnyflg" v-model="model.cnybop.cnyflg"
style="width: 100%" style="width: 100%"
......
src/views/Business/Cptadv/index.vue
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<!--PD000000 --> <!--PD000000 -->
<m-coninfp :model="model" :codes="codes" /> <m-coninfp :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="报文及面函" name="docpan1"> <el-tab-pane label="报文及面函" name="docpan">
<!--PD000000 --> <!--PD000000 -->
<m-docpan :model="model" :codes="codes" /> <m-docpan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
......
src/views/Public/CptOpnp1Common.vue
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,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>
...@@ -102,7 +101,6 @@ ...@@ -102,7 +101,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>
...@@ -162,7 +160,6 @@ ...@@ -162,7 +160,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>
...@@ -310,7 +307,6 @@ ...@@ -310,7 +307,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>
...@@ -366,7 +362,6 @@ ...@@ -366,7 +362,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>
...@@ -437,7 +432,6 @@ ...@@ -437,7 +432,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>
...@@ -488,7 +482,6 @@ ...@@ -488,7 +482,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>
...@@ -568,7 +561,6 @@ ...@@ -568,7 +561,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>
......
src/views/Public/Docpan.vue
...@@ -459,7 +459,7 @@ export default { ...@@ -459,7 +459,7 @@ export default {
//后续要根据快照模式切换请求方式 //后续要根据快照模式切换请求方式
let cortyp = row.cortyp let cortyp = row.cortyp
let docnam = doceot.docnam||''; let docnam = doceot.docnam||'';
docnam = docnam.substr(docnam.lastIndexOf("\\")+1).toLowerCase(); docnam = docnam.substr(docnam.indexOf("\\")+1).toLowerCase().replaceAll("\\","_");
let rtnmsg let rtnmsg
if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') { if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
this.model.setmod.msgmod.doccod = row.id this.model.setmod.msgmod.doccod = row.id
...@@ -468,8 +468,7 @@ export default { ...@@ -468,8 +468,7 @@ export default {
this.model.trnmod.trndoc.doccod = row.id this.model.trnmod.trndoc.doccod = row.id
this.model.trnmod.trndoc.cortyp = cortyp this.model.trnmod.trndoc.cortyp = cortyp
const params = { const params = {
index: index, index: index
docnam: docnam
} }
rtnmsg = await Api.post(`${this.declareParams.trnName}/executeDocpan`, this.wrapper(params)) rtnmsg = await Api.post(`${this.declareParams.trnName}/executeDocpan`, this.wrapper(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