Commit 46f95e23 authored by 刘予佳's avatar 刘予佳

合并冲突

parent ebb32d94
<template> <template>
<div id="publicContent"> <div id="publicContent" :class="activeName=='index0' && formClass">
<div v-if="formTabs && formTabs.length > 0"> <div v-if="formTabs && formTabs.length > 0">
<el-button class="draftButton">{{ <el-button class="draftButton">
{{
formType == 1 ? "临时保存" : "返回" formType == 1 ? "临时保存" : "返回"
}}</el-button> }}
</el-button>
<el-tabs <el-tabs
v-model="activeName" v-model="activeName"
type="card" type="card"
......
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