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

src/model/Public/Mtabut/index.js

@@ -25,6 +25,9 @@ export default class Mtabut {
                 dsp:"",			//  Display		.mtabut.syswrn.dsp
             },
             clsflg: "",
+            entmod: {
+                entsubpenl1blk: ""      //XMLPanel entsubpenl1的内置block
+            }
         }
     }
 }
\ No newline at end of file

src/views/Business/Brtame/index.vue

@@ -55,6 +55,13 @@
                     <m-setpan :model="model" :codes="codes" />
                     </c-content>
                 </el-tab-pane>
+
+                <el-tab-pane label="Booking" name="glepan">
+                    <c-content>
+                    <m-glepan :model="model" :codes="codes" />
+                    </c-content>
+                </el-tab-pane>
+
                 <!--coninf PD000000 Completion -->
                 <el-tab-pane label="Completion" name="coninfp">
                     <m-coninfp :model="model" :codes="codes" />
@@ -89,6 +96,7 @@ import Shpdet from "./Shpdet";
 
 import Engp from "~/views/Public/Engp";
 import Setpan from "~/views/Public/Setpan";
+import Glepan from "~/views/Public/Glepan";
 import Coninfp from "~/views/Public/Coninfp";
 import Docpan from "~/views/Public/Docpan";
 import Doctre from "~/views/Public/Doctre";
@@ -101,6 +109,7 @@ export default {
         "m-shpdet": Shpdet,
         "m-engp": Engp,
         "m-setpan": Setpan,
+        "m-glepan": Glepan,
         "m-coninfp": Coninfp,
         "m-docpan": Docpan,
         "m-doctre": Doctre,

src/views/Home/cells/Hall.vue

@@ -223,7 +223,7 @@ export default {
 }
 
 .display1 {
-    padding: 5px 0 35px 0;
+    padding: 5px 0 55px 0;
 }
 
 .display2 {