Skip to content

bdc / bdcdj-web

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

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

2 parents 1fd6d06f 335c8231
Inline Side-by-side
Showing 15 changed files with 759 additions and 525 deletions
...@@ -128,3 +128,15 @@ export function getZtQlxx (params) { ...@@ -128,3 +128,15 @@ export function getZtQlxx (params) {
128 data 128 data
129 }) 129 })
130 } 130 }
131 /**
132 * @description: 添加审核意见
133 * @param {*} data
134 * @author: renchao
135 */
136 export function addidea (data) {
137 return request({
138 url: SERVER.SERVERAPI + '/rest/djbRepair/sh',
139 method: 'post',
140 data
141 })
142 }
......
...@@ -124,7 +124,8 @@ export default { ...@@ -124,7 +124,8 @@ export default {
124 //读取申请单元信息 124 //读取申请单元信息
125 loadBdcdylist(add) { 125 loadBdcdylist(add) {
126 var formdata = new FormData(); 126 var formdata = new FormData();
127 formdata.append("bsmSlsq", this.bsmSlsq); 127 if(this.bsmSlsq){
128 formdata.append("bsmSlsq", this.bsmSlsq);
128 formdata.append("bestepid", this.bestepid); 129 formdata.append("bestepid", this.bestepid);
129 leftMenu(formdata).then((res) => { 130 leftMenu(formdata).then((res) => {
130 if (res.code === 200 && res.result) { 131 if (res.code === 200 && res.result) {
...@@ -135,6 +136,8 @@ export default { ...@@ -135,6 +136,8 @@ export default {
135 } 136 }
136 } 137 }
137 }); 138 });
139 }
140
138 141
139 }, 142 },
140 // 获取右侧菜单 143 // 获取右侧菜单
......
...@@ -59,16 +59,17 @@ ...@@ -59,16 +59,17 @@
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" :formatter="formatDate" width="160" align="center" />
69 <el-table-column label="办结时间" prop="finishTime" width="160" align="center" /> 69 <el-table-column label="认领时间" prop="claimTime" :formatter="formatDate" width="160" align="center" />
70 <el-table-column label="操作方式" align="center"> 70 <el-table-column label="转出时间" prop="endTime" :formatter="formatDate" width="160" align="center" />
71 </el-table-column> 71 <el-table-column label="操作方式" prop="controls" align="center"/>
72 <el-table-column label="意见" prop="idea" align="center"/>
72 </el-table> 73 </el-table>
73 </div> 74 </div>
74 </div> 75 </div>
...@@ -118,6 +119,14 @@ ...@@ -118,6 +119,14 @@
118 this.clearViewer() 119 this.clearViewer()
119 }, 120 },
120 methods: { 121 methods: {
122 formatDate(row, column) {
123 let data = row[column.property]
124 if(data == null) {
125 return null
126 }
127 let dt = new Date(data)
128 return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds()
129 },
121 processReZoom () { 130 processReZoom () {
122 this.defaultZoom = 1 131 this.defaultZoom = 1
123 this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto') 132 this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto')
...@@ -237,13 +246,32 @@ ...@@ -237,13 +246,32 @@
237 // 获取流程记录 246 // 获取流程记录
238 getCommentList() { 247 getCommentList() {
239 this.formData.allCommentList.forEach(async (item,index) => { 248 this.formData.allCommentList.forEach(async (item,index) => {
240 this.formData.allCommentList[index].agent=item.assignee.name 249 item.comments.forEach(element => {
250 if(element.type=="COMPLETE"){
251 this.formData.allCommentList[index].idea=element.message
252 this.formData.allCommentList[index].controls="完成"
253 }
254 });
255 this.formData.allCommentList[index].agent=item.assignee.name
256 })
257 this.formData.handlinglist.forEach(async (item,index) => {
258 if(item.assignee.name){
259 this.formData.handlinglist[index].agent=item.assignee.name
260 }else{
261 let str=""
262 item.countersign.forEach((item) => {
263 str+=item.name+","
264 })
265 str=str.slice(0, -1);
266 this.formData.allCommentList[index].agent=str
267 }
268
241 }) 269 })
242 setTimeout(() => { 270 this.taskList =[...this.formData.allCommentList,...this.formData.handlinglist];
243 this.taskList =this.formData.allCommentList; 271 // this.taskList =this.formData.allCommentList;
244 // 处理数据之后赋值 272 // 处理数据之后赋值
245 this.taskCommentList=this.taskList 273 this.taskCommentList=this.taskList
246 }, 100) 274
247 }, 275 },
248 276
249 // 设置流程图元素状态 277 // 设置流程图元素状态
......
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
15 :label-position="flag ? 'top' : ''" 15 :label-position="flag ? 'top' : ''"
16 :inline="flag" 16 :inline="flag"
17 label-width="145px" 17 label-width="145px"
18 inline-message> 18 inline-message
19 >
19 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 20 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
20 <div class="slxx_title title-block"> 21 <div class="slxx_title title-block">
21 补录信息 22 补录信息
...@@ -50,18 +51,22 @@ ...@@ -50,18 +51,22 @@
50 :table-width="550" 51 :table-width="550"
51 :tableData="ztQlxxList" 52 :tableData="ztQlxxList"
52 :props="props" 53 :props="props"
53 @change="ztQlxxchange"> 54 @change="ztQlxxchange"
55 >
54 <el-table-column 56 <el-table-column
55 prop="qllxmc" 57 prop="qllxmc"
56 width="130" 58 width="130"
57 label="权利类型"></el-table-column> 59 label="权利类型"
60 ></el-table-column>
58 <el-table-column 61 <el-table-column
59 prop="bdcqzh" 62 prop="bdcqzh"
60 width="160" 63 width="160"
61 label="不动产权证书"></el-table-column> 64 label="不动产权证书"
65 ></el-table-column>
62 <el-table-column 66 <el-table-column
63 prop="qlrmc" 67 prop="qlrmc"
64 label="被执行人"></el-table-column> 68 label="被执行人"
69 ></el-table-column>
65 <el-table-column prop="mjmc" label="面积"></el-table-column> 70 <el-table-column prop="mjmc" label="面积"></el-table-column>
66 <el-table-column prop="ytmc" label="用途"></el-table-column> 71 <el-table-column prop="ytmc" label="用途"></el-table-column>
67 <el-table-column prop="zl" label="坐落"></el-table-column> 72 <el-table-column prop="zl" label="坐落"></el-table-column>
...@@ -76,15 +81,18 @@ ...@@ -76,15 +81,18 @@
76 :table-width="550" 81 :table-width="550"
77 :tableData="ssQlxxList" 82 :tableData="ssQlxxList"
78 :props="props" 83 :props="props"
79 @change="ssQlxxchange"> 84 @change="ssQlxxchange"
85 >
80 <el-table-column 86 <el-table-column
81 prop="qllxmc" 87 prop="qllxmc"
82 width="130" 88 width="130"
83 label="权利类型"></el-table-column> 89 label="权利类型"
90 ></el-table-column>
84 <el-table-column 91 <el-table-column
85 prop="bdcqzh" 92 prop="bdcqzh"
86 width="160" 93 width="160"
87 label="不动产权证书"></el-table-column> 94 label="不动产权证书"
95 ></el-table-column>
88 <el-table-column prop="qlrmc" label="权利人"></el-table-column> 96 <el-table-column prop="qlrmc" label="权利人"></el-table-column>
89 <el-table-column prop="mjmc" label="面积"></el-table-column> 97 <el-table-column prop="mjmc" label="面积"></el-table-column>
90 <el-table-column prop="ytmc" label="用途"></el-table-column> 98 <el-table-column prop="ytmc" label="用途"></el-table-column>
...@@ -178,7 +186,8 @@ ...@@ -178,7 +186,8 @@
178 v-for="item in sfbxflist" 186 v-for="item in sfbxflist"
179 :key="item.dcode" 187 :key="item.dcode"
180 :label="item.dname" 188 :label="item.dname"
181 :value="item.dcode"></el-option> 189 :value="item.dcode"
190 ></el-option>
182 </el-select> 191 </el-select>
183 </el-form-item> 192 </el-form-item>
184 </el-col> 193 </el-col>
...@@ -194,12 +203,17 @@ ...@@ -194,12 +203,17 @@
194 v-for="item in qsztlist" 203 v-for="item in qsztlist"
195 :key="item.dcode" 204 :key="item.dcode"
196 :label="item.dname" 205 :label="item.dname"
197 :value="item.dcode"></el-option> 206 :value="item.dcode"
207 ></el-option>
198 </el-select> 208 </el-select>
199 </el-form-item> 209 </el-form-item>
200 </el-col> 210 </el-col>
201 <el-col :span="8"> 211 <el-col :span="8">
202 <el-form-item label="不动产权证号：" prop="qlxx.bdcqzh" :rules="rules.bdcqzhrules"> 212 <el-form-item
213 label="不动产权证号："
214 prop="qlxx.bdcqzh"
215 :rules="rules.bdcqzhrules"
216 >
203 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 217 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
204 </el-form-item> 218 </el-form-item>
205 </el-col> 219 </el-col>
...@@ -215,7 +229,8 @@ ...@@ -215,7 +229,8 @@
215 v-for="item in dictData['A32']" 229 v-for="item in dictData['A32']"
216 :key="item.dcode" 230 :key="item.dcode"
217 :label="item.dname" 231 :label="item.dname"
218 :value="item.dcode"></el-option> 232 :value="item.dcode"
233 ></el-option>
219 </el-select> 234 </el-select>
220 </el-form-item> 235 </el-form-item>
221 </el-col> 236 </el-col>
...@@ -245,24 +260,47 @@ ...@@ -245,24 +260,47 @@
245 </el-form-item> 260 </el-form-item>
246 </el-col> 261 </el-col>
247 <el-col :span="8"> 262 <el-col :span="8">
248 <el-form-item label="区县代码：" prop="qlxx.qxdm" :rules="rules.qxdmrules"> 263 <el-form-item
264 label="区县代码："
265 prop="qlxx.qxdm"
266 :rules="rules.qxdmrules"
267 >
249 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 268 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
250 </el-form-item> 269 </el-form-item>
251 </el-col> 270 </el-col>
252 <el-col :span="8"> 271 <el-col :span="8">
253 <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules"> 272 <el-form-item
273 label="登记机构："
274 prop="qlxx.djjg"
275 :rules="rules.djjgrules"
276 >
254 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 277 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
255 </el-form-item> 278 </el-form-item>
256 </el-col> 279 </el-col>
257 280
258 <el-col :span="8"> 281 <el-col :span="8">
259 <el-form-item label="登簿人：" prop="qlxx.dbr" :rules="rules.dbrrules"> 282 <el-form-item
283 label="登簿人："
284 prop="qlxx.dbr"
285 :rules="rules.dbrrules"
286 >
260 <el-input v-model="ruleForm.qlxx.dbr"></el-input> 287 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
261 </el-form-item> 288 </el-form-item>
262 </el-col> 289 </el-col>
263 <el-col :span="8"> 290 <el-col :span="8">
264 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules"> 291 <el-form-item
265 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 292 label="登记时间："
293 prop="qlxx.djsj"
294 :rules="rules.djsjrules"
295 >
296 <el-date-picker
297 v-model="ruleForm.qlxx.djsj"
298 type="date"
299 placeholder="选择日期"
300 value-format="yyyy-MM-dd HH:mm:ss"
301 format="yyyy-MM-dd"
302 >
303 </el-date-picker>
266 </el-form-item> 304 </el-form-item>
267 </el-col> 305 </el-col>
268 <el-col :span="24"> 306 <el-col :span="24">
...@@ -302,7 +340,7 @@ ...@@ -302,7 +340,7 @@
302 </el-form-item> 340 </el-form-item>
303 </el-col> 341 </el-col>
304 </div> 342 </div>
305 <el-row class="btn"> 343 <el-row class="btn" v-if="!$route.query.viewtype">
306 <el-form-item> 344 <el-form-item>
307 <el-button type="primary" @click="onSubmit">保存</el-button> 345 <el-button type="primary" @click="onSubmit">保存</el-button>
308 </el-form-item> 346 </el-form-item>
...@@ -311,227 +349,227 @@ ...@@ -311,227 +349,227 @@
311 </div> 349 </div>
312 </template> 350 </template>
313 <script> 351 <script>
314 import { mapGetters } from "vuex"; 352 import { mapGetters } from "vuex";
315 import { init, getSsQlxx, getZtQlxx, save } from "@/api/djbbl.js"; 353 import { init, getSsQlxx, getZtQlxx, save } from "@/api/djbbl.js";
316 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable"; 354 import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
317 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable"; 355 import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
318 import tdytTable from "@/views/workflow/components/tdytTable"; 356 import tdytTable from "@/views/workflow/components/tdytTable";
319 import selectTable from "@/components/selectTable/index.vue"; 357 import selectTable from "@/components/selectTable/index.vue";
320 export default { 358 export default {
321 components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable }, 359 components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable },
322 computed: { 360 computed: {
323 ...mapGetters(["dictData", "flag"]), 361 ...mapGetters(["dictData", "flag"]),
324 }, 362 },
325 data () { 363 data() {
326 return { 364 return {
327 //表单是否可操作 365 //表单是否可操作
328 props: { 366 props: {
329 label: "bdcqzh", 367 label: "bdcqzh",
330 value: "bdcdyid", 368 value: "bdcdyid",
369 },
370 propsParam: this.$attrs,
371 key: 0,
372 isShow: false,
373 ssqlxxshow: true,
374 disabled: true,
375 czrOptions: [],
376 ruleForm: {},
377 rules: {},
378 // 登记类型
379 djlxlist: [
380 {
381 dcode: "100",
382 dname: "首次登记",
383 },
384 {
385 dcode: "200",
386 dname: "转移登记",
387 },
388 {
389 dcode: "300",
390 dname: "变更登记",
391 },
392 {
393 dcode: "500",
394 dname: "更正登记",
331 }, 395 },
332 propsParam: this.$attrs,
333 key: 0,
334 isShow: false,
335 ssqlxxshow: true,
336 disabled: true,
337 czrOptions: [],
338 ruleForm: {},
339 rules: {},
340 // 登记类型
341 djlxlist: [
342 {
343 dcode: "100",
344 dname: "首次登记",
345 },
346 {
347 dcode: "200",
348 dname: "转移登记",
349 },
350 {
351 dcode: "300",
352 dname: "变更登记",
353 },
354 {
355 dcode: "500",
356 dname: "更正登记",
357 },
358
359 {
360 dcode: "901",
361 dname: "补证",
362 },
363 {
364 dcode: "902",
365 dname: "换证",
366 },
367 ],
368 396
369 // 权属状态 397 {
370 qsztlist: [ 398 dcode: "901",
371 { 399 dname: "补证",
372 dcode: "1", 400 },
373 dname: "现势", 401 {
374 }, 402 dcode: "902",
375 { 403 dname: "换证",
376 dcode: "2", 404 },
377 dname: "历史", 405 ],
378 },
379 ],
380 // 是否被续封
381 sfbxflist: [
382 {
383 dcode: "0",
384 dname: "否",
385 },
386 {
387 dcode: "1",
388 dname: "是",
389 },
390 ],
391 //传递参数\
392 406
393 ssQlxxList: [], 407 // 权属状态
394 ztQlxxList: [], 408 qsztlist: [
395 rules: { 409 {
396 bdcqzh: [ 410 dcode: "1",
397 { required: true, message: "不动产登记证明号", trigger: "blur" }, 411 dname: "现势",
398 ], 412 },
399 qxdm: [{ required: true, message: "区县代码", trigger: "blur" }], 413 {
400 djjg: [{ required: true, message: "登记机构", trigger: "blur" }], 414 dcode: "2",
401 dbr: [{ required: true, message: "登簿人", trigger: "blur" }], 415 dname: "历史",
402 djsj: [{ required: true, message: "登记时间", trigger: "blur" }],
403 }, 416 },
404 }; 417 ],
418 // 是否被续封
419 sfbxflist: [
420 {
421 dcode: "0",
422 dname: "否",
423 },
424 {
425 dcode: "1",
426 dname: "是",
427 },
428 ],
429 //传递参数\
430
431 ssQlxxList: [],
432 ztQlxxList: [],
433 rules: {
434 bdcqzhrules: [
435 { required: true, message: "不动产权证号：", trigger: "change" },
436 ],
437 qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
438 djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
439 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
440 djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
441 },
442 };
443 },
444 created() {
445 this.loadData();
446 },
447 mounted() {},
448 methods: {
449 ztQlxxchange(val) {
450 this.ruleForm.ztQlxx = val;
405 }, 451 },
406 created () { 452 ssQlxxchange(val) {
407 this.loadData(); 453 this.ruleForm.ssQlxx = val;
454 this.ruleForm.qlxx.ssywh = val.ssywh;
408 }, 455 },
409 mounted () { }, 456 djlxchange(val) {
410 methods: { 457 if (val == null || val == 100) {
411 ztQlxxchange (val) { 458 this.ssqlxxshow = false;
412 this.ruleForm.ztQlxx = val; 459 } else {
413 }, 460 this.ssqlxxshow = true;
414 ssQlxxchange (val) { 461 }
415 this.ruleForm.ssQlxx = val; 462 },
416 this.ruleForm.qlxx.ssywh = val.ssywh; 463 loadData() {
417 }, 464 this.propsParam.isEdit = this.$parent.isEdit;
418 djlxchange (val) { 465 init(this.propsParam).then((res) => {
419 if (val == null || val == 100) { 466 if (res.code == 200) {
420 this.ssqlxxshow = false; 467 this.ruleForm = res.result;
421 } else { 468 this.isShow = true;
422 this.ssqlxxshow = true; 469 let djlx = this.ruleForm.qlxx.djlx;
423 } 470 if (djlx == null || djlx == 100) {
424 }, 471 this.ssqlxxshow = false;
425 loadData () {
426 this.propsParam.isEdit = this.$parent.isEdit;
427 init(this.propsParam).then((res) => {
428 if (res.code == 200) {
429 this.ruleForm = res.result;
430 this.isShow = true;
431 let djlx = this.ruleForm.qlxx.djlx;
432 if (djlx == null || djlx == 100) {
433 this.ssqlxxshow = false;
434 }
435 }
436 });
437 //获取主体信息
438 getSsQlxx({
439 bdcdyid: this.propsParam.bdcdyid,
440 qllx: this.propsParam.qllx,
441 }).then((res) => {
442 if (res.code == 200) {
443 this.ssQlxxList = res.result;
444 }
445 });
446 //获取上手信息
447 getZtQlxx({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
448 if (res.code == 200) {
449 this.ztQlxxList = res.result;
450 } 472 }
451 }); 473 }
452 }, 474 });
453 // 更新土地用途信息 475 //获取主体信息
454 upDateTdytxxList (val) { 476 getSsQlxx({
455 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 477 bdcdyid: this.propsParam.bdcdyid,
456 this.key++; 478 qllx: this.propsParam.qllx,
457 }, 479 }).then((res) => {
458 // 更新权利人信息 480 if (res.code == 200) {
459 upDateQlrxxList (val) { 481 this.ssQlxxList = res.result;
460 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val)); 482 }
461 this.czrOptions = this.ruleForm.qlrData; 483 });
462 this.key++; 484 //获取上手信息
463 }, 485 getZtQlxx({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
464 // 更新义务人信息 486 if (res.code == 200) {
465 upDateYwrxxList (val) { 487 this.ztQlxxList = res.result;
466 this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val)); 488 }
467 this.key++; 489 });
468 }, 490 },
469 onSubmit () { 491 // 更新土地用途信息
470 this.$refs.ruleForm.validate((valid) => { 492 upDateTdytxxList(val) {
471 console.log("valid", valid); 493 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
472 if (valid) { 494 this.key++;
473 if (this.ruleForm.qlrData.length == 0) { 495 },
496 // 更新权利人信息
497 upDateQlrxxList(val) {
498 this.ruleForm.qlrData && (this.ruleForm.qlrData = _.cloneDeep(val));
499 this.czrOptions = this.ruleForm.qlrData;
500 this.key++;
501 },
502 // 更新义务人信息
503 upDateYwrxxList(val) {
504 this.ruleForm.ywrData && (this.ruleForm.ywrData = _.cloneDeep(val));
505 this.key++;
506 },
507 onSubmit() {
508 this.$refs.ruleForm.validate((valid) => {
509 console.log("valid", valid);
510 if (valid) {
511 // if (this.ruleForm.qlrData.length == 0) {
512 // this.$message({
513 // showClose: true,
514 // message: "请确认权利人信息",
515 // type: "error",
516 // });
517 // return false;
518 // }
519
520 // if (this.ruleForm.qlxx.gyfs == "0") {
521 // if (this.ruleForm.qlrData.length > 1) {
522 // this.$message({
523 // showClose: true,
524 // message: "共有方式：单独所有，权利人只能是一个人",
525 // type: "error",
526 // });
527 // return false;
528 // }
529 // this.ruleForm.qlrData[0].sfczr = "1";
530 // }
531 // if (this.ruleForm.qlxx.gyfs == "1") {
532 // //是否分别持证
533 // if (this.ruleForm.qlxx.sqfbcz == "1") {
534 // //是
535 // this.ruleForm.qlrData.forEach((item, index) => {
536 // item.sfczr = "1";
537 // });
538 // } else {
539 // this.ruleForm.qlrData.forEach((item, index) => {
540 // if (item.zjh == this.ruleForm.czr) {
541 // item.sfczr = "1";
542 // } else {
543 // item.sfczr = "0";
544 // }
545 // });
546 // }
547 // }
548 save(this.ruleForm).then((res) => {
549 if (res.code === 200) {
550 this.$message({
551 showClose: true,
552 message: "保存成功！",
553 type: "success",
554 });
555 this.$store.dispatch("user/refreshPage", true);
556 } else {
474 this.$message({ 557 this.$message({
475 showClose: true, 558 showClose: true,
476 message: "请确认权利人信息", 559 message: res.message,
477 type: "error", 560 type: "error",
478 }); 561 });
479 return false;
480 }
481
482 if (this.ruleForm.qlxx.gyfs == "0") {
483 if (this.ruleForm.qlrData.length > 1) {
484 this.$message({
485 showClose: true,
486 message: "共有方式：单独所有，权利人只能是一个人",
487 type: "error",
488 });
489 return false;
490 }
491 this.ruleForm.qlrData[0].sfczr = "1";
492 }
493 if (this.ruleForm.qlxx.gyfs == "1") {
494 //是否分别持证
495 if (this.ruleForm.qlxx.sqfbcz == "1") {
496 //是
497 this.ruleForm.qlrData.forEach((item, index) => {
498 item.sfczr = "1";
499 });
500 } else {
501 this.ruleForm.qlrData.forEach((item, index) => {
502 if (item.zjh == this.ruleForm.czr) {
503 item.sfczr = "1";
504 } else {
505 item.sfczr = "0";
506 }
507 });
508 }
509 } 562 }
510 save(this.ruleForm).then((res) => { 563 });
511 if (res.code === 200) { 564 } else {
512 this.$message({ 565 return false;
513 showClose: true, 566 }
514 message: "保存成功！", 567 });
515 type: "success",
516 });
517 this.$store.dispatch("user/refreshPage", true);
518 } else {
519 this.$message({
520 showClose: true,
521 message: res.message,
522 type: "error",
523 });
524 }
525 });
526 } else {
527 return false;
528 }
529 });
530 },
531 }, 568 },
532 }; 569 },
570 };
533 </script> 571 </script>
534 <style scoped lang="scss"> 572 <style scoped lang="scss">
535 @import "~@/styles/public.scss"; 573 @import "~@/styles/public.scss";
536 @import "~@/styles/slxx/slxx.scss"; 574 @import "~@/styles/slxx/slxx.scss";
537 </style> 575 </style>
......
...@@ -373,8 +373,8 @@ ...@@ -373,8 +373,8 @@
373 v-model="ruleForm.qlxx.djsj" 373 v-model="ruleForm.qlxx.djsj"
374 type="date" 374 type="date"
375 placeholder="选择日期" 375 placeholder="选择日期"
376 value-format="yyyy/MM/dd HH:mm:ss" 376 value-format="yyyy-MM-dd HH:mm:ss"
377 format="yyyy/MM/dd" 377 format="yyyy-MM-dd"
378 > 378 >
379 </el-date-picker> 379 </el-date-picker>
380 </el-form-item> 380 </el-form-item>
...@@ -471,7 +471,7 @@ ...@@ -471,7 +471,7 @@
471 /> 471 />
472 </div> 472 </div>
473 </div> 473 </div>
474 <el-row class="btn"> 474 <el-row class="btn" v-if="!$route.query.viewtype">
475 <el-form-item> 475 <el-form-item>
476 <el-button type="primary" @click="onSubmit">保存</el-button> 476 <el-button type="primary" @click="onSubmit">保存</el-button>
477 </el-form-item> 477 </el-form-item>
......
...@@ -110,7 +110,14 @@ ...@@ -110,7 +110,14 @@
110 </el-col> 110 </el-col>
111 <el-col :span="8"> 111 <el-col :span="8">
112 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules"> 112 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
113 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 113 <el-date-picker
114 v-model="ruleForm.qlxx.djsj"
115 type="date"
116 placeholder="选择日期"
117 value-format="yyyy-MM-dd HH:mm:ss"
118 format="yyyy-MM-dd"
119 >
120 </el-date-picker>
114 </el-form-item> 121 </el-form-item>
115 </el-col> 122 </el-col>
116 <el-col :span="8"> 123 <el-col :span="8">
...@@ -253,7 +260,7 @@ ...@@ -253,7 +260,7 @@
253 /> 260 />
254 </div> 261 </div>
255 </div> 262 </div>
256 <el-row class="btn"> 263 <el-row class="btn" v-if="!$route.query.viewtype">
257 <el-form-item> 264 <el-form-item>
258 <el-button type="primary" @click="onSubmit">保存</el-button> 265 <el-button type="primary" @click="onSubmit">保存</el-button>
259 </el-form-item> 266 </el-form-item>
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 <el-form-item label="登记类型："> 69 <el-form-item label="登记类型：">
70 <el-select v-model="ruleForm.qlxx.djlx"> 70 <el-select v-model="ruleForm.qlxx.djlx">
71 <el-option 71 <el-option
72 v-for="item in dictData['A21']" 72 v-for="item in djlxlist"
73 :key="item.dcode" 73 :key="item.dcode"
74 :label="item.dname" 74 :label="item.dname"
75 :value="item.dcode" 75 :value="item.dcode"
...@@ -219,28 +219,35 @@ ...@@ -219,28 +219,35 @@
219 </el-col> 219 </el-col>
220 220
221 <el-col :span="8"> 221 <el-col :span="8">
222 <el-form-item label="不动产权证号："> 222 <el-form-item label="不动产权证号：" prop="qlxx.bdcqzh" :rules="rules.bdcqzhrules">
223 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 223 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
224 </el-form-item> 224 </el-form-item>
225 </el-col> 225 </el-col>
226 <el-col :span="8"> 226 <el-col :span="8">
227 <el-form-item label="区县代码："> 227 <el-form-item label="区县代码：" prop="qlxx.qxdm" :rules="rules.qxdmrules">
228 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 228 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
229 </el-form-item> 229 </el-form-item>
230 </el-col> 230 </el-col>
231 <el-col :span="8"> 231 <el-col :span="8">
232 <el-form-item label="登记机构："> 232 <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
233 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 233 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
234 </el-form-item> 234 </el-form-item>
235 </el-col> 235 </el-col>
236 <el-col :span="8"> 236 <el-col :span="8">
237 <el-form-item label="登簿人："> 237 <el-form-item label="登簿人：" prop="qlxx.dbr" :rules="rules.dbrrules">
238 <el-input v-model="ruleForm.qlxx.dbr"></el-input> 238 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
239 </el-form-item> 239 </el-form-item>
240 </el-col> 240 </el-col>
241 <el-col :span="8"> 241 <el-col :span="8">
242 <el-form-item label="登记时间："> 242 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
243 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 243 <el-date-picker
244 v-model="ruleForm.qlxx.djsj"
245 type="date"
246 placeholder="选择日期"
247 value-format="yyyy-MM-dd HH:mm:ss"
248 format="yyyy-MM-dd"
249 >
250 </el-date-picker>
244 </el-form-item> 251 </el-form-item>
245 </el-col> 252 </el-col>
246 </el-row> 253 </el-row>
...@@ -328,7 +335,7 @@ ...@@ -328,7 +335,7 @@
328 /> 335 />
329 </div> 336 </div>
330 </div> 337 </div>
331 <el-row class="btn"> 338 <el-row class="btn" v-if="!$route.query.viewtype">
332 <el-form-item> 339 <el-form-item>
333 <el-button type="primary" @click="onSubmit">保存</el-button> 340 <el-button type="primary" @click="onSubmit">保存</el-button>
334 </el-form-item> 341 </el-form-item>
...@@ -366,6 +373,34 @@ export default { ...@@ -366,6 +373,34 @@ export default {
366 373
367 //表单是否可操作 374 //表单是否可操作
368 propsParam: this.$attrs, 375 propsParam: this.$attrs,
376 // 登记类型
377 djlxlist: [
378 {
379 dcode: "100",
380 dname: "首次登记",
381 },
382 {
383 dcode: "200",
384 dname: "转移登记",
385 },
386 {
387 dcode: "300",
388 dname: "变更登记",
389 },
390 {
391 dcode: "500",
392 dname: "更正登记",
393 },
394
395 {
396 dcode: "901",
397 dname: "补证",
398 },
399 {
400 dcode: "902",
401 dname: "换证",
402 },
403 ],
369 // 权属状态 404 // 权属状态
370 qsztlist: [ 405 qsztlist: [
371 { 406 {
...@@ -383,8 +418,16 @@ export default { ...@@ -383,8 +418,16 @@ export default {
383 disabled: true, 418 disabled: true,
384 czrOptions: [], 419 czrOptions: [],
385 ruleForm: {}, 420 ruleForm: {},
386 //传递参数\ 421 //传递参数\
387 rules: {}, 422 rules: {
423 bdcqzhrules:[
424 { required: true, message: "不动产权证号：", trigger: "change" },
425 ],
426 qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
427 djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
428 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
429 djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
430 },
388 }; 431 };
389 }, 432 },
390 created() { 433 created() {
...@@ -393,6 +436,7 @@ export default { ...@@ -393,6 +436,7 @@ export default {
393 mounted() {}, 436 mounted() {},
394 methods: { 437 methods: {
395 loadData() { 438 loadData() {
439
396 this.propsParam.isEdit=this.$parent.isEdit 440 this.propsParam.isEdit=this.$parent.isEdit
397 init(this.propsParam).then((res) => { 441 init(this.propsParam).then((res) => {
398 if (res.code == 200) { 442 if (res.code == 200) {
...@@ -423,6 +467,8 @@ export default { ...@@ -423,6 +467,8 @@ export default {
423 this.key++; 467 this.key++;
424 }, 468 },
425 onSubmit() { 469 onSubmit() {
470 this.$refs.ruleForm.validate((valid) => {
471 if (valid) {
426 if (this.ruleForm.qlrData.length == 0) { 472 if (this.ruleForm.qlrData.length == 0) {
427 this.$message({ 473 this.$message({
428 showClose: true, 474 showClose: true,
...@@ -496,7 +542,11 @@ export default { ...@@ -496,7 +542,11 @@ export default {
496 type: "error", 542 type: "error",
497 }); 543 });
498 } 544 }
545 }); } else {
546 return false;
547 }
499 }); 548 });
549
500 }, 550 },
501 }, 551 },
502 }; 552 };
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 <el-form-item label="登记类型："> 69 <el-form-item label="登记类型：">
70 <el-select v-model="ruleForm.qlxx.djlx"> 70 <el-select v-model="ruleForm.qlxx.djlx">
71 <el-option 71 <el-option
72 v-for="item in dictData['A21']" 72 v-for="item in djlxlist"
73 :key="item.dcode" 73 :key="item.dcode"
74 :label="item.dname" 74 :label="item.dname"
75 :value="item.dcode" 75 :value="item.dcode"
...@@ -107,17 +107,17 @@ ...@@ -107,17 +107,17 @@
107 <el-input v-model="ruleForm.jsydsyq.syqmj"></el-input> 107 <el-input v-model="ruleForm.jsydsyq.syqmj"></el-input>
108 </el-form-item> 108 </el-form-item>
109 </el-col> 109 </el-col>
110 <el-col :span="8"> 110 <el-col :span="8">
111 <el-form-item label="使用权起始时间"> 111 <el-form-item label="使用权起始时间">
112 <el-input v-model="ruleForm.jsydsyq.syqqssj"></el-input> 112 <el-input v-model="ruleForm.jsydsyq.syqqssj"></el-input>
113 </el-form-item> 113 </el-form-item>
114 </el-col> 114 </el-col>
115 <el-col :span="8"> 115 <el-col :span="8">
116 <el-form-item label="使用权结束时间"> 116 <el-form-item label="使用权结束时间">
117 <el-input v-model="ruleForm.jsydsyq.syqjssj"></el-input> 117 <el-input v-model="ruleForm.jsydsyq.syqjssj"></el-input>
118 </el-form-item> 118 </el-form-item>
119 </el-col> 119 </el-col>
120 <el-col :span="8"> 120 <el-col :span="8">
121 <el-form-item label="土地使用期限"> 121 <el-form-item label="土地使用期限">
122 <el-input v-model="ruleForm.jsydsyq.tdsyqx"></el-input> 122 <el-input v-model="ruleForm.jsydsyq.tdsyqx"></el-input>
123 </el-form-item> 123 </el-form-item>
...@@ -148,28 +148,55 @@ ...@@ -148,28 +148,55 @@
148 </el-col> 148 </el-col>
149 149
150 <el-col :span="8"> 150 <el-col :span="8">
151 <el-form-item label="不动产权证号："> 151 <el-form-item
152 label="不动产权证号："
153 prop="qlxx.bdcqzh"
154 :rules="rules.bdcqzhrules"
155 >
152 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 156 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
153 </el-form-item> 157 </el-form-item>
154 </el-col> 158 </el-col>
155 <el-col :span="8"> 159 <el-col :span="8">
156 <el-form-item label="区县代码："> 160 <el-form-item
161 label="区县代码："
162 prop="qlxx.qxdm"
163 :rules="rules.qxdmrules"
164 >
157 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 165 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
158 </el-form-item> 166 </el-form-item>
159 </el-col> 167 </el-col>
160 <el-col :span="8"> 168 <el-col :span="8">
161 <el-form-item label="登记机构："> 169 <el-form-item
170 label="登记机构："
171 prop="qlxx.djjg"
172 :rules="rules.djjgrules"
173 >
162 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 174 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
163 </el-form-item> 175 </el-form-item>
164 </el-col> 176 </el-col>
165 <el-col :span="8"> 177 <el-col :span="8">
166 <el-form-item label="登簿人："> 178 <el-form-item
179 label="登簿人："
180 prop="qlxx.dbr"
181 :rules="rules.dbrrules"
182 >
167 <el-input v-model="ruleForm.qlxx.dbr"></el-input> 183 <el-input v-model="ruleForm.qlxx.dbr"></el-input>
168 </el-form-item> 184 </el-form-item>
169 </el-col> 185 </el-col>
170 <el-col :span="8"> 186 <el-col :span="8">
171 <el-form-item label="登记时间："> 187 <el-form-item
172 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 188 label="登记时间："
189 prop="qlxx.djsj"
190 :rules="rules.djsjrules"
191 >
192 <el-date-picker
193 v-model="ruleForm.qlxx.djsj"
194 type="date"
195 placeholder="选择日期"
196 value-format="yyyy-MM-dd HH:mm:ss"
197 format="yyyy-MM-dd"
198 >
199 </el-date-picker>
173 </el-form-item> 200 </el-form-item>
174 </el-col> 201 </el-col>
175 </el-row> 202 </el-row>
...@@ -253,7 +280,7 @@ ...@@ -253,7 +280,7 @@
253 /> 280 />
254 </div> 281 </div>
255 </div> 282 </div>
256 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation"> 283 <el-row class="btn" v-if="!$route.query.viewtype">
257 <el-form-item> 284 <el-form-item>
258 <el-button type="primary" @click="onSubmit">保存</el-button> 285 <el-button type="primary" @click="onSubmit">保存</el-button>
259 </el-form-item> 286 </el-form-item>
...@@ -289,6 +316,34 @@ export default { ...@@ -289,6 +316,34 @@ export default {
289 propsParam: this.$attrs, 316 propsParam: this.$attrs,
290 ableOperation: true, 317 ableOperation: true,
291 key: 0, 318 key: 0,
319 // 登记类型
320 djlxlist: [
321 {
322 dcode: "100",
323 dname: "首次登记",
324 },
325 {
326 dcode: "200",
327 dname: "转移登记",
328 },
329 {
330 dcode: "300",
331 dname: "变更登记",
332 },
333 {
334 dcode: "500",
335 dname: "更正登记",
336 },
337
338 {
339 dcode: "901",
340 dname: "补证",
341 },
342 {
343 dcode: "902",
344 dname: "换证",
345 },
346 ],
292 // 权属状态 347 // 权属状态
293 qsztlist: [ 348 qsztlist: [
294 { 349 {
...@@ -300,13 +355,21 @@ export default { ...@@ -300,13 +355,21 @@ export default {
300 dname: "历史", 355 dname: "历史",
301 }, 356 },
302 ], 357 ],
303 tdxz:null, 358 tdxz: null,
304 isShow: false, 359 isShow: false,
305 disabled: true, 360 disabled: true,
306 czrOptions: [], 361 czrOptions: [],
307 ruleForm: {}, 362 ruleForm: {},
308 //传递参数\ 363 //传递参数\
309 rules: {}, 364 rules: {
365 bdcqzhrules: [
366 { required: true, message: "不动产权证号：", trigger: "change" },
367 ],
368 qxdmrules: [{ required: true, message: "区县代码", trigger: "blur" }],
369 djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
370 dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
371 djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
372 },
310 }; 373 };
311 }, 374 },
312 created() { 375 created() {
...@@ -319,14 +382,15 @@ export default { ...@@ -319,14 +382,15 @@ export default {
319 return store.getters.dictData[val]; 382 return store.getters.dictData[val];
320 }, 383 },
321 loadData() { 384 loadData() {
322 this.propsParam.isEdit=this.$parent.isEdit 385
386 this.propsParam.isEdit = this.$parent.isEdit;
323 init(this.propsParam).then((res) => { 387 init(this.propsParam).then((res) => {
324 if (res.code == 200) { 388 if (res.code == 200) {
325 this.ruleForm = res.result; 389 this.ruleForm = res.result;
326 if( this.ruleForm.tdytqxList.length>0){ 390 if (this.ruleForm.tdytqxList.length > 0) {
327 this.tdxz=this.ruleForm.tdytqxList[0].qlxzbm 391 this.tdxz = this.ruleForm.tdytqxList[0].qlxzbm;
328 }else{ 392 } else {
329 this.tdxz=null 393 this.tdxz = null;
330 } 394 }
331 this.isShow = true; 395 this.isShow = true;
332 } 396 }
...@@ -349,57 +413,63 @@ export default { ...@@ -349,57 +413,63 @@ export default {
349 this.key++; 413 this.key++;
350 }, 414 },
351 onSubmit() { 415 onSubmit() {
352 if (this.ruleForm.qlrData.length == 0) { 416 this.$refs.ruleForm.validate((valid) => {
353 this.$message({ 417 if (valid) {
354 showClose: true, 418 if (this.ruleForm.qlrData.length == 0) {
355 message: "请确认权利人信息", 419 this.$message({
356 type: "error", 420 showClose: true,
357 }); 421 message: "请确认权利人信息",
358 return false; 422 type: "error",
359 } 423 });
424 return false;
425 }
360 426
361 if (this.ruleForm.qlxx.gyfs == "0") { 427 if (this.ruleForm.qlxx.gyfs == "0") {
362 if (this.ruleForm.qlrData.length > 1) { 428 if (this.ruleForm.qlrData.length > 1) {
363 this.$message({ 429 this.$message({
364 showClose: true, 430 showClose: true,
365 message: "共有方式：单独所有，权利人只能是一个人", 431 message: "共有方式：单独所有，权利人只能是一个人",
366 type: "error", 432 type: "error",
367 }); 433 });
368 return false; 434 return false;
369 } 435 }
370 this.ruleForm.qlrData[0].sfczr = "1"; 436 this.ruleForm.qlrData[0].sfczr = "1";
371 } 437 }
372 if (this.ruleForm.qlxx.gyfs == "1") { 438 if (this.ruleForm.qlxx.gyfs == "1") {
373 //是否分别持证 439 //是否分别持证
374 if (this.ruleForm.qlxx.sqfbcz == "1") { 440 if (this.ruleForm.qlxx.sqfbcz == "1") {
375 //是 441 //是
376 this.ruleForm.qlrData.forEach((item, index) => { 442 this.ruleForm.qlrData.forEach((item, index) => {
377 item.sfczr = "1"; 443 item.sfczr = "1";
378 }); 444 });
379 } else {
380 this.ruleForm.qlrData.forEach((item, index) => {
381 if (item.zjh == this.ruleForm.czr) {
382 item.sfczr = "1";
383 } else { 445 } else {
384 item.sfczr = "0"; 446 this.ruleForm.qlrData.forEach((item, index) => {
447 if (item.zjh == this.ruleForm.czr) {
448 item.sfczr = "1";
449 } else {
450 item.sfczr = "0";
451 }
452 });
453 }
454 }
455 save(this.ruleForm).then((res) => {
456 if (res.code === 200) {
457 this.$message({
458 showClose: true,
459 message: "保存成功！",
460 type: "success",
461 });
462 this.$store.dispatch("user/refreshPage", true);
463 } else {
464 this.$message({
465 showClose: true,
466 message: res.message,
467 type: "error",
468 });
385 } 469 }
386 }); 470 });
387 }
388 }
389 save(this.ruleForm).then((res) => {
390 if (res.code === 200) {
391 this.$message({
392 showClose: true,
393 message: "保存成功！",
394 type: "success",
395 });
396 this.$store.dispatch("user/refreshPage", true);
397 } else { 471 } else {
398 this.$message({ 472 return false;
399 showClose: true,
400 message: res.message,
401 type: "error",
402 });
403 } 473 }
404 }); 474 });
405 }, 475 },
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
100 </el-form-item> 100 </el-form-item>
101 </el-col> 101 </el-col>
102 <el-col :span="8"> 102 <el-col :span="8">
103 <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules"> 103 <el-form-item label="登记机构：" prop="qlxx.djjg" :rules="rules.djjgrules">
104 <el-input v-model="ruleForm.qlxx.djjg"></el-input> 104 <el-input v-model="ruleForm.qlxx.djjg"></el-input>
105 </el-form-item> 105 </el-form-item>
106 </el-col> 106 </el-col>
...@@ -111,7 +111,14 @@ ...@@ -111,7 +111,14 @@
111 </el-col> 111 </el-col>
112 <el-col :span="8"> 112 <el-col :span="8">
113 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules"> 113 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
114 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 114 <el-date-picker
115 v-model="ruleForm.qlxx.djsj"
116 type="date"
117 placeholder="选择日期"
118 value-format="yyyy-MM-dd HH:mm:ss"
119 format="yyyy-MM-dd"
120 >
121 </el-date-picker>
115 </el-form-item> 122 </el-form-item>
116 </el-col> 123 </el-col>
117 <el-col :span="8"> 124 <el-col :span="8">
...@@ -292,7 +299,7 @@ ...@@ -292,7 +299,7 @@
292 /> 299 />
293 </div> 300 </div>
294 </div> 301 </div>
295 <el-row class="btn"> 302 <el-row class="btn" v-if="!$route.query.viewtype">
296 <el-form-item> 303 <el-form-item>
297 <el-button type="primary" @click="onSubmit">保存</el-button> 304 <el-button type="primary" @click="onSubmit">保存</el-button>
298 </el-form-item> 305 </el-form-item>
......
...@@ -110,7 +110,14 @@ ...@@ -110,7 +110,14 @@
110 </el-col> 110 </el-col>
111 <el-col :span="8"> 111 <el-col :span="8">
112 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules"> 112 <el-form-item label="登记时间：" prop="qlxx.djsj" :rules="rules.djsjrules">
113 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 113 <el-date-picker
114 v-model="ruleForm.qlxx.djsj"
115 type="date"
116 placeholder="选择日期"
117 value-format="yyyy-MM-dd HH:mm:ss"
118 format="yyyy-MM-dd"
119 >
120 </el-date-picker>
114 </el-form-item> 121 </el-form-item>
115 </el-col> 122 </el-col>
116 <el-col :span="8"> 123 <el-col :span="8">
...@@ -154,7 +161,14 @@ ...@@ -154,7 +161,14 @@
154 </el-col> 161 </el-col>
155 <el-col :span="8"> 162 <el-col :span="8">
156 <el-form-item label="注销异议登记时间"> 163 <el-form-item label="注销异议登记时间">
157 <el-input v-model="ruleForm.yydj.zxyydjsj"></el-input> 164 <el-date-picker
165 v-model="ruleForm.yydj.zxyydjsj"
166 type="date"
167 placeholder="选择日期"
168 value-format="yyyy-MM-dd HH:mm:ss"
169 format="yyyy-MM-dd"
170 >
171 </el-date-picker>
158 </el-form-item> 172 </el-form-item>
159 </el-col> 173 </el-col>
160 <el-col :span="8"> 174 <el-col :span="8">
...@@ -203,8 +217,7 @@ ...@@ -203,8 +217,7 @@
203 /> 217 />
204 </div> 218 </div>
205 </div> 219 </div>
206 <!-- <el-row class="btn" v-if="!$route.query.viewtype && ableOperation"> --> 220 <el-row class="btn" v-if="!$route.query.viewtype">
207 <el-row class="btn">
208 <el-form-item> 221 <el-form-item>
209 <el-button type="primary" @click="onSubmit">保存</el-button> 222 <el-button type="primary" @click="onSubmit">保存</el-button>
210 </el-form-item> 223 </el-form-item>
......
...@@ -4,230 +4,233 @@ ...@@ -4,230 +4,233 @@
4 * @LastEditTime: 2023-05-17 10:41:24 4 * @LastEditTime: 2023-05-17 10:41:24
5 --> 5 -->
6 <template> 6 <template>
7 <div class='spyj loadingtext'> 7 <div class="spyj loadingtext">
8 <div class="box"> 8 <div class="box">
9 <b class="spyj_title">审批表</b> 9 <b class="spyj_title">审批表</b>
10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 10 <div v-for="(item, index) in tableData" :key="index">
11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index"> 11 <el-form :model="tableData[index]" label-width="120px" :rules="rules" :ref="'ruleFormRef'+index">
12 <div class="item_left"> 12 <div class="spyj_form" >
13 {{ item.jdmc }}意见 13 <div class="item_left">{{ item.jdmc }}意见</div>
14 </div>
15 <div class="item_right"> 14 <div class="item_right">
16 <el-row> 15 <el-row>
17 <el-col :span="24"> 16 <el-col :span="24">
18 <el-form-item label-width="0" class="opinion_item" prop="shyj"> 17 <el-form-item
19 <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入审批意见" 18 label-width="0"
20 v-if="item.stepShjy == '1' && ableOperation" v-model="ruleForm.shyj"></el-input> 19 class="opinion_item"
21 <el-input type="textarea" :rows="4" class="opinion" v-model="item.shyj" v-else :disabled="true"> 20 prop="shyj"
22 </el-input> 21 >
23 <el-button class="opinion_btn" @click="commonOpinion" 22 <el-input
24 v-if="item.stepShjy == '1' && ableOperation">常用意见</el-button> 23 type="textarea"
24 :rows="4"
25 class="opinion"
26 placeholder="请输入审批意见"
27 v-model="item.shyj"
28 ></el-input>
25 </el-form-item> 29 </el-form-item>
26 </el-col> 30 </el-col>
27 </el-row> 31 </el-row>
28 <el-row> 32 <el-row>
29 <el-col :span="16"> 33 <el-col :span="16">
30 <el-form-item label="审查人" prop="shryxm"> 34 <el-form-item
31 {{ item.shryxm }} 35 label="审查人"
36 prop="shryxm"
37 >
38 <el-input v-model="item.shryxm"></el-input>
32 </el-form-item> 39 </el-form-item>
33 </el-col> 40 </el-col>
34 <el-col :span="8"> 41 <el-col :span="8">
35 <el-form-item label="审核时间" prop="shjssj" :key="refresh"> 42 <el-form-item
36 {{ item.shjssj }} 43 label="审核时间"
44 prop="shsj"
45 >
46 <el-date-picker
47 v-model="item.shsj"
48 type="date"
49 placeholder="选择日期"
50 value-format="yyyy/MM/dd HH:mm:ss"
51 format="yyyy/MM/dd"
52 >
53 </el-date-picker>
37 </el-form-item> 54 </el-form-item>
38 </el-col> 55 </el-col>
39 </el-row> 56 </el-row>
40 </div> 57 </div>
41 </div> 58 </div>
42 <div class="submit_button" v-if="ableOperation">
43 <el-button type="primary" @click="onSubmit">保存</el-button>
44 </div>
45 </el-form> 59 </el-form>
60 </div>
61 <div class="submit_button" v-if="!$route.query.viewtype">
62 <el-button type="primary" @click="onSubmit('ruleFormRef')">保存</el-button>
63 </div>
46 </div> 64 </div>
47 <el-empty v-if="isNoData" description="暂无数据"></el-empty> 65 <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
48 </div> 66 </div>
49 </template> 67 </template>
50 <script> 68 <script>
51 import { getSpyjList, saveSpyj, saveSpyjBySlsq } from "@/api/fqsq.js"; 69 import { addidea } from "@/api/djbbl.js";
52 import { mapGetters } from 'vuex' 70 import { mapGetters } from "vuex";
53 export default { 71 export default {
54 computed: { 72 computed: {
55 ...mapGetters(['userData', 'yjsqOptions']) 73 ...mapGetters(["userData", "yjsqOptions"]),
56 }, 74 },
57 data () { 75 data() {
58 return { 76 return {
59 isNoData: false, 77 isNoData: false,
60 bsmSlsq: '', 78 ableOperation: true,
61 //刷新值 79
62 refresh: 10, 80 tableData: [{ jdmc: "初审" }, { jdmc: "复审" }, { jdmc: "核定" }],
63 ableOperation: true, 81
64 bsmSlsq: this.$route.query.bsmSlsq, 82 rules: {
65 bestepid: this.$route.query.bestepid, 83 shyj: [{ required: true, message: "请填写意见", trigger: "blur" }],
66 ruleForm: {}, 84 shryxm: [{ required: true, message: "审查人", trigger: "blur" }],
67 rules: { 85 shsj: [{ required: true, message: "审核时间", trigger: "blur" }],
68 shyj: [
69 { required: true, message: '请输入审批意见', trigger: 'blur' }
70 ],
71 },
72 tableData: [],
73 propsParam: {}
74 }
75 },
76 watch: {
77 yjsqOptions: {
78 handler (val) {
79 this.ruleForm.shyj = val
80 },
81 deep: true,
82 immediate: true
83 },
84 },
85 mounted () {
86 this.propsParam = this.$attrs;
87 if (this.$route.query.viewtype) {
88 this.ableOperation = false
89 }
90 this.list();
91 },
92 methods: {
93 //审批意见数据初始化
94 list () {
95 let that = this
96 this.$startLoading()
97 var formdata = new FormData();
98 formdata.append("bsmBusiness", this.propsParam.bsmRepair);
99 formdata.append("bestepid", this.$route.query.bestepid);
100 formdata.append("ableOperation", this.ableOperation)
101 getSpyjList(formdata).then((res) => {
102 this.$endLoading()
103 if (res.code === 200 && res.result) {
104 console.log("this.tableData this.tableData this.tableData ",this.tableData );
105 this.tableData = res.result ? res.result : []
106 console.log("this.tableDatathis.tableDatathis.tableDatathis.tableData",this.tableData);
107 if (res.result.length == 0) {
108 that.isNoData = true
109 }
110 this.ruleForm = res.result[res.result.length - 1]
111 }
112 })
113 }, 86 },
114 onSubmit () { 87 };
115 this.ruleForm.bsmSlsq = this.bsmSlsq 88 },
116 this.ruleForm.bestepid = this.bestepid 89
117 saveSpyjBySlsq(this.ruleForm).then(res => { 90 watch: {},
118 if (res.code === 200) { 91 created() {},
119 this.$message.success("保存成功") 92 mounted() {},
120 this.refresh += 1 93 methods: {
121 } else { 94 onSubmit(formName) {
122 this.$message.error(res.message) 95 const falg = []
96 for (let index = 0; index < this.tableData.length; index++) {
97 this.$refs[formName + index][0].validate((valid) => {
98 if (valid) {
99 falg.push(1)
123 } 100 }
124 }) 101 });
125 },
126 //打开常用意见列表弹窗
127 commonOpinion () {
128 this.$popupDialog("常用意见", "djbworkflow/components/dialog/commonOpinion", {}, "70%", true)
129 },
130 //使用常用意见
131 useOpinion (opinion) {
132 this.ruleForm.shyj = opinion
133 } 102 }
134 } 103 if (falg.length == this.tableData.length) {
135 } 104 this.tableData.forEach((item, index) => {
105 item["bsmBusiness"] = this.$parent.bsmRepair;
106 }),
107 addidea(this.tableData).then((res) => {
108 if (res.code === 200) {
109 this.$message.success("保存成功");
110 this.refresh += 1;
111 } else {
112 this.$message.error(res.message);
113 }
114 });
115 alert(1)
116 } else {
117 return false;
118 }
119 },
120 // onSubmit() {
121 // this.$refs.tablelist[index].validate((valid) => {
122 // if (valid) {
123 // this.tableData.forEach((item, index) => {
124 // item["bsmBusiness"] = this.$parent.bsmRepair;
125 // }),
126 // addidea(this.tableData).then((res) => {
127 // if (res.code === 200) {
128 // this.$message.success("保存成功");
129 // this.refresh += 1;
130 // } else {
131 // this.$message.error(res.message);
132 // }
133 // });
134 // }
135 // });
136 // },
137 },
138 };
136 </script> 139 </script>
137 <style scoped lang='scss'> 140 <style scoped lang="scss">
138 @import "~@/styles/mixin.scss"; 141 @import "~@/styles/mixin.scss";
139 142
140 .spyj { 143 .spyj {
144 width: 100%;
145 height: 100%;
146 background-color: #f5f5f5;
147 padding: 5px;
148 .box {
149 overflow-x: auto;
141 width: 100%; 150 width: 100%;
142 height: 100%; 151 height: 95%;
143 background-color: #f5f5f5; 152 background: #fff;
144 padding: 5px; 153 text-align: center;
145 .box { 154 padding: 4px;
146 overflow-x: auto; 155 overflow-y: scroll;
147 width: 100%; 156 padding-top: 20px;
148 height: 95%; 157 padding: 20px 40px;
149 background: #fff; 158 }
150 text-align: center; 159 .spyj_title {
151 padding: 4px; 160 line-height: 68px;
152 overflow-y: scroll; 161 border: 1px solid $borderColor;
153 padding-top: 20px; 162 text-align: center;
154 padding: 20px 40px; 163 font-size: 22px;
155 } 164 font-weight: 400;
156 .spyj_title { 165 background-color: #eceef2;
157 line-height: 68px; 166 display: block;
158 border: 1px solid $borderColor; 167 border-bottom: none;
159 text-align: center; 168 }
160 font-size: 22px;
161 font-weight: 400;
162 background-color: #eceef2;
163 display: block;
164 border-bottom: none;
165 }
166 169
167 /deep/.el-form-item { 170 /deep/.el-form-item {
168 margin-bottom: 0; 171 margin-bottom: 0;
169 } 172 }
170 173
171 .bottom10 { 174 .bottom10 {
172 margin-bottom: 15px; 175 margin-bottom: 15px;
173 } 176 }
177
178 .spyj_form {
179 display: flex;
180 border: 1px solid $borderColor;
174 181
175 .spyj_form { 182 .item_left {
183 width: 150px;
184 background-color: #f8f8fa;
185 color: #606266;
176 display: flex; 186 display: flex;
177 border: 1px solid $borderColor; 187 font-size: 14px;
188 text-indent: 80px;
189 align-items: center;
190 border-right: 1px solid $borderColor;
191 }
192
193 .item_right {
194 flex: 1;
195 width: 100%;
178 196
179 .item_left { 197 /deep/.el-form-item__label {
180 width: 150px;
181 background-color: #f8f8fa; 198 background-color: #f8f8fa;
182 color: #606266;
183 display: flex;
184 font-size: 14px;
185 text-indent: 80px;
186 align-items: center;
187 border-right: 1px solid $borderColor;
188 } 199 }
189 200 /deep/.el-form-item__content {
190 .item_right { 201 display: block;
191 flex: 1; 202 text-align: left;
192 width: 100%; 203 text-indent: 10px;
193 204 }
194 /deep/.el-form-item__label { 205 .opinion_item {
195 background-color: #f8f8fa; 206 /deep/.el-form-item__error {
196 } 207 margin-top: -16px !important;
197 /deep/.el-form-item__content { 208 left: 3px;
198 display: block;
199 text-align: left;
200 text-indent: 10px;
201 } 209 }
202 .opinion_item {
203 /deep/.el-form-item__error {
204 margin-top: -16px !important;
205 left: 3px;
206 }
207 210
208 border-bottom: 1px solid $borderColor; 211 border-bottom: 1px solid $borderColor;
209 } 212 }
210 213
211 .opinion { 214 .opinion {
212 position: relative; 215 position: relative;
213 font-size: 14px; 216 font-size: 14px;
214 217
215 /deep/.el-textarea__inner { 218 /deep/.el-textarea__inner {
216 border: none; 219 border: none;
217 }
218 } 220 }
221 }
219 222
220 .opinion_btn { 223 .opinion_btn {
221 position: absolute; 224 position: absolute;
222 right: 15px; 225 right: 15px;
223 bottom: 10px; 226 bottom: 10px;
224 }
225 } 227 }
226 } 228 }
229 }
227 230
228 .submit_button { 231 .submit_button {
229 text-align: center; 232 text-align: center;
230 margin: 15px 0; 233 margin: 15px 0;
231 }
232 } 234 }
235 }
233 </style> 236 </style>
......
...@@ -67,21 +67,22 @@ export default { ...@@ -67,21 +67,22 @@ export default {
67 case "B0": 67 case "B0":
68 this.openDialog() 68 this.openDialog()
69 break; 69 break;
70 case "B1": 70 case "B1":
71 getWorkFlowImage(this.bsmSlsq, this.$route.query.bestepid).then(res => { 71 getWorkFlowImage(this.bsmSlsq, this.$route.query.bestepid).then(res => {
72 let { result } = res 72 let { result } = res
73 this.$popupDialog("流程图", "workflow/components/processViewer", { 73 this.$popupDialog("流程图", "workflow/components/processViewer", {
74 xml: result.xml, 74 xml: result.xml,
75 finishedInfo: { 75 finishedInfo: {
76 finishedTaskSet: result.finishedActivityIds, 76 finishedTaskSet: result.finishedActivityIds,
77 unfinishedTaskSet: result.runningActivityIds, 77 unfinishedTaskSet: result.runningActivityIds,
78 rejectedTaskSet: result.rejectedTaskSet, 78 rejectedTaskSet: {},
79 finishedSequenceFlowSet: result.finishedSequenceFlowIds 79 finishedSequenceFlowSet: result.finishedSequenceFlowIds
80 }, 80 },
81 allCommentList: result.historyTaskList 81 handlinglist:result.runningTasks,
82 }, '80%', true) 82 allCommentList: result.finishedTasks
83 }) 83 }, '80%', true)
84 break; 84 })
85 break;
85 case "B2": //材料分屏按钮 86 case "B2": //材料分屏按钮
86 87
87 this.closefp() 88 this.closefp()
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-05 09:55:42 4 * @LastEditTime: 2023-07-05 09:55:42
5 --> 5 -->
...@@ -67,9 +67,11 @@ ...@@ -67,9 +67,11 @@
67 ...mapGetters(["dictData"]) 67 ...mapGetters(["dictData"])
68 }, 68 },
69 created () { 69 created () {
70 this.ableOperation = this.$parent?.currentSelectTab?.ableOperation || false
71 this.clmlInitList(1) 70 this.clmlInitList(1)
72 }, 71 },
72 mounted() {
73 this.ableOperation = this.$parent.isEdit;
74 },
73 methods: { 75 methods: {
74 // 自动预览 76 // 自动预览
75 nextPriview () { 77 nextPriview () {
...@@ -125,7 +127,6 @@ ...@@ -125,7 +127,6 @@
125 this.previewImg.bsmSj = item.bsmSj; 127 this.previewImg.bsmSj = item.bsmSj;
126 }, 128 },
127 updateList (val) { 129 updateList (val) {
128 console.log(val, 'valvalvalval');
129 let that = this 130 let that = this
130 if (val.children.length != []) { //删除最后一张图片时 val=null 131 if (val.children.length != []) { //删除最后一张图片时 val=null
131 this.tableData.forEach(item => { 132 this.tableData.forEach(item => {
...@@ -339,4 +340,4 @@ ...@@ -339,4 +340,4 @@
339 } 340 }
340 } 341 }
341 } 342 }
342 </style>
...\ No newline at end of file ...\ No newline at end of file
343 </style>
......
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
83 }, 83 },
84 }, 84 },
85 mounted () { 85 mounted () {
86 this.propsParam.isEdit=this.$parent.isEdit
86 this.propsParam = this.$attrs; 87 this.propsParam = this.$attrs;
87 if (this.$route.query.viewtype) { 88 if (this.$route.query.viewtype) {
88 this.ableOperation = false 89 this.ableOperation = false
......
...@@ -198,9 +198,9 @@ ...@@ -198,9 +198,9 @@
198 "/djbworkFrameview?bsmSlsq=" + 198 "/djbworkFrameview?bsmSlsq=" +
199 item.bsmSlsq + 199 item.bsmSlsq +
200 "&bestepid=" + 200 "&bestepid=" +
201 item.bestepid + 201 item.bestepid+
202 "&isEdit=" + 202 "&bsmBusiness=" +
203 true 203 "&viewtype=1"
204 ); 204 );
205 window.open(href, `urlname${item.bsmSlsq}`); 205 window.open(href, `urlname${item.bsmSlsq}`);
206 } else { 206 } else {
......