Commit 98d5f8ee by taojinrui

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 e348b205 ae08a7ad
...@@ -5,6 +5,7 @@ import Pub from "../Public" //引入公共面板 ...@@ -5,6 +5,7 @@ import Pub from "../Public" //引入公共面板
export default class Brteus{ export default class Brteus{
constructor () { constructor () {
this.data = { this.data = {
liaall: new Pub().data.Liaall,
setmod: new Pub().data.Setmod, //加入公共面板账务字段 setmod: new Pub().data.Setmod, //加入公共面板账务字段
mtabut: new Pub().data.Mtabut, mtabut: new Pub().data.Mtabut,
trnmod: new Pub().data.Trnmod, //加入公共面板面函的字段 trnmod: new Pub().data.Trnmod, //加入公共面板面函的字段
......
...@@ -62,6 +62,10 @@ ...@@ -62,6 +62,10 @@
<m-setpan :model="model" :codes="codes" /> <m-setpan :model="model" :codes="codes" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Booking" name="glepan">
<m-glepan :model="model" :codes="codes" />
</el-tab-pane>
<!--PD000000 --> <!--PD000000 -->
<el-tab-pane label="Completion" name="coninfp"> <el-tab-pane label="Completion" name="coninfp">
<m-coninfp :model="model" :codes="codes" /> <m-coninfp :model="model" :codes="codes" />
...@@ -110,6 +114,7 @@ import Brteuss from "./Brteus"; ...@@ -110,6 +114,7 @@ import Brteuss from "./Brteus";
import Engp from "~/views/Public/Engp"; import Engp from "~/views/Public/Engp";
import Setpan from "~/views/Public/Setpan"; import Setpan from "~/views/Public/Setpan";
import Glepan from "~/views/Public/Glepan";
import Coninfp from "~/views/Public/Coninfp"; import Coninfp from "~/views/Public/Coninfp";
import Docpan from "~/views/Public/Docpan"; import Docpan from "~/views/Public/Docpan";
import Doctre from "~/views/Public/Doctre"; import Doctre from "~/views/Public/Doctre";
...@@ -128,6 +133,7 @@ export default { ...@@ -128,6 +133,7 @@ export default {
"m-othadvtypp" : Othadvtypp, "m-othadvtypp" : Othadvtypp,
"m-engp": Engp, "m-engp": Engp,
"m-setpan": Setpan, "m-setpan": Setpan,
"m-glepan": Glepan,
"m-coninfp": Coninfp, "m-coninfp": Coninfp,
"m-docpan": Docpan, "m-docpan": Docpan,
"m-doctre": Doctre, "m-doctre": Doctre,
......
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