Skip to content

V
vue-gjjs
Commit 34b92d5d by liaoxing
Options

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110
parents 7ca2aeda b57aa38c
Showing with 76 additions and 82 deletions
src/business/botdcr/event/buildCommons.js
...@@ -31,10 +31,11 @@ export default { ...@@ -31,10 +31,11 @@ export default {
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'BOD', objtyp: 'BOD',
objinr: model.bodgrp.rec.inr,
ownref: model.bodgrp.rec.ownref, ownref: model.bodgrp.rec.ownref,
opndat: model.bodgrp.rec.opndat, opndat: model.bodgrp.rec.opndat,
expdat: model.bodgrp.rec.expdat, expdat: model.bodgrp.rec.expdat,
branchInr: model.bodgrp.rec.branchInr, branchInr: model.bodgrp.rec.branchinr,
hndtyp: model.bodgrp.rec.hndtyp, hndtyp: model.bodgrp.rec.hndtyp,
gartyp: model.bodgrp.rec.gartyp, gartyp: model.bodgrp.rec.gartyp,
fingua: model.bodgrp.rec.fingua, fingua: model.bodgrp.rec.fingua,
...@@ -45,10 +46,13 @@ export default { ...@@ -45,10 +46,13 @@ export default {
purpos: model.bodgrp.rec.purpos, purpos: model.bodgrp.rec.purpos,
revflg: model.bodgrp.rec.revflg, revflg: model.bodgrp.rec.revflg,
cnfsta: model.bodgrp.rec.cnfsta, cnfsta: model.bodgrp.rec.cnfsta,
rejtypsel: model.rejtypsel,
}, },
cbsMap: { cbsMap: {
MAX: model.bodgrp.cbs.max, MAX: model.bodgrp.cbs.max,
OPN1: model.bodgrp.cbs.opn1, OPN1: model.bodgrp.cbs.opn1,
RSV: model.bodgrp.cbs.rsv,
// MAC: model.bodgrp.cbs.mac, // MAC: model.bodgrp.cbs.mac,
// MAC2: model.bodgrp.cbs.mac2, // MAC2: model.bodgrp.cbs.mac2,
// OPC2: model.bodgrp.cbs.opc2, // OPC2: model.bodgrp.cbs.opc2,
......
src/business/botdcr/event/index.js
...@@ -28,6 +28,11 @@ export default { ...@@ -28,6 +28,11 @@ export default {
...params, ...params,
transName: this.trnName, transName: this.trnName,
userId: window.sessionStorage.userId || 'ZL', userId: window.sessionStorage.userId || 'ZL',
bodgrp:{
rec:{
inr: this.$route.query.inr
}
},
}); });
if (!res.data) { if (!res.data) {
return return
......
src/business/botdcr/model/check.js
...@@ -22,7 +22,6 @@ let checkObj = { ...@@ -22,7 +22,6 @@ let checkObj = {
"bodgrp.blk.delins" :null, "bodgrp.blk.delins" :null,
"bodgrp.drr.pts.nam" :null, "bodgrp.drr.pts.nam" :null,
"bodgrp.blk.resrej" :null, "bodgrp.blk.resrej" :null,
"mtabut.coninf.conexedat" :null,
"bodgrp.col.namelc" :null, "bodgrp.col.namelc" :null,
"bodgrp.drr.adrelc" :null, "bodgrp.drr.adrelc" :null,
"bodgrp.dre.namelc" :null, "bodgrp.dre.namelc" :null,
...@@ -35,7 +34,6 @@ let checkObj = { ...@@ -35,7 +34,6 @@ let checkObj = {
"bodgrp.blk.othins" :null, "bodgrp.blk.othins" :null,
"bodgrp.dre.pts.extkey" :null, "bodgrp.dre.pts.extkey" :null,
"bodgrp.drr.pts.extkey" :null, "bodgrp.drr.pts.extkey" :null,
"mtabut.clsflg" :null,
"botp.recget.sdamod.dadsnd":[ "botp.recget.sdamod.dadsnd":[
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 16,message:"长度不能超过16"} {max: 16,message:"长度不能超过16"}
...@@ -264,26 +262,6 @@ let checkObj = { ...@@ -264,26 +262,6 @@ let checkObj = {
], ],
"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"}
......
src/business/botdcr/model/index.js
...@@ -10,6 +10,8 @@ export default class Botdcr { ...@@ -10,6 +10,8 @@ export default class Botdcr {
botcoll1blk: "", botcoll1blk: "",
bodgrp: { bodgrp: {
rec: { rec: {
inr: "",
branchinr: "",
matpertyp: "", // Days/Months or Years for Maturity Period .bodgrp.rec.matpertyp matpertyp: "", // Days/Months or Years for Maturity Period .bodgrp.rec.matpertyp
ownref: "", // Reference .bodgrp.rec.ownref ownref: "", // Reference .bodgrp.rec.ownref
nam: "", // Name .bodgrp.rec.nam nam: "", // Name .bodgrp.rec.nam
...@@ -34,6 +36,10 @@ export default class Botdcr { ...@@ -34,6 +36,10 @@ export default class Botdcr {
}, },
opn1: { opn1: {
cur: "", // Warehouse/Insurance .bodgrp.cbs.opn1.cur cur: "", // Warehouse/Insurance .bodgrp.cbs.opn1.cur
amt: "0.00", // Open Amount .bodgrp.cbs.opn1.amt
},
rsv: {
cur: "", // Warehouse/Insurance .bodgrp.cbs.opn1.cur
amt: "", // Open Amount .bodgrp.cbs.opn1.amt amt: "", // Open Amount .bodgrp.cbs.opn1.amt
}, },
}, },
......
src/business/botdcr/views/index.vue
...@@ -12,26 +12,20 @@ ...@@ -12,26 +12,20 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="费用/账务" name="engp,setpan,glepan"> <!--PD000027 -->
<c-content> <el-tab-pane label="表外记账" name="engp">
<div class="eibs-tab"> <c-content>
<el-collapse v-model="activeNames"> <!-- 表外记账 -->
<el-collapse-item title="表外记账" name="engp"> <m-engp :model="model" :codes="codes" />
<!-- 表外记账 --> </c-content>
<m-engp :model="model" :codes="codes"/> </el-tab-pane>
</el-collapse-item>
<el-collapse-item title="结算" name="setmod"> <!--PD000027 -->
<!-- 结算 --> <el-tab-pane label="费用/账务" name="setmod">
<m-setmod :model="model" :codes="codes"/> <c-content>
</el-collapse-item> <m-setmod :model="model" :codes="codes" />
<el-collapse-item title="会计分录" name="glepan"> </c-content>
<!-- 会计分录 --> </el-tab-pane>
<m-glepan :model="model" :codes="codes"/>
</el-collapse-item>
</el-collapse>
</div>
</c-content>
</el-tab-pane>
<el-tab-pane label="备查/附言" name="addbcb"> <el-tab-pane label="备查/附言" name="addbcb">
<c-content> <c-content>
...@@ -78,13 +72,14 @@ import Inst from "./Inst" ...@@ -78,13 +72,14 @@ import Inst from "./Inst"
import Ptyp from "./Ptyp" import Ptyp from "./Ptyp"
import Addbcb from "./Addbcb"; import Addbcb from "./Addbcb";
import Ovwp from "./Ovwp" import Ovwp from "./Ovwp"
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 Glepan from "~/components/business/glentry/views";
import Doctre from "~/components/business/doctre/views";
import Engp from "~/views/Public/Engp"
import Setmod from "~/components/business/setmod/views"
import Coninfp from "~/views/Public/Coninfp"
import Docpan from "~/views/Public/Docpan"
import Glepan from "~/views/Public/Glepan"
import Doctre from "~/views/Public/Doctre"
import operationFunc from "@/mixin/operationFunc"; import operationFunc from "@/mixin/operationFunc";
import event from "../event"; import event from "../event";
......
src/business/botrad/event/buildCommons.js
...@@ -20,17 +20,18 @@ export default { ...@@ -20,17 +20,18 @@ export default {
buildCommonData (model, trnName) { buildCommonData (model, trnName) {
let ptsptaList = []; let ptsptaList = [];
if (model.bodgrp.col.pts.extkey) { if (model.bodgrp.col.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.bodgrp.apl)); ptsptaList.push(this.buildPtspta(model.bodgrp.col));
} }
if (model.bodgrp.drr.pts.extkey) { if (model.bodgrp.drr.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.bodgrp.adv)); ptsptaList.push(this.buildPtspta(model.bodgrp.drr));
} }
if (model.bodgrp.dre.pts.extkey) { if (model.bodgrp.dre.pts.extkey) {
ptsptaList.push(this.buildPtspta(model.bodgrp.ben)); ptsptaList.push(this.buildPtspta(model.bodgrp.dre));
} }
let dataObj = { let dataObj = {
rec: { rec: {
objtyp: 'BOD', objtyp: 'BOD',
objinr: model.bodgrp.rec.inr,
ownref: model.bodgrp.rec.ownref, ownref: model.bodgrp.rec.ownref,
opndat: model.bodgrp.rec.opndat, opndat: model.bodgrp.rec.opndat,
expdat: model.bodgrp.rec.expdat, expdat: model.bodgrp.rec.expdat,
......
src/business/botrad/model/check.js
...@@ -236,13 +236,13 @@ let checkObj = { ...@@ -236,13 +236,13 @@ let checkObj = {
{type: "string", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 20,message:"长度不能超过20"} {max: 20,message:"长度不能超过20"}
], ],
"mtabut.coninf.conexedat":[ // "mtabut.coninf.conexedat":[
{ required: false, message: "输入正确的日期"} // { required: false, message: "输入正确的日期"}
], // ],
"mtabut.coninf.usr.extkey":[ // "mtabut.coninf.usr.extkey":[
{type: "string", required: false, message: "必输项"}, // {type: "string", required: false, message: "必输项"},
{max: 8,message:"长度不能超过8"} // {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"}
......
src/business/botrad/views/index.vue
...@@ -11,26 +11,20 @@ ...@@ -11,26 +11,20 @@
</c-content> </c-content>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="费用/账务" name="engp,setpan,glepan"> <!--PD000027 -->
<c-content> <el-tab-pane label="表外记账" name="engp">
<div class="eibs-tab"> <c-content>
<el-collapse v-model="activeNames"> <!-- 表外记账 -->
<el-collapse-item title="表外记账" name="engp"> <m-engp :model="model" :codes="codes" />
<!-- 表外记账 --> </c-content>
<m-engp :model="model" :codes="codes" /> </el-tab-pane>
</el-collapse-item>
<el-collapse-item title="结算" name="setmod"> <!--PD000027 -->
<!-- 结算 --> <el-tab-pane label="费用/账务" name="setmod">
<m-setmod :model="model" :codes="codes" /> <c-content>
</el-collapse-item> <m-setmod :model="model" :codes="codes" />
<el-collapse-item title="会计分录" name="glepan"> </c-content>
<!-- 会计分录 --> </el-tab-pane>
<m-glepan :model="model" :codes="codes" />
</el-collapse-item>
</el-collapse>
</div>
</c-content>
</el-tab-pane>
<el-tab-pane label="备查/附言" name="addbcb"> <el-tab-pane label="备查/附言" name="addbcb">
<c-content> <c-content>
......
src/business/botset/model/index.js
...@@ -131,7 +131,7 @@ export default class Botset { ...@@ -131,7 +131,7 @@ export default class Botset {
predat: '', predat: '',
matpercnt: '', matpercnt: '',
ownref: '', ownref: '',
docsta: '', docsta: 'E',
matperbeg: '', matperbeg: '',
wairmtcod: '', wairmtcod: '',
doctypcod: '', doctypcod: '',
......
src/business/botset/views/Setp.vue
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
<el-form-item label="扣减金额" prop="setmod.doccur"> <el-form-item label="扣减金额" prop="setmod.doccur">
<c-select <c-select
disabled disabled
v-model="model.setmod.doccur" v-model="modelsetmoddoccur"
style="width: 100%" style="width: 100%"
placeholder="请选择币种" placeholder="请选择币种"
> >
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
prop="setmod.docamt" prop="setmod.docamt"
> >
<c-input-currency <c-input-currency
v-model="model.setmod.docamt" v-model="modelsetmoddocamt"
style="text-align: left; width: 100%" style="text-align: left; width: 100%"
placeholder="请输入" placeholder="请输入"
@change="change1" @change="change1"
...@@ -442,6 +442,17 @@ export default { ...@@ -442,6 +442,17 @@ export default {
flag() { flag() {
return this.model.mtabut.coninf.usr.extkey == ""; return this.model.mtabut.coninf.usr.extkey == "";
}, },
modelsetmoddoccur() {
this.model.setmod.doccur =this.model.bodgrp.cbs.max.cur;
return this.model.setmod.doccur
},
modelsetmoddocamt() {
this.model.setmod.docamt =this.model.bodgrp.cbs.max.amt;
return this.model.setmod.docamt
}
}, },
mounted() {}, mounted() {},
......
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