Skip to content

V
vue-gjjs
Commit bd42fa3e by liyixun
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 de28d9ad cf895856
Showing with 244 additions and 62 deletions
src/model/Cptati/Check.js
......@@ -10,14 +10,18 @@ let checkObj = {
"cpdgrp.rmt.pts.extkey" :null,
"cpdgrp.ori.pts.adrblk" :null,
"trnmod.trndoc.doccur.adrfax" :null,
"bopmod.dbagrp.bas.methods" :null,
"cpdgrp.pyb.pts.adrblk" :null,
"attp.feetyp" :null,
"attp.commet" :null,
"bopmod.dbagrp.bas.lcyacc" :null,
"cpdgrp.orc.pts.extkey" :null,
"attp.orcadr" :null,
"cpdgrp.pye.namelc" :null,
"bopmod.dbagrp.bas.outchargeamt" :null,
"bopmod.dbdgrp.bas.fcyacc" :null,
"attp.pyeadr" :null,
"bopmod.dbagrp.bas.fcyamt" :null,
"attp.swftyp" :null,
"bopmod.dbdgrp.bas.buscode" :null,
"attp.pyenam" :null,
......@@ -26,10 +30,12 @@ let checkObj = {
"bopmod.dbagrp.dcl.txcode" :null,
"attp.bustyp" :null,
"bopmod.dbdgrp.bas.custnm" :null,
"bopmod.dbagrp.bas.exrate" :null,
"setmod.dspflg" :null,
"bopmod.dbdgrp.bas.txamt" :null,
"cpdgrp.orc.adrelc" :null,
"bopmod.dbagrp.dcl.txcode2" :null,
"bopmod.dbagrp.bas.txccy" :null,
"trnmod.trndoc.doccur.tag79z" :null,
"cpdgrp.pye.pts.extkey" :null,
"bopmod.dbagrp.dcl.isref" :null,
......@@ -37,6 +43,7 @@ let checkObj = {
"cpdgrp.med.pts.adrblk" :null,
"cpdgrp.pye.pts.adrblk" :null,
"cpdgrp.rec.trntyp" :null,
"bopmod.dbagrp.bas.custcod" :null,
"cpdgrp.ori.namelc" :null,
"bopmod.dbdgrp.bas.fcyamt" :null,
"trnmod.trndoc.doccur.rcv.namelc" :null,
......@@ -44,13 +51,17 @@ let checkObj = {
"bopmod.dbagrp.dcl.inptelc" :null,
"trnmod.trndoc.doccur.rcv.pts.extkey" :null,
"trnmod.trndoc.doccur.rcv.pts.jigomc" :null,
"bopmod.dbagrp.bas.txamt" :null,
"cpdgrp.pye.adrelc" :null,
"bopmod.dbdgrp.bas.methods" :null,
"cpdgrp.rec.valdat" :null,
"bopmod.dbdgrp.bas.exrate" :null,
"attp.country" :null,
"bopmod.dbagrp.bas.buscode" :null,
"lendoc.account" :null,
"bopmod.dbagrp.bas.othamt" :null,
"trnmod.trndoc.doccur.apf" :null,
"bopmod.dbagrp.bas.actiondesc" :null,
"cpdgrp.rmt.pts.adrblk" :null,
"cpdgrp.pyb.pts.extkey" :null,
"trnmod.trndoc.doccur.cortyp" :null,
......@@ -63,8 +74,10 @@ let checkObj = {
"bopmod.dbdgrp.bas.custype" :null,
"trnmod.trndoc.doccur.rcv.pts.dizhii" :null,
"trnmod.trndoc.doccur.addstr" :null,
"bopmod.dbagrp.bas.outchargeccy" :null,
"trnmod.trndoc.doccur.adrrid" :null,
"bopmod.dbagrp.dcl.country" :null,
"bopmod.dbagrp.bas.actiontype" :null,
"bopmod.dbagrp.dcl.tx2rem" :null,
"bopmod.dbdgrp.bas.rptno" :null,
"cpdgrp.orc.pts.adrblk" :null,
......@@ -82,12 +95,16 @@ let checkObj = {
"cpdgrp.med.pts.extkey" :null,
"trnmod.trndoc.doccur.adrdtacid" :null,
"bopmod.dbagrp.dcl.tc2amt" :null,
"bopmod.dbagrp.bas.inchargeccy" :null,
"cpdgrp.ori.adrelc" :null,
"bopmod.dbagrp.bas.custnm" :null,
"bopmod.dbdgrp.bas.othacc" :null,
"bopmod.dbagrp.bas.fcyacc" :null,
"cpdgrp.cbs.nom1.amt" :null,
"trnmod.trndoc.doccur.rcv.adrelc" :null,
"cpdgrp.ori.pts.extkey" :null,
"bopmod.dbdgrp.bas.inchargeccy" :null,
"bopmod.dbagrp.bas.custype" :null,
"cpdgrp.cbs.max.amt" :null,
"trnmod.trndoc.doccur.roladr" :null,
"trnmod.trndoc.doccur.rcv.pts.adrblk" :null,
......@@ -95,9 +112,15 @@ let checkObj = {
"bopmod.dbdgrp.bas.txccy" :null,
"bopmod.dbagrp.dcl.txrem" :null,
"bopmod.dbdgrp.bas.custcod" :null,
"bopmod.dbagrp.bas.rptno" :null,
"bopmod.dbagrp.bas.oppuser" :null,
"bopmod.basflg" :null,
"bopmod.dbdgrp.bas.lcyacc" :null,
"bopmod.dbagrp.bas.idcode" :null,
"bopmod.dbagrp.bas.othacc" :null,
"mtabut.coninf.conexedat" :null,
"bopmod.dbagrp.bas.lcyamt" :null,
"bopmod.dbagrp.bas.inchargeamt" :null,
"bopmod.dbagrp.dcl.crtuser" :null,
"trnmod.trndoc.doccur.adrref" :null,
"cpdgrp.cbs.max.cur" :null,
......
src/model/Cptati/Default.js
......@@ -67,6 +67,8 @@ export default {
"cpdgrp.orc.adrelc" :Utils.defaultFunction,
"cpdgrp.orc.namelc" :Utils.defaultFunction,
"bopmod.dbdgrp.bas.buscode" :Utils.defaultFunction,
"bopmod.dbagrp.bas.custype" :Utils.defaultFunction,
"bopmod.dbagrp.bas.custcod" :Utils.defaultFunction,
"bopmod.dbagrp.dcl.paytype" :Utils.defaultFunction,
"cpdgrp.pye.adrelc" :Utils.defaultFunction,
"cpdgrp.pye.namelc" :Utils.defaultFunction,
......@@ -75,6 +77,7 @@ export default {
"trnmod.trndoc.doccur.rcv.pts.bankno" :Utils.defaultFunction,
"trnmod.trndoc.doccur.rcv.pts.adrblk" :Utils.defaultFunction,
"bopmod.dbagrp.dcl.crtuser" :Utils.defaultFunction,
"bopmod.dbagrp.bas.rptno" :Utils.defaultFunction,
"cpdgrp.med.pts.adrblk" :Utils.defaultFunction,
"cpdgrp.cbs.nom1.amt" :Utils.defaultFunction,
"bopmod.dbagrp.dcl.inptelc" :Utils.defaultFunction,
......@@ -82,7 +85,9 @@ export default {
"bopmod.dbagrp.dcl.rptdate" :Utils.defaultFunction,
"bopmod.dbap.dclpp.acp" :Utils.defaultFunction,
"attp.xnggbh" :Utils.defaultFunction,
"bopmod.dbagrp.bas.tmpref" :Utils.defaultFunction,
"attp.country" :Utils.defaultFunction,
"bopmod.dbagrp.bas.buscode" :Utils.defaultFunction,
"attp.swftyp" :Utils.defaultFunction,
"cpdgrp.rec.trntyp" :Utils.defaultFunction,
"attp.sndbchnam" :Utils.defaultFunction,
......@@ -97,6 +102,7 @@ export default {
"attp.resbchnam" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inftxt" :Utils.defaultFunction,
"mtabut.coninf.oitset.oit.inflev" :Utils.defaultFunction,
"bopmod.dbagrp.bas.ownextkey" :Utils.defaultFunction,
"attp.paycountcode" :Utils.defaultFunction,
}
//你可以添加自动default处理
src/model/Cptati/Pattern.js
......@@ -763,5 +763,81 @@ export default {
"bopmod.dbdgrp.bas.inchargeamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbagrp.bas.rptno":[
{type: "string", required: false, message: "必输项"},
{max: 22,message:"长度不能超过22"}
],
"bopmod.dbagrp.bas.tmpref":[
{type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"}
],
"bopmod.dbagrp.bas.actiondesc":[
{type: "string", required: true, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbagrp.bas.buscode":[
{type: "string", required: false, message: "必输项"},
{max: 22,message:"长度不能超过22"}
],
"bopmod.dbagrp.bas.custcod":[
{type: "string", required: false, message: "必输项"},
{max: 18,message:"长度不能超过18"}
],
"bopmod.dbagrp.bas.custnm":[
{type: "string", required: true, message: "必输项"},
{max: 63,message:"长度不能超过63"}
],
"bopmod.dbagrp.bas.oppuser":[
{type: "string", required: true, message: "必输项"},
{max: 63,message:"长度不能超过63"}
],
"bopmod.dbagrp.bas.idcode":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbagrp.bas.exrate":[
{type: "string", required: false, message: "必输项"},
{max: 13,message:"长度不能超过13"}
],
"bopmod.dbagrp.bas.lcyamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbagrp.bas.lcyacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbagrp.bas.fcyamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbagrp.bas.fcyacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbagrp.bas.othamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbagrp.bas.othacc":[
{type: "string", required: false, message: "必输项"},
{max: 32,message:"长度不能超过32"}
],
"bopmod.dbagrp.bas.txamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbagrp.bas.inchargeamt":[
{type: "number", required: false, message: "必输项"} ],
"bopmod.dbagrp.bas.outchargeamt":[
{type: "number", required: false, message: "必输项"} ],
}
\ No newline at end of file
src/model/Cptati/index.js
......@@ -292,6 +292,16 @@ export default class Cptati{
inptelc1:"", // 申报填报人电话 .bopmod.dbap.dclpp.inptelc1
acp:"", // 确认 .bopmod.dbap.dclpp.acp
},
baspp:{
cusnam:"", // .bopmod.dbap.baspp.cusnam
cornam:"", // .bopmod.dbap.baspp.cornam
corpnam:"", // .bopmod.dbap.baspp.corpnam
roptnam:"", // RoptNam .bopmod.dbap.baspp.roptnam
exratelab:"", // �'�汇/结汇汇率 .bopmod.dbap.baspp.exratelab
lcyamtlab:"", // �'�汇/结汇金额 .bopmod.dbap.baspp.lcyamtlab
acp:"", // 确认 .bopmod.dbap.baspp.acp
tmprefnew:"", // TMPREFLABEL .bopmod.dbap.baspp.tmprefnew
},
},
dbagrp:{
dcl:{
......@@ -314,6 +324,33 @@ export default class Cptati{
country:"", // 付款人常驻国家/地区编码 .bopmod.dbagrp.dcl.country
billno:"", // 外债编号 .bopmod.dbagrp.dcl.billno
},
bas:{
tmpref:"", // �'时申报流�'号 .bopmod.dbagrp.bas.tmpref
ownextkey:"", // 地区机构号 .bopmod.dbagrp.bas.ownextkey
actiontype:"", // 操作类型 .bopmod.dbagrp.bas.actiontype
rptno:"", // 申报号码 .bopmod.dbagrp.bas.rptno
idcode:"", // 身份证件号码 .bopmod.dbagrp.bas.idcode
lcyacc:"", // 人民币帐号/银行卡号 .bopmod.dbagrp.bas.lcyacc
fcyamt:"", // 现汇金额 .bopmod.dbagrp.bas.fcyamt
fcyacc:"", // 外汇帐号/银行卡号 .bopmod.dbagrp.bas.fcyacc
othamt:"", // 其它金额 .bopmod.dbagrp.bas.othamt
othacc:"", // 其它帐号/银行卡号 .bopmod.dbagrp.bas.othacc
methods:"", // 结算方式 .bopmod.dbagrp.bas.methods
buscode:"", // 银行业务编号 .bopmod.dbagrp.bas.buscode
custype:"", // 类型 .bopmod.dbagrp.bas.custype
actiondesc:"", // 操作类型 .bopmod.dbagrp.bas.actiondesc
exrate:"", // 结汇汇率 .bopmod.dbagrp.bas.exrate
lcyamt:"", // 结汇金额 .bopmod.dbagrp.bas.lcyamt
custnm:"", // 收款人名称 .bopmod.dbagrp.bas.custnm
oppuser:"", // 付款人名称 .bopmod.dbagrp.bas.oppuser
custcod:"", // 组织机构 .bopmod.dbagrp.bas.custcod
inchargeccy:"", // 国内银行扣费 .bopmod.dbagrp.bas.inchargeccy
inchargeamt:"", // 国内银行扣费 .bopmod.dbagrp.bas.inchargeamt
outchargeamt:"", // 国外银行扣费 .bopmod.dbagrp.bas.outchargeamt
outchargeccy:"", // 国外银行扣费 .bopmod.dbagrp.bas.outchargeccy
txccy:"", // 收入款币种及金额 .bopmod.dbagrp.bas.txccy
txamt:"", // 收入款币种及金额 .bopmod.dbagrp.bas.txamt
},
},
dbdp:{
baspp:{
......
src/views/Business/Brtdck/Brtdckp.vue
......@@ -153,6 +153,7 @@
style="width: 100%"
placeholder="请输入Maturity Date"
value-format="yyyy-MM-dd"
:disabled="model.brdgrp.blk.matper!=''||model.brdgrp.rec.docflg=='P'"
></c-date-picker>
</el-form-item>
</c-col>
......@@ -341,6 +342,7 @@
style="width: 100%"
placeholder="Maturity Date"
value-format="yyyy-MM-dd"
:disabled="model.brdgrp.blk.matper!=''||model.brdgrp.rec.docflg=='P'"
></c-date-picker>
</el-form-item>
</c-col>
......@@ -385,6 +387,7 @@
maxlength="65"
show-word-limit
placeholder="请输入Maturity Period"
:disabled="model.brdgrp.rec.matdat!=null&&model.brdgrp.rec.matdat!=''||model.brdgrp.rec.docflg=='P'"
></c-input>
</c-form-item>
</c-col>
......
src/views/Business/Cltdav/index.vue
......@@ -88,54 +88,56 @@ import Coninfp from "~/views/Public/Coninfp";
import Doctre from "~/views/Public/Doctre";
export default {
name: "Cltdav",
components: {
"m-sel": Sel,
"m-account": Account,
"m-setpan": Setpan,
"m-engp": Engp,
"m-glepan": Glepan,
"m-docpan": Docpan,
"m-doctre": Doctre,
"m-coninfp": Coninfp,
"m-ccvpan": Ccvpan,
},
name: "Cltdav",
components: {
"m-sel": Sel,
"m-account": Account,
"m-setpan": Setpan,
"m-engp": Engp,
"m-glepan": Glepan,
"m-docpan": Docpan,
"m-doctre": Doctre,
"m-coninfp": Coninfp,
"m-ccvpan": Ccvpan,
},
provide() {
return {
root: this
}
},
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "sel",
trnName: "cltdav",
model: new Cltdav().data,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: { ...CodeTable },
}
},
methods: {
tabClick() {
}
},
created: async function () {
console.log("进入cltdav交易");
let rtnmsg = await this.init({})
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
//TODO 处理数据逻辑
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
}
provide() {
return {
root: this
}
},
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "sel",
trnName: "cltdav",
model: new Cltdav().data,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
codes: { ...CodeTable },
}
},
methods: {
tabClick() {
}
},
created: async function () {
console.log("进入cltdav交易");
let rtnmsg = await this.init({})
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data);
if (this.isInDisplay) {
this.restoreDisplay();
}
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
}
}
</script>
<style>
</style>
\ No newline at end of file
src/views/Business/Cptati/index.vue
......@@ -111,20 +111,12 @@
</el-tab-pane> -->
</c-tabs>
</el-form>
<c-grid-ety-prompt-dialog
ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog
ref="doxpDialog"
:isPty="false"
:promptData="promptData"
@select-ety="selectMsg"
>   
</c-grid-ety-prompt-dialog>
<c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
</c-grid-ety-prompt-dialog>
</div>
</c-page>
</template>
......
src/views/Business/Letopn/Ovwp.vue
......@@ -511,7 +511,6 @@ export default {
}).then(() => {//yes的执行在这里写
this.executeRule('ledgrp.rec.revflg').then(res => {
if (res.respCode == SUCCESS) {
this.model.ledgrp.rec.revdat ='';//后端在事件中把日期置为null而不是nullstr，导致日期实际并没有清空，故在此加清空日期
this.updateModel(res.data)
}
})
......
src/views/Review/Business/ReviewCctset.vue 0 → 100644
<template>
<ReviewWrapper>
<Cctset></Cctset>
</ReviewWrapper>
</template>
<script>
import Cctset from "~/views/Business/Cctset";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewCctset",
components: { ReviewWrapper, Cctset },
created() {},
mounted() {},
};
</script>
<style></style>
\ No newline at end of file
src/views/Review/Business/ReviewCltdav.vue 0 → 100644
<template>
<ReviewWrapper>
<Cltdav></Cltdav>
</ReviewWrapper>
</template>
<script>
import Cltdav from "~/views/Business/Cltdav";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewCltdav",
components: { ReviewWrapper, Cltdav },
created() {},
mounted() {},
};
</script>
<style></style>
\ No newline at end of file
src/views/Review/ReviewRouter.js
......@@ -89,6 +89,7 @@ import ReviewLitcan from "./Business/ReviewLitcan.vue";
import ReviewBetamc from "./Business/ReviewBetamc.vue";
import ReviewCptcan from "./Business/ReviewCptcan.vue";
import ReviewCptrep from "./Business/ReviewCptrep.vue";
import ReviewCltdav from "./Business/ReviewCltdav.vue";
const ReviewRouter = [
......@@ -191,6 +192,7 @@ const ReviewRouter = [
{ path: "cctdcr", component: ReviewCctdcr, name: "ReviewCctdcr", meta: { title: "复核-Cctdcr" } },
{ path: "ccttra", component: ReviewCcttra, name: "ReviewCcttra", meta: { title: "复核-Ccttra" } },
{ path: "lttopn", component: ReviewLttopn, name: "ReviewLttopn", meta: { title: "复核-Lttopn" } },
{ path: "cltdav", component: ReviewCltdav, name: "ReviewCltdav", meta: { title: "复核-Cltdav" } },
{ path: "Cptati", component: ReviewCptati, name: "ReviewCptati", meta: { title: "复核-Cptati" } },
{ path: "Cptato", component: ReviewCptato, name: "ReviewCptato", meta: { title: "复核-Cptato" } },
......
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