Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
cfbaedd4 by 杨威
Options

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

2 parents 5027998a a484c835
Inline Side-by-side
Showing 2 changed files with 121 additions and 56 deletions
...@@ -84,14 +84,14 @@ ...@@ -84,14 +84,14 @@
84 </el-form-item> 84 </el-form-item>
85 </el-form> 85 </el-form>
86 <div class="handleBtn"> 86 <div class="handleBtn">
87 <el-button type="primary" class="w98 import">导入图形</el-button> 87 <!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
88 <el-button type="primary" class="w98 creat" @click="newZd">创建</el-button> 88 <el-button type="primary" class="w98 creat" @click="newZd">创建</el-button>
89 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> 89 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
90 </div> 90 </div>
91 </el-tab-pane> 91 </el-tab-pane>
92 <el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh"> 92 <el-tab-pane class="eltabspane" v-if="!auth" label="宗海" name="zh">
93 <div class="handleBtn"> 93 <div class="handleBtn">
94 <el-button type="primary" class="w98 import">导入图形</el-button> 94 <!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
95 <el-button type="primary" class="w98 creat" @click="todo">创建</el-button> 95 <el-button type="primary" class="w98 creat" @click="todo">创建</el-button>
96 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> 96 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
97 </div> 97 </div>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
106 </el-form-item> 106 </el-form-item>
107 </el-form> 107 </el-form>
108 <div class="handleBtn"> 108 <div class="handleBtn">
109 <el-button type="primary" class="w98 import">导入图形</el-button> 109 <!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
110 <el-button type="primary" class="w98 creat" @click="newZrz">创建</el-button> 110 <el-button type="primary" class="w98 creat" @click="newZrz">创建</el-button>
111 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> 111 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
112 </div> 112 </div>
...@@ -121,14 +121,14 @@ ...@@ -121,14 +121,14 @@
121 </el-form-item> 121 </el-form-item>
122 </el-form> 122 </el-form>
123 <div class="handleBtn"> 123 <div class="handleBtn">
124 <el-button type="primary" class="w98 import">导入图形</el-button> 124 <!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
125 <el-button type="primary" class="w98 creat" @click="newDz">创建</el-button> 125 <el-button type="primary" class="w98 creat" @click="newDz">创建</el-button>
126 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> 126 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
127 </div> 127 </div>
128 </el-tab-pane> 128 </el-tab-pane>
129 <el-tab-pane class="eltabspane" v-if="!createZrz" label="林权" name="lq"> 129 <el-tab-pane class="eltabspane" v-if="!createZrz" label="林权" name="lq">
130 <div class="handleBtn"> 130 <div class="handleBtn">
131 <el-button type="primary" class="w98 import">导入图形</el-button> 131 <!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
132 <el-button type="primary" class="w98 creat" @click="todo">创建</el-button> 132 <el-button type="primary" class="w98 creat" @click="todo">创建</el-button>
133 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> 133 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
134 </div> 134 </div>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
143 </el-form-item> 143 </el-form-item>
144 </el-form> 144 </el-form>
145 <div class="handleBtn"> 145 <div class="handleBtn">
146 <el-button type="primary" class="w98 import">导入图形</el-button> 146 <!-- <el-button type="primary" class="w98 import">导入图形</el-button> -->
147 <el-button type="primary" class="w98 creat" @click="newGzw">创建</el-button> 147 <el-button type="primary" class="w98 creat" @click="newGzw">创建</el-button>
148 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button> 148 <el-button type="primary" class="w98 cancel" @click="close">取消</el-button>
149 </div> 149 </div>
...@@ -673,7 +673,7 @@ export default { ...@@ -673,7 +673,7 @@ export default {
673 position: absolute; 673 position: absolute;
674 bottom: 0; 674 bottom: 0;
675 left: 50%; 675 left: 50%;
676 margin-left: -250px; 676 // margin-left: -250px;
677 .w98{ 677 .w98{
678 width: 98px; 678 width: 98px;
679 } 679 }
......
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
67 import SearchHead from "@components/searchHead/searchHead"; 67 import SearchHead from "@components/searchHead/searchHead";
68 import {getSearchList} from "@api/search"; 68 import {getSearchList} from "@api/search";
69 import {updateQsztByBsm} from "@api/common"; 69 import {updateQsztByBsm} from "@api/common";
70 import { createProcessInstance } from "@api/user";
70 71
71 export default { 72 export default {
72 name: "", 73 name: "",
...@@ -137,16 +138,19 @@ ...@@ -137,16 +138,19 @@
137 handleClick(row) { 138 handleClick(row) {
138 let type;name; 139 let type;name;
139 let path = ""; 140 let path = "";
141 let workflowName="";
140 switch (row.dylx) { 142 switch (row.dylx) {
141 case "zd": 143 case "zd":
142 type = "zd"; 144 type = "zd";
143 name = '宗地'; 145 name = '宗地';
144 path = "/zd"; 146 path = "/zd";
147 workflowName = "更正宗地";
145 break; 148 break;
146 case "zrz": 149 case "zrz":
147 type = "zrz"; 150 type = "zrz";
148 name = '自然幢'; 151 name = '自然幢';
149 path = "/zrz"; 152 path = "/zrz";
153 workflowName = "更正自然幢";
150 break; 154 break;
151 case "h": 155 case "h":
152 case "h0": 156 case "h0":
...@@ -154,83 +158,144 @@ ...@@ -154,83 +158,144 @@
154 type = "h"; 158 type = "h";
155 name = "户" 159 name = "户"
156 path = "/h"; 160 path = "/h";
161 workflowName = "更正户";
157 break; 162 break;
158 case "dz": 163 case "dz":
159 type = "dz"; 164 type = "dz";
160 name = "多幢"; 165 name = "多幢";
161 path = "/dz"; 166 path = "/dz";
167 workflowName = "更正多幢";
162 break; 168 break;
163 case "gzw": 169 case "gzw":
164 type = "gzw"; 170 type = "gzw";
165 name = "构筑物"; 171 name = "构筑物";
166 path = "/gzw"; 172 path = "/gzw";
173 workflowName = "更正构筑物";
167 break; 174 break;
168 175
169 default: 176 default:
170 break; 177 break;
171 } 178 }
172 let data = {"id": row.bsm, "type": type}; 179 let data = {"id": row.bsm, "type": type,"ywlx":"modify"};
180 let wfdata = {
181 params:data,
182 workflowName:workflowName
183 };
173 this.$nextTick(()=>{ 184 this.$nextTick(()=>{
174 this.$confirm('确定更正该'+name+'吗？', '提示', { 185 this.$confirm('确定更正该'+name+'吗？', '提示', {
175 confirmButtonText: '确定', 186 confirmButtonText: '确定',
176 cancelButtonText: '取消', 187 cancelButtonText: '取消',
177 type: 'warning' 188 type: 'warning'
178 }).then(() => { 189 }).then(() => {
179 updateQsztByBsm(data) 190 if(row.dylx === 'h' ||row.dylx === 'h0' ||row.dylx === 'h1' ||row.dylx === 'gzw'){
180 .then((res => { 191 updateQsztByBsm(data)
181 if (res.code == 200) { 192 .then((res => {
182 this.$store.state.oldZdbsm = ''; 193 if (res.code == 200) {
183 switch (row.dylx) { 194 this.$store.state.oldZdbsm = '';
184 case "zd": 195 switch (row.dylx) {
185 this.$store.state.zdbsm = res.result; 196 case "zd":
186 this.getRightTree(res.result,'0,1,2'); 197 this.$store.state.zdbsm = res.result;
187 break; 198 this.getRightTree(res.result,'0,1,2');
188 case "zrz": 199 break;
189 this.$store.state.zrzbsm = res.result; 200 case "zrz":
190 this.getTreeByBsm(res.result,row.dylx,'0,1,2'); 201 this.$store.state.zrzbsm = res.result;
191 break; 202 this.getTreeByBsm(res.result,row.dylx,'0,1,2');
192 case "h": 203 break;
193 case "h0": 204 case "h":
194 case "h1": 205 case "h0":
195 this.$store.state.hbsm = res.result; 206 case "h1":
196 this.getTreeByBsm(res.result,'h','0,1,2'); 207 this.$store.state.hbsm = res.result;
197 break; 208 this.getTreeByBsm(res.result,'h','0,1,2');
198 case "dz": 209 break;
199 this.$store.state.dzbsm = res.result; 210 case "dz":
200 this.getTreeByBsm(res.result,row.dylx,'0,1,2'); 211 this.$store.state.dzbsm = res.result;
201 break; 212 this.getTreeByBsm(res.result,row.dylx,'0,1,2');
202 case "gzw": 213 break;
203 this.$store.state.dzbsm = res.result; 214 case "gzw":
204 this.getTreeByBsm(res.result,row.dylx,'0,1,2'); 215 this.$store.state.dzbsm = res.result;
205 break; 216 this.getTreeByBsm(res.result,row.dylx,'0,1,2');
217 break;
206 218
207 default: 219 default:
208 break; 220 break;
209 }
210 this.$message({
211 type: 'success',
212 message: '更正成功!'
213 });
214 this.$router.push({
215 path: path,
216 query: {
217 bsm: res.result,
218 source: 2,
219 auth:'1'
220 } 221 }
221 }); 222 this.$message({
222 } else { 223 type: 'success',
223 this.$message({ 224 message: '更正成功!'
224 message: res.message, 225 });
225 type: "warning", 226 this.$router.push({
226 }); 227 path: path,
227 } 228 query: {
228 })).catch(() => { 229 bsm: res.result,
230 source: 2,
231 auth:'1'
232 }
233 });
234 } else {
235 this.$message({
236 message: res.message,
237 type: "warning",
238 });
239 }
240 })).catch(() => {
229 this.$message({ 241 this.$message({
230 message: res.message, 242 message: res.message,
231 type: "error", 243 type: "error",
232 }); 244 });
233 }); 245 });
246 } else {
247 createProcessInstance(wfdata)
248 .then((res) => {
249 console.log(res);
250 if (res.needShow) {
251 this.$store.state.oldZdbsm = '';
252 switch (row.dylx) {
253 case "zd":
254 this.$store.state.zdbsm = res.processInstance.title;
255 this.getRightTree(res.result,'0,1,2');
256 break;
257 case "zrz":
258 this.$store.state.zrzbsm = res.processInstance.title;
259 this.getTreeByBsm(res.result,row.dylx,'0,1,2');
260 break;
261 case "h":
262 case "h0":
263 case "h1":
264 this.$store.state.hbsm = res.processInstance.title;
265 this.getTreeByBsm(res.result,'h','0,1,2');
266 break;
267 case "dz":
268 this.$store.state.dzbsm = res.processInstance.title;
269 this.getTreeByBsm(res.result,row.dylx,'0,1,2');
270 break;
271 case "gzw":
272 this.$store.state.dzbsm = res.processInstance.title;
273 this.getTreeByBsm(res.result,row.dylx,'0,1,2');
274 break;
275
276 default:
277 break;
278 }
279 this.$message({
280 type: 'success',
281 message: '更正成功!'
282 });
283 this.$router.push({
284 path: path,
285 query: {
286 bsm: res.processInstance.title,
287 source: 2,
288 workitemInstanceId:res.workitemInstance.id,
289 auth:'1'
290 }
291 });
292 } else {
293 this.$message.error("创建失败");
294 }
295 })
296 .catch((error) => {});
297 }
298
234 299
235 }).catch(() => { 300 }).catch(() => {
236 301
......