Skip to content

bdc / bdcdj-web

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

Merge branch 'dev'

2 parents c57b1d5b d1a1eecf
Expand all
Inline Side-by-side
Showing 16 changed files with 719 additions and 639 deletions
...@@ -147,9 +147,11 @@ div:focus { ...@@ -147,9 +147,11 @@ div:focus {
147 .pl-5 { 147 .pl-5 {
148 padding-left: 5px; 148 padding-left: 5px;
149 } 149 }
150
150 .pt-10 { 151 .pt-10 {
151 padding-top: 10px; 152 padding-top: 10px;
152 } 153 }
154
153 .block { 155 .block {
154 display: block; 156 display: block;
155 } 157 }
...@@ -383,7 +385,65 @@ aside { ...@@ -383,7 +385,65 @@ aside {
383 transition: 0.5s; 385 transition: 0.5s;
384 margin-left: -1px; 386 margin-left: -1px;
385 border-top: 0; 387 border-top: 0;
388
386 .el-checkbox__label { 389 .el-checkbox__label {
387 font-size: 16px; 390 font-size: 16px;
388 } 391 }
389 } 392 }
393
394
395 .linshiIcon {
396 position: relative;
397
398 .icon {
399 position: absolute;
400 top: 12px;
401 right: -5px;
402 transform: rotate(45deg);
403 color: #fff;
404 font-size: 12px;
405 z-index: 10;
406 }
407 }
408
409 .linshiIcon::after {
410 content: "";
411 display: block;
412 width: 0;
413 height: 0;
414 border-width: 0px 0px 55px 55px;
415 border-style: none solid solid;
416 border-color: transparent transparent #fe9400;
417 position: absolute;
418 top: 0;
419 right: 0;
420 transform: rotate(-90deg);
421 }
422
423 .xianshiIcon {
424 position: relative;
425
426 .icon {
427 position: absolute;
428 top: 9px;
429 right: 5px;
430 transform: rotate(45deg);
431 color: #fff;
432 font-size: 12px;
433 z-index: 10;
434 }
435 }
436
437 .xianshiIcon::after {
438 content: "";
439 display: block;
440 width: 0;
441 height: 0;
442 border-width: 0px 0px 55px 55px;
443 border-style: none solid solid;
444 border-color: transparent transparent #67C23A;
445 position: absolute;
446 top: 0;
447 right: 0;
448 transform: rotate(-90deg);
449 }
...\ No newline at end of file ...\ No newline at end of file
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-03 08:59:06
5 */
6 import store from '@/store'
1 export function getSjlx (level) { 7 export function getSjlx (level) {
2 const resultMap = { 8 const resultMap = {
3 1: '系统数据', 9 1: '系统数据',
...@@ -5,4 +11,16 @@ export function getSjlx (level) { ...@@ -5,4 +11,16 @@ export function getSjlx (level) {
5 3: '补录数据', 11 3: '补录数据',
6 } 12 }
7 return resultMap[level] || resultMap.default; 13 return resultMap[level] || resultMap.default;
14 }
15
16 export function getDictLeabel (level, code) {
17 const resultMap = store.getters.dictData[code]
18 const desiredObject = resultMap.find(obj => obj.dcode === level);
19
20 if (desiredObject) {
21 const desiredName = desiredObject.dname;
22 return desiredName
23 } else {
24 return ''
25 }
8 } 26 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -107,64 +107,6 @@ ...@@ -107,64 +107,6 @@
107 } 107 }
108 } 108 }
109 109
110 .linshiIcon {
111 position: relative;
112
113 .icon {
114 position: absolute;
115 top: 12px;
116 right: -5px;
117 transform: rotate(45deg);
118 color: #fff;
119 font-size: 12px;
120 z-index: 10;
121 }
122 }
123
124 .linshiIcon::after {
125 content: "";
126 display: block;
127 width: 0;
128 height: 0;
129 border-width: 0px 0px 55px 55px;
130 border-style: none solid solid;
131 border-color: transparent transparent #fe9400;
132 position: absolute;
133 top: 0;
134 right: 0;
135 transform: rotate(-90deg);
136 }
137
138 .xianshiIcon {
139 position: relative;
140
141 .icon {
142 position: absolute;
143 top: 9px;
144 right: 5px;
145 transform: rotate(45deg);
146 color: #fff;
147 font-size: 12px;
148 z-index: 10;
149 }
150 }
151
152 .xianshiIcon::after {
153 content: "";
154 display: block;
155 width: 0;
156 height: 0;
157 border-width: 0px 0px 55px 55px;
158 border-style: none solid solid;
159 border-color: transparent transparent #67C23A;
160 position: absolute;
161 top: 0;
162 right: 0;
163 transform: rotate(-90deg);
164 }
165
166
167
168 tr { 110 tr {
169 display: flex; 111 display: flex;
170 } 112 }
...@@ -209,4 +151,4 @@ ...@@ -209,4 +151,4 @@
209 margin-left: 2px; 151 margin-left: 2px;
210 } 152 }
211 } 153 }
212 } 154 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ class data extends filter { ...@@ -4,7 +4,7 @@ class data extends filter {
4 constructor() { 4 constructor() {
5 super() 5 super()
6 } 6 }
7 columns() { 7 columns () {
8 return { 8 return {
9 //空列值个数 9 //空列值个数
10 emptycolNum: 3, 10 emptycolNum: 3,
...@@ -26,9 +26,10 @@ class data extends filter { ...@@ -26,9 +26,10 @@ class data extends filter {
26 ], 26 ],
27 JSYDSYQ: [ 27 JSYDSYQ: [
28 28
29 { prop:"cz", 29 {
30 label:"操作", 30 prop: "cz",
31 render: (h, scope) => { 31 label: "操作",
32 render: (h, scope) => {
32 return ( 33 return (
33 <div> 34 <div>
34 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope.row) }}>登记薄</el-button> 35 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope.row) }}>登记薄</el-button>
...@@ -144,8 +145,9 @@ class data extends filter { ...@@ -144,8 +145,9 @@ class data extends filter {
144 ], 145 ],
145 FDCQ2: [ 146 FDCQ2: [
146 147
147 { prop:"cz", 148 {
148 label:"操作" 149 prop: "cz",
150 label: "操作"
149 }, 151 },
150 { 152 {
151 prop: "qszt", 153 prop: "qszt",
...@@ -283,8 +285,9 @@ class data extends filter { ...@@ -283,8 +285,9 @@ class data extends filter {
283 ], 285 ],
284 NYDSYQ: [ 286 NYDSYQ: [
285 287
286 { prop:"cz", 288 {
287 label:"操作" 289 prop: "cz",
290 label: "操作"
288 }, 291 },
289 { 292 {
290 prop: "qszt", 293 prop: "qszt",
...@@ -412,9 +415,9 @@ class data extends filter { ...@@ -412,9 +415,9 @@ class data extends filter {
412 }, 415 },
413 ], 416 ],
414 DYAQ: [ 417 DYAQ: [
415 418 {
416 { prop:"cz", 419 prop: "cz",
417 label:"操作" 420 label: "操作"
418 }, 421 },
419 { 422 {
420 prop: "qszt", 423 prop: "qszt",
...@@ -423,6 +426,19 @@ class data extends filter { ...@@ -423,6 +426,19 @@ class data extends filter {
423 { 426 {
424 prop: "dybdclx", 427 prop: "dybdclx",
425 label: "抵押不动产类型", 428 label: "抵押不动产类型",
429 render: (h, scope) => {
430 return (
431 <div>
432 <span v-show={scope.row.dybdclx == '1'}>土地</span>
433 <span v-show={scope.row.dybdclx == '2'}>土地和房屋</span>
434 <span v-show={scope.row.dybdclx == '3'}>林地和林木</span>
435 <span v-show={scope.row.dybdclx == '4'}>土地和在建建筑物</span>
436 <span v-show={scope.row.dybdclx == '5'}>海域</span>
437 <span v-show={scope.row.dybdclx == '6'}>海域和构筑物</span>
438 <span v-show={scope.row.dybdclx == '7'}>其它</span>
439 </div>
440 )
441 }
426 }, 442 },
427 { 443 {
428 prop: "djlxmc", 444 prop: "djlxmc",
...@@ -572,8 +588,9 @@ class data extends filter { ...@@ -572,8 +588,9 @@ class data extends filter {
572 ], 588 ],
573 DYIQ: [ 589 DYIQ: [
574 590
575 { prop:"cz", 591 {
576 label:"操作" 592 prop: "cz",
593 label: "操作"
577 }, 594 },
578 { 595 {
579 prop: "qszt", 596 prop: "qszt",
...@@ -666,8 +683,9 @@ class data extends filter { ...@@ -666,8 +683,9 @@ class data extends filter {
666 ], 683 ],
667 YGDJ: [ 684 YGDJ: [
668 685
669 { prop:"cz", 686 {
670 label:"操作" 687 prop: "cz",
688 label: "操作"
671 }, 689 },
672 { 690 {
673 prop: "qszt", 691 prop: "qszt",
...@@ -792,8 +810,9 @@ class data extends filter { ...@@ -792,8 +810,9 @@ class data extends filter {
792 ], 810 ],
793 CFDJ: [ 811 CFDJ: [
794 812
795 { prop:"cz", 813 {
796 label:"操作" 814 prop: "cz",
815 label: "操作"
797 }, 816 },
798 { 817 {
799 prop: "qszt", 818 prop: "qszt",
...@@ -903,8 +922,9 @@ class data extends filter { ...@@ -903,8 +922,9 @@ class data extends filter {
903 ], 922 ],
904 YYDJ: [ 923 YYDJ: [
905 924
906 { prop:"cz", 925 {
907 label:"操作" 926 prop: "cz",
927 label: "操作"
908 }, 928 },
909 { 929 {
910 prop: "qszt", 930 prop: "qszt",
......
...@@ -22,13 +22,19 @@ ...@@ -22,13 +22,19 @@
22 :class="[ 22 :class="[
23 row.qszt == '2' ? 'lishi' : '', 23 row.qszt == '2' ? 'lishi' : '',
24 row.qszt == '0' ? 'linshi' : '', 24 row.qszt == '0' ? 'linshi' : '',
25 item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))? 'linshiIcon' : '', 25 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
26 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
26 ]"> 27 ]">
27 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 28 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
28 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
31 </div>
32 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
33 正在办理
34 </div>
35 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
36 有效
30 </div> 37 </div>
31 <div class="icon" v-if="item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))">正在办理</div>
32 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span> 38 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
33 39
34 <span v-else>{{ row[item.prop] }}</span> 40 <span v-else>{{ row[item.prop] }}</span>
...@@ -66,9 +72,9 @@ ...@@ -66,9 +72,9 @@
66 }, 72 },
67 methods: { 73 methods: {
68 loadData () { 74 loadData () {
69 if (this.$parent.addRepairRecord) { 75 if (this.$parent.addRepairRecord) {
70 this.columns.unshift({ prop: "cz", label: "操作" }); 76 this.columns.unshift({ prop: "cz", label: "操作" });
71 } 77 }
72 getCfdjList({ 78 getCfdjList({
73 bdcdyid: this.propsParam.bdcdyid, 79 bdcdyid: this.propsParam.bdcdyid,
74 qllx: this.propsParam.qllx, 80 qllx: this.propsParam.qllx,
...@@ -113,28 +119,28 @@ ...@@ -113,28 +119,28 @@
113 } 119 }
114 return name; 120 return name;
115 }, 121 },
116 // 新增一条补录信息 122 // 新增一条补录信息
117 editDialog(row, del) { 123 editDialog (row, del) {
118 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 124 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
119 confirmButtonText: "确定", 125 confirmButtonText: "确定",
120 cancelButtonText: "取消", 126 cancelButtonText: "取消",
121 type: "warning", 127 type: "warning",
122 })
123 .then(() => {
124 this.$parent.addRepairRecord(row, del);
125
126 this.$message({
127 type: "success",
128 message: "补录成功!",
129 });
130 }) 128 })
131 .catch(() => { 129 .then(() => {
132 this.$message({ 130 this.$parent.addRepairRecord(row, del);
133 type: "info", 131
134 message: "取消编辑", 132 this.$message({
133 type: "success",
134 message: "补录成功!",
135 });
136 })
137 .catch(() => {
138 this.$message({
139 type: "info",
140 message: "取消编辑",
141 });
135 }); 142 });
136 }); 143 },
137 },
138 }, 144 },
139 }; 145 };
140 </script> 146 </script>
......
...@@ -8,9 +8,7 @@ ...@@ -8,9 +8,7 @@
8 <el-checkbox 8 <el-checkbox
9 v-for="item in qsztList" 9 v-for="item in qsztList"
10 :key="item.value" 10 :key="item.value"
11 :label="item.value" 11 :label="item.value">{{ item.label }}</el-checkbox>
12 >{{ item.label }}</el-checkbox
13 >
14 </el-checkbox-group> 12 </el-checkbox-group>
15 </div> 13 </div>
16 </div> 14 </div>
...@@ -27,25 +25,24 @@ ...@@ -27,25 +25,24 @@
27 row.qszt == '2' ? 'lishi' : '', 25 row.qszt == '2' ? 'lishi' : '',
28 row.qszt == '0' ? 'linshi' : '', 26 row.qszt == '0' ? 'linshi' : '',
29 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 27 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
30 ]" 28 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
31 > 29 ]">
32 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 30 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
33 <el-button 31 <el-button
34 type="text" 32 type="text"
35 icon="el-icon-edit-outline" 33 icon="el-icon-edit-outline"
36 @click="editDialog(row)" 34 @click="editDialog(row)">编辑</el-button>
37 >编辑</el-button
38 >
39 <el-button 35 <el-button
40 type="text" 36 type="text"
41 icon="el-icon-edit-outline" 37 icon="el-icon-edit-outline"
42 @click="editDialog(row, 'D')" 38 @click="editDialog(row, 'D')">删除</el-button>
43 >删除</el-button
44 >
45 </div> 39 </div>
46 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 40 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
47 正在办理 41 正在办理
48 </div> 42 </div>
43 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
44 有效
45 </div>
49 <span v-if="item.prop == 'qszt'"> 46 <span v-if="item.prop == 'qszt'">
50 {{ getQsztName(row[item.prop]) }} 47 {{ getQsztName(row[item.prop]) }}
51 </span> 48 </span>
...@@ -61,96 +58,96 @@ ...@@ -61,96 +58,96 @@
61 </template> 58 </template>
62 59
63 <script> 60 <script>
64 import { datas } from "./qlxxFormData.js"; 61 import { datas } from "./qlxxFormData.js";
65 import { getSjlx } from "@/utils/dictionary.js"; 62 import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
66 import { getDiyaqList } from "@/api/registerBook.js"; 63 import { getDiyaqList } from "@/api/registerBook.js";
67 export default { 64 export default {
68 data() { 65 data () {
69 return { 66 return {
70 title: "抵押权登记信息", 67 title: "抵押权登记信息",
71 qsztList: datas.columns().qsztList, 68 qsztList: datas.columns().qsztList,
72 checkList: datas.columns().checkList, 69 checkList: datas.columns().checkList,
73 //传递参数 70 //传递参数
74 propsParam: this.$attrs, 71 propsParam: this.$attrs,
75 //列表数据 72 //列表数据
76 tableData: [], 73 tableData: [],
77 //空列值个数 74 //空列值个数
78 emptycolNum: datas.columns().emptycolNum, 75 emptycolNum: datas.columns().emptycolNum,
79 //列名称对象 76 //列名称对象
80 columns: datas.columns().DYAQ, 77 columns: datas.columns().DYAQ,
81 }; 78 };
82 },
83 created() {
84 this.loadData();
85 },
86 methods: {
87 loadData() {
88 if (this.$parent.addRepairRecord) {
89 this.columns.unshift({ prop: "cz", label: "操作" });
90 }
91 getDiyaqList({
92 bdcdyid: this.propsParam.bdcdyid,
93 qllx: this.propsParam.qllx,
94 qszt: this.checkList,
95 }).then((res) => {
96 if (res.code === 200) {
97 this.tableData = res.result;
98 this.tableData.forEach((item) => {
99 item.sjlx = getSjlx(item.sjlx);
100 });
101 if (this.tableData.length < datas.columns().emptycolNum) {
102 this.emptycolNum =
103 datas.columns().emptycolNum - this.tableData.length;
104 } else {
105 this.emptycolNum = 0;
106 }
107 }
108 });
109 }, 79 },
110 checkChange() { 80 created () {
111 if (this.checkList.length === 0) { 81 this.loadData();
112 this.tableData = [];
113 this.emptycolNum = datas.columns().emptycolNum;
114 } else {
115 this.loadData();
116 }
117 }, 82 },
118 getQsztName(code) { 83 methods: {
119 let name = ""; 84 loadData () {
120 for (let item of this.qsztList) { 85 if (this.$parent.addRepairRecord) {
121 if (item.value == code) { 86 this.columns.unshift({ prop: "cz", label: "操作" });
122 name = item.label;
123 break;
124 } 87 }
125 } 88 getDiyaqList({
126 return name; 89 bdcdyid: this.propsParam.bdcdyid,
127 }, 90 qllx: this.propsParam.qllx,
128 // 新增一条补录信息 91 qszt: this.checkList,
129 editDialog(row, del) { 92 }).then((res) => {
130 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 93 if (res.code === 200) {
131 confirmButtonText: "确定", 94 this.tableData = res.result;
132 cancelButtonText: "取消", 95 this.tableData.forEach((item) => {
133 type: "warning", 96 item.sjlx = getSjlx(item.sjlx);
134 }) 97 item.dybdclx = getDictLeabel(item.dybdclx, 'A27')
135 .then(() => { 98 });
136 this.$parent.addRepairRecord(row, del); 99 if (this.tableData.length < datas.columns().emptycolNum) {
137 100 this.emptycolNum =
138 this.$message({ 101 datas.columns().emptycolNum - this.tableData.length;
139 type: "success", 102 } else {
140 message: "补录成功!", 103 this.emptycolNum = 0;
141 }); 104 }
105 }
106 });
107 },
108 checkChange () {
109 if (this.checkList.length === 0) {
110 this.tableData = [];
111 this.emptycolNum = datas.columns().emptycolNum;
112 } else {
113 this.loadData();
114 }
115 },
116 getQsztName (code) {
117 let name = "";
118 for (let item of this.qsztList) {
119 if (item.value == code) {
120 name = item.label;
121 break;
122 }
123 }
124 return name;
125 },
126 // 新增一条补录信息
127 editDialog (row, del) {
128 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
129 confirmButtonText: "确定",
130 cancelButtonText: "取消",
131 type: "warning",
142 }) 132 })
143 .catch(() => { 133 .then(() => {
144 this.$message({ 134 this.$parent.addRepairRecord(row, del);
145 type: "info", 135 this.$message({
146 message: "取消编辑", 136 type: "success",
137 message: "补录成功!",
138 });
139 })
140 .catch(() => {
141 this.$message({
142 type: "info",
143 message: "取消编辑",
144 });
147 }); 145 });
148 }); 146 },
149 }, 147 },
150 }, 148 };
151 };
152 </script> 149 </script>
153 150
154 <style lang="scss" scoped> 151 <style lang="scss" scoped>
155 @import "./qlxxCommon.scss"; 152 @import "./qlxxCommon.scss";
156 </style> 153 </style>
......
...@@ -8,9 +8,7 @@ ...@@ -8,9 +8,7 @@
8 <el-checkbox 8 <el-checkbox
9 v-for="item in qsztList" 9 v-for="item in qsztList"
10 :key="item.value" 10 :key="item.value"
11 :label="item.value" 11 :label="item.value">{{ item.label }}</el-checkbox>
12 >{{ item.label }}</el-checkbox
13 >
14 </el-checkbox-group> 12 </el-checkbox-group>
15 </div> 13 </div>
16 </div> 14 </div>
...@@ -27,15 +25,18 @@ ...@@ -27,15 +25,18 @@
27 row.qszt == '2' ? 'lishi' : '', 25 row.qszt == '2' ? 'lishi' : '',
28 row.qszt == '0' ? 'linshi' : '', 26 row.qszt == '0' ? 'linshi' : '',
29 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 27 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
30 ]" 28 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
31 > 29 ]">
32 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 30 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
33 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 31 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
34 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 32 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
35 </div> 33 </div>
36 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 34 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
37 正在办理 35 正在办理
38 </div> 36 </div>
37 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
38 有效
39 </div>
39 <span v-if="item.prop == 'qszt'"> 40 <span v-if="item.prop == 'qszt'">
40 {{ getQsztName(row[item.prop]) }} 41 {{ getQsztName(row[item.prop]) }}
41 </span> 42 </span>
...@@ -51,96 +52,96 @@ ...@@ -51,96 +52,96 @@
51 </template> 52 </template>
52 53
53 <script> 54 <script>
54 import { datas } from "./qlxxFormData.js"; 55 import { datas } from "./qlxxFormData.js";
55 import { getSjlx } from "@/utils/dictionary.js"; 56 import { getSjlx } from "@/utils/dictionary.js";
56 import { getDiyiqList } from "@/api/registerBook.js"; 57 import { getDiyiqList } from "@/api/registerBook.js";
57 export default { 58 export default {
58 data() { 59 data () {
59 return { 60 return {
60 title: "地役权登记信息", 61 title: "地役权登记信息",
61 qsztList: datas.columns().qsztList, 62 qsztList: datas.columns().qsztList,
62 checkList: datas.columns().checkList, 63 checkList: datas.columns().checkList,
63 //传递参数 64 //传递参数
64 propsParam: this.$attrs, 65 propsParam: this.$attrs,
65 //列表数据 66 //列表数据
66 tableData: [], 67 tableData: [],
67 //空列值个数 68 //空列值个数
68 emptycolNum: datas.columns().emptycolNum, 69 emptycolNum: datas.columns().emptycolNum,
69 //列名称对象 70 //列名称对象
70 columns: datas.columns().DYIQ, 71 columns: datas.columns().DYIQ,
71 }; 72 };
72 },
73 created() {
74 this.loadData();
75 },
76 methods: {
77 loadData() {
78 if (this.$parent.addRepairRecord) {
79 this.columns.unshift({ prop: "cz", label: "操作" });
80 }
81 getDiyiqList({
82 bdcdyid: this.propsParam.bdcdyid,
83 qllx: this.propsParam.qllx,
84 qszt: this.checkList,
85 }).then((res) => {
86 if (res.code === 200) {
87 this.tableData = res.result;
88 this.tableData.forEach((item) => {
89 item.sjlx = getSjlx(item.sjlx);
90 });
91 if (this.tableData.length < datas.columns().emptycolNum) {
92 this.emptycolNum =
93 datas.columns().emptycolNum - this.tableData.length;
94 } else {
95 this.emptycolNum = 0;
96 }
97 }
98 });
99 }, 73 },
100 checkChange() { 74 created () {
101 if (this.checkList.length === 0) { 75 this.loadData();
102 this.tableData = [];
103 this.emptycolNum = datas.columns().emptycolNum;
104 } else {
105 this.loadData();
106 }
107 }, 76 },
108 getQsztName(code) { 77 methods: {
109 let name = ""; 78 loadData () {
110 for (let item of this.qsztList) { 79 if (this.$parent.addRepairRecord) {
111 if (item.value == code) { 80 this.columns.unshift({ prop: "cz", label: "操作" });
112 name = item.label;
113 break;
114 } 81 }
115 } 82 getDiyiqList({
116 return name; 83 bdcdyid: this.propsParam.bdcdyid,
117 }, 84 qllx: this.propsParam.qllx,
118 // 新增一条补录信息 85 qszt: this.checkList,
119 editDialog(row, del) { 86 }).then((res) => {
120 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 87 if (res.code === 200) {
121 confirmButtonText: "确定", 88 this.tableData = res.result;
122 cancelButtonText: "取消", 89 this.tableData.forEach((item) => {
123 type: "warning", 90 item.sjlx = getSjlx(item.sjlx);
124 }) 91 });
125 .then(() => { 92 if (this.tableData.length < datas.columns().emptycolNum) {
126 this.$parent.addRepairRecord(row, del); 93 this.emptycolNum =
127 94 datas.columns().emptycolNum - this.tableData.length;
128 this.$message({ 95 } else {
129 type: "success", 96 this.emptycolNum = 0;
130 message: "补录成功!", 97 }
131 }); 98 }
99 });
100 },
101 checkChange () {
102 if (this.checkList.length === 0) {
103 this.tableData = [];
104 this.emptycolNum = datas.columns().emptycolNum;
105 } else {
106 this.loadData();
107 }
108 },
109 getQsztName (code) {
110 let name = "";
111 for (let item of this.qsztList) {
112 if (item.value == code) {
113 name = item.label;
114 break;
115 }
116 }
117 return name;
118 },
119 // 新增一条补录信息
120 editDialog (row, del) {
121 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
122 confirmButtonText: "确定",
123 cancelButtonText: "取消",
124 type: "warning",
132 }) 125 })
133 .catch(() => { 126 .then(() => {
134 this.$message({ 127 this.$parent.addRepairRecord(row, del);
135 type: "info", 128
136 message: "取消编辑", 129 this.$message({
130 type: "success",
131 message: "补录成功!",
132 });
133 })
134 .catch(() => {
135 this.$message({
136 type: "info",
137 message: "取消编辑",
138 });
137 }); 139 });
138 }); 140 },
139 }, 141 },
140 }, 142 };
141 };
142 </script> 143 </script>
143 144
144 <style lang="scss" scoped> 145 <style lang="scss" scoped>
145 @import "./qlxxCommon.scss"; 146 @import "./qlxxCommon.scss";
146 </style> 147 </style>
......
...@@ -11,117 +11,118 @@ ...@@ -11,117 +11,118 @@
11 </div> 11 </div>
12 </template> 12 </template>
13 <script> 13 <script>
14 import { getBdcqljqtsx } from "@/api/registerBook.js"; 14 import { getBdcqljqtsx } from "@/api/registerBook.js";
15 import { loadTreeData, getNode } from "./djbFrameData.js"; 15 import { loadTreeData, getNode } from "./djbFrameData.js";
16 export default { 16 export default {
17 data () { 17 data () {
18 return { 18 return {
19 //接收参数 19 //接收参数
20 // propsParam: this.$attrs, 20 // propsParam: this.$attrs,
21 //左侧目录 21 //左侧目录
22 catalog: {}, 22 catalog: {},
23 //选择加载哪一个组件 23 //选择加载哪一个组件
24 componentTag: "", 24 componentTag: "",
25 //子组件接收参数 25 //子组件接收参数
26 currentSelectProps: {}, 26 currentSelectProps: {},
27 //左侧树形结构数据 27 //左侧树形结构数据
28 treedata: [], 28 treedata: [],
29 defaultNode: "", 29 defaultNode: "",
30 defaultProps: { 30 defaultProps: {
31 value: "id", 31 value: "id",
32 children: "children", 32 children: "children",
33 label: "label", 33 label: "label",
34 }, 34 },
35 showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断 35 showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
36 };
37 },
38 props: ["formData"],
39 mounted () {
40 this.loadData();
41 },
42 methods: {
43 loadData () {
44 getBdcqljqtsx({
45 bdcdyid: this.formData.bdcdyid,
46 bdcdyh: this.formData.bdcdyh,
47 }).then((res) => {
48 if (res.code === 200) {
49 this.treedata = loadTreeData(res.result, this.formData.bdcdyh);
50 this.$nextTick(function () {
51 this.defaultNode = getNode(this.formData.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
52 this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
53 this.loadComponent(this.defaultNode.form);
54 });
55 }
56 });
57 this.currentSelectProps = {
58 bdcdyid: this.formData.bdcdyid,
59 bdcdyh: this.formData.bdcdyh,
60 qllx: this.formData.qllx,
61 bsmQlxx: this.formData.bsmQlxx,
62 }; 36 };
63 }, 37 },
64 handleNodeClick (data, node, elem) { 38 props: ["formData"],
65 this.loadComponent(data.form); 39 mounted () {
40 this.loadData();
66 }, 41 },
67 loadComponent (form) { 42 methods: {
68 this.componentTag = (r) => 43 loadData () {
69 require.ensure([], () => r(require("@/views/registerBook/" + form))); 44 getBdcqljqtsx({
45 bdcdyid: this.formData.bdcdyid,
46 bdcdyh: this.formData.bdcdyh,
47 }).then((res) => {
48 if (res.code === 200) {
49 this.treedata = loadTreeData(res.result, this.formData.bdcdyh);
50 this.$nextTick(function () {
51 this.defaultNode = getNode(this.formData.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
52 this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
53 this.loadComponent(this.defaultNode.form);
54 });
55 }
56 });
57 this.currentSelectProps = {
58 bdcdyid: this.formData.bdcdyid,
59 bdcdyh: this.formData.bdcdyh,
60 qllx: this.formData.qllx,
61 bsmQlxx: this.formData.bsmQlxx,
62 };
63 },
64 handleNodeClick (data, node, elem) {
65 this.loadComponent(data.form);
66 },
67 loadComponent (form) {
68 console.log(form, 'formformformform');
69 this.componentTag = (r) =>
70 require.ensure([], () => r(require("@/views/registerBook/" + form)));
71 },
70 }, 72 },
71 }, 73 };
72 };
73 </script> 74 </script>
74 <style scoped lang="scss"> 75 <style scoped lang="scss">
75 /deep/.rollTable { 76 /deep/.rollTable {
76 height: calc(100vh - 240px) !important; 77 height: calc(100vh - 240px) !important;
77 } 78 }
78 79
79 .content { 80 .content {
80 width: 100%; 81 width: 100%;
81 height: 100%; 82 height: 100%;
82 display: flex; 83 display: flex;
83 84
84 .left { 85 .left {
85 width: 256px; 86 width: 256px;
86 height: 704px; 87 height: 704px;
87 background-color: #f5f5f5; 88 background-color: #f5f5f5;
88 color: #333; 89 color: #333;
89 border: 1px solid rgb(228, 228, 228); 90 border: 1px solid rgb(228, 228, 228);
90 } 91 }
91 92
92 .right { 93 .right {
93 width: calc(100% - 256px); 94 width: calc(100% - 256px);
94 height: 704px; 95 height: 704px;
95 // overflow-y: scroll; 96 // overflow-y: scroll;
96 overflow: auto; 97 overflow: auto;
97 background-color: #f5f5f5; 98 background-color: #f5f5f5;
98 border: 1px solid rgb(228, 228, 228); 99 border: 1px solid rgb(228, 228, 228);
100 }
99 } 101 }
100 }
101 102
102 /deep/ .expanded.el-tree-node__expand-icon, 103 /deep/ .expanded.el-tree-node__expand-icon,
103 /deep/ .el-tree-node__expand-icon { 104 /deep/ .el-tree-node__expand-icon {
104 visibility: hidden; 105 visibility: hidden;
105 } 106 }
106 107
107 /deep/ .el-tree-node__content { 108 /deep/ .el-tree-node__content {
108 border: 1px solid rgb(228, 228, 228); 109 border: 1px solid rgb(228, 228, 228);
109 height: 45px; 110 height: 45px;
110 } 111 }
111 112
112 /deep/ .el-tree-node:focus>.el-tree-node__content { 113 /deep/ .el-tree-node:focus > .el-tree-node__content {
113 background-color: #f5f5f5; 114 background-color: #f5f5f5;
114 color: #0079fe; 115 color: #0079fe;
115 border-right: 4px solid #0079fe; 116 border-right: 4px solid #0079fe;
116 } 117 }
117 118
118 /deep/.el-tree-node { 119 /deep/.el-tree-node {
119 white-space: pre-wrap; 120 white-space: pre-wrap;
120 } 121 }
121 122
122 /deep/ .is-current>.el-tree-node__content { 123 /deep/ .is-current > .el-tree-node__content {
123 background-color: #f5f5f5; 124 background-color: #f5f5f5;
124 color: #0079fe; 125 color: #0079fe;
125 border-right: 4px solid #0079fe; 126 border-right: 4px solid #0079fe;
126 } 127 }
127 </style> 128 </style>
......
...@@ -8,9 +8,7 @@ ...@@ -8,9 +8,7 @@
8 <el-checkbox 8 <el-checkbox
9 v-for="item in qsztList" 9 v-for="item in qsztList"
10 :key="item.value" 10 :key="item.value"
11 :label="item.value" 11 :label="item.value">{{ item.label }}</el-checkbox>
12 >{{ item.label }}</el-checkbox
13 >
14 </el-checkbox-group> 12 </el-checkbox-group>
15 </div> 13 </div>
16 </div> 14 </div>
...@@ -27,25 +25,24 @@ ...@@ -27,25 +25,24 @@
27 row.qszt == '2' ? 'lishi' : '', 25 row.qszt == '2' ? 'lishi' : '',
28 row.qszt == '0' ? 'linshi' : '', 26 row.qszt == '0' ? 'linshi' : '',
29 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 27 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
30 ]" 28 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
31 > 29 ]">
32 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 30 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
33 <el-button 31 <el-button
34 type="text" 32 type="text"
35 icon="el-icon-edit-outline" 33 icon="el-icon-edit-outline"
36 @click="editDialog(row)" 34 @click="editDialog(row)">编辑</el-button>
37 >编辑</el-button
38 >
39 <el-button 35 <el-button
40 type="text" 36 type="text"
41 icon="el-icon-edit-outline" 37 icon="el-icon-edit-outline"
42 @click="editDialog(row, 'D')" 38 @click="editDialog(row, 'D')">删除</el-button>
43 >删除</el-button
44 >
45 </div> 39 </div>
46 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 40 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
47 正在办理 41 正在办理
48 </div> 42 </div>
43 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
44 有效
45 </div>
49 <span v-if="item.prop == 'qszt'"> 46 <span v-if="item.prop == 'qszt'">
50 {{ getQsztName(row[item.prop]) }} 47 {{ getQsztName(row[item.prop]) }}
51 </span> 48 </span>
...@@ -61,91 +58,91 @@ ...@@ -61,91 +58,91 @@
61 </template> 58 </template>
62 59
63 <script> 60 <script>
64 import { datas } from "./qlxxFormData.js"; 61 import { datas } from "./qlxxFormData.js";
65 import { getSjlx } from "@/utils/dictionary.js"; 62 import { getSjlx } from "@/utils/dictionary.js";
66 import { getFdcq2List } from "@/api/registerBook.js"; 63 import { getFdcq2List } from "@/api/registerBook.js";
67 export default { 64 export default {
68 data() { 65 data () {
69 return { 66 return {
70 title: "房地产权登记信息（独幢、层、套、间房屋）", 67 title: "房地产权登记信息（独幢、层、套、间房屋）",
71 qsztList: datas.columns().qsztList, 68 qsztList: datas.columns().qsztList,
72 checkList: datas.columns().checkList, 69 checkList: datas.columns().checkList,
73 //传递参数 70 //传递参数
74 propsParam: this.$attrs, 71 propsParam: this.$attrs,
75 //列表数据 72 //列表数据
76 tableData: [], 73 tableData: [],
77 //空列值个数 74 //空列值个数
78 emptycolNum: datas.columns().emptycolNum, 75 emptycolNum: datas.columns().emptycolNum,
79 //列名称对象 76 //列名称对象
80 columns: datas.columns().FDCQ2, 77 columns: datas.columns().FDCQ2,
81 }; 78 };
82 },
83 created() {
84 this.loadData();
85 },
86 methods: {
87 loadData() {
88 if (this.$parent.addRepairRecord) {
89 this.columns.unshift({ prop: "cz", label: "操作" });
90 }
91 getFdcq2List({
92 bdcdyid: this.propsParam.bdcdyid,
93 qllx: this.propsParam.qllx,
94 qszt: this.checkList,
95 }).then((res) => {
96 if (res.code === 200) {
97 this.tableData = res.result;
98 this.tableData.forEach((item) => {
99 item.sjlx = getSjlx(item.sjlx);
100 });
101 if (this.tableData.length < datas.columns().emptycolNum) {
102 this.emptycolNum =
103 datas.columns().emptycolNum - this.tableData.length;
104 } else {
105 this.emptycolNum = 0;
106 }
107 }
108 });
109 }, 79 },
110 checkChange() { 80 created () {
111 if (this.checkList.length === 0) { 81 this.loadData();
112 this.tableData = [];
113 this.emptycolNum = datas.columns().emptycolNum;
114 } else {
115 this.loadData();
116 }
117 }, 82 },
118 getQsztName(code) { 83 methods: {
119 let name = ""; 84 loadData () {
120 for (let item of this.qsztList) { 85 if (this.$parent.addRepairRecord) {
121 if (item.value == code) { 86 this.columns.unshift({ prop: "cz", label: "操作" });
122 name = item.label;
123 break;
124 } 87 }
125 } 88 getFdcq2List({
126 return name; 89 bdcdyid: this.propsParam.bdcdyid,
127 }, 90 qllx: this.propsParam.qllx,
128 // 新增一条补录信息 91 qszt: this.checkList,
129 editDialog(row, del) { 92 }).then((res) => {
130 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 93 if (res.code === 200) {
131 confirmButtonText: "确定", 94 this.tableData = res.result;
132 cancelButtonText: "取消", 95 this.tableData.forEach((item) => {
133 type: "warning", 96 item.sjlx = getSjlx(item.sjlx);
134 }) 97 });
135 .then(() => { 98 if (this.tableData.length < datas.columns().emptycolNum) {
136 this.$parent.addRepairRecord(row, del); 99 this.emptycolNum =
100 datas.columns().emptycolNum - this.tableData.length;
101 } else {
102 this.emptycolNum = 0;
103 }
104 }
105 });
106 },
107 checkChange () {
108 if (this.checkList.length === 0) {
109 this.tableData = [];
110 this.emptycolNum = datas.columns().emptycolNum;
111 } else {
112 this.loadData();
113 }
114 },
115 getQsztName (code) {
116 let name = "";
117 for (let item of this.qsztList) {
118 if (item.value == code) {
119 name = item.label;
120 break;
121 }
122 }
123 return name;
124 },
125 // 新增一条补录信息
126 editDialog (row, del) {
127 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
128 confirmButtonText: "确定",
129 cancelButtonText: "取消",
130 type: "warning",
137 }) 131 })
138 .catch(() => { 132 .then(() => {
139 this.$message({ 133 this.$parent.addRepairRecord(row, del);
140 type: "info", 134 })
141 message: "取消", 135 .catch(() => {
136 this.$message({
137 type: "info",
138 message: "取消",
139 });
142 }); 140 });
143 }); 141 },
144 }, 142 },
145 }, 143 };
146 };
147 </script> 144 </script>
148 145
149 <style lang="scss" scoped> 146 <style lang="scss" scoped>
150 @import "./qlxxCommon.scss"; 147 @import "./qlxxCommon.scss";
151 </style> 148 </style>
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
23 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 23 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
24 ]"> 24 ]">
25 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 25 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
27 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 27 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
28 </div> 28 </div>
29 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 29 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
30 正在办理 30 正在办理
...@@ -51,10 +51,14 @@ ...@@ -51,10 +51,14 @@
51 row.qszt == '2' ? 'lishi' : '', 51 row.qszt == '2' ? 'lishi' : '',
52 row.qszt == '0' ? 'linshi' : '', 52 row.qszt == '0' ? 'linshi' : '',
53 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 53 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
54 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
54 ]"> 55 ]">
55 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 56 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
56 正在办理 57 正在办理
57 </div> 58 </div>
59 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
60 有效
61 </div>
58 <span v-if="item.prop == 'qszt'"> 62 <span v-if="item.prop == 'qszt'">
59 {{ getQsztName(row[item.prop]) }} 63 {{ getQsztName(row[item.prop]) }}
60 </span> 64 </span>
...@@ -100,11 +104,12 @@ ...@@ -100,11 +104,12 @@
100 }, 104 },
101 methods: { 105 methods: {
102 loadData () { 106 loadData () {
103 if(this.$parent.addRepairRecord){ 107 if (this.$parent.addRepairRecord) {
104 this.columns.unshift({prop:"cz", 108 this.columns.unshift({
105 label:"操作" 109 prop: "cz",
106 }) 110 label: "操作"
107 } 111 })
112 }
108 getNydsyqList({ 113 getNydsyqList({
109 bdcdyid: this.propsParam.bdcdyid, 114 bdcdyid: this.propsParam.bdcdyid,
110 qllx: this.propsParam.qllx, 115 qllx: this.propsParam.qllx,
...@@ -142,14 +147,14 @@ ...@@ -142,14 +147,14 @@
142 } 147 }
143 return name; 148 return name;
144 }, 149 },
145 // 新增一条补录信息 150 // 新增一条补录信息
146 editDialog(row,del){ 151 editDialog (row, del) {
147 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 152 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
148 confirmButtonText: '确定', 153 confirmButtonText: '确定',
149 cancelButtonText: '取消', 154 cancelButtonText: '取消',
150 type: 'warning' 155 type: 'warning'
151 }).then(() => { 156 }).then(() => {
152 this.$parent.addRepairRecord(row,del) 157 this.$parent.addRepairRecord(row, del)
153 158
154 this.$message({ 159 this.$message({
155 type: 'success', 160 type: 'success',
......
...@@ -19,14 +19,18 @@ ...@@ -19,14 +19,18 @@
19 row.qszt == '2' ? 'lishi' : '', 19 row.qszt == '2' ? 'lishi' : '',
20 row.qszt == '0' ? 'linshi' : '', 20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
22 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
22 ]"> 23 ]">
23 <div class="setbut" v-if="item.prop == 'cz'"> 24 <div class="setbut" v-if="item.prop == 'cz'">
24 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 25 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
25 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
26 </div> 27 </div>
27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 28 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
28 正在办理 29 正在办理
29 </div> 30 </div>
31 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
32 有效
33 </div>
30 <span v-if="item.prop == 'qszt'"> 34 <span v-if="item.prop == 'qszt'">
31 {{ getQsztName(row[item.prop]) }} 35 {{ getQsztName(row[item.prop]) }}
32 </span> 36 </span>
...@@ -42,77 +46,78 @@ ...@@ -42,77 +46,78 @@
42 </template> 46 </template>
43 47
44 <script> 48 <script>
45 import { getYgdjList } from "@/api/registerBook.js"; 49 import { getYgdjList } from "@/api/registerBook.js";
46 import { datas } from "./qlxxFormData.js"; 50 import { datas } from "./qlxxFormData.js";
47 export default { 51 export default {
48 data () { 52 data () {
49 return { 53 return {
50 title: "预告登记信息", 54 title: "预告登记信息",
51 qsztList: datas.columns().qsztList, 55 qsztList: datas.columns().qsztList,
52 checkList: datas.columns().checkList, 56 checkList: datas.columns().checkList,
53 //传递参数 57 //传递参数
54 propsParam: this.$attrs, 58 propsParam: this.$attrs,
55 //列表数据 59 //列表数据
56 tableData: [], 60 tableData: [],
57 //空列值个数 61 //空列值个数
58 emptycolNum: datas.columns().emptycolNum, 62 emptycolNum: datas.columns().emptycolNum,
59 //列名称对象 63 //列名称对象
60 columns: datas.columns().YGDJ, 64 columns: datas.columns().YGDJ,
61 }; 65 };
62 },
63 created () {
64 this.loadData();
65 },
66 methods: {
67 loadData () {
68 // 判断是否在登记簿补录调的子页面
69 if(this.$parent.addRepairRecord){
70 this.columns.unshift({prop:"cz",
71 label:"操作"
72 })
73 }
74 getYgdjList({
75 bdcdyid: this.propsParam.bdcdyid,
76 qllx: this.propsParam.qllx,
77 qszt: this.checkList,
78 }).then((res) => {
79 if (res.code === 200) {
80 this.tableData = res.result;
81 if (this.tableData.length < datas.columns().emptycolNum) {
82 this.emptycolNum =
83 datas.columns().emptycolNum - this.tableData.length;
84 } else {
85 this.emptycolNum = 0;
86 }
87 }
88 });
89 }, 66 },
90 checkChange () { 67 created () {
91 if (this.checkList.length === 0) { 68 this.loadData();
92 this.tableData = [];
93 this.emptycolNum = datas.columns().emptycolNum;
94 } else {
95 this.loadData();
96 }
97 }, 69 },
98 getQsztName (code) { 70 methods: {
99 let name = ""; 71 loadData () {
100 for (let item of this.qsztList) { 72 // 判断是否在登记簿补录调的子页面
101 if (item.value == code) { 73 if (this.$parent.addRepairRecord) {
102 name = item.label; 74 this.columns.unshift({
103 break; 75 prop: "cz",
76 label: "操作"
77 })
104 } 78 }
105 } 79 getYgdjList({
106 return name; 80 bdcdyid: this.propsParam.bdcdyid,
107 }, 81 qllx: this.propsParam.qllx,
108 // 新增一条补录信息 82 qszt: this.checkList,
109 editDialog(row,del){ 83 }).then((res) => {
110 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 84 if (res.code === 200) {
85 this.tableData = res.result;
86 if (this.tableData.length < datas.columns().emptycolNum) {
87 this.emptycolNum =
88 datas.columns().emptycolNum - this.tableData.length;
89 } else {
90 this.emptycolNum = 0;
91 }
92 }
93 });
94 },
95 checkChange () {
96 if (this.checkList.length === 0) {
97 this.tableData = [];
98 this.emptycolNum = datas.columns().emptycolNum;
99 } else {
100 this.loadData();
101 }
102 },
103 getQsztName (code) {
104 let name = "";
105 for (let item of this.qsztList) {
106 if (item.value == code) {
107 name = item.label;
108 break;
109 }
110 }
111 return name;
112 },
113 // 新增一条补录信息
114 editDialog (row, del) {
115 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
111 confirmButtonText: '确定', 116 confirmButtonText: '确定',
112 cancelButtonText: '取消', 117 cancelButtonText: '取消',
113 type: 'warning' 118 type: 'warning'
114 }).then(() => { 119 }).then(() => {
115 this.$parent.addRepairRecord(row,del) 120 this.$parent.addRepairRecord(row, del)
116 121
117 this.$message({ 122 this.$message({
118 type: 'success', 123 type: 'success',
...@@ -126,10 +131,10 @@ export default { ...@@ -126,10 +131,10 @@ export default {
126 }); 131 });
127 132
128 }, 133 },
129 }, 134 },
130 }; 135 };
131 </script> 136 </script>
132 137
133 <style lang="scss" scoped> 138 <style lang="scss" scoped>
134 @import "./qlxxCommon.scss"; 139 @import "./qlxxCommon.scss";
135 </style> 140 </style>
......
...@@ -19,14 +19,18 @@ ...@@ -19,14 +19,18 @@
19 row.qszt == '2' ? 'lishi' : '', 19 row.qszt == '2' ? 'lishi' : '',
20 row.qszt == '0' ? 'linshi' : '', 20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
22 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
22 ]"> 23 ]">
23 <div class="setbut" v-if="item.prop == 'cz'"> 24 <div class="setbut" v-if="item.prop == 'cz'">
24 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 25 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
25 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 26 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
26 </div> 27 </div>
27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 28 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
28 正在办理 29 正在办理
29 </div> 30 </div>
31 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
32 有效
33 </div>
30 <span v-if="item.prop == 'qszt'"> 34 <span v-if="item.prop == 'qszt'">
31 {{ getQsztName(row[item.prop]) }} 35 {{ getQsztName(row[item.prop]) }}
32 </span> 36 </span>
...@@ -42,76 +46,77 @@ ...@@ -42,76 +46,77 @@
42 </template> 46 </template>
43 47
44 <script> 48 <script>
45 import { getYydjList } from "@/api/registerBook.js"; 49 import { getYydjList } from "@/api/registerBook.js";
46 import { datas } from "./qlxxFormData.js"; 50 import { datas } from "./qlxxFormData.js";
47 export default { 51 export default {
48 data () { 52 data () {
49 return { 53 return {
50 title: "异议登记信息", 54 title: "异议登记信息",
51 qsztList: datas.columns().qsztList, 55 qsztList: datas.columns().qsztList,
52 checkList: datas.columns().checkList, 56 checkList: datas.columns().checkList,
53 //传递参数 57 //传递参数
54 propsParam: this.$attrs, 58 propsParam: this.$attrs,
55 //列表数据 59 //列表数据
56 tableData: [], 60 tableData: [],
57 //空列值个数 61 //空列值个数
58 emptycolNum: datas.columns().emptycolNum, 62 emptycolNum: datas.columns().emptycolNum,
59 //列名称对象 63 //列名称对象
60 columns: datas.columns().YYDJ, 64 columns: datas.columns().YYDJ,
61 }; 65 };
62 },
63 created () {
64 this.loadData();
65 },
66 methods: {
67 loadData () {
68 if(this.$parent.addRepairRecord){
69 this.columns.unshift({prop:"cz",
70 label:"操作"
71 })
72 }
73 getYydjList({
74 bdcdyid: this.propsParam.bdcdyid,
75 qllx: this.propsParam.qllx,
76 qszt: this.checkList,
77 }).then((res) => {
78 if (res.code === 200) {
79 this.tableData = res.result;
80 if (this.tableData.length < datas.columns().emptycolNum) {
81 this.emptycolNum =
82 datas.columns().emptycolNum - this.tableData.length;
83 } else {
84 this.emptycolNum = 0;
85 }
86 }
87 });
88 }, 66 },
89 checkChange () { 67 created () {
90 if (this.checkList.length === 0) { 68 this.loadData();
91 this.tableData = [];
92 this.emptycolNum = datas.columns().emptycolNum;
93 } else {
94 this.loadData();
95 }
96 }, 69 },
97 getQsztName (code) { 70 methods: {
98 let name = ""; 71 loadData () {
99 for (let item of this.qsztList) { 72 if (this.$parent.addRepairRecord) {
100 if (item.value == code) { 73 this.columns.unshift({
101 name = item.label; 74 prop: "cz",
102 break; 75 label: "操作"
76 })
103 } 77 }
104 } 78 getYydjList({
105 return name; 79 bdcdyid: this.propsParam.bdcdyid,
106 }, 80 qllx: this.propsParam.qllx,
107 // 新增一条补录信息 81 qszt: this.checkList,
108 editDialog(row,del){ 82 }).then((res) => {
109 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 83 if (res.code === 200) {
84 this.tableData = res.result;
85 if (this.tableData.length < datas.columns().emptycolNum) {
86 this.emptycolNum =
87 datas.columns().emptycolNum - this.tableData.length;
88 } else {
89 this.emptycolNum = 0;
90 }
91 }
92 });
93 },
94 checkChange () {
95 if (this.checkList.length === 0) {
96 this.tableData = [];
97 this.emptycolNum = datas.columns().emptycolNum;
98 } else {
99 this.loadData();
100 }
101 },
102 getQsztName (code) {
103 let name = "";
104 for (let item of this.qsztList) {
105 if (item.value == code) {
106 name = item.label;
107 break;
108 }
109 }
110 return name;
111 },
112 // 新增一条补录信息
113 editDialog (row, del) {
114 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
110 confirmButtonText: '确定', 115 confirmButtonText: '确定',
111 cancelButtonText: '取消', 116 cancelButtonText: '取消',
112 type: 'warning' 117 type: 'warning'
113 }).then(() => { 118 }).then(() => {
114 this.$parent.addRepairRecord(row,del) 119 this.$parent.addRepairRecord(row, del)
115 120
116 this.$message({ 121 this.$message({
117 type: 'success', 122 type: 'success',
...@@ -125,10 +130,10 @@ export default { ...@@ -125,10 +130,10 @@ export default {
125 }); 130 });
126 131
127 }, 132 },
128 }, 133 },
129 }; 134 };
130 </script> 135 </script>
131 136
132 <style lang="scss" scoped> 137 <style lang="scss" scoped>
133 @import "./qlxxCommon.scss"; 138 @import "./qlxxCommon.scss";
134 </style> 139 </style>
......
...@@ -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 this.formData.allCommentList[index].agent=item.assignee.name 240 item.comments.forEach(element => {
241 if(element.type=="COMPLETE"){
242 this.formData.allCommentList[index].idea=element.message
243 }
244 });
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 })
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-17 10:43:41 4 * @LastEditTime: 2023-06-30 17:09:35
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable" :style="{'max-height': this.timeLineHeight + 'px' }" 7 <div class="djxxTable" :style="{'max-height': this.timeLineHeight + 'px' }"
...@@ -28,10 +28,14 @@ ...@@ -28,10 +28,14 @@
28 row.qszt == '2' ? 'lishi' : '', 28 row.qszt == '2' ? 'lishi' : '',
29 row.qszt == '0' ? 'linshi' : '', 29 row.qszt == '0' ? 'linshi' : '',
30 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 30 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
31 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '',
31 ]"> 32 ]">
32 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 33 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
33 正在办理 34 正在办理
34 </div> 35 </div>
36 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
37 有效
38 </div>
35 <span v-if="item.prop == 'qszt'"> 39 <span v-if="item.prop == 'qszt'">
36 {{ getQsztName(row[item.prop]) }} 40 {{ getQsztName(row[item.prop]) }}
37 </span> 41 </span>
......