Skip to content

V
vue-gjjs
Commit 8a94c947 by nanrui
Options

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

parents fb75ba60 8d0042a4
Showing with 189 additions and 110 deletions
src/model/Letopn/Check.js
...@@ -4,104 +4,94 @@ import Utils from "~/utils" ...@@ -4,104 +4,94 @@ import Utils from "~/utils"
* Letopn Check规则 * Letopn Check规则
*/ */
let checkObj = { let checkObj = {
"ledgrp.apb.pts.extkey": null, "ledgrp.apb.pts.extkey" :null,
"liaall.misamt": null, "liaall.misamt" :null,
"letp.rmbp.ptsget.sdamod.dadsnd": null, "ledgrp.rec.opndat" :null,
"ledgrp.rec.opndat": null, "ledgrp.adv.namelc" :null,
"ledgrp.adv.namelc": null, "ledgrp.blk.shpper" :null,
"ledgrp.blk.shpper": null, "ledgrp.rmb.pts.extkey" :null,
"ledgrp.rmb.pts.extkey": null, "ledgrp.iss.pts.adrblk" :null,
"letp.avbp.ptsget.sdamod.dadsnd": null, "ledgrp.avb.adrelc" :null,
"ledgrp.a2b.pts.adrblk": null, "ledgrp.rec.tenmaxday" :null,
"letp.conp.ptsget.sdamod.dadsnd": null, "ledgrp.blk.mixdet" :null,
"ledgrp.iss.pts.adrblk": null, "ledgrp.avb.pts.extkey" :null,
"letp.issp.ptsget.sdamod.dadsnd": null, "ledgrp.drw.adrelc" :null,
"ledgrp.rec.revdat": null, "ledgrp.ben.pts.extkey" :null,
"ledgrp.blk.spcrcb": null, "setmod.dspflg" :null,
"ledgrp.blk.preper": null, "letp.usr.extkey" :null,
"ledgrp.adv.adrelc": null, "ledgrp.rec.nomspc" :null,
"ledgrp.ben.adrelc": null, "ledgrp.a2b.namelc" :null,
"ledgrp.avb.adrelc": null, "ledgrp.rec.revtyp" :null,
"ledgrp.rec.tenmaxday": null, "ledgrp.rec.avbby" :null,
"ledgrp.blk.mixdet": null, "ledgrp.rec.shpdat" :null,
"ledgrp.avb.pts.extkey": null, "ledgrp.rec.prepers18" :null,
"ledgrp.adv.pts.extkey": null, "ledgrp.iss.adrelc" :null,
"ledgrp.drw.adrelc": null, "ledgrp.apb.namelc" :null,
"ledgrp.ben.pts.extkey": null, "ledgrp.apl.namelc" :null,
"ledgrp.rmb.pts.adrblk": null, "ledgrp.cbs.max2.amt" :null,
"ledgrp.blk.lcrgod": null, "ledgrp.rec.stacty" :null,
"setmod.dspflg": null, "ledgrp.blk.lcrdoc" :null,
"ledgrp.a2b.adrelc": null, "ledgrp.blk.dftat" :null,
"ledgrp.avb.namelc": null, "ledgrp.blk.insbnk" :null,
"ledgrp.avb.pts.adrblk": null, "ledgrp.iss.pts.extkey" :null,
"ledgrp.apb.pts.adrblk": null, "ledgrp.blk.adlcnd" :null,
"letp.usr.extkey": null, "ledgrp.rec.expplc" :null,
"ledgrp.rec.nomspc": null, "ledgrp.a2b.pts.extkey" :null,
"ledgrp.a2b.namelc": null, "ledgrp.iss.pts.ref" :null,
"ledgrp.cbs.nom1.cur": null, "ledgrp.apl.pts.adrblk" :null,
"ledgrp.rec.revtyp": null, "ledgrp.rmb.adrelc" :null,
"ledgrp.rec.avbby": null, "ledgrp.drw.pts.adrblk" :null,
"ledgrp.rec.shpdat": null, "ledgrp.blk.spcben" :null,
"letp.a2bp.ptsget.sdamod.dadsnd": null, "ledgrp.a2b.pts.adrblk" :null,
"ledgrp.rec.prepers18": null, "ledgrp.rec.revdat" :null,
"ledgrp.rec.nomtop": null, "ledgrp.blk.spcrcb" :null,
"ledgrp.iss.adrelc": null, "ledgrp.blk.preper" :null,
"ledgrp.rec.nomton": null, "ledgrp.adv.adrelc" :null,
"ledgrp.rec.avbwth": null, "ledgrp.ben.adrelc" :null,
"ledgrp.apb.namelc": null, "ledgrp.adv.pts.extkey" :null,
"letp.drwp.ptsget.sdamod.dadsnd": null, "ledgrp.rmb.pts.adrblk" :null,
"ledgrp.rec.ownref": null, "ledgrp.blk.lcrgod" :null,
"ledgrp.rmb.namelc": null, "ledgrp.a2b.adrelc" :null,
"ledgrp.blk.feetxt": null, "ledgrp.avb.namelc" :null,
"ledgrp.apl.namelc": null, "ledgrp.avb.pts.adrblk" :null,
"ledgrp.blk.revcls": null, "ledgrp.apb.pts.adrblk" :null,
"ledgrp.cbs.max2.amt": null, "ledgrp.cbs.nom1.cur" :null,
"ledgrp.rec.stacty": null, "ledgrp.con.pts.nam" :null,
"ledgrp.adv.pts.adrblk": null, "ledgrp.rec.nomtop" :null,
"ledgrp.cbs.nom1.amt": null, "ledgrp.rec.nomton" :null,
"ledgrp.blk.lcrdoc": null, "ledgrp.rec.avbwth" :null,
"ledgrp.blk.defdet": null, "ledgrp.rec.ownref" :null,
"letp.apbp.ptsget.sdamod.dadsnd": null, "ledgrp.rmb.namelc" :null,
"ledgrp.rec.expdat": null, "ledgrp.blk.feetxt" :null,
"ledgrp.blk.dftat": null, "ledgrp.blk.revcls" :null,
"letp.benp.ptsget.sdamod.dadsnd": null, "ledgrp.adv.pts.adrblk" :null,
"ledgrp.rec.lcrtyp": null, "ledgrp.cbs.nom1.amt" :null,
"ledgrp.blk.insbnk": null, "ledgrp.blk.defdet" :null,
"mtabut.coninf.conexedat": null, "ledgrp.rec.expdat" :null,
"ledgrp.rec.apprul": null, "ledgrp.rec.lcrtyp" :null,
"ledgrp.apl.adrelc": null, "mtabut.coninf.conexedat" :null,
"ledgrp.iss.pts.extkey": null, "ledgrp.rec.apprul" :null,
"ledgrp.blk.adlcnd": null, "ledgrp.apl.adrelc" :null,
"ledgrp.iss.namelc": null, "ledgrp.iss.namelc" :null,
"ledgrp.rec.expplc": null, "ledgrp.drw.pts.extkey" :null,
"letp.advp.ptsget.sdamod.dadsnd": null, "ledgrp.ben.namelc" :null,
"ledgrp.drw.pts.extkey": null, "ledgrp.rec.preadvdt" :null,
"ledgrp.a2b.pts.extkey": null, "ledgrp.ben.pts.adrblk" :null,
"ledgrp.iss.pts.ref": null, "ledgrp.blk.addamtcov" :null,
"ledgrp.ben.namelc": null, "setmod.docamt" :null,
"ledgrp.apl.pts.adrblk": null, "ledgrp.rec.cnfins" :null,
"letp.recget.sdamod.dadsnd": null, "ledgrp.apb.adrelc" :null,
"ledgrp.rec.preadvdt": null, "ledgrp.drw.namelc" :null,
"ledgrp.ben.pts.adrblk": null, "ledgrp.apl.pts.extkey" :null,
"ledgrp.blk.addamtcov": null, "ledgrp.con.pts.extkey" :null,
"setmod.docamt": null, "ledgrp.rec.cnfdet" :null,
"ledgrp.rec.cnfins": null, "ledgrp.rec.apprultxt" :null,
"ledgrp.apb.adrelc": null,
"ledgrp.rmb.adrelc": null,
"ledgrp.drw.namelc": null,
"ledgrp.apl.pts.extkey": null,
"letp.aplp.ptsget.sdamod.dadsnd": null,
"ledgrp.con.pts.extkey": null,
"ledgrp.rec.cnfdet": null,
"ledgrp.drw.pts.adrblk": null,
"ledgrp.rec.apprultxt": null,
"ledgrp.blk.spcben": null,
} }
// for (const key in checkObj) { for (const key in checkObj) {
// if (Object.hasOwnProperty.call(checkObj, key)) { if (Object.hasOwnProperty.call(checkObj, key)) {
// checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key) checkObj[key] = checkObj[key] ? checkObj[key] : Utils.reflectCheck(key)
// } }
// } }
export default checkObj export default checkObj
src/views/Business/Letamc/index.vue
...@@ -159,6 +159,9 @@ export default { ...@@ -159,6 +159,9 @@ export default {
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data) this.updateModel(rtnmsg.data)
//TODO 处理数据逻辑 //TODO 处理数据逻辑
if (this.isInDisplay) {
this.restoreDisplay();
}
} }
else { else {
......
src/views/Business/Letopn/index.vue
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
size="small" size="small"
:validate-on-rule-change="false" :validate-on-rule-change="false"
> >
<c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick"> <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
<!--PD000017 --> <!--PD000017 -->
<el-tab-pane label="基本信息" name="ovwp"> <el-tab-pane label="基本信息" name="ovwp">
<c-content> <c-content>
...@@ -70,6 +70,16 @@ ...@@ -70,6 +70,16 @@
<m-doxp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'led'" /> <m-doxp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'led'" />
</el-tab-pane> </el-tab-pane>
<!--PD000317 -->
<el-tab-pane label="PD000317" name="revp">
<m-revp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="表外" name="engp">
<m-engp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="账务" name="setpan"> <el-tab-pane label="账务" name="setpan">
<c-content> <c-content>
...@@ -92,16 +102,6 @@ ...@@ -92,16 +102,6 @@
<m-doctre :model="model" :codes="codes" /> <m-doctre :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<!--PD000027 -->
<el-tab-pane label="或有" name="engp">
<m-engp :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000317 -->
<!-- <el-tab-pane label="PD000317" name="revp">
<m-revp :model="model" :codes="codes" />
</el-tab-pane> -->
<!--PD000394 --> <!--PD000394 -->
<el-tab-pane <el-tab-pane
v-if="model.ledgrp.rec.spcbenflg" v-if="model.ledgrp.rec.spcbenflg"
...@@ -116,6 +116,11 @@ ...@@ -116,6 +116,11 @@
/> />
</el-tab-pane> </el-tab-pane>
<!--PD000394 -->
<!-- <el-tab-pane label="PD000394" name="spcbenp">
<m-spcbenp :model="model" :codes="codes" />
</el-tab-pane> -->
<!--PD000395 --> <!--PD000395 -->
<el-tab-pane <el-tab-pane
v-if="model.ledgrp.rec.spcrcbflg" v-if="model.ledgrp.rec.spcrcbflg"
...@@ -129,6 +134,10 @@ ...@@ -129,6 +134,10 @@
:rec="'led'" :rec="'led'"
/> />
</el-tab-pane> </el-tab-pane>
<!--PD000422 -->
<!-- <el-tab-pane label="PD000422" name="spcrcvp">
<m-spcrcvp :model="model" :codes="codes" />
</el-tab-pane> -->
<!--PD000001 --> <!--PD000001 -->
<el-tab-pane label="分录信息" name="glepan"> <el-tab-pane label="分录信息" name="glepan">
...@@ -166,18 +175,25 @@ import Pattern from "~/model/Letopn/Pattern"; ...@@ -166,18 +175,25 @@ import Pattern from "~/model/Letopn/Pattern";
import Ovwp from "./Ovwp"; import Ovwp from "./Ovwp";
import Detp from "./Detp"; import Detp from "./Detp";
import Ptyp from "./Ptyp"; import Ptyp from "./Ptyp";
// import Dogp from './Dogp';
// import Dorp from './Dorp';
// import Adcp from './Adcp';
// import Setpan from "./Setpan"; // import Setpan from "./Setpan";
// import Coninfp from "./Coninfp"; // import Coninfp from "./Coninfp";
// import Docpan from "./Docpan"; // import Docpan from "./Docpan";
// import Glepan from "./Glepan"; // import Glepan from "./Glepan";
// import Engp from "./Engp"; // import Engp from "./Engp";
import Doctre from "./Doctre"; // import Doctre from "./Doctre";
import Revp from "./Revp"; import Revp from "./Revp";
import Aamp from "./Aamp"; import Aamp from "./Aamp";
// import Spcbenp from './Spcbenp'
// import Spcrcvp from './Spcrcvp'
// import Glepan from './Glepan'
import Coninfp from "~/views/Public/Coninfp"; import Coninfp from "~/views/Public/Coninfp";
import Setpan from "~/views/Public/Setpan"; import Setpan from "~/views/Public/Setpan";
import Docpan from "~/views/Public/Docpan"; import Docpan from "~/views/Public/Docpan";
import Doctre from "~/views/Public/Doctre";
import Engp from "~/views/Public/Engp"; import Engp from "~/views/Public/Engp";
import Glepan from "~/views/Public/Glepan"; import Glepan from "~/views/Public/Glepan";
import Doxp from "~/views/Public/Doxp"; import Doxp from "~/views/Public/Doxp";
...@@ -217,7 +233,12 @@ export default { ...@@ -217,7 +233,12 @@ export default {
}; };
}, },
methods: { methods: {
tabClick() {}, myTabClick(tab) {
this.tabClick(tab)
/**
* do it yourself
**/
},
}, },
created: async function () { created: async function () {
console.log("进入letopn交易"); console.log("进入letopn交易");
...@@ -226,6 +247,7 @@ export default { ...@@ -226,6 +247,7 @@ export default {
//更新数据 //更新数据
this.updateModel(rtnmsg.data) this.updateModel(rtnmsg.data)
// Utils.copyValueFromVO(this.model, rtnmsg.data); // Utils.copyValueFromVO(this.model, rtnmsg.data);
//TODO 处理数据逻辑
if (this.isInDisplay) { if (this.isInDisplay) {
this.restoreDisplay(); this.restoreDisplay();
} }
......
src/views/Review/Business/ReviewLetamc.vue 0 → 100644
<template>
<ReviewWrapper>
<Letamc></Letamc>
</ReviewWrapper>
</template>
<script>
import Letamc from "~/views/Business/Letamc";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewLetamc",
components: { ReviewWrapper, Letamc },
created() {},
mounted() {},
};
</script>
<style></style>
src/views/Review/Business/ReviewLetame.vue 0 → 100644
<template>
<ReviewWrapper>
<Letame></Letame>
</ReviewWrapper>
</template>
<script>
import Letame from "~/views/Business/Letame";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewLetame",
components: { ReviewWrapper, Letame },
created() {},
mounted() {},
};
</script>
<style></style>
src/views/Review/Business/ReviewLetopn.vue 0 → 100644
<template>
<ReviewWrapper>
<Letopn></Letopn>
</ReviewWrapper>
</template>
<script>
import Letopn from "~/views/Business/Letopn";
import { ReviewWrapper } from "~/components/gj-common.min.js";
export default {
name: "ReviewLetopn",
components: { ReviewWrapper, Letopn },
created() {},
mounted() {},
};
</script>
<style></style>
src/views/Review/ReviewRouter.js
...@@ -14,6 +14,9 @@ import ReviewBrtdck from "./Business/ReviewBrtdck.vue"; ...@@ -14,6 +14,9 @@ import ReviewBrtdck from "./Business/ReviewBrtdck.vue";
import ReviewBrtudp from "./Business/ReviewBrtudp.vue"; import ReviewBrtudp from "./Business/ReviewBrtudp.vue";
import ReviewBrteus from "./Business/ReviewBrteus.vue"; import ReviewBrteus from "./Business/ReviewBrteus.vue";
import ReviewLetnot from "./Business/ReviewLetnot.vue"; import ReviewLetnot from "./Business/ReviewLetnot.vue";
import ReviewLetopn from "./Business/ReviewLetopn.vue";
import ReviewLetamc from "./Business/ReviewLetamc.vue";
import ReviewLetame from "./Business/ReviewLetame.vue";
import ReviewBdtdcr from "./Business/ReviewBdtdcr.vue"; import ReviewBdtdcr from "./Business/ReviewBdtdcr.vue";
import ReviewBdteus from "./Business/ReviewBdteus.vue"; import ReviewBdteus from "./Business/ReviewBdteus.vue";
...@@ -36,6 +39,10 @@ const ReviewRouter = [ ...@@ -36,6 +39,10 @@ const ReviewRouter = [
{ path: "brtudp", component: ReviewBrtudp, name: "ReviewBrtudp", meta: { title: "复核-Brtudp" } }, { path: "brtudp", component: ReviewBrtudp, name: "ReviewBrtudp", meta: { title: "复核-Brtudp" } },
{ path: "brteus", component: ReviewBrteus, name: "ReviewBrteus", meta: { title: "复核-Brteus" } }, { path: "brteus", component: ReviewBrteus, name: "ReviewBrteus", meta: { title: "复核-Brteus" } },
{ path: "letnot", component: ReviewLetnot, name: "ReviewLetnot", meta: { title: "复核-Letnot" } }, { path: "letnot", component: ReviewLetnot, name: "ReviewLetnot", meta: { title: "复核-Letnot" } },
{ path: "letopn", component: ReviewLetopn, name: "ReviewLetopn", meta: { title: "复核-Letopn" } },
{ path: "letamc", component: ReviewLetamc, name: "ReviewLetamc", meta: { title: "复核-Letamc" } },
{ path: "letame", component: ReviewLetame, name: "ReviewLetame", meta: { title: "复核-Letame" } },
]; ];
export default ReviewRouter; export default ReviewRouter;
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