Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
fc31f4fa by cheliming
Options

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

2 parents 17fdd866 d30e237d
Inline Side-by-side
Showing 7 changed files with 51 additions and 21 deletions
...@@ -226,7 +226,8 @@ export default { ...@@ -226,7 +226,8 @@ export default {
226 width: 22px; 226 width: 22px;
227 left: 9px; 227 left: 9px;
228 top: 9px; 228 top: 9px;
229 background: #c3c5c8; 229 background: url('../../assets/images/rowline.png');
230 background-position-y: center;
230 } 231 }
231 232
232 .linkLine_default::after { 233 .linkLine_default::after {
......
...@@ -56,14 +56,19 @@ ...@@ -56,14 +56,19 @@
56 <li v-show="isZD">导入属性</li> 56 <li v-show="isZD">导入属性</li>
57 <li v-show="!isZD">导入楼盘</li> 57 <li v-show="!isZD">导入楼盘</li>
58 <li>重叠分析</li> 58 <li>重叠分析</li>
59 <li v-show="isZD">添加定着物</li> 59 <li v-show="isZD" @click="openCreateDialog">添加定着物</li>
60 <li @click="deleteByBsm()">删除</li> 60 <li @click="deleteByBsm()">删除</li>
61 </ul> 61 </ul>
62 <!-- 添加定着物弹框 -->
63 <el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
64 <Create @closeDialog="closeDialog" :auth="true"></Create>
65 </el-dialog>
62 </div> 66 </div>
63 </template> 67 </template>
64 <script> 68 <script>
65 import lineItem from "./lineItem.vue"; 69 import lineItem from "./lineItem.vue";
66 import {deleteZdInfoByBsm} from "../../api/zd"; 70 import {deleteZdInfoByBsm} from "../../api/zd";
71 import Create from "../../views/panel/create/index";
67 export default { 72 export default {
68 inheritAttrs: false, 73 inheritAttrs: false,
69 props: { 74 props: {
...@@ -73,7 +78,7 @@ export default { ...@@ -73,7 +78,7 @@ export default {
73 default: 14, 78 default: 14,
74 }, 79 },
75 }, 80 },
76 components: { lineItem }, 81 components: { lineItem,Create },
77 data() { 82 data() {
78 return { 83 return {
79 selectedDetail: {}, 84 selectedDetail: {},
...@@ -83,7 +88,8 @@ export default { ...@@ -83,7 +88,8 @@ export default {
83 top: 0, 88 top: 0,
84 left: 0, 89 left: 0,
85 isZD: true, 90 isZD: true,
86 zdData:{} 91 zdData:{},
92 dialogVisible:false
87 }; 93 };
88 }, 94 },
89 watch: { 95 watch: {
...@@ -115,6 +121,14 @@ export default { ...@@ -115,6 +121,14 @@ export default {
115 changeIsZD(data) { 121 changeIsZD(data) {
116 this.isZD = data; 122 this.isZD = data;
117 }, 123 },
124 //添加定着物
125 openCreateDialog(){
126 this.dialogVisible = true
127 },
128 //关闭添加定着物弹框
129 closeDialog() {
130 this.dialogVisible = false;
131 },
118 preDealData(list) { 132 preDealData(list) {
119 list.forEach((x) => { 133 list.forEach((x) => {
120 if (!x.expand) this.$set(x, "expand", true); 134 if (!x.expand) this.$set(x, "expand", true);
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 <Navigation ref="navigation"></Navigation> 36 <Navigation ref="navigation"></Navigation>
37 </div> --> 37 </div> -->
38 <el-dialog title="新建" :visible.sync="dialogVisible" width="40%"> 38 <el-dialog title="新建" :visible.sync="dialogVisible" width="40%">
39 <Create @closeDialog="closeDialog"></Create> 39 <Create @closeDialog="closeDialog" :auth="false"></Create>
40 </el-dialog> 40 </el-dialog>
41 </el-header> 41 </el-header>
42 <el-main> 42 <el-main>
......
...@@ -24,12 +24,18 @@ ...@@ -24,12 +24,18 @@
24 </el-table-column> 24 </el-table-column>
25 <el-table-column prop="bdcqzh" align="left" label="不动产权证号"> 25 <el-table-column prop="bdcqzh" align="left" label="不动产权证号">
26 </el-table-column> 26 </el-table-column>
27 <el-table-column prop="lx" align="left" width="120" label="类型"> 27 <el-table-column prop="dylx" align="left" width="120" label="类型">
28 <template slot-scope="scope">
29 {{scope.row.dylx | bdcLxFilter}}
30 </template>
28 </el-table-column> 31 </el-table-column>
29 <el-table-column prop="qlr" align="left" width="120" label="权利人"> 32 <el-table-column prop="qlr" align="left" width="120" label="权利人">
30 </el-table-column> 33 </el-table-column>
31 <el-table-column prop="zl" align="left" label="坐落"></el-table-column> 34 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
32 <el-table-column prop="zrsj" align="left" width="120" label="转入时间"> 35 <el-table-column prop="addtime" align="left" width="120" label="转入时间">
36 <template slot-scope="scope">
37 {{scope.row.addtime | timeFilter}}
38 </template>
33 </el-table-column> 39 </el-table-column>
34 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 40 <el-table-column prop="cjr" align="left" width="120" label="创建人">
35 </el-table-column> 41 </el-table-column>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 type="card" 6 type="card"
7 class="eltabs" 7 class="eltabs"
8 @tab-click="handleClick"> 8 @tab-click="handleClick">
9 <el-tab-pane class="eltabspane" label="宗地" name="zd"> 9 <el-tab-pane class="eltabspane" v-if="!auth" label="宗地" name="zd">
10 <el-form :inline="true" :rules="rules" :model="ruleForm" ref="ruleForm" class="demo-form-inline"> 10 <el-form :inline="true" :rules="rules" :model="ruleForm" ref="ruleForm" class="demo-form-inline">
11 <el-form-item label="行政区划" required prop="xzqbsm"> 11 <el-form-item label="行政区划" required prop="xzqbsm">
12 <el-select v-model="ruleForm.xzqbsm" style="width:100px;" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(ruleForm.xzqbsm)"> 12 <el-select v-model="ruleForm.xzqbsm" style="width:100px;" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(ruleForm.xzqbsm)">
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
82 </el-form-item> 82 </el-form-item>
83 </el-form> 83 </el-form>
84 </el-tab-pane> 84 </el-tab-pane>
85 <el-tab-pane class="eltabspane" label="宗海" name="zh">宗海</el-tab-pane> 85 <el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh">宗海</el-tab-pane>
86 <el-tab-pane class="eltabspane" label="自然幢" name="zrz"> 86 <el-tab-pane class="eltabspane" label="自然幢" name="zrz">
87 <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="zrzProject"> 87 <el-form :inline="true" :rules="rules1" :model="ruleForm1" ref="ruleForm1" class="zrzProject">
88 <el-form-item label="项目名称" prop="xmmc"> 88 <el-form-item label="项目名称" prop="xmmc">
...@@ -133,12 +133,12 @@ import { insertDzjbxx } from "../../../api/dz"; ...@@ -133,12 +133,12 @@ import { insertDzjbxx } from "../../../api/dz";
133 export default { 133 export default {
134 name: "", 134 name: "",
135 components: {}, 135 components: {},
136 props: {}, 136 props: ['auth'],
137 data() { 137 data() {
138 return { 138 return {
139 tabPosition: "left", 139 tabPosition: "left",
140 //默认第一个选项卡 140 //默认第一个选项卡
141 activeName: "zd", 141 activeName: "",
142 zrzProjectName: "", 142 zrzProjectName: "",
143 xzq: [], 143 xzq: [],
144 djq: [], 144 djq: [],
...@@ -211,7 +211,10 @@ export default { ...@@ -211,7 +211,10 @@ export default {
211 created() { 211 created() {
212 this.getXzqList(); 212 this.getXzqList();
213 }, 213 },
214 mounted() {}, 214 mounted() {
215 console.log(this,'this');
216 this.activeName = this.auth ? 'zrz':'zd'
217 },
215 methods: { 218 methods: {
216 handleClick(tab, event) { 219 handleClick(tab, event) {
217 console.log(tab, event); 220 console.log(tab, event);
......
...@@ -24,12 +24,18 @@ ...@@ -24,12 +24,18 @@
24 </el-table-column> 24 </el-table-column>
25 <el-table-column prop="bdcqzh" align="left" label="不动产权证号"> 25 <el-table-column prop="bdcqzh" align="left" label="不动产权证号">
26 </el-table-column> 26 </el-table-column>
27 <el-table-column prop="lx" align="left" width="120" label="类型"> 27 <el-table-column prop="dylx" align="left" width="120" label="类型">
28 <template slot-scope="scope">
29 {{scope.row.dylx | bdcLxFilter}}
30 </template>
28 </el-table-column> 31 </el-table-column>
29 <el-table-column prop="qlr" align="left" width="120" label="权利人"> 32 <el-table-column prop="qlr" align="left" width="120" label="权利人">
30 </el-table-column> 33 </el-table-column>
31 <el-table-column prop="zl" align="left" label="坐落"></el-table-column> 34 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
32 <el-table-column prop="zrsj" align="left" width="120" label="转入时间"> 35 <el-table-column prop="addtime" align="left" width="120" label="转入时间">
36 <template slot-scope="scope">
37 {{scope.row.addtime | timeFilter}}
38 </template>
33 </el-table-column> 39 </el-table-column>
34 <el-table-column prop="cjr" align="left" width="120" label="创建人"> 40 <el-table-column prop="cjr" align="left" width="120" label="创建人">
35 </el-table-column> 41 </el-table-column>
......
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
233 <span>调查意见</span> 233 <span>调查意见</span>
234 </td> 234 </td>
235 <td colspan="10" > 235 <td colspan="10" >
236 <el-input v-model="form.name"></el-input> 236 <el-input v-model="form.dcyj"></el-input>
237 </td> 237 </td>
238 </tr> 238 </tr>
239 239
...@@ -242,15 +242,16 @@ ...@@ -242,15 +242,16 @@
242 <span>审查员</span> 242 <span>审查员</span>
243 </td> 243 </td>
244 <td colspan="2" > 244 <td colspan="2" >
245 <el-input v-model="form.name"></el-input> 245 <el-input v-model="form.scy"></el-input>
246 </td> 246 </td>
247 <td colspan="2" rowspan="2" align="right" style="width:8.33%;padding-right:10px"> 247 <td colspan="2" align="right" style="width:8.33%;padding-right:10px">
248 <span>审查日期</span> 248 <span>审查日期</span>
249 </td> 249 </td>
250 <td colspan="2" > 250 <td colspan="2" >
251 <el-date-picker 251 <el-date-picker
252 v-model="form.date" 252 v-model="form.date"
253 type="date" 253 type="date"
254 style="width: 100%"
254 placeholder="选择日期"> 255 placeholder="选择日期">
255 </el-date-picker> 256 </el-date-picker>
256 </td> 257 </td>
...@@ -312,8 +313,10 @@ ...@@ -312,8 +313,10 @@
312 fwcbbsm:'', //房屋产别ID 313 fwcbbsm:'', //房屋产别ID
313 fwcqlybsm:'', //房屋产权来源ID 314 fwcqlybsm:'', //房屋产权来源ID
314 ydybsm:'', //原单元标识码 315 ydybsm:'', //原单元标识码
316 dcyj:'', //调查意见
317 scy:'', //审查员
315 name:'', 318 name:'',
316 date:'', 319 date:'', //审查日期
317 fwytList:[{ 320 fwytList:[{
318 glbsm:'', //关联标识码 321 glbsm:'', //关联标识码
319 fwytzdbsm:'', //房屋用途字典标识码 322 fwytzdbsm:'', //房屋用途字典标识码
...@@ -496,9 +499,6 @@ ...@@ -496,9 +499,6 @@
496 this.form.zrzbsm=this.$route.query.bsm; 499 this.form.zrzbsm=this.$route.query.bsm;
497 this.getZrzDetailByBsm(this.$route.query.bsm) 500 this.getZrzDetailByBsm(this.$route.query.bsm)
498 } 501 }
499 if(this.source!==1){
500 this.getZrzDetailByBsm(this.$route.query.bsm)
501 }
502 }, 502 },
503 mounted() {}, 503 mounted() {},
504 computed: { 504 computed: {
......