Skip to content

V
vue-gjjs
Commit 234571f9 by WH
Options

Merge remote-tracking branch 'origin/settle-test-20230110' into settle-test-20230110

parents 00e1a4cb 185991cf
Showing with 133 additions and 57 deletions
src/business/betcan/model/index.js
...@@ -142,7 +142,8 @@ export default class Betcan { ...@@ -142,7 +142,8 @@ export default class Betcan {
pts: new Pts().data, pts: new Pts().data,
}, },
rec: { rec: {
ownref: '' ownref: '',
branchinr: ''
}, },
cbs: { cbs: {
opn1: { opn1: {
...@@ -155,6 +156,7 @@ export default class Betcan { ...@@ -155,6 +156,7 @@ export default class Betcan {
strinf: '', strinf: '',
bedgrp: { bedgrp: {
rec: { rec: {
inr: "",
predat: '', predat: '',
rcvdat: '', rcvdat: '',
doctypcod: '', doctypcod: '',
......
src/business/betsnd/model/check.js
...@@ -144,20 +144,20 @@ export default { ...@@ -144,20 +144,20 @@ export default {
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"bedgrp.rec.rcvdat":[ "bedgrp.rec.rcvdat":[
{type: "date", required: false, message: "输入正确的日期"} { required: false, message: "输入正确的日期"}
], ],
"bedgrp.rec.shpdat":[ "bedgrp.rec.shpdat":[
{type: "date", required: false, message: "输入正确的日期"} { required: false, message: "输入正确的日期"}
], ],
"bedgrp.prb.adrelc":[ "bedgrp.prb.adrelc":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"bedgrp.rec.predat":[ "bedgrp.rec.predat":[
{type: "date", required: false, message: "输入正确的日期"} { required: false, message: "输入正确的日期"}
], ],
"bedgrp.rec.matdat":[ "bedgrp.rec.matdat":[
{type: "date", required: false, message: "输入正确的日期"} { required: false, message: "输入正确的日期"}
], ],
"bedgrp.blk.matper":[ "bedgrp.blk.matper":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
...@@ -172,7 +172,7 @@ export default { ...@@ -172,7 +172,7 @@ export default {
{max: 1300,message:"长度不能超过1300"} {max: 1300,message:"长度不能超过1300"}
], ],
"bedgrp.rec.disdat":[ "bedgrp.rec.disdat":[
{type: "date", required: false, message: "输入正确的日期"} { required: false, message: "输入正确的日期"}
], ],
"bedgrp.rec.lescom":[ "bedgrp.rec.lescom":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -183,10 +183,10 @@ export default { ...@@ -183,10 +183,10 @@ export default {
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 390,message:"长度不能超过390"} {max: 390,message:"长度不能超过390"}
], ],
"bedgrp.blk.docdis":[ // "bedgrp.blk.docdis":[
{type: "string", required: true, message: "必输项"}, // {type: "string", required: true, message: "必输项"},
{max: 3500,message:"长度不能超过3500"} // {max: 3500,message:"长度不能超过3500"}
], // ],
"betp.docp.ptsget.sdamod.dadsnd":[ "betp.docp.ptsget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
...@@ -203,10 +203,10 @@ export default { ...@@ -203,10 +203,10 @@ export default {
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"bedgrp.doc.pts.adrblk":[ // "bedgrp.doc.pts.adrblk":[
{type: "string", required: true, message: "必输项"}, // {type: "string", required: true, message: "必输项"},
{max: 140,message:"长度不能超过140"} // {max: 140,message:"长度不能超过140"}
], // ],
"bedgrp.doc.dbfadrblkcn":[ "bedgrp.doc.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
...@@ -223,10 +223,10 @@ export default { ...@@ -223,10 +223,10 @@ export default {
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 650,message:"长度不能超过650"} {max: 650,message:"长度不能超过650"}
], ],
"bedsnd.newbenadr":[ // "bedsnd.newbenadr":[
{type: "string", required: true, message: "必输项"}, // {type: "string", required: true, message: "必输项"},
{max: 175,message:"长度不能超过175"} // {max: 175,message:"长度不能超过175"}
], // ],
"bedgrp.blk.benref":[ "bedgrp.blk.benref":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
{max: 160,message:"长度不能超过160"} {max: 160,message:"长度不能超过160"}
...@@ -263,31 +263,11 @@ export default { ...@@ -263,31 +263,11 @@ export default {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
], ],
"setmod.docamt":[
{type: "number", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
],
"setmod.zmqacc":[ "setmod.zmqacc":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"} {max: 20,message:"长度不能超过20"}
], ],
"mtabut.coninf.oitinf.oit.inftxt":[
{type: "string", required: false, message: "必输项"},
{max: 60,message:"长度不能超过60"}
],
"mtabut.coninf.oitset.oit.inftxt":[
{type: "string", required: false, message: "必输项"},
{max: 60,message:"长度不能超过60"}
],
"mtabut.coninf.conexedat":[
{type: "date", required: false, message: "输入正确的日期"}
],
"mtabut.coninf.usr.extkey":[
{type: "string", required: false, message: "必输项"},
{max: 8,message:"长度不能超过8"}
],
"trnmod.trndoc.advnam":[ "trnmod.trndoc.advnam":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 50,message:"长度不能超过50"} {max: 50,message:"长度不能超过50"}
...@@ -413,7 +393,7 @@ export default { ...@@ -413,7 +393,7 @@ export default {
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"rmbclm.valdat":[ "rmbclm.valdat":[
{type: "date", required: false, message: "输入正确的日期"} { required: false, message: "输入正确的日期"}
], ],
"cnybop.cnylib.spk":[ "cnybop.cnylib.spk":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -452,13 +432,13 @@ export default { ...@@ -452,13 +432,13 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"cnybop.cnylib.doccurdate":[ "cnybop.cnylib.doccurdate":[
{type: "date", required: false, message: "输入正确的日期"} { required: false, message: "输入正确的日期"}
], ],
"cnybop.cnylib.denddate":[ "cnybop.cnylib.denddate":[
{type: "date", required: false, message: "输入正确的日期"} { required: false, message: "输入正确的日期"}
], ],
"cnybop.cnylib.dcreditenddate":[ "cnybop.cnylib.dcreditenddate":[
{type: "date", required: false, message: "输入正确的日期"} { required: false, message: "输入正确的日期"}
], ],
"cnybop.cnylib.famt":[ "cnybop.cnylib.famt":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
...@@ -466,14 +446,14 @@ export default { ...@@ -466,14 +446,14 @@ export default {
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
"cnybop.cnylib.dexchangedate":[ "cnybop.cnylib.dexchangedate":[
{type: "date", required: false, message: "输入正确的日期"} { required: false, message: "输入正确的日期"}
], ],
"cnybop.fexchangeamt":[ "cnybop.fexchangeamt":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"} {max: 20,message:"长度不能超过20"}
], ],
"cnybop.cnylib.dexchangeenddate":[ "cnybop.cnylib.dexchangeenddate":[
{type: "date", required: false, message: "输入正确的日期"} { required: false, message: "输入正确的日期"}
], ],
"cnybop.saddwordlib":[ "cnybop.saddwordlib":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: true, message: "必输项"},
......
src/business/betsnd/views/Dscins.vue
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
title: '', title: '',
grp: 'bedgrp', grp: 'bedgrp',
rol: 'doc', rol: 'doc',
}":disabled1=" }" :disabled1="
model.bedgrp.rec.docrol != 'OTH' || model.bedgrp.rec.docrolflg == '' model.bedgrp.rec.docrol != 'OTH' || model.bedgrp.rec.docrolflg == ''
" :disabled="true"> " :disabled="true">
</c-ptap1> </c-ptap1>
......
src/business/betsnd/views/Rgfp.vue
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="到期日" prop="bedgrp.rec.matdat"> <el-form-item label="到期日" prop="bedgrp.rec.matdat">
<c-date-picker type="date" v-model="model.bedgrp.rec.matdat" style="width: 100%" placeholder="请选择到期日" <c-date-picker type="date" v-model="model.bedgrp.rec.matdat" style="width: 100%" placeholder="请选择到期日"
value-format="yyyy-MM-dd" :disabled="true"></c-date-picker> value-format="yyyy-MM-dd" ></c-date-picker>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- <c-col :span="12"></c-col> --> <!-- <c-col :span="12"></c-col> -->
...@@ -176,9 +176,9 @@ ...@@ -176,9 +176,9 @@
<c-col :span="12"> <c-col :span="12">
<el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt"> <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt">
<c-input v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入信用证余额" disabled <c-input-currency v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入信用证余额" disabled
class="m-input-currency"> class="m-input-currency">
</c-input> </c-input-currency>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
......
src/business/letcan/event/buildCommons.js
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
cbsMap: { cbsMap: {
MAX: model.ledgrp.cbs.max, MAX: model.ledgrp.cbs.max,
OPN1: model.ledgrp.cbs.opn1, OPN1: model.ledgrp.cbs.opn1,
OPN2: model.ledgrp.cbs.opn1, OPN2: model.ledgrp.cbs.opn2,
MAC: model.ledgrp.cbs.mac, MAC: model.ledgrp.cbs.mac,
MAC2: model.ledgrp.cbs.mac2, MAC2: model.ledgrp.cbs.mac2,
OPC2: model.ledgrp.cbs.opc2, OPC2: model.ledgrp.cbs.opc2,
......
src/business/letcan/model/check.js
...@@ -85,7 +85,7 @@ export default { ...@@ -85,7 +85,7 @@ export default {
'letp0.cnftxt': [ 'letp0.cnftxt': [
{ type: 'string', required: false, message: '必输项' }, { type: 'string', required: false, message: '必输项' },
{ max: 40, message: '长度不能超过40' }, { max: 400, message: '长度不能超过40' },
], ],
'letcanf.strinf': [ 'letcanf.strinf': [
{ type: 'string', required: false, message: '必输项' }, { type: 'string', required: false, message: '必输项' },
......
src/business/letcan/model/index.js
...@@ -99,6 +99,20 @@ export default class Letcan { ...@@ -99,6 +99,20 @@ export default class Letcan {
}, },
rmbrol: '', rmbrol: '',
}, },
async queryGridEtyPromptDialogData(type, ptytyp) {
let params = {
userId: window.sessionStorage.userId || 'ZL',
ptytyp: ptytyp,
extkey: this.model.ledgrp[type.toLowerCase()].pts.extkey,
};
let res = await Api.post('/service/ptspta/list', params);
if (res.respCode == SUCCESS) {
this.root.$refs['etyDialog'].show = true;
this.root.promptData.data = res.data.ptaInfos;
this.root.promptData.type = type;
}
},
setmod: new Pub().data.Setmod, setmod: new Pub().data.Setmod,
mtabut: new Pub().data.Mtabut, mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod, trnmod: new Pub().data.Trnmod,
......
src/business/letcan/views/Canp.vue
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="确认文本" prop="letp0.cnftxt"> <el-form-item label="确认文本" prop="letp0.cnftxt">
<c-input <c-input
v-model="model.letp0.cnftxt" v-model="cnftxt"
maxlength="40" maxlength="40"
placeholder="请输入" placeholder="请输入"
disabled disabled
...@@ -334,6 +334,13 @@ export default { ...@@ -334,6 +334,13 @@ export default {
}, },
methods: {}, methods: {},
created: function () {}, created: function () {},
computed:{
cnftxt(){
this.model.letp0.cnftxt="The L/C was canceled "+new Date()
return this.model.letp0.cnftxt
}
}
} }
</script> </script>
......
src/business/letdrw/views/Ovwp1.vue
...@@ -436,12 +436,43 @@ export default { ...@@ -436,12 +436,43 @@ export default {
data() { data() {
return {} return {}
}, },
watch:{
"model.ledgrp":{
immediate: true,
deep: true,
handler(val,oldval){
const res = this.model.ledgrp
if(res.cbs.nom1.cur !== "" || res.cbs.nom1.amt !== "" || res.apl.pts.adrblk !== "" || res.rec.stacty !== "" ){
this.model.ledgrp.rec.nam = (res.cbs.nom1.cur.concat(" ").concat(res.cbs.nom1.amt).concat(" ").concat(res.rec.stacty).concat(".").concat(res.ben.pts.nam)).substring(0,40);
}
}
},
"model.ledgrp.iss":{
immediate: true,
deep: true,
handler(val,oldval){
if(this.model.ledgrp.iss.pts !==""){
this.getstacty()
}
}
}
},
methods: { methods: {
apprulChange(v) { apprulChange(v) {
if (v !== 'OTHR') { if (v !== 'OTHR') {
this.model.ledgrp.rec.apprultxt = '' this.model.ledgrp.rec.apprultxt = ''
} }
}, },
async getstacty() {
let params = {
ptainr: this.model.ledgrp.iss.pts.ptainr
}
let res = await Api.post('/service/letopn/stacty', params);
if (res.respCode == SUCCESS) {
this.model.ledgrp.rec.stacty = res.data;
}
}
}, },
created: function () {}, created: function () {},
computed:{ computed:{
......
src/business/letrsv/event/buildCommons.js
...@@ -52,6 +52,7 @@ export default { ...@@ -52,6 +52,7 @@ export default {
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'LED', objtyp: 'LED',
objinr: model.ledgrp.rec.objinr,
ownref: model.ledgrp.rec.ownref, ownref: model.ledgrp.rec.ownref,
opndat: model.ledgrp.rec.opndat, opndat: model.ledgrp.rec.opndat,
expdat: model.ledgrp.rec.expdat, expdat: model.ledgrp.rec.expdat,
......
src/business/letrsv/model/check.js
...@@ -288,16 +288,16 @@ let checkObj = { ...@@ -288,16 +288,16 @@ let checkObj = {
], ],
"ledgrp.drw.pts.adrblk": [ "ledgrp.drw.pts.adrblk": [
{ type: "string", required: true, message: "必输项" }, { type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" } { max: 350, message: "长度不能超过35" }
], ],
"ledgrp.drw.dbfadrblkcn": [ "ledgrp.drw.dbfadrblkcn": [
{ type: "string", required: true, message: "必输项" }, { type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" } { max: 350, message: "长度不能超过35" }
], ],
"ledgrp.drw.adrelc": [ "ledgrp.drw.adrelc": [
{ type: "string", required: true, message: "必输项" }, { type: "string", required: true, message: "必输项" },
{ max: 35, message: "长度不能超过35" } { max: 350, message: "长度不能超过35" }
], ],
"ledgrp.rec.shpfro": [ "ledgrp.rec.shpfro": [
......
src/business/letrsv/model/index.js
...@@ -9,11 +9,11 @@ export default class Letrsv { ...@@ -9,11 +9,11 @@ export default class Letrsv {
cbs: { cbs: {
max: { max: {
cur: '', cur: '',
amt: '' amt: '0.00'
}, },
max2: { max2: {
cur: '', cur: '',
amt: '' amt: '0.00'
} }
} }
}, },
......
src/business/letrsv/views/Ovwp1.vue
...@@ -446,6 +446,38 @@ export default { ...@@ -446,6 +446,38 @@ export default {
data() { data() {
return {}; return {};
}, },
watch:{
"model.ledgrp":{
immediate: true,
deep: true,
handler(val,oldval){
const res = this.model.ledgrp
if(res.cbs.nom1.cur !== "" || res.cbs.nom1.amt !== "" || res.apl.pts.adrblk !== "" || res.rec.stacty !== "" ){
this.model.ledgrp.rec.nam = (res.cbs.nom1.cur.concat(" ").concat(res.cbs.nom1.amt).concat(" ").concat(res.rec.stacty).concat(".").concat(res.ben.pts.nam)).substring(0,40);
}
}
},
"model.ledgrp.iss":{
immediate: true,
deep: true,
handler(val,oldval){
if(this.model.ledgrp.iss.pts !==""){
this.getstacty()
}
}
},
//国家地区
async getstacty() {
let params = {
ptainr: this.model.ledgrp.iss.pts.ptainr
}
let res = await Api.post('/service/letrsv/stacty', params);
if (res.respCode == SUCCESS) {
this.model.ledgrp.rec.stacty = res.data;
}
}
},
computed: { computed: {
flag() { flag() {
return this.model.mtabut.coninf.usr.extkey == ""; return this.model.mtabut.coninf.usr.extkey == "";
...@@ -502,6 +534,15 @@ export default { ...@@ -502,6 +534,15 @@ export default {
}, },
created: function () { created: function () {
}, },
async getstacty() {
let params = {
ptainr: this.model.ledgrp.iss.pts.ptainr
}
let res = await Api.post('/service/letopn/stacty', params);
if (res.respCode == SUCCESS) {
this.model.ledgrp.rec.stacty = res.data;
}
}
}; };
</script> </script>
<style> <style>
......
src/views/Business/Letcan/Canp.vue
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
style="width: 100%" style="width: 100%"
placeholder="请选择类型" placeholder="请选择类型"
disabled disabled
:code="codes.lcrtyp" :code="codes.lcrtyp1"
> >
</c-select> </c-select>
</el-form-item> </el-form-item>
......
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