Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
821e66db by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents b831478f 91135e95
Inline Side-by-side
Showing 4 changed files with 42 additions and 38 deletions
...@@ -182,26 +182,26 @@ ...@@ -182,26 +182,26 @@
182 this.$store.state.oldZdbsm = ''; 182 this.$store.state.oldZdbsm = '';
183 switch (row.dylx) { 183 switch (row.dylx) {
184 case "zd": 184 case "zd":
185 this.$store.state.zdbsm = row.glbsm; 185 this.$store.state.zdbsm = res.result;
186 this.getRightTree(row.glbsm,'0,1,2'); 186 this.getRightTree(res.result,'0,1,2');
187 break; 187 break;
188 case "zrz": 188 case "zrz":
189 this.$store.state.zrzbsm = row.glbsm; 189 this.$store.state.zrzbsm = res.result;
190 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2'); 190 this.getTreeByBsm(res.result,row.dylx,'0,1,2');
191 break; 191 break;
192 case "h": 192 case "h":
193 case "h0": 193 case "h0":
194 case "h1": 194 case "h1":
195 this.$store.state.hbsm = row.glbsm; 195 this.$store.state.hbsm = res.result;
196 this.getTreeByBsm(row.glbsm,'h','0,1,2'); 196 this.getTreeByBsm(res.result,'h','0,1,2');
197 break; 197 break;
198 case "dz": 198 case "dz":
199 this.$store.state.dzbsm = row.glbsm; 199 this.$store.state.dzbsm = res.result;
200 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2'); 200 this.getTreeByBsm(res.result,row.dylx,'0,1,2');
201 break; 201 break;
202 case "gzw": 202 case "gzw":
203 this.$store.state.dzbsm = row.glbsm; 203 this.$store.state.dzbsm = res.result;
204 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2'); 204 this.getTreeByBsm(res.result,row.dylx,'0,1,2');
205 break; 205 break;
206 206
207 default: 207 default:
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
214 this.$router.push({ 214 this.$router.push({
215 path: path, 215 path: path,
216 query: { 216 query: {
217 bsm: row.glbsm, 217 bsm: res.result,
218 source: 2, 218 source: 2,
219 auth:'1' 219 auth:'1'
220 } 220 }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- <div class="content_box"> --> 2 <!-- <div class="content_box"> -->
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" > 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane> 4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
5 <!-- <el-tab-pane label="分类调查表" name="fldcb" v-if="isFldc"><fldcb v-if="fldbcVisible" :qlr="qlr" :bdcdyh="bdcdyh" :zddm="zddm"></fldcb></el-tab-pane> --> 5 <el-tab-pane label="分类调查表" name="fldcb" v-if="isFldc"><fldcb v-if="fldbcVisible" :qlr="qlr" :bdcdyh="bdcdyh" :zddm="zddm"></fldcb></el-tab-pane>
6 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane> 6 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
7 <el-tab-pane label="界址点" name="jzd"> 7 <el-tab-pane label="界址点" name="jzd">
8 <jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd> 8 <jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd>
...@@ -32,13 +32,13 @@ import lshs from "./lshs"; ...@@ -32,13 +32,13 @@ import lshs from "./lshs";
32 import fjcl from "./fjcl/fjcl" 32 import fjcl from "./fjcl/fjcl"
33 import Lcgz from "./lcgz" 33 import Lcgz from "./lcgz"
34 import {queryStatus} from "@api/search" 34 import {queryStatus} from "@api/search"
35 // import Fldcb from "@components/Fldcb/Fldcb" 35 import Fldcb from "@components/Fldcb/Fldcb"
36 import {getQjZdjbxxDetailById} from '@api/zd' 36 import {getQjZdjbxxDetailById} from '@api/zd'
37 export default { 37 export default {
38 name: "", 38 name: "",
39 components: { 39 components: {
40 // zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Fldcb,Lcgz 40 zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Fldcb,Lcgz
41 zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Lcgz 41 //zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Lcgz
42 42
43 }, 43 },
44 props: {}, 44 props: {},
...@@ -93,9 +93,9 @@ export default { ...@@ -93,9 +93,9 @@ export default {
93 case 'mjftb': 93 case 'mjftb':
94 this.mjftbVisible = true; 94 this.mjftbVisible = true;
95 break; 95 break;
96 // case 'fldcb': 96 case 'fldcb':
97 // this.fldbcVisible = true; 97 this.fldbcVisible = true;
98 // break; 98 break;
99 case 'jzd': 99 case 'jzd':
100 this.jzdVisible = true; 100 this.jzdVisible = true;
101 break; 101 break;
......
...@@ -40,11 +40,13 @@ export default { ...@@ -40,11 +40,13 @@ export default {
40 "workflowPeriod": "current", 40 "workflowPeriod": "current",
41 "workitemInstanceId": this.$route.query.workitemInstanceId 41 "workitemInstanceId": this.$route.query.workitemInstanceId
42 } 42 }
43 vm.loadingShow('数据获取中');
43 getActivityDetail(params).then((res) => { 44 getActivityDetail(params).then((res) => {
44 console.log(res.processInstance.templetId); 45 console.log(res.processInstance.templetId);
45 templateLoad(res.processInstance.templetId).then((res1) => { 46 templateLoad(res.processInstance.templetId).then((res1) => {
46 console.log(this.$x2js.xml2js(res1).Process,'Process'); 47 console.log(this.$x2js.xml2js(res1).Process,'Process');
47 getProcessOutline(res.processInstance.id).then((res2) => { 48 getProcessOutline(res.processInstance.id).then((res2) => {
49 vm.loadingHide();
48 this.flowData = this.$x2js.xml2js(res1).Process; 50 this.flowData = this.$x2js.xml2js(res1).Process;
49 console.log(res2.activityOutlines,'res.activityOutlines'); 51 console.log(res2.activityOutlines,'res.activityOutlines');
50 this.flowState = res2.activityOutlines; 52 this.flowState = res2.activityOutlines;
...@@ -59,7 +61,9 @@ export default { ...@@ -59,7 +61,9 @@ export default {
59 this.flowShow = true; 61 this.flowShow = true;
60 }) 62 })
61 }) 63 })
62 .catch((error) => {}); 64 .catch((error) => {
65 vm.loadingHide();
66 });
63 }) 67 })
64 .catch((error) => {}); 68 .catch((error) => {});
65 }) 69 })
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 <tr> 9 <tr>
10 <td colspan="2" class="tdright">行政区</td> 10 <td colspan="2" class="tdright">行政区</td>
11 <td colspan="2"> 11 <td colspan="2">
12 <el-select 12 <el-select name="xzq"
13 :disabled="disabled" 13 :disabled="disabled"
14 class="formSelect" 14 class="formSelect"
15 v-model="formData.xzqbsm" 15 v-model="formData.xzqbsm"
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 </td> 26 </td>
27 <td colspan="2" class="tdright">地籍区</td> 27 <td colspan="2" class="tdright">地籍区</td>
28 <td colspan="2"> 28 <td colspan="2">
29 <el-select 29 <el-select name="djq"
30 class="formSelect" 30 class="formSelect"
31 :disabled="disabled" 31 :disabled="disabled"
32 v-model="formData.djqbsm" 32 v-model="formData.djqbsm"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 <td colspan="2" class="tdright">地籍子区</td> 44 <td colspan="2" class="tdright">地籍子区</td>
45 <td colspan="2"> 45 <td colspan="2">
46 <el-select class="formSelect" @change="changeDjzq" :disabled="disabled" v-model="formData.djzqbsm"> 46 <el-select class="formSelect" @change="changeDjzq" :disabled="disabled" v-model="formData.djzqbsm">
47 <el-option 47 <el-option name="djzq"
48 v-for="item in $store.state.djzqList" 48 v-for="item in $store.state.djzqList"
49 :key="item.bsm" 49 :key="item.bsm"
50 :label="item.mc" 50 :label="item.mc"
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
57 <tr> 57 <tr>
58 <td colspan="2" class="tdright">权利类型</td> 58 <td colspan="2" class="tdright">权利类型</td>
59 <td colspan="4"> 59 <td colspan="4">
60 <el-select class="formSelect" :disabled="disabled" v-model="formData.qllxbsm"> 60 <el-select name="qllx" class="formSelect" :disabled="disabled" v-model="formData.qllxbsm">
61 <el-option 61 <el-option
62 v-for="item in $store.state.qllxList" 62 v-for="item in $store.state.qllxList"
63 :key="item.bsm" 63 :key="item.bsm"
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 </td> 69 </td>
70 <td colspan="2" class="tdright"><i class="requisite">*</i>宗地特征码</td> 70 <td colspan="2" class="tdright"><i class="requisite">*</i>宗地特征码</td>
71 <td colspan="4"> 71 <td colspan="4">
72 <el-select class="formSelect" ref="zdtzm" :disabled="disabled" 72 <el-select name="zdtzm" class="formSelect" ref="zdtzm" :disabled="disabled"
73 v-model="formData.zdtzmbsm"> 73 v-model="formData.zdtzmbsm">
74 <el-option 74 <el-option
75 v-for="item in $store.state.zdtzmList" 75 v-for="item in $store.state.zdtzmList"
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 <tr> 84 <tr>
85 <td colspan="2" class="tdright">权利设定方式</td> 85 <td colspan="2" class="tdright">权利设定方式</td>
86 <td colspan="4"> 86 <td colspan="4">
87 <el-select class="formSelect" :disabled="disabled" v-model="formData.qlsdfs"> 87 <el-select name="qlsdfs" class="formSelect" :disabled="disabled" v-model="formData.qlsdfs">
88 <el-option 88 <el-option
89 v-for="item in $store.state.qlsdfsList" 89 v-for="item in $store.state.qlsdfsList"
90 :key="item.bsm" 90 :key="item.bsm"
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
96 </td> 96 </td>
97 <td colspan="2" class="tdright"><i class="requisite">*</i>宗地代码</td> 97 <td colspan="2" class="tdright"><i class="requisite">*</i>宗地代码</td>
98 <td colspan="4" class="psr"> 98 <td colspan="4" class="psr">
99 <input :disabled="disabled" @blur="inputBlur($event)" ref="zddm" on maxlength="19" 99 <input name="zddm" :disabled="disabled" @blur="inputBlur($event)" ref="zddm" on maxlength="19"
100 type="text" 100 type="text"
101 class="formInput percent80" 101 class="formInput percent80"
102 v-model="formData.zddm" 102 v-model="formData.zddm"
...@@ -110,12 +110,12 @@ ...@@ -110,12 +110,12 @@
110 <tr> 110 <tr>
111 <td colspan="2" class="tdright">地籍号</td> 111 <td colspan="2" class="tdright">地籍号</td>
112 <td colspan="4"> 112 <td colspan="4">
113 <input type="text" :disabled="disabled" class="formInput" v-model="formData.djh"/> 113 <input name="djh" type="text" :disabled="disabled" class="formInput" v-model="formData.djh"/>
114 </td> 114 </td>
115 115
116 <td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td> 116 <td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td>
117 <td colspan="4" class="psr"> 117 <td colspan="4" class="psr">
118 <input 118 <input name="bdcdyh"
119 type="text" :disabled="disabled" @blur="inputBlur($event)" ref="bdcdyh" 119 type="text" :disabled="disabled" @blur="inputBlur($event)" ref="bdcdyh"
120 maxlength="28" 120 maxlength="28"
121 class="formInput" 121 class="formInput"
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
127 <tr> 127 <tr>
128 <td colspan="2" class="tdright">项目名称</td> 128 <td colspan="2" class="tdright">项目名称</td>
129 <td colspan="4" class="psr"> 129 <td colspan="4" class="psr">
130 <input :disabled="disabled" 130 <input name="xmmc" :disabled="disabled"
131 type="text" 131 type="text"
132 class="formInput " 132 class="formInput "
133 v-model="formData.xmmc" 133 v-model="formData.xmmc"
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
135 </td> 135 </td>
136 <td colspan="2" class="tdright">预编宗地代码</td> 136 <td colspan="2" class="tdright">预编宗地代码</td>
137 <td colspan="4" class="psr"> 137 <td colspan="4" class="psr">
138 <input :disabled="disabled" 138 <input name="ybzddm" :disabled="disabled"
139 type="text" 139 type="text"
140 class="formInput " 140 class="formInput "
141 v-model="formData.ybzddm" 141 v-model="formData.ybzddm"
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
154 <!-- >--> 154 <!-- >-->
155 <!-- </el-option>--> 155 <!-- </el-option>-->
156 <!-- </el-select>--> 156 <!-- </el-select>-->
157 <el-select-tree 157 <el-select-tree name="gmjjhyfl"
158 style="width:100%" 158 style="width:100%"
159 v-if="show" 159 v-if="show"
160 :default-expand-all="defaultExpandAll" 160 :default-expand-all="defaultExpandAll"
...@@ -170,13 +170,13 @@ ...@@ -170,13 +170,13 @@
170 </td> 170 </td>
171 <td colspan="2" class="tdright">价格(元)</td> 171 <td colspan="2" class="tdright">价格(元)</td>
172 <td colspan="4" class="psr"> 172 <td colspan="4" class="psr">
173 <input :disabled="disabled" class="formInput" type="number" v-model="formData.jg"/> 173 <input id="jgid" :disabled="disabled" class="formInput" type="number" v-model="formData.jg"/>
174 </td> 174 </td>
175 </tr> 175 </tr>
176 <tr> 176 <tr>
177 <td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td> 177 <td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
178 <td colspan="10"> 178 <td colspan="10">
179 <input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl" 179 <input name="zl" type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
180 class="formInput" v-model="formData.zl"/> 180 class="formInput" v-model="formData.zl"/>
181 </td> 181 </td>
182 </tr> 182 </tr>
...@@ -294,28 +294,28 @@ ...@@ -294,28 +294,28 @@
294 <td colspan="2" rowspan="4" class="tdright">宗地四至</td> 294 <td colspan="2" rowspan="4" class="tdright">宗地四至</td>
295 <td colspan="2" class="tdright"><i class="requisite">*</i>北至</td> 295 <td colspan="2" class="tdright"><i class="requisite">*</i>北至</td>
296 <td colspan="8" class="psr"> 296 <td colspan="8" class="psr">
297 <input type="text" @blur="inputBlur($event)" ref="zdszb" :disabled="disabled" 297 <input name="zdszb" type="text" @blur="inputBlur($event)" ref="zdszb" :disabled="disabled"
298 class="formInput" v-model="formData.zdszb"/> 298 class="formInput" v-model="formData.zdszb"/>
299 </td> 299 </td>
300 </tr> 300 </tr>
301 <tr> 301 <tr>
302 <td colspan="2" class="tdright"><i class="requisite">*</i>东至</td> 302 <td colspan="2" class="tdright"><i class="requisite">*</i>东至</td>
303 <td colspan="8" class="psr"> 303 <td colspan="8" class="psr">
304 <input type="text" @blur="inputBlur($event)" ref="zdszd" :disabled="disabled" 304 <input name="zdszd" type="text" @blur="inputBlur($event)" ref="zdszd" :disabled="disabled"
305 class="formInput" v-model="formData.zdszd"/> 305 class="formInput" v-model="formData.zdszd"/>
306 </td> 306 </td>
307 </tr> 307 </tr>
308 <tr> 308 <tr>
309 <td colspan="2" class="tdright"><i class="requisite">*</i>南至</td> 309 <td colspan="2" class="tdright"><i class="requisite">*</i>南至</td>
310 <td colspan="8" class="psr"> 310 <td colspan="8" class="psr">
311 <input type="text" @blur="inputBlur($event)" ref="zdszn" :disabled="disabled" 311 <input name="zdszn" type="text" @blur="inputBlur($event)" ref="zdszn" :disabled="disabled"
312 class="formInput" v-model="formData.zdszn"/> 312 class="formInput" v-model="formData.zdszn"/>
313 </td> 313 </td>
314 </tr> 314 </tr>
315 <tr> 315 <tr>
316 <td colspan="2" class="tdright"><i class="requisite">*</i>西至</td> 316 <td colspan="2" class="tdright"><i class="requisite">*</i>西至</td>
317 <td colspan="8" class="psr"> 317 <td colspan="8" class="psr">
318 <input type="text" @blur="inputBlur($event)" ref="zdszx" :disabled="disabled" 318 <input name="zdszx" type="text" @blur="inputBlur($event)" ref="zdszx" :disabled="disabled"
319 class="formInput" v-model="formData.zdszx"/> 319 class="formInput" v-model="formData.zdszx"/>
320 </td> 320 </td>
321 </tr> 321 </tr>
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
332 </td> 332 </td>
333 <td colspan="2" class="tdright"><i class="requisite">*</i>宗地面积(㎡)</td> 333 <td colspan="2" class="tdright"><i class="requisite">*</i>宗地面积(㎡)</td>
334 <td colspan="4" > 334 <td colspan="4" >
335 <input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zdmj" 335 <input name="zdmj" type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zdmj"
336 onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.zdmj"/> 336 onkeyup="value=value.replace(/[^\d\.]/g,'')" class="formInput" v-model="formData.zdmj"/>
337 </td> 337 </td>
338 </tr> 338 </tr>
......