Skip to content

V
vue-gjjs
Commit da2fd94a by WH
Options

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

parents 4d5da0d7 32dfe6bd
Showing with 220 additions and 62 deletions
src/business/botcan/event/index.js
......@@ -28,6 +28,11 @@ export default {
...params,
transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL',
bodgrp:{
rec:{
inr:this.$route.query.inr
}
}
});
if (!res.data) {
return
......
src/business/botcan/views/index.vue
......@@ -105,6 +105,8 @@ import Engp from "~/views/Public/Engp";
import Glepan from "~/views/Public/Glepan";
import Ovwp from "./Ovwp.vue";
import event from "../event";
export default {
name: "Botcan",
components: {
......@@ -122,7 +124,7 @@ export default {
root: this,
};
},
mixins: [commonProcess,commonFuncs], // 里面包含了Default、Check等的公共处理
mixins: [commonProcess,commonFuncs,event], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "ovwp",
......@@ -139,19 +141,8 @@ export default {
methods: {
// tabClick() {},
},
created: async function() {
console.log("进入botcan交易");
let rtnmsg = await this.init({});
if (rtnmsg.respCode == SUCCESS) {
//TODO 处理数据逻辑
//更新数据
this.updateModel(rtnmsg.data)
if (this.isInDisplay) {
this.restoreDisplay();
}
} else {
this.$notify.error({ title: "错误", message: "服务请求失败！" });
}
mounted () {
this.init()
},
};
</script>
......
src/business/botdav/event/buildCommons.js
......@@ -45,6 +45,7 @@ export default {
purpos: model.bodgrp.rec.purpos,
revflg: model.bodgrp.rec.revflg,
cnfsta: model.bodgrp.rec.cnfsta,
semflg: model.semflg,
},
cbsMap: {
MAX: model.bodgrp.cbs.max,
......
src/business/botdav/model/index.js
......@@ -38,10 +38,12 @@ export default class Botdav {
waicolcod: "", // Protest Instructions .bodgrp.rec.waicolcod
wairmtcod: "", // Waive Remitting Bank Charges .bodgrp.rec.wairmtcod
othins: "", // Defer Payment until .bodgrp.rec.othins
lescom: "", // Warehouse/Insurance .bodgrp.rec.lescom
lescom: "0", // Warehouse/Insurance .bodgrp.rec.lescom
shpfro: "", // Shipment from .bodgrp.rec.shpfro
shpto: "", // For Transportation to .bodgrp.rec.shpto
branchinr: '',
inr: '',
ownusr: '',
},
cbs: {
max: {
......
src/business/botrad/event/index.js
......@@ -24,10 +24,15 @@ export default {
const params = {
spt: JSON.parse(localStorage.getItem('row_' + this.trnName))
}
const res = await Api.post('/service/gitopn/init', {
const res = await Api.post('/service/botrad/init', {
...params,
transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL',
bodgrp:{
rec:{
inr: this.$route.query.inr
}
},
});
if (!res.data) {
return
......
src/business/botrad/model/check.js
......@@ -54,9 +54,9 @@ let checkObj = {
{type: "string", required: false, message: "必输项"},
{max: 40,message:"长度不能超过40"}
],
"bodgrp.rec.matdat":[
{type: "date", required: false, message: "输入正确的日期"}
],
// "bodgrp.rec.matdat":[
// { required: false, message: "输入正确的日期"}
// ],
"bodgrp.rec.matpercnt":[
{type: "int", required: false, message: "必输项"},
{max: 3,message:"长度不能超过3"}
......@@ -70,10 +70,10 @@ let checkObj = {
{max: 40,message:"长度不能超过40"}
],
"bodgrp.rec.rcvdat":[
{type: "date", required: false, message: "输入正确的日期"}
{ required: false, message: "输入正确的日期"}
],
"bodgrp.rec.predat":[
{type: "date", required: false, message: "输入正确的日期"}
{ required: false, message: "输入正确的日期"}
],
"setmod.docamt":[
{type: "string", required: false, message: "必输项"},
......@@ -150,7 +150,7 @@ let checkObj = {
],
"bodgrp.drr.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 140,message:"长度不能超过140"}
],
"bodgrp.drr.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -158,7 +158,7 @@ let checkObj = {
],
"bodgrp.col.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 140,message:"长度不能超过140"}
],
"bodgrp.col.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -190,7 +190,7 @@ let checkObj = {
],
"bodgrp.dre.pts.adrblk":[
{type: "string", required: true, message: "必输项"},
{max: 35,message:"长度不能超过35"}
{max: 140,message:"长度不能超过140"}
],
"bodgrp.dre.dbfadrblkcn":[
{type: "string", required: true, message: "必输项"},
......@@ -237,7 +237,7 @@ let checkObj = {
{max: 20,message:"长度不能超过20"}
],
"mtabut.coninf.conexedat":[
{type: "date", required: false, message: "输入正确的日期"}
{ required: false, message: "输入正确的日期"}
],
"mtabut.coninf.usr.extkey":[
{type: "string", required: false, message: "必输项"},
......
src/business/botrad/model/index.js
......@@ -3,6 +3,165 @@ import Pub from '~/components/business/commonModel/index.js';
export default class Botacc {
constructor() {
this.data = {};
this.data = { botdrrl1blk: "",
botdrrl2blk: "",
botcoll1blk: "",
liaall: new Pub().data.Liaall,
setmod: new Pub().data.Setmod,
trnmod: new Pub().data.Trnmod,
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
},
},
},
bodgrp: {
rec: {
matpertyp: "", // Days/Months or Years for Maturity Period .bodgrp.rec.matpertyp
ownref: "", // Reference .bodgrp.rec.ownref
nam: "", // Name .bodgrp.rec.nam
doctypcod: "", // Collection Condition .bodgrp.rec.doctypcod
docsta: "", // Document Set Status .bodgrp.rec.docsta
matdat: "", // Maturity Date .bodgrp.rec.matdat
matpercnt: "", // Tenor Specification .bodgrp.rec.matpercnt
matperbeg: "", // Starting from .bodgrp.rec.matperbeg
rcvdat: "", // Order Date .bodgrp.rec.rcvdat
predat: "", // Presentation Date .bodgrp.rec.predat
trpdoctyp: "", // Transport Doc. Type .bodgrp.rec.trpdoctyp
trpdocnum: "", // Transport Doc. Ref. .bodgrp.rec.trpdocnum
tradat: "", // Document Dated .bodgrp.rec.tradat
tramod: "", // Mode of Transport .bodgrp.rec.tramod
shpfro: "", // Shipment from .bodgrp.rec.shpfro
shpto: "", // For Transportation to .bodgrp.rec.shpto
chato: "", // Our Charges to .bodgrp.rec.chato
focflg: "", // Free of Payment .bodgrp.rec.focflg
waicolcod: "", // Protest Instructions .bodgrp.rec.waicolcod
wairmtcod: "", // Waive Remitting Bank Charges .bodgrp.rec.wairmtcod
othins: "", // Defer Payment until .bodgrp.rec.othins
lescom: "", // Warehouse/Insurance .bodgrp.rec.lescom
dircolflg: "", // Direct Collection .bodgrp.rec.dircolflg
resflg: "", // Reservated Contract .bodgrp.rec.resflg
shpdat: "", // Shipment date .bodgrp.rec.shpdat
advdat: "", // Dispatched on .bodgrp.rec.advdat
stacty: "", // Country Code Risk Country! .bodgrp.rec.stacty
stagod: "", // Goods Code .bodgrp.rec.stagod
invtyp: "", // Maturity Date .bodgrp.rec.invtyp
paydoctyp: "", // Financial Document .bodgrp.rec.paydoctyp
paydocnum: "", // Document Number .bodgrp.rec.paydocnum
issdat: "", // Issued on .bodgrp.rec.issdat
ccdndrflg: "", // Truncation - Physical Document Kept w OWN .bodgrp.rec.ccdndrflg
ccdpurflg: "", // Payment Under Reserve .bodgrp.rec.ccdpurflg
},
cbs: {
max: {
cur: "", // Document Amount .bodgrp.cbs.max.cur
amt: "", // Document Amount .bodgrp.cbs.max.amt
},
opn1: {
cur: "", // Open Amount .bodgrp.cbs.opn1.cur
amt: "", // Open Amount .bodgrp.cbs.opn1.amt
},
},
drr: {
pts: new Pts().data,
},
col: {
pts: new Pts().data,
},
dre: {
pts: new Pts().data,
},
blk: {
docpre:"", // bodgrp.blk.docpre
colinssnm: "", // Instructions for Second Mail .bodgrp.blk.colinssnm
vesselnam: "", // Vessel Name .bodgrp.blk.vesselnam
goddes: "", // Description of Goods .bodgrp.blk.goddes
colins: "", // Collection Instructions .bodgrp.blk.colins
colinsflg: "", // Collection instructions modified .bodgrp.blk.colinsflg
dftins: "", // Draft Instructions .bodgrp.blk.dftins
proins: "", // Protest Instructions .bodgrp.blk.proins
othins: "", // Other Instructions .bodgrp.blk.othins
chgtxt: "", // Charges Text .bodgrp.blk.chgtxt
delins: "", // Delivery instructions .bodgrp.blk.delins
bogdet: "", // Tenor Details Text .bodgrp.blk.bogdet
cctinsrcv: "", // Instructions Received .bodgrp.blk.cctinsrcv
cctinscol: "", // Collection Instruction .bodgrp.blk.cctinscol
intins: "", // Interest Instructions .bodgrp.blk.intins
setinsbo: "", // Settlement insrtrctions .bodgrp.blk.setinsbo
agtaut: "", // Authority of Agent .bodgrp.blk.agtaut
},
},
botp: {
recget: {
sdamod: {
dadsnd: "", // Drag Drop Sender .botp.recget.sdamod.dadsnd
seainf: "", // .botp.recget.sdamod.seainf
},
},
matp: {
mattxtlab: "", // Label for MATTXT .botp.matp.mattxtlab
},
docgrdm: {
docgrd:"",
docdsclab: "", // Label of document description .botp.docgrdm.docdsclab
},
usr: {
extkey: "", // Responsible User .botp.usr.extkey
},
usrget: {
sdamod: {
seainf: "", // .botp.usrget.sdamod.seainf
},
},
drrp: {
ptsget: {
sdamod: {
seainf: "", // .botp.drrp.ptsget.sdamod.seainf
dadsnd: "", // Drag Drop Sender .botp.drrp.ptsget.sdamod.dadsnd
},
},
},
colp: {
ptsget: {
sdamod: {
seainf: "", // .botp.colp.ptsget.sdamod.seainf
dadsnd: "", // Drag Drop Sender .botp.colp.ptsget.sdamod.dadsnd
},
},
},
drep: {
ptsget: {
sdamod: {
seainf: "", // .botp.drep.ptsget.sdamod.seainf
dadsnd: "", // Drag Drop Sender .botp.drep.ptsget.sdamod.dadsnd
},
},
},
ptsaddp: {
ptsaddg: [], // .botp.ptsaddp.ptsaddg
},
},
oridre: "", // Original Documents Passed to Drawee .oridre
pageId: "" // ctx的key
};
}
}
src/business/botrad/views/index.vue
......@@ -19,9 +19,9 @@
<!-- 表外记账 -->
<m-engp :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="结算" name="setpan">
<el-collapse-item title="结算" name="setmod">
<!-- 结算 -->
<m-setpan :model="model" :codes="codes" />
<m-setmod :model="model" :codes="codes" />
</el-collapse-item>
<el-collapse-item title="会计分录" name="glepan">
<!-- 会计分录 -->
......@@ -64,26 +64,21 @@
<script>
import Api from "~/service/Api"
import CodeTable from "~/config/CodeTable"
import commonFuncs from "~/mixin/commonFuncs";
import Botrad from "~/model/Botrad"
import commonProcess from "~/mixin/commonProcess"
import Check from "~/model/Botrad/Check"
import Default from "~/model/Botrad/Default"
import Glepan from "~/views/Public/Glepan";
import formRules from '../model/check'
import Botrad from "../model"
import Botrad1 from "./Botrad"
import Ptyp from "./Ptyp"
import Addbcb from "./Addbcb";
import Ovwp from "./Ovwp"
import Engp from "~/views/Public/Engp"
import Setpan from "~/components/business/setmod/views"
import Pattern from "~/model/Botrad/Pattern"
import Coninfp from "~/views/Public/Coninfp"
import Docpan from "~/views/Public/Docpan"
import Doctre from "~/views/Public/Doctre"
import Engp from "~/components/business/engp/views"
import Setmod from "~/components/business/setmod/views"
import Coninfp from "~/components/business/coninfp/views"
import Docpan from "~/components/business/docpan/views"
import Doctre from "~/components/business/doctre/views"
import Glepan from "~/components/business/glentry/views";
import event from "../event";
import operationFunc from "@/mixin/operationFunc";
export default {
name: "Botrad",
......@@ -92,7 +87,7 @@ export default {
"m-ovwp": Ovwp,
"m-botrad1": Botrad1,
"m-ptyp": Ptyp,
"m-setpan": Setpan,
"m-setmod": Setmod,
"m-coninfp": Coninfp,
"m-engp": Engp,
"m-docpan": Docpan,
......@@ -104,22 +99,22 @@ export default {
root: this
}
},
mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
mixins: [operationFunc, event], // 里面包含了Default、Check等的公共处理
data() {
return {
tabVal: "ovwp",
trnName: "botrad",
model: new Botrad().data,
checkRules: Check,
defaultRules: Default,
pattern: Pattern,
rules: null,
rules: formRules,
codes: {
...CodeTable
},
activeNames: ["engp"],
}
},
mounted() {
this.init()
},
methods: {
// myTabClick(tab) {
// this.tabClick(tab)
......@@ -129,19 +124,19 @@ export default {
// }
},
created: async function () {
console.log("进入botrad交易");
let rtnmsg = await this.init({})
if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data)
//TODO 处理数据逻辑
if (this.isInDisplay) {
this.restoreDisplay();
}
// console.log("进入botrad交易");
// let rtnmsg = await this.init({})
// if (rtnmsg.respCode == SUCCESS) {
// this.updateModel(rtnmsg.data)
// //TODO 处理数据逻辑
// if (this.isInDisplay) {
// this.restoreDisplay();
// }
}
else {
this.$notify.error({ title: '错误', message: '服务请求失败！' });
}
// }
// else {
// this.$notify.error({ title: '错误', message: '服务请求失败！' });
// }
}
}
</script>
......
src/business/infbod/event/index.js
......@@ -99,7 +99,7 @@ export default {
this.currentHandleRow = row
const params = {
//根据xx字段 查询处理的数据
ownref: row.ownref,
seaownref: row.seaownref,
};
const res = await Api.post('/service/infbod/dealWithByOwnref', params);
if (res.respCode === SUCCESS) {
......
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