Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -193,8 +193,9 @@
                 </tbody>
             </table>
         </el-form>
-        <div class="header-button" :style="{width:mainBoxWidth+'px'}" v-if="$store.state.isWorkFlow && workitemInstanceFlag">
-            <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled">保存</el-button>
+        <div class="header-button" :style="{width:mainBoxWidth+'px'}">
+            <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled"
+                       v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
             <el-button type="primary" @click="registerCall">登记调用</el-button>
         </div>
         <div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag">

 <template>
-    <div class="content_box">
-        <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"   >
-            <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
-            <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
-            <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
-            <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
-            <el-tab-pane label="流程跟踪" name="lcgz"  v-if="$store.state.isWorkFlow || $store.state.lcgzShow" lazy>
-                <lcgz  ref="lcgz" ></lcgz>
-            </el-tab-pane>
-        </el-tabs>
-    </div>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
+        <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
+        <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
+        <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
+        <el-tab-pane label="流程跟踪" name="lcgz"  v-if="$store.state.isWorkFlow || $store.state.lcgzShow" lazy>
+            <lcgz  ref="lcgz" ></lcgz>
+        </el-tab-pane>
+    </el-tabs>
 </template>
 
 <script>

@@ -363,8 +363,9 @@
                     </td>
                 </tr>
             </table>
-            <div class="header-button" :style="{width:mainBoxWidth+'px'}" v-if="$store.state.isWorkFlow && workitemInstanceFlag">
-                <el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun">保存</el-button>
+            <div class="header-button" :style="{width:mainBoxWidth+'px'}">
+                <el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun"
+                           v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
                 <el-button type="primary" @click="registerCall">登记调用</el-button>
             </div>
         </div>

@@ -272,8 +272,9 @@
                 </tr>
 
             </table>
-			<div class="header-button" :style="{width:mainBoxWidth+'px'}" v-if="$store.state.isWorkFlow && workitemInstanceFlag">
-				<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun">保存</el-button>
+			<div class="header-button" :style="{width:mainBoxWidth+'px'}">
+				<el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun"
+                           v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
 				<el-button type="primary" @click="registerCall">登记调用</el-button>
 				<!-- <el-button type="primary" class="saveBtn"  @click="save">保存</el-button> -->
 			</div>