Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
5f56d429 by 杨威
Options

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

2 parents 78274434 6d026244
Inline Side-by-side
Showing 4 changed files with 10 additions and 9 deletions
...@@ -193,8 +193,9 @@ ...@@ -193,8 +193,9 @@
193 </tbody> 193 </tbody>
194 </table> 194 </table>
195 </el-form> 195 </el-form>
196 <div class="header-button" :style="{width:mainBoxWidth+'px'}" v-if="$store.state.isWorkFlow && workitemInstanceFlag"> 196 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
197 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled">保存</el-button> 197 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled"
198 v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
198 <el-button type="primary" @click="registerCall">登记调用</el-button> 199 <el-button type="primary" @click="registerCall">登记调用</el-button>
199 </div> 200 </div>
200 <div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag"> 201 <div class="sh-btn" v-if="$store.state.isWorkFlow && workitemInstanceFlag">
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <el-tabs v-model="activeName" @tab-click="handleClick">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane> 3 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
5 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> 4 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
6 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane> 5 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
...@@ -9,7 +8,6 @@ ...@@ -9,7 +8,6 @@
9 <lcgz ref="lcgz" ></lcgz> 8 <lcgz ref="lcgz" ></lcgz>
10 </el-tab-pane> 9 </el-tab-pane>
11 </el-tabs> 10 </el-tabs>
12 </div>
13 </template> 11 </template>
14 12
15 <script> 13 <script>
......
...@@ -363,8 +363,9 @@ ...@@ -363,8 +363,9 @@
363 </td> 363 </td>
364 </tr> 364 </tr>
365 </table> 365 </table>
366 <div class="header-button" :style="{width:mainBoxWidth+'px'}" v-if="$store.state.isWorkFlow && workitemInstanceFlag"> 366 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
367 <el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun">保存</el-button> 367 <el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="iconfont iconbaocun"
368 v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
368 <el-button type="primary" @click="registerCall">登记调用</el-button> 369 <el-button type="primary" @click="registerCall">登记调用</el-button>
369 </div> 370 </div>
370 </div> 371 </div>
......
...@@ -272,8 +272,9 @@ ...@@ -272,8 +272,9 @@
272 </tr> 272 </tr>
273 273
274 </table> 274 </table>
275 <div class="header-button" :style="{width:mainBoxWidth+'px'}" v-if="$store.state.isWorkFlow && workitemInstanceFlag"> 275 <div class="header-button" :style="{width:mainBoxWidth+'px'}">
276 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun">保存</el-button> 276 <el-button type="primary" class="saveBtn" @click="onSave" :disabled="disabled" icon="iconfont iconbaocun"
277 v-if="$store.state.isWorkFlow && workitemInstanceFlag">保存</el-button>
277 <el-button type="primary" @click="registerCall">登记调用</el-button> 278 <el-button type="primary" @click="registerCall">登记调用</el-button>
278 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> --> 279 <!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
279 </div> 280 </div>
......