Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
f3bbb514 by renchao@pashanhoo.com
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents e50fd215 9f8d7d9f
Inline Side-by-side
Showing 3 changed files with 130 additions and 40 deletions
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
13 ref="ruleForm" 13 ref="ruleForm"
14 :label-position="flag ? 'top' : ''" 14 :label-position="flag ? 'top' : ''"
15 :inline="flag" 15 :inline="flag"
16 label-width="145px"> 16 label-width="145px"
17 >
17 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 18 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
18 <div class="slxx_title title-block"> 19 <div class="slxx_title title-block">
19 补录信息 20 补录信息
...@@ -66,7 +67,12 @@ ...@@ -66,7 +67,12 @@
66 <el-col :span="8"> 67 <el-col :span="8">
67 <el-form-item label="登记类型："> 68 <el-form-item label="登记类型：">
68 <el-select v-model="ruleForm.qlxx.djlx"> 69 <el-select v-model="ruleForm.qlxx.djlx">
69 <el-option v-for="item in dictData['A21']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 70 <el-option
71 v-for="item in djlxlist"
72 :key="item.dcode"
73 :label="item.dname"
74 :value="item.dcode"
75 >
70 </el-option> 76 </el-option>
71 </el-select> 77 </el-select>
72 </el-form-item> 78 </el-form-item>
...@@ -125,7 +131,12 @@ ...@@ -125,7 +131,12 @@
125 </el-form-item> --> 131 </el-form-item> -->
126 <el-form-item label="抵押不动产类型："> 132 <el-form-item label="抵押不动产类型：">
127 <el-select v-model="ruleForm.qlxx.djlx"> 133 <el-select v-model="ruleForm.qlxx.djlx">
128 <el-option v-for="item in dictData['A27']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 134 <el-option
135 v-for="item in dictData['A27']"
136 :key="item.dcode"
137 :label="item.dname"
138 :value="item.dcode"
139 >
129 </el-option> 140 </el-option>
130 </el-select> 141 </el-select>
131 </el-form-item> 142 </el-form-item>
...@@ -158,7 +169,12 @@ ...@@ -158,7 +169,12 @@
158 <el-col :span="8"> 169 <el-col :span="8">
159 <el-form-item label="是否预告登记："> 170 <el-form-item label="是否预告登记：">
160 <el-select v-model="ruleForm.qlxx.djlx"> 171 <el-select v-model="ruleForm.qlxx.djlx">
161 <el-option v-for="item in dictData['A6']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 172 <el-option
173 v-for="item in dictData['A6']"
174 :key="item.dcode"
175 :label="item.dname"
176 :value="item.dcode"
177 >
162 </el-option> 178 </el-option>
163 </el-select> 179 </el-select>
164 </el-form-item> 180 </el-form-item>
...@@ -175,40 +191,64 @@ ...@@ -175,40 +191,64 @@
175 </el-col> 191 </el-col>
176 <el-col :span="8"> 192 <el-col :span="8">
177 <el-form-item label="抵押面积："> 193 <el-form-item label="抵押面积：">
178 <div style="display:flex"> 194 <div style="display: flex">
179 <el-input v-model="ruleForm.diyaq.dymj" style="width:500%" 195 <el-input
180 oninput="value=value.replace(/[^\d.]/g,'')"></el-input> 196 v-model="ruleForm.diyaq.dymj"
197 style="width: 500%"
198 oninput="value=value.replace(/[^\d.]/g,'')"
199 ></el-input>
181 <el-select v-model="ruleForm.diyaq.mjdw"> 200 <el-select v-model="ruleForm.diyaq.mjdw">
182 <el-option v-for="item in dictData['A7']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 201 <el-option
202 v-for="item in dictData['A7']"
203 :key="item.dcode"
204 :label="item.dname"
205 :value="item.dcode"
206 >
183 </el-option> 207 </el-option>
184 </el-select> 208 </el-select>
185 </div> 209 </div>
186 </el-form-item> 210 </el-form-item>
187 </el-col > 211 </el-col>
188 <el-col :span="8"> 212 <el-col :span="8">
189 <el-form-item label="最高债权额"> 213 <el-form-item label="最高债权额">
190 <div style="display:flex"> 214 <div style="display: flex">
191 <el-input v-model="ruleForm.diyaq.zgzqse" style="width:500%" 215 <el-input
192 oninput="value=value.replace(/[^\d.]/g,'')"></el-input> 216 v-model="ruleForm.diyaq.zgzqse"
217 style="width: 500%"
218 oninput="value=value.replace(/[^\d.]/g,'')"
219 ></el-input>
193 <el-select v-model="ruleForm.diyaq.jedw"> 220 <el-select v-model="ruleForm.diyaq.jedw">
194 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 221 <el-option
222 v-for="item in dictData['A57']"
223 :key="item.dcode"
224 :label="item.dname"
225 :value="item.dcode"
226 >
195 </el-option> 227 </el-option>
196 </el-select> 228 </el-select>
197 </div> 229 </div>
198 </el-form-item> 230 </el-form-item>
199 </el-col > 231 </el-col>
200 <el-col :span="8"> 232 <el-col :span="8">
201 <el-form-item label="被担保主债权数额"> 233 <el-form-item label="被担保主债权数额">
202 <div style="display:flex"> 234 <div style="display: flex">
203 <el-input v-model="ruleForm.diyaq.bdbzzqse" style="width:500%" 235 <el-input
204 oninput="value=value.replace(/[^\d.]/g,'')"></el-input> 236 v-model="ruleForm.diyaq.bdbzzqse"
237 style="width: 500%"
238 oninput="value=value.replace(/[^\d.]/g,'')"
239 ></el-input>
205 <el-select v-model="ruleForm.diyaq.jedw"> 240 <el-select v-model="ruleForm.diyaq.jedw">
206 <el-option v-for="item in dictData['A57']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 241 <el-option
242 v-for="item in dictData['A57']"
243 :key="item.dcode"
244 :label="item.dname"
245 :value="item.dcode"
246 >
207 </el-option> 247 </el-option>
208 </el-select> 248 </el-select>
209 </div> 249 </div>
210 </el-form-item> 250 </el-form-item>
211 </el-col > 251 </el-col>
212 <el-col :span="8"> 252 <el-col :span="8">
213 <el-form-item label="币种"> 253 <el-form-item label="币种">
214 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 254 <el-input v-model="ruleForm.qlxx.djsj"></el-input>
...@@ -312,8 +352,7 @@ ...@@ -312,8 +352,7 @@
312 <el-row :gutter="10"> 352 <el-row :gutter="10">
313 <el-col :span="12"> 353 <el-col :span="12">
314 <el-form-item label="共有方式："> 354 <el-form-item label="共有方式：">
315 <el-radio-group 355 <el-radio-group v-model="ruleForm.qlxx.gyqk">
316 v-model="ruleForm.qlxx.gyqk">
317 <el-radio label="0">单独所有</el-radio> 356 <el-radio label="0">单独所有</el-radio>
318 <el-radio label="1">共同共有</el-radio> 357 <el-radio label="1">共同共有</el-radio>
319 <el-radio label="2">按份所有</el-radio> 358 <el-radio label="2">按份所有</el-radio>
...@@ -326,7 +365,8 @@ ...@@ -326,7 +365,8 @@
326 :tableData="ruleForm.qlrData" 365 :tableData="ruleForm.qlrData"
327 @upDateQlrxxList="upDateQlrxxList" 366 @upDateQlrxxList="upDateQlrxxList"
328 :key="key" 367 :key="key"
329 :gyfs="ruleForm.qlxx.gyfs" /> 368 :gyfs="ruleForm.qlxx.gyfs"
369 />
330 370
331 <div> 371 <div>
332 <div class="slxx_title title-block"> 372 <div class="slxx_title title-block">
...@@ -337,7 +377,8 @@ ...@@ -337,7 +377,8 @@
337 v-if="ruleForm.ywrData" 377 v-if="ruleForm.ywrData"
338 :tableData="ruleForm.ywrData" 378 :tableData="ruleForm.ywrData"
339 :key="key" 379 :key="key"
340 @upDateQlrxxList="upDateYwrxxList" /> 380 @upDateQlrxxList="upDateYwrxxList"
381 />
341 </div> 382 </div>
342 </div> 383 </div>
343 <el-row class="btn"> 384 <el-row class="btn">
...@@ -350,13 +391,13 @@ ...@@ -350,13 +391,13 @@
350 </template> 391 </template>
351 <script> 392 <script>
352 import { mapGetters } from "vuex"; 393 import { mapGetters } from "vuex";
353 import { init,save } from "@/api/djbbl.js"; 394 import { init, save } from "@/api/djbbl.js";
354 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable"; 395 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
355 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable"; 396 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
356 397
357 import tdytTable from "@/views/workflow/components/tdytTable"; 398 import tdytTable from "@/views/workflow/components/tdytTable";
358 export default { 399 export default {
359 components: { qlrCommonTable,ywrCommonTable,tdytTable }, 400 components: { qlrCommonTable, ywrCommonTable, tdytTable },
360 computed: { 401 computed: {
361 ...mapGetters(["dictData", "flag"]), 402 ...mapGetters(["dictData", "flag"]),
362 }, 403 },
...@@ -371,6 +412,7 @@ export default { ...@@ -371,6 +412,7 @@ export default {
371 ruleForm: {}, 412 ruleForm: {},
372 //传递参数\ 413 //传递参数\
373 rules: {}, 414 rules: {},
415 // 权属状态
374 qsztlist: [ 416 qsztlist: [
375 { 417 {
376 dcode: "1", 418 dcode: "1",
...@@ -381,6 +423,35 @@ export default { ...@@ -381,6 +423,35 @@ export default {
381 dname: "历史", 423 dname: "历史",
382 }, 424 },
383 ], 425 ],
426
427 // 登记类型
428 djlxlist: [
429 {
430 dcode: "100",
431 dname: "首次登记",
432 },
433 {
434 dcode: "200",
435 dname: "转移登记",
436 },
437 {
438 dcode: "300",
439 dname: "变更登记",
440 },
441 {
442 dcode: "500",
443 dname: "更正登记",
444 },
445
446 {
447 dcode: "901",
448 dname: "补证",
449 },
450 {
451 dcode: "902",
452 dname: "换证",
453 },
454 ],
384 }; 455 };
385 }, 456 },
386 created() { 457 created() {
...@@ -389,26 +460,26 @@ export default { ...@@ -389,26 +460,26 @@ export default {
389 mounted() {}, 460 mounted() {},
390 methods: { 461 methods: {
391 loadData() { 462 loadData() {
392 console.log("预告登记",this.propsParam); 463 console.log("预告登记", this.propsParam);
393 init(this.propsParam.bsmRepair).then((res) => { 464 init(this.propsParam.bsmRepair).then((res) => {
394 if (res.code == 200) { 465 if (res.code == 200) {
395 this.ruleForm = res.result; 466 this.ruleForm = res.result;
396 console.log("this.ruleForm",this.ruleForm); 467 console.log("this.ruleForm", this.ruleForm);
397 this.isShow = true; 468 this.isShow = true;
398 } 469 }
399 }); 470 });
400 }, 471 },
401 // 更新土地用途信息 472 // 更新土地用途信息
402 upDateTdytxxList(val) { 473 upDateTdytxxList(val) {
403 console.log("VAL",val); 474 console.log("VAL", val);
404 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 475 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
405 this.key++; 476 this.key++;
406 }, 477 },
407 // 更新权利人信息 478 // 更新权利人信息
408 upDateQlrxxList(val) { 479 upDateQlrxxList(val) {
409 console.log("val",val); 480 console.log("val", val);
410 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val)); 481 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
411 console.log("this.ruleForm.qlrData",this.ruleForm.qlrData); 482 console.log("this.ruleForm.qlrData", this.ruleForm.qlrData);
412 this.czrOptions = this.ruleForm.qlrData; 483 this.czrOptions = this.ruleForm.qlrData;
413 this.key++; 484 this.key++;
414 }, 485 },
...@@ -418,7 +489,7 @@ export default { ...@@ -418,7 +489,7 @@ export default {
418 this.key++; 489 this.key++;
419 }, 490 },
420 onSubmit() { 491 onSubmit() {
421 console.log("this.ruleForm大信息",this.ruleForm); 492 console.log("this.ruleForm大信息", this.ruleForm);
422 if (this.ruleForm.qlrData.length == 0) { 493 if (this.ruleForm.qlrData.length == 0) {
423 this.$message({ 494 this.$message({
424 showClose: true, 495 showClose: true,
......
...@@ -59,16 +59,16 @@ ...@@ -59,16 +59,16 @@
59 <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" /> 59 <el-table-column label="序号" header-align="center" align="center" type="index" width="55px" />
60 <el-table-column label="流程状态" header-align="center" align="center"> 60 <el-table-column label="流程状态" header-align="center" align="center">
61 <template slot-scope="scope"> 61 <template slot-scope="scope">
62 <div v-if="scope.row.finishTime == null">正在办理</div> 62 <div v-if="scope.row.endTime">已完结</div>
63 <div v-else>已完结</div> 63 <div v-else>正在办理</div>
64 </template> 64 </template>
65 </el-table-column> 65 </el-table-column>
66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" /> 66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" /> 67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
68 <el-table-column label="处理时间" prop="createTime" width="160" align="center" /> 68 <el-table-column label="创建时间" prop="createTime" width="160" align="center" />
69 <el-table-column label="办结时间" prop="finishTime" width="160" align="center" /> 69 <el-table-column label="办结时间" prop="endTime" width="160" align="center" />
70 <el-table-column label="操作方式" align="center"> 70 <el-table-column label="操作方式" prop="businessName" align="center"/>
71 </el-table-column> 71 <el-table-column label="意见" prop="idea" align="center"/>
72 </el-table> 72 </el-table>
73 </div> 73 </div>
74 </div> 74 </div>
...@@ -237,13 +237,31 @@ ...@@ -237,13 +237,31 @@
237 // 获取流程记录 237 // 获取流程记录
238 getCommentList() { 238 getCommentList() {
239 this.formData.allCommentList.forEach(async (item,index) => { 239 this.formData.allCommentList.forEach(async (item,index) => {
240 item.comments.forEach(element => {
241 if(element.type=="COMPLETE"){
242 this.formData.allCommentList[index].idea=element.message
243 }
244 });
240 this.formData.allCommentList[index].agent=item.assignee.name 245 this.formData.allCommentList[index].agent=item.assignee.name
241 }) 246 })
242 setTimeout(() => { 247 this.formData.handlinglist.forEach(async (item,index) => {
243 this.taskList =this.formData.allCommentList; 248 if(item.assignee.name){
249 this.formData.handlinglist[index].agent=item.assignee.name
250 }else{
251 let str=""
252 item.countersign.forEach((item) => {
253 str+=item.name+","
254 })
255 str=str.slice(0, -1);
256 this.formData.allCommentList[index].agent=str
257 }
258
259 })
260 this.taskList =[...this.formData.allCommentList,...this.formData.handlinglist];
261 // this.taskList =this.formData.allCommentList;
244 // 处理数据之后赋值 262 // 处理数据之后赋值
245 this.taskCommentList=this.taskList 263 this.taskCommentList=this.taskList
246 }, 100) 264
247 }, 265 },
248 266
249 // 设置流程图元素状态 267 // 设置流程图元素状态
......
...@@ -76,6 +76,7 @@ export default { ...@@ -76,6 +76,7 @@ export default {
76 rejectedTaskSet: {}, 76 rejectedTaskSet: {},
77 finishedSequenceFlowSet: result.finishedSequenceFlowIds 77 finishedSequenceFlowSet: result.finishedSequenceFlowIds
78 }, 78 },
79 handlinglist:result.runningTasks,
79 allCommentList: result.finishedTasks 80 allCommentList: result.finishedTasks
80 }, '80%', true) 81 }, '80%', true)
81 }) 82 })
......