Commit 191c0dd0 by zhujiazhan

Merge remote-tracking branch 'origin/development-202206' into development-202206

parents 88112fde 5ff570db
......@@ -102,35 +102,13 @@ export default class Betdcr {
},
},
advrefflg: "", // Advice of Refusal MT734 .advrefflg
mtabut: {
clsflg: "", // Close Flag .mtabut.clsflg
coninf: {
oitinf: {
labinftxt: "", // Label for INFTXT .mtabut.coninf.oitinf.labinftxt
oit: {
inftxt: "", // Infotext .mtabut.coninf.oitinf.oit.inftxt
inflev: "", // Infotext Level .mtabut.coninf.oitinf.oit.inflev
},
},
oitset: {
labinftxt: "", // Label for INFTXT .mtabut.coninf.oitset.labinftxt
oit: {
inftxt: "", // Infotext .mtabut.coninf.oitset.oit.inftxt
inflev: "", // Infotext Level .mtabut.coninf.oitset.oit.inflev
},
},
conexedat: "", // 执行日期 .mtabut.coninf.conexedat
usr: {
extkey: "", // User ID .mtabut.coninf.usr.extkey
},
},
},
advdisflg: "", // Advice of Discrepancy MT750 .advdisflg
rejpenins: "", // Rejection pending instructions .rejpenins
pageId: "", // ctx的key
trnmod: new Pub().data.Trnmod,
setmod: new Pub().data.Setmod,
liaall: new Pub().data.Liaall,
mtabut: new Pub().data.Mtabut
}
}
}
\ No newline at end of file
......@@ -117,7 +117,27 @@ export default {
},
async handleReset(formName) {
console.log(this);
this.$refs[formName].resetFields();
this.$refs[formName].resetFields();
// this.model.infcon.seaownref = "";
// this.model.infcon.searef = "";
// this.model.infcon.pty.extkey = "";
// this.model.infcon.seapty = "";
this.model.infcon.opndatfrom = "";
this.model.infcon.opndatto = "";
this.model.infcon.seaamtfr = "";
this.model.infcon.seaamtto = "";
// this.model.infcon.seasta = "";
// this.model.infcon.usr.extkey = "";
// this.model.infcon.nam = "";
// this.model.infcon.hndtyp = "";
// this.model.infcon.pty.nam = "";
// this.model.infcon.searol = "";
// this.model.infcon.seacur = "";
// this.model.infcon.seasta = "";
// this.model.seapaytyp="";
// this.model.msgtyp="";
// this.model.countcode="";
// this.stmData.data = "";
},
async handleSearch() {
......
......@@ -271,30 +271,32 @@ export default {
},
async handleReset(formName) {
this.$refs[formName].resetFields();
this.model.infcon.opndatfrom = "";
this.model.infcon.opndatto = "";
this.model.infcon.seaamtfr = "";
this.model.infcon.seaamtto = "";
},
async handleSearch() {
this.stmData.data = [];
let opndatfrom = this.model.infcon.opndatfrom;
if(!opndatfrom || opndatfrom == ''){
if (!opndatfrom || opndatfrom == '') {
this.$notify.error({ title: '错误', message: '查询开始日期必输!' });
return;
}
let opndatto = this.model.infcon.opndatto;
if(!opndatto || opndatto == ''){
if (!opndatto || opndatto == '') {
this.$notify.error({ title: '错误', message: '查询结束日期必输!' });
return;
}
let rtnmsg = await this.executeRule("infbut.searow")
if(rtnmsg.respCode == SUCCESS)
{
if (rtnmsg.respCode == SUCCESS) {
this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
}
else
{
this.$notify.error({title: '错误',message: '服务请求失败!'});
else {
this.$notify.error({ title: '错误', message: '服务请求失败!' });
}
},
......
......@@ -170,5 +170,9 @@ export default {
this.$notify.error({title: '错误',message: '服务请求失败!'});
}
},
onSeainf(){},
onBenpDet(){},
onAplpDet(){},
}
\ No newline at end of file
......@@ -78,7 +78,7 @@
</el-form-item>
</c-col>
<c-col :span="24">
<c-checkbox v-model="docdisflg" style="margin-left: 150px"
<c-checkbox v-model="docdisflg" style="margin-left: 150px"
>Discrepancies modified</c-checkbox
>
</c-col>
......@@ -163,7 +163,7 @@
<c-col :span="24">
<el-form-item label="" prop="rejpenins">
<c-checkbox v-model="rejpenins"
<c-checkbox v-model="rejpenins"
>Rejection Pending Instructions</c-checkbox
>
</el-form-item>
......@@ -319,11 +319,12 @@ export default {
computed: {
docdisflg: {
get() {
if (this.model.bedgrp.blk.docdis == "") {
return this.model.bedgrp.blk.docdisflg != "";
} else {
return this.model.bedgrp.blk.docdisflg != "X";
}
return this.model.bedgrp.blk.docdisflg != "X";
// if (this.model.bedgrp.blk.docdis == "") {
// return this.model.bedgrp.blk.docdisflg != "";
// } else {
// return this.model.bedgrp.blk.docdisflg != "X";
// }
},
set(val) {
this.model.bedgrp.blk.docdisflg = val ? "X" : "";
......
......@@ -312,15 +312,14 @@
<el-form-item label="" prop="bedgrp.rec.advdocflg">
<c-checkbox
v-model="model.bedgrp.rec.advdocflg"
@change="clsflgpChange"
>Receive returned ducuments</c-checkbox
>
</el-form-item>
</c-col>
<c-col :span="24">
<el-form-item label="" prop="mtabut.clsflgp">
<c-checkbox v-model="clsflgp" disabled
<el-form-item label="" prop="mtabut.clsflg">
<c-checkbox v-model="clsflg" disabled
>Close Contract</c-checkbox
>
</el-form-item>
......@@ -745,12 +744,12 @@ export default {
// this.model.mtabut.clsflg = val ? "C" : "O";
// },
// },
clsflgp: {
clsflg: {
get() {
return this.model.mtabut.clsflgp == "";
return this.model.mtabut.clsflg == "C";
},
set(val) {
this.model.mtabut.clsflgp = val ? "C" : "O";
this.model.mtabut.clsflg = val ? "C" : "O";
},
},
advdisflg: {
......@@ -764,13 +763,6 @@ export default {
},
methods: {
...Event,
clsflgpChange(v) {
if (v == "X") {
this.model.bedgrp.rec.docsta = "R";
} else {
this.model.bedgrp.rec.docsta = "E";
}
},
},
created: function () {},
};
......
......@@ -132,12 +132,7 @@
v-model="model.ledgrp.cbs.nom1.amt"
style="text-align: left; width: 100%"
placeholder="Please input Nominal Amount"
@keyup.enter.native="
defaultFunction(
'ledgrp.cbs.nom1.amt',
model.ledgrp.cbs.nom1.amt
)
"
@keyup.enter.native="$event.target.blur()"
></c-input-currency>
</el-form-item>
</c-col>
......@@ -160,6 +155,7 @@
maxlength="2"
style="width: 100%"
placeholder="Please input Amount Tolerance +/-"
@keyup.enter.native="$event.target.blur()"
class="m-input-currency"
></c-input>
</el-form-item>
......@@ -171,6 +167,7 @@
maxlength="2"
style="width: 100%"
placeholder="Please input Amount Tolerance - Negative"
@keyup.enter.native="$event.target.blur()"
class="m-input-currency"
></c-input>
</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