d62bbbeb by renchao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 02844270 47670ab9
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 <!-- 内容框架 --> 38 <!-- 内容框架 -->
39 <div class="containerFrame"> 39 <div class="containerFrame">
40 <!-- 左侧菜单栏 区分业务--> 40 <!-- 左侧菜单栏 区分业务-->
41 <segmentMenu v-if="['A0320099', 'A0330099'].includes(slsq.djqxbm)" 41 <segmentMenu v-if="['A0320099', 'A0330099','A04300S1','A04200S2','A0830S1'].includes(slsq.djqxbm)"
42 @getCurrentSelectProps="getCurrentSelectProps" /> 42 @getCurrentSelectProps="getCurrentSelectProps" />
43 <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" /> 43 <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" />
44 <div class="leftCon"> 44 <div class="leftCon">
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 <!-- 内容框架 --> 26 <!-- 内容框架 -->
27 <div class="containerFrame"> 27 <div class="containerFrame">
28 <!-- 左侧菜单栏 区分业务--> 28 <!-- 左侧菜单栏 区分业务-->
29 <segmentMenu v-if="['A0320099','A0330099' ].includes(slsq.djqxbm)" @getCurrentSelectProps="getCurrentSelectProps" /> 29 <segmentMenu v-if="['A0320099','A0330099' ,'A04300S1','A04200S2','A0830S1'].includes(slsq.djqxbm)" @getCurrentSelectProps="getCurrentSelectProps" />
30 <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" /> 30 <ordinaryMenu v-else @getCurrentSelectProps="getCurrentSelectProps" />
31 31
32 <div class="leftCon"> 32 <div class="leftCon">
......