Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
49adeb62 by 田浩浩
Options

合并

1 parent 83da5cd3
Inline Side-by-side
Showing 1 changed file with 0 additions and 28 deletions
...@@ -58,33 +58,6 @@ ...@@ -58,33 +58,6 @@
58 <p class="splitScreen tabsList-title">材料信息</p> 58 <p class="splitScreen tabsList-title">材料信息</p>
59 <div class="splitScreen"></div> 59 <div class="splitScreen"></div>
60 </div> 60 </div>
61 <<<<<<< HEAD
62 <el-tabs v-model="activeName" @tab-click="activeClick">
63 <el-tab-pane
64 :label="item.name"
65 :name="item.value"
66 v-for="(item, index) in tabList"
67 :key="index"
68 >
69 <div class="splitScreen-con">
70 <component
71 ref="slxx"
72 v-if="index == 0"
73 :is="editItem"
74 :flag="flag"
75 :key="key"
76 />
77 <component
78 ref="clxx"
79 :is="editItem"
80 v-else-if="index == 1"
81 :key="key"
82 />
83 <component :is="editItem" v-else :key="key" />
84 </div>
85 </el-tab-pane>
86 </el-tabs>
87 =======
88 <div style="width:100%"> 61 <div style="width:100%">
89 <el-tabs v-model="activeName" @tab-click='activeClick'> 62 <el-tabs v-model="activeName" @tab-click='activeClick'>
90 <el-tab-pane :label="item.name" :name="item.value" v-for="(item, index) in tabList" :key="index"> 63 <el-tab-pane :label="item.name" :name="item.value" v-for="(item, index) in tabList" :key="index">
...@@ -95,7 +68,6 @@ ...@@ -95,7 +68,6 @@
95 <component :is="editItem" :key="key" /> 68 <component :is="editItem" :key="key" />
96 </div> 69 </div>
97 </div> 70 </div>
98 >>>>>>> 560bdac56422758a7b06eb466a42296662fac954
99 </div> 71 </div>
100 </div> 72 </div>
101 <zc ref="zcDialogRef" v-model="zcDialog" :queryForm="queryForm" /> 73 <zc ref="zcDialogRef" v-model="zcDialog" :queryForm="queryForm" />
......