Skip to content

V
vue-gjjs
Commit 72f6b61c by 李少勇
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 5e4c1a64 ea828f14
Showing with 102 additions and 38 deletions
src/config/CodeTable/index.js
...@@ -6850,14 +6850,16 @@ const CodeTable = { ...@@ -6850,14 +6850,16 @@ const CodeTable = {
{ label: "信用", value: "C" }, { label: "信用", value: "C" },
], ],
setfelRol: [ setfelRol: [
{ label: "OWN Ourselves", value: "OWN" },
{ label: "ISS 开证行", value: "ISS" },
{ label: "APL 申请人", value: "APL" },
{ label: "ADT 通知行转账", value: "ADT" }, { label: "ADT 通知行转账", value: "ADT" },
{ label: "APL 申请人", value: "APL" },
{ label: "AVB 可用银行", value: "AVB" },
{ label: "AVT Avail. w. Bank Tr.", value: "AVT" }, { label: "AVT Avail. w. Bank Tr.", value: "AVT" },
{ label: "BE1 第一受益人", value: "BE1" }, { label: "BE1 第一受益人", value: "BE1" },
{ label: "BE2 第二受益人", value: "BE2" }, { label: "BE2 第二受益人", value: "BE2" },
{ label: "BEN 受益人", value: "BEN" }, { label: "BEN 受益人", value: "BEN" },
{ label: "CON 保兑行", value: "CON" },
{ label: "DRW 付款人(DRW)", value: "DRW" },
{ label: "ISS 开证行", value: "ISS" },
], ],
setfelRol1: [ setfelRol1: [
{ label: "A2B 第二通知行", value: "A2B" }, { label: "A2B 第二通知行", value: "A2B" },
......
src/mixin/commonFuncs.js
...@@ -164,6 +164,8 @@ export default { ...@@ -164,6 +164,8 @@ export default {
} }
// let result = await this.checkAll(); // let result = await this.checkAll();
console.log(">>>>>>>>>")
console.log(result)
if (result.respCode == SUCCESS) { if (result.respCode == SUCCESS) {
const fieldErrors = result.fieldErrors; const fieldErrors = result.fieldErrors;
this.updateModel(result.data); this.updateModel(result.data);
......
src/model/Infbtd/Event.js
...@@ -75,9 +75,34 @@ export default { ...@@ -75,9 +75,34 @@ export default {
} }
}, },
async handleReset(formName) { async handleReset(formName) {
this.$refs[formName].resetFields(); this.model.infcon.seaownref=''
this.model.infcon.seaamtfr = '0.00'; let today=new Date();
this.model.infcon.seaamtto = '0.00'; let date={
year:today.getFullYear(),
month:today.getMonth()+1,
day:today.getDate()
}
if(date.month<10)
date.month=`0${date.month}`
if(date.day<10)
date.day=`0${date.day}`
let nowDate=date.year+'-'+date.month+'-'+date.day;
console.log(nowDate)
if( this.model.infcon.opndatto != nowDate){
this.model.infcon.opndatto=''
}
if(this.model.infcon.opndatfrom != nowDate){
this.model.infcon.opndatfrom=''
}
this.model.infcon.nam=''
this.model.infcon.searef=''
this.model.infcon.pty.extkey=''
this.model.infcon.seapty=''
this.model.infcon.searol=''
this.model.infcon.seasta=''
this.model.infcon.seacur=''
this.model.infcon.seaamtfr='0.00'
this.model.infcon.seaamtto='0.00'
}, },
async handleSearch() { async handleSearch() {
this.stmData.data = []; this.stmData.data = [];
...@@ -91,6 +116,15 @@ export default { ...@@ -91,6 +116,15 @@ export default {
this.$notify.error({ title: '错误', message: '查询结束日期必输！' }); this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
return; return;
} }
let seaamtfr = this.model.infcon.seaamtfr;
let seaamtto = this.model.infcon.seaamtto;
let seacur = this.model.infcon.seacur;
if(seaamtfr !='0.00' || seaamtto !='0.00'){
if(seacur=='' || !seacur){
this.$notify.error({ title: '错误', message: '不允许在没有有效货币的情况下搜索金额' });
return;
}
}
let rtnmsg = await this.executeRule("infbut.searow") let rtnmsg = await this.executeRule("infbut.searow")
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑 //TODO 处理数据逻辑
......
src/model/Infltd/Event.js
...@@ -21,30 +21,45 @@ export default { ...@@ -21,30 +21,45 @@ export default {
} }
},*/ },*/
// async handleReset() { async handleReset() {
// this.model.infcon.seaownref = ""; this.model.infcon.seaownref = "";
// this.model.infcon.searef = ""; this.model.infcon.searef = "";
// this.model.infcon.pty.extkey = ""; this.model.infcon.pty.extkey = "";
// this.model.infcon.seapty = ""; this.model.infcon.seapty = "";
// this.model.infcon.opndatfrom = ""; let today=new Date();
// this.model.infcon.opndatto = ""; let date={
// this.model.infcon.seaamtfr = ""; year:today.getFullYear(),
// this.model.infcon.seaamtto = ""; month:today.getMonth()+1,
// this.model.infcon.seasta = ""; day:today.getDate()
// this.model.infcon.usr.extkey = ""; }
// this.model.infcon.nam = ""; if(date.month<10)
// this.model.infcon.hndtyp = ""; date.month=`0${date.month}`
// this.model.infcon.pty.nam = ""; if(date.day<10)
// this.model.infcon.searol = ""; date.day=`0${date.day}`
// this.model.infcon.seacur = ""; let nowDate=date.year+'-'+date.month+'-'+date.day;
// this.stmData.data = ""; if( this.model.infcon.opndatfrom != nowDate){
this.model.infcon.opndatfrom=''
// }, }
if(this.model.infcon.opndatto != nowDate){
this.model.infcon.opndatto =''
}
this.model.infcon.seaamtfr = "0.00";
this.model.infcon.seaamtto = "0.00";
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.stmData.data = "";
async handleReset(formName) {
this.$refs[formName].resetFields();
}, },
// async handleReset(formName) {
// this.$refs[formName].resetFields();
// },
async handleSearch() { async handleSearch() {
this.stmData.data = []; this.stmData.data = [];
let opndatfrom = this.model.infcon.opndatfrom; let opndatfrom = this.model.infcon.opndatfrom;
......
src/views/Public/Setpan.vue
...@@ -171,20 +171,31 @@ ...@@ -171,20 +171,31 @@
<el-table-column label="处理方式" prop="dsp" width="110px"> <el-table-column label="处理方式" prop="dsp" width="110px">
</el-table-column> </el-table-column>
<el-table-column label="付款人摘要" prop="txtdbt" width="auto"> <el-table-column label="付款人摘要" prop="txtdbt" width="auto">
<template slot-scope="scope">
<c-input
v-model="scope.row.txtdbt"
></c-input>
</template>
</el-table-column> </el-table-column>
<el-table-column label="收款人摘要" prop="txtpay" width="auto"> <el-table-column label="收款人摘要" prop="txtpay" width="auto">
<template slot-scope="scope">
<c-input
v-model="scope.row.txtpay"
style="border:none"
></c-input>
</template>
</el-table-column> </el-table-column>
<el-table-column label="币种" prop="cur" width="110px"> <el-table-column label="币种" prop="cur" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<c-select v-model="scope.row.cur"> <c-select v-model="scope.row.cur">
<el-option <el-option
v-for="item in codes.cur" v-for="item in codes.cur"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
> >
</el-option> </el-option>
</c-select> </c-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="金额" prop="amt" width="110px"> <el-table-column label="金额" prop="amt" width="110px">
...@@ -193,10 +204,10 @@ ...@@ -193,10 +204,10 @@
label-width="0" label-width="0"
:prop="'setmod.setfog.setfol.' + scope.$index + '.amt'" :prop="'setmod.setfog.setfol.' + scope.$index + '.amt'"
> >
<!-- <c-input-currency <c-input-currency
v-model="scope.row.amt" v-model="scope.row.amt"
placeholder="0.00" placeholder="0.00"
></c-input-currency> --> ></c-input-currency>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
......
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