合并

@@ -58,33 +58,6 @@
           <p class="splitScreen tabsList-title">材料信息</p>
           <div class="splitScreen"></div>
         </div>
-<<<<<<< HEAD
-        <el-tabs v-model="activeName" @tab-click="activeClick">
-          <el-tab-pane
-            :label="item.name"
-            :name="item.value"
-            v-for="(item, index) in tabList"
-            :key="index"
-          >
-            <div class="splitScreen-con">
-              <component
-                ref="slxx"
-                v-if="index == 0"
-                :is="editItem"
-                :flag="flag"
-                :key="key"
-              />
-              <component
-                ref="clxx"
-                :is="editItem"
-                v-else-if="index == 1"
-                :key="key"
-              />
-              <component :is="editItem" v-else :key="key" />
-            </div>
-          </el-tab-pane>
-        </el-tabs>
-=======
         <div style="width:100%">
           <el-tabs v-model="activeName" @tab-click='activeClick'>
             <el-tab-pane :label="item.name" :name="item.value" v-for="(item, index) in tabList" :key="index">
@@ -95,7 +68,6 @@
             <component :is="editItem" :key="key" />
           </div>
         </div>
->>>>>>> 560bdac56422758a7b06eb466a42296662fac954
       </div>
     </div>
     <zc ref="zcDialogRef" v-model="zcDialog" :queryForm="queryForm" />