b5125572 by renchao@pashanhoo.com

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

2 parents 150145c9 69c583cc
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-08 13:43:33 4 * @LastEditTime: 2023-06-16 16:06:39
5 */ 5 */
6 import request from '@/utils/request' 6 import request from "@/utils/request";
7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) 7 let SERVER = window.config
8 const url = SERVER.SERVERAPI + '/rest/zhcx/lpcx/' 8 ? window.config
9 // 9 : JSON.parse(localStorage.getItem("ApiUrl"));
10 const url = SERVER.SERVERAPI + "/rest/zhcx/lpcx/";
11 //
10 /** 12 /**
11 * @description:楼盘查询- 根据条件进行列表查询 13 * @description:楼盘查询- 根据条件进行列表查询
12 * @param {*} data 14 * @param {*} data
13 * @author: renchao 15 * @author: renchao
14 */ 16 */
15 export function getLpZrz (data) { 17 export function getLpZrz(data) {
16 return request({ 18 return request({
17 url: 'service-lpb-zq/rest/zhcx/lpcx/getLpZrz', 19 url: "service-lpb-zq/rest/zhcx/lpcx/getLpZrz",
18 method: 'post', 20 method: "post",
19 data: data 21 data: data,
20 }) 22 });
21 } 23 }
22 24
23 /** 25 /**
...@@ -25,32 +27,47 @@ export function getLpZrz (data) { ...@@ -25,32 +27,47 @@ export function getLpZrz (data) {
25 * @param {*} zrzbsm 27 * @param {*} zrzbsm
26 * @author: renchao 28 * @author: renchao
27 */ 29 */
28 export function getLpb (zrzbsm) { 30 export function getLpb(zrzbsm) {
29 return request({ 31 return request({
30 url: 'service-lpb-zq/rest/zhcx/lpcx/getLpb?scyclx=1&zrzbsm=' + zrzbsm, 32 url: "service-lpb-zq/rest/zhcx/lpcx/getLpb?scyclx=0&zrzbsm=" + zrzbsm,
31 method: 'get' 33 method: "get",
32 }) 34 });
33 } 35 }
34 /** 36 /**
35 * @description: 获取楼盘表房屋用途,房屋性质右侧房屋用途统计数据 37 * @description: 获取楼盘表房屋用途,房屋性质右侧房屋用途统计数据
36 * @param {*} zrzbsm 38 * @param {*} zrzbsm
37 * @author: renchao 39 * @author: renchao
38 */ 40 */
39 export function getLpbFwytAndQlxz (zrzbsm) { 41 export function getLpbFwytAndQlxz(zrzbsm) {
40 return request({ 42 return request({
41 url: 'service-lpb-zq/rest/zhcx/lpcx/getLpbFwytAndQlxz?scyclx=1&zrzbsm=' + zrzbsm, 43 url:
42 method: 'get' 44 "service-lpb-zq/rest/zhcx/lpcx/getLpbFwytAndQlxz?scyclx=0&zrzbsm=" +
43 }) 45 zrzbsm,
46 method: "get",
47 });
44 } 48 }
45 /** 49 /**
46 * @description: 获取楼盘表缺失项统计 50 * @description: 获取楼盘表缺失项统计
47 * @param {*} zrzbsm 51 * @param {*} zrzbsm
48 * @author: renchao 52 * @author: renchao
49 */ 53 */
50 export function getLpbQsxtj (zrzbsm) { 54 export function getLpbQsxtj(zrzbsm) {
51 return request({ 55 return request({
52 url: url + 'getLpbQsxtj?scyclx=1&zrzbsm=' + zrzbsm, 56 url: "service-lpb-zq/rest/zhcx/lpcx/getLpbQsxtj?scyclx=0&zrzbsm=" + zrzbsm,
53 method: 'get' 57 method: "get",
54 }) 58 });
55 } 59 }
56 60
61 /**
62 * @description: 楼盘表 获取单元状态统计数据
63 * @param {*} data
64 * zrzbsm 自然幢标识码
65 * scyclx 实测预测类型 0预测,1实测
66 * @return {*}
67 */
68 export function getLpbTj(zrzbsm) {
69 return request({
70 url: "service-lpb-zq/rest/zhcx/lpcx/getLpbTj?scyclx=0&zrzbsm=" + zrzbsm,
71 method: "get",
72 });
73 }
......
...@@ -73,7 +73,7 @@ export function choiceBdcdy (data) { ...@@ -73,7 +73,7 @@ export function choiceBdcdy (data) {
73 */ 73 */
74 export function selectRepairQlxx (data) { 74 export function selectRepairQlxx (data) {
75 return request({ 75 return request({
76 url: 'ywbl/ywsq/selectRepairQlxx', 76 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectRepairQlxx',
77 method: 'post', 77 method: 'post',
78 data 78 data
79 }) 79 })
......
1 <svg t="1661331325273" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2167" width="200" height="200"><path d="M521.309091 158.254545a27.927273 27.927273 0 0 1 27.927273 27.927273v586.472727a27.927273 27.927273 0 0 1-27.927273 27.927273h-372.363636a83.781818 83.781818 0 0 1-83.781819-83.781818V242.036364a83.781818 83.781818 0 0 1 83.781819-83.781819z m400.290909 0a83.781818 83.781818 0 0 1 83.502545 76.893091l0.279273 6.888728v474.763636a83.781818 83.781818 0 0 1-76.893091 83.502545l-6.888727 0.279273h-260.654545a27.927273 27.927273 0 0 1-4.51491-55.482182L660.945455 744.727273h260.654545a27.927273 27.927273 0 0 0 27.554909-23.412364l0.372364-4.514909V242.036364a27.927273 27.927273 0 0 0-23.412364-27.554909L921.6 214.109091h-260.654545a27.927273 27.927273 0 0 1-4.51491-55.482182L660.945455 158.254545h260.654545z m-428.218182 55.854546H148.945455a27.927273 27.927273 0 0 0-27.55491 23.412364L121.018182 242.036364v474.763636a27.927273 27.927273 0 0 0 27.927273 27.927273h344.436363V214.109091z" p-id="2168"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-05-09 09:20:10
5 -->
6 <template>
7 <el-dialog
8 :close-on-click-modal="false"
9 title="选择权利类型"
10 class="qllxdialog"
11 :visible.sync="dialogVisible"
12 custom-class="insetDialog"
13 append-to-body
14 width="20%"
15 >
16 <el-select v-model="qllxvalue" placeholder="请选择">
17 <el-option
18 v-for="item in options"
19 :key="item.value"
20 :label="item.label"
21 :value="item.value"
22 >
23 </el-option>
24 </el-select>
25 <!-- <el-radio-group v-model="radio">
26 <el-radio :label="1">111</el-radio>
27 <el-radio :label="2">111</el-radio>
28 </el-radio-group> -->
29 <el-button type="primary" @click="handleSubmit">确定</el-button>
30 <el-button type="primary" @click="closeDialog">取消</el-button>
31 </el-dialog>
32 </template>
33
34 <script>
35 export default {
36
37 data () {
38 return {
39 dialogVisible:false,
40 options: [
41 {
42 value: "选项1",
43 label: "抵押权",
44 },
45 {
46 value: "选项2",
47 label: "地役权",
48 },
49 {
50 value: "选项3",
51 label: "预告登记",
52 },
53 {
54 value: "选项4",
55 label: "异议登记",
56 },
57 {
58 value: "选项5",
59 label: "查封登记",
60 },
61 ],
62 qllxvalue: "",
63 radio:3,
64 qllxobj:{
65 qllx:"",
66 bsmQlxx
67
68 }
69 };
70 },
71 methods: {
72 closeDialog () {
73 this.dialogVisible=false
74 },
75 handleSubmit () {
76 let qllxobj={
77 qllx:this.value,
78 bsmQlxx:this.value
79
80 }
81 // this.$parent.addRepairRecord(qllxobj)
82 },
83 },
84 };
85 </script>
86 <style scoped lang="scss">
87 .qllxdialog{
88 margin-top: 200px;
89 /deep/.el-dialog__body{
90 margin-top: 10px;
91 height: 100px;
92 }
93 .el-button{
94 margin-top: 10px;
95 margin-left: 20px;
96 }
97 }
98 </style>
...@@ -5,126 +5,159 @@ ...@@ -5,126 +5,159 @@
5 */ 5 */
6 //流程环节操作按钮 6 //流程环节操作按钮
7 export function getForm (tabName, djywbm) { 7 export function getForm (tabName, djywbm) {
8 let form; 8 let form;
9 switch (tabName) { 9 switch (tabName) {
10 // case "jsydsyqslxx100": 10 // case "jsydsyqslxx100":
11 // form = require("@/views/ywbl/slsqxx/jsydsyq/slxx.vue"); 11 // form = require("@/views/ywbl/slsqxx/jsydsyq/slxx.vue");
12 // break; 12 // break;
13 // case "jsydsyqslxx300": 13 // case "jsydsyqslxx300":
14 // form = require("@/views/ywbl/slsqxx/jsydsyq/slxx300.vue"); 14 // form = require("@/views/ywbl/slsqxx/jsydsyq/slxx300.vue");
15 // break; 15 // break;
16 // case "fwsyqslxx100": 16 // case "fwsyqslxx100":
17 // form = require("@/views/ywbl/slsqxx/fdcq2/slxx.vue"); 17 // form = require("@/views/ywbl/slsqxx/fdcq2/slxx.vue");
18 // break; 18 // break;
19 // case "fwsyqslxx300": 19 // case "fwsyqslxx300":
20 // form = require("@/views/ywbl/slsqxx/fdcq2/slxx300.vue"); 20 // form = require("@/views/ywbl/slsqxx/fdcq2/slxx300.vue");
21 // break; 21 // break;
22 // case "nydsyqslxx100": 22 // case "nydsyqslxx100":
23 // form = require("@/views/ywbl/slsqxx/nydsyq/slxx.vue"); 23 // form = require("@/views/ywbl/slsqxx/nydsyq/slxx.vue");
24 // break; 24 // break;
25 // case "nydsyqslxx200": 25 // case "nydsyqslxx200":
26 // form = require("@/views/ywbl/slsqxx/nydsyq/slxx200.vue"); 26 // form = require("@/views/ywbl/slsqxx/nydsyq/slxx200.vue");
27 // break; 27 // break;
28 // case "tdslxxCfdj": 28 // case "tdslxxCfdj":
29 // form = require("@/views/ywbl/slsqxx/cfdj/tdslxx.vue"); 29 // form = require("@/views/ywbl/slsqxx/cfdj/tdslxx.vue");
30 // break; 30 // break;
31 // case "plslxxCfdj": 31 // case "plslxxCfdj":
32 // form = require("@/views/ywbl/slsqxx/cfdj/plcfslxx.vue"); 32 // form = require("@/views/ywbl/slsqxx/cfdj/plcfslxx.vue");
33 // break; 33 // break;
34 // case "diyaqSlxx": 34 // case "diyaqSlxx":
35 // form = require("@/views/ywbl/slsqxx/diyaq/slxx.vue"); 35 // form = require("@/views/ywbl/slsqxx/diyaq/slxx.vue");
36 // break; 36 // break;
37 // case "ygmm100": 37 // case "ygmm100":
38 // form = require("@/views/ywbl/slsqxx/ygdj/slxx.vue"); 38 // form = require("@/views/ywbl/slsqxx/ygdj/slxx.vue");
39 // break; 39 // break;
40 // case "ygmm300": 40 // case "ygmm300":
41 // form = require("@/views/ywbl/slsqxx/ygdj/slxx300.vue"); 41 // form = require("@/views/ywbl/slsqxx/ygdj/slxx300.vue");
42 // break; 42 // break;
43 // case "ygdy100": 43 // case "ygdy100":
44 // case "ygdy300": 44 // case "ygdy300":
45 // form = require("@/views/ywbl/slsqxx/ygdy/slxx.vue"); 45 // form = require("@/views/ywbl/slsqxx/ygdy/slxx.vue");
46 // break; 46 // break;
47 // case "zjgcdyqSlxx": 47 // case "zjgcdyqSlxx":
48 // form = require("@/views/ywbl/slsqxx/zjgcdy/slxx.vue"); 48 // form = require("@/views/ywbl/slsqxx/zjgcdy/slxx.vue");
49 // break; 49 // break;
50 // case "szxx": 50 // case "szxx":
51 // form = require("@/views/djbworkflow/components/szxx.vue"); 51 // form = require("@/views/djbworkflow/components/szxx.vue");
52 // break; 52 // break;
53 // case "fzxx": 53 // case "fzxx":
54 // form = require("@/views/djbworkflow/components/fzxx.vue"); 54 // form = require("@/views/djbworkflow/components/fzxx.vue");
55 // break; 55 // break;
56 // case "zdt": 56 // case "zdt":
57 // form = require("@/views/djbworkflow/components/zdt.vue"); 57 // form = require("@/views/djbworkflow/components/zdt.vue");
58 // break; 58 // break;
59 // 宗地基本信息 59 case "zdjbxx":
60 case "zdjbxx": 60 form = require("@/views/registerBook/zdjbxx.vue");
61 form = require("@/views/djbworkflow/djbBook/zdjbxx.vue"); 61 break;
62 break; 62 case "cfdj":
63 // 查封登记 63 form = require("@/views/registerBook/cfdj.vue");
64 case "cfdj": 64 break;
65 form = require("@/views/djbworkflow/djbBook/cfdj.vue"); 65 case "jsydsyq":
66 break; 66 form = require("@/views/registerBook/jsydsyq.vue");
67 // 国有建设用地使用权 67 break;
68 case "jsydsyq": 68 case "nydsyq":
69 form = require("@/views/djbworkflow/djbBook/jsydsyq.vue"); 69 form = require("@/views/registerBook/nydsyq.vue");
70 break; 70 break;
71 // 农用地使用权 71 case "fdcq2":
72 case "nydsyq": 72 form = require("@/views/registerBook/fdcq2.vue");
73 form = require("@/views/djbworkflow/djbBook/nydsyq.vue"); 73 break;
74 break; 74 case "diyaq":
75 // 房屋产权2 75 form = require("@/views/registerBook/diyaq.vue");
76 case "fdcq2": 76 break;
77 form = require("@/views/djbworkflow/djbBook/fdcq2.vue"); 77 case "ygdj":
78 break; 78 form = require("@/views/registerBook/ygdj.vue");
79 // 抵押权 79 break;
80 case "diyaq": 80 // 地役权
81 form = require("@/views/djbworkflow/djbBook/diyaq.vue"); 81 case "diyiq":
82 break; 82 form = require("@/views/registerBook/diyiq.vue");
83 // 预告登记 83 break;
84 case "ygdj": 84 // 登记簿封面
85 form = require("@/views/djbworkflow/djbBook/ygdj.vue"); 85 case "djbfm":
86 break; 86 form = require("@/views/registerBook/djbfm.vue");
87 // 地役权 87 break;
88 case "diyiq": 88 // 异议登记
89 form = require("@/views/djbworkflow/djbBook/diyiq.vue"); 89 case "yydj":
90 break; 90 form = require("@/views/registerBook/yydj.vue");
91 // 登记簿封面 91 break;
92 case "djbfm": 92 // // 宗地基本信息
93 form = require("@/views/djbworkflow/djbBook/djbfm.vue"); 93 // case "zdjbxx":
94 break; 94 // form = require("@/views/djbworkflow/djbBook/zdjbxx.vue");
95 // 异议登记 95 // break;
96 case "yydj": 96 // // 查封登记
97 form = require("@/views/djbworkflow/djbBook/yydj.vue"); 97 // case "cfdj":
98 break; 98 // form = require("@/views/djbworkflow/djbBook/cfdj.vue");
99 // 受理信息 99 // break;
100 case "slxx": 100 // // 国有建设用地使用权
101 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fwsyq/slxx.vue"); 101 // case "jsydsyq":
102 break; 102 // form = require("@/views/djbworkflow/djbBook/jsydsyq.vue");
103 // case "clxx": 103 // break;
104 // form = require("@/views/djbworkflow/djbBook/components/clxx.vue"); 104 // // 农用地使用权
105 // break; 105 // case "nydsyq":
106 // case "spyj": 106 // form = require("@/views/djbworkflow/djbBook/nydsyq.vue");
107 // form = require("@/views/djbworkflow/djbBook/components/spyj.vue"); 107 // break;
108 // break; 108 // // 房屋产权2
109 // case "slxx": 109 // case "fdcq2":
110 // form = require("@/views/djbworkflow/djbBook/slxx.vue"); 110 // form = require("@/views/djbworkflow/djbBook/fdcq2.vue");
111 // break; 111 // break;
112 case "clxx": 112 // // 抵押权
113 form = require("@/views/djbworkflow/djbBook/clxx.vue"); 113 // case "diyaq":
114 break; 114 // form = require("@/views/djbworkflow/djbBook/diyaq.vue");
115 case "spyj": 115 // break;
116 form = require("@/views/djbworkflow/djbBook/spyj.vue"); 116 // // 预告登记
117 break; 117 // case "ygdj":
118 // form = require("@/views/djbworkflow/djbBook/ygdj.vue");
119 // break;
120 // // 地役权
121 // case "diyiq":
122 // form = require("@/views/djbworkflow/djbBook/diyiq.vue");
123 // break;
124 // // 登记簿封面
125 // case "djbfm":
126 // form = require("@/views/djbworkflow/djbBook/djbfm.vue");
127 // break;
128 // // 异议登记
129 // case "yydj":
130 // form = require("@/views/djbworkflow/djbBook/yydj.vue");
131 // break;
132 // 受理信息
133 case "slxx":
134 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/fwsyq/slxx.vue");
135 break;
136 // case "clxx":
137 // form = require("@/views/djbworkflow/djbBook/components/clxx.vue");
138 // break;
139 // case "spyj":
140 // form = require("@/views/djbworkflow/djbBook/components/spyj.vue");
141 // break;
142 // case "slxx":
143 // form = require("@/views/djbworkflow/djbBook/slxx.vue");
144 // break;
145 case "clxx":
146 form = require("@/views/djbworkflow/djbBook/clxx.vue");
147 break;
148 case "spyj":
149 form = require("@/views/djbworkflow/djbBook/spyj.vue");
150 break;
118 151
119 // case "clxx": 152 // case "clxx":
120 // form = require("@/views/djbworkflow/components/clxxUnify.vue"); 153 // form = require("@/views/djbworkflow/components/clxxUnify.vue");
121 // break; 154 // break;
122 // case "spyj": 155 // case "spyj":
123 // form = require("@/views/djbworkflow/components/spyj.vue"); 156 // form = require("@/views/djbworkflow/components/spyj.vue");
124 // break; 157 // break;
125 default: 158 default:
126 form = require("@/views/error-page/404.vue"); 159 form = require("@/views/error-page/404.vue");
127 break; 160 break;
128 } 161 }
129 return (r) => require.ensure([], () => r(form)); 162 return (r) => require.ensure([], () => r(form));
130 } 163 }
......
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
80 break; 80 break;
81 case "B2": //材料分屏按钮 81 case "B2": //材料分屏按钮
82 this.splitScreen = this.splitScreen ? false : true; 82 this.splitScreen = this.splitScreen ? false : true;
83 this.$store.dispatch("app/settScreen", this.splitScreen); 83 this.$store.dispatch("app/set1tScreen", this.splitScreen);
84 if (this.splitScreen) { 84 if (this.splitScreen) {
85 //如果当前选项卡为材料信息内容,递减到上一个选项卡内容 85 //如果当前选项卡为材料信息内容,递减到上一个选项卡内容
86 if (this.tabName == this.clxxTab.value) { 86 if (this.tabName == this.clxxTab.value) {
...@@ -100,60 +100,45 @@ export default { ...@@ -100,60 +100,45 @@ export default {
100 case "B4": 100 case "B4":
101 this.$popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%', true) 101 this.$popupDialog("登记簿详情", "registerBook/djbFrame", this.currentSelectProps, '80%', true)
102 break; 102 break;
103 case "B5": 103 // case "B5":
104 const h = this.$createElement; 104 // const h = this.$createElement;
105 this.$msgbox({ 105 // this.$msgbox({
106 title: '消息', 106 // title: '请选择新增权利类型',
107 message: h('p', null, [ 107 // message: h('p', null, [
108 h('span', null, '内容可以是 '), 108 // h('span', null, '内容可以是 '),
109 h('i', { style: 'color: teal' }, 'VNode') 109 // h('el-button', { style: 'color: teal' }, 'VNode'),
110 ]), 110 // h('i', { style: 'color: teal' }, 'VNode')
111 showCancelButton: true, 111 // ]),
112 confirmButtonText: '确定', 112 // showCancelButton: true,
113 cancelButtonText: '取消', 113 // confirmButtonText: '确定',
114 beforeClose: (action, instance, done) => { 114 // cancelButtonText: '取消',
115 if (action === 'confirm') { 115 // beforeClose: (action, instance, done) => {
116 instance.confirmButtonLoading = true; 116 // if (action === 'confirm') {
117 instance.confirmButtonText = '执行中...'; 117 // instance.confirmButtonLoading = true;
118 setTimeout(() => { 118 // instance.confirmButtonText = '执行中...';
119 done(); 119 // setTimeout(() => {
120 setTimeout(() => { 120 // done();
121 instance.confirmButtonLoading = false; 121 // setTimeout(() => {
122 }, 300); 122 // instance.confirmButtonLoading = false;
123 }, 3000); 123 // }, 300);
124 } else { 124 // }, 3000);
125 done(); 125 // } else {
126 } 126 // done();
127 } 127 // }
128 }).then(action => { 128 // }
129 this.addRepairRecord() 129 // }).then(action => {
130 this.$message({ 130 // this.addRepairRecord()
131 type: 'info', 131 // this.$message({
132 message: 'action: ' + action 132 // type: 'info',
133 }); 133 // message: 'action: ' + action
134 }); 134 // });
135 // this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { 135 // });
136 // bsmSlsq: this.bsmSlsq,
137 // entryType: '1'
138 // }, '65%', true)
139 // this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
140 // confirmButtonText: '确定',
141 // cancelButtonText: '取消',
142 // type: 'warning'
143 // }).then(() => {
144 // this.addRepairRecord()
145 // this.$message({
146 // type: 'success',
147 // message: '补录成功!'
148 // });
149 // }).catch(() => {
150 // this.$message({
151 // type: 'info',
152 // message: '取消编辑'
153 // });
154 // });
155 136
156 break; 137 // break;
138 case "B5":
139 // this.$popupDialog("选择新增权力类型", "djbworkflow/djbBook/components/qllxcloseDailog", this.currentSelectProps, '50%', true)
140 this.$refs.qllxlist.dialogVisible=true
141 break;
157 case "B6": 142 case "B6":
158 //根据编号获取对应信息 143 //根据编号获取对应信息
159 getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => { 144 getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {
......
...@@ -62,6 +62,8 @@ ...@@ -62,6 +62,8 @@
62 </div> 62 </div>
63 </div> 63 </div>
64 </div> 64 </div>
65 <!-- 新增补录信息勾选权利类型 -->
66 <qllxDailog ref="qllxlist"/>
65 </div> 67 </div>
66 </template> 68 </template>
67 <style scoped lang="scss"> 69 <style scoped lang="scss">
...@@ -70,18 +72,18 @@ ...@@ -70,18 +72,18 @@
70 </style> 72 </style>
71 <script> 73 <script>
72 import WorkFlow from "./mixin/index"; 74 import WorkFlow from "./mixin/index";
73 import { getForm } from "./flowform" 75 import { getForm } from "./flowform";
74 import NoticeBar from "@/components/NoticeBar/index"; 76 import NoticeBar from "@/components/NoticeBar/index";
75 import { unClaimTask } from "@/api/ywbl.js";
76 import ProcessViewer from "./components/processViewer.vue"; 77 import ProcessViewer from "./components/processViewer.vue";
77 // 引入左侧菜单 78 // 引入左侧菜单
78 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue"; 79 import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
80 import qllxDailog from "./djbBook/components/qllxDailog";
79 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue"; 81 import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
80 import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js"; 82 import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
81 // 登记簿数据信息 83 // 登记簿数据信息
82 import { addRepairRecord } from "@/api/djbbl.js" 84 import { addRepairRecord } from "@/api/djbbl.js";
83 // 获取权利类型数组 85 // 获取权利类型数组
84 import { getQllxByBdcdyid } from "@/api/djbbl.js" 86 import { getQllxByBdcdyid } from "@/api/djbbl.js";
85 87
86 import { getBdcqljqtsx } from "@/api/registerBook.js"; 88 import { getBdcqljqtsx } from "@/api/registerBook.js";
87 export default { 89 export default {
...@@ -90,6 +92,7 @@ export default { ...@@ -90,6 +92,7 @@ export default {
90 NoticeBar, 92 NoticeBar,
91 ProcessViewer, 93 ProcessViewer,
92 ordinaryMenu, 94 ordinaryMenu,
95 qllxDailog,
93 }, 96 },
94 mixins: [WorkFlow], 97 mixins: [WorkFlow],
95 data() { 98 data() {
...@@ -104,8 +107,10 @@ export default { ...@@ -104,8 +107,10 @@ export default {
104 qllx: this.$route.query.qllx, 107 qllx: this.$route.query.qllx,
105 //设置那个表单选中 108 //设置那个表单选中
106 tabName: "", 109 tabName: "",
110 // 弹框显示
111 dialogVisible: true,
107 // 权利类型数组 112 // 权利类型数组
108 qllxlist:[], 113 qllxlist: [],
109 //表单集合 114 //表单集合
110 tabList: [], 115 tabList: [],
111 //选择加载哪一个组件 116 //选择加载哪一个组件
...@@ -118,100 +123,101 @@ export default { ...@@ -118,100 +123,101 @@ export default {
118 clxxTab: {}, 123 clxxTab: {},
119 //页面监听时间 124 //页面监听时间
120 _beforeUnload_time: "", 125 _beforeUnload_time: "",
121 treedata:{}, 126 treedata: {},
122 tabdata:[], 127 tabdata: [],
123 defaultNode:{} 128 defaultNode: {},
124 };
125 },
126 mounted() {
127 129
130 };
128 }, 131 },
132 mounted() {},
129 133
130 methods: { 134 methods: {
131 getQllxByBdcdyid(){ 135 getQllxByBdcdyid() {
132 console.log("this.currentSelectProps.bdcdyid",this.currentSelectProps.bdcdyid); 136 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
133 getQllxByBdcdyid({bdcdyid:this.currentSelectProps.bdcdyid}).then((res) => { 137 (res) => {
134 if (res.code === 200) { 138 if (res.code === 200) {
135 console.log("Qllxlist",res); 139 console.log("Qllxlist", res);
136 140 }
137 } 141 }
138 }); 142 );
139 }, 143 },
140 // 获取右侧选项卡 144 // 获取右侧选项卡
141 getCurrentSelectProps (val) { 145 getCurrentSelectProps(val) {
142 this.currentSelectProps = val 146 this.currentSelectProps = val;
143 if(this.currentSelectProps.bsmRepair){ 147 if (this.currentSelectProps.bsmRepair) {
144 this.tabset(val) 148 this.tabset(val);
145 }else{ 149 } else {
146 this.getdjblist() 150 this.getdjblist();
147 } 151 }
148 152 },
149 }, 153 // 获取渲染登记簿列表
150 // 获取渲染登记簿列表 154 getdjblist() {
151 getdjblist(){ 155 getBdcqljqtsx({
152 getBdcqljqtsx({
153 bdcdyid: this.currentSelectProps.bdcdyid, 156 bdcdyid: this.currentSelectProps.bdcdyid,
154 bdcdyh: this.currentSelectProps.bdcdyh, 157 bdcdyh: this.currentSelectProps.bdcdyh,
155 }).then((res) => { 158 }).then((res) => {
156 if (res.code === 200) { 159 if (res.code === 200) {
157 this.treedata = loadTreeData(res.result, this.bdcdyh); 160 this.treedata = loadTreeData(res.result, this.bdcdyh);
158 this.$nextTick(function () { 161 this.$nextTick(function () {
159 console.log("this.currentSelectProps.qllx",this.currentSelectProps); 162 this.defaultNode = getNode(
160 this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, ""); 163 this.currentSelectProps.qllx,
161 console.log("this.defaultNode",this.defaultNode); 164 { linShi: 0, xianShi: 0, liShi: 0 },
162 this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点 165 ""
166 );
167 this.tabName = this.defaultNode.id; //data[0].id为默认选中的节点
163 }); 168 });
164 } 169 }
165 }); 170 });
166 171
167 setTimeout(() => { 172 setTimeout(() => {
168 let settree=JSON.parse(JSON.stringify(this.treedata)) 173 let settree = JSON.parse(JSON.stringify(this.treedata));
169 this.tabdata=[...settree,...settree[1].children[0].children[0].children] 174 this.tabdata = [
170 this.tabdata.forEach((item,index,arr) => { 175 ...settree,
171 arr[index].name=item.label; 176 ...settree[1].children[0].children[0].children,
172 arr[index].value=item.id
173 })
174 this.tabList=this.tabdata
175 this.getQllxByBdcdyid()
176 }, 200)
177
178 },
179
180 tabset(val){
181 this.tabName = '';
182 this.tabList = [
183 {
184 name:val.qllxmc+ "补录信息",
185 value: "slxx",
186 sort: 1,
187 },
188 {
189 name: "审批意见",
190 value: "spyj",
191 sort: 2,
192 },
193 {
194 name: "材料信息",
195 value: "clxx",
196 sort: 2,
197 },
198 ]; 177 ];
178 this.tabdata.forEach((item, index, arr) => {
179 arr[index].name = item.label;
180 arr[index].value = item.id;
181 });
182 this.tabList = this.tabdata;
183 this.getQllxByBdcdyid();
184 }, 200);
185 },
199 186
200 this.$nextTick(function () { 187 tabset(val) {
201 this.tabName = 'slxx'; 188 this.tabName = "";
202 }); 189 this.tabList = [
203 190 {
191 name: val.qllxmc + "补录信息",
192 value: "slxx",
193 sort: 1,
194 },
195 {
196 name: "审批意见",
197 value: "spyj",
198 sort: 2,
199 },
200 {
201 name: "材料信息",
202 value: "clxx",
203 sort: 2,
204 }, 204 },
205 ];
206
207 this.$nextTick(function () {
208 this.tabName = "slxx";
209 });
210 },
205 211
206 //右侧表单选项卡事件 212 //右侧表单选项卡事件
207 beforeLeave (activeName, oldActiveName) { 213 beforeLeave(activeName, oldActiveName) {
208 if (activeName && activeName != 0) this.getFromRouter(activeName) 214 if (activeName && activeName != 0) this.getFromRouter(activeName);
209 }, 215 },
210 //切换选项卡内容组件 216 //切换选项卡内容组件
211 getFromRouter (tabname) { 217 getFromRouter(tabname) {
212 for (let item of this.tabList) { 218 for (let item of this.tabList) {
213 if (item.value === tabname) { 219 if (item.value === tabname) {
214 this.currentSelectTab = item 220 this.currentSelectTab = item;
215 break; 221 break;
216 } 222 }
217 } 223 }
...@@ -219,27 +225,29 @@ export default { ...@@ -219,27 +225,29 @@ export default {
219 }, 225 },
220 226
221 // 增加补录记录 227 // 增加补录记录
222 addRepairRecord(row){ 228 addRepairRecord(row) {
223 console.log("this.currentSelectProps",this.currentSelectProps); 229 let from = {
224 let from={ 230 bsmQlxx: "",
225 bsmQlxx:"", 231 bsmSlsq: this.bsmSlsq,
226 bsmSlsq:this.bsmSlsq, 232 bsmSldy: this.currentSelectProps.bsmSldy,
227 bsmSldy:this.currentSelectProps.bsmSldy, 233 operate: "C",
228 operate:"C", 234 qllx: this.currentSelectProps.qllx,
229 qllx:this.currentSelectProps.qllx 235 };
230 } 236 if (row) {
231 if(row){ 237 from.bsmQlxx = row.bsmQlxx;
232 from.bsmQlxx=row.bsmQlxx 238 from.operate = "U";
233 from.operate="U" 239 from.qllx = row.qllx;
234 from.qllx=row.qllx 240 }
235 }
236 241
237 addRepairRecord(from).then((res) => { 242 addRepairRecord(from).then((res) => {
238 this.$nextTick(() => { 243 this.$nextTick(() => {
239 this.$refs.Menu.getleftMenubl(res.result); 244 this.$refs.Menu.getleftMenubl(res.result);
240 }); 245 });
241 }); 246 });
242 }, 247 },
248
243 }, 249 },
244 }; 250 };
245 </script> 251 </script>
252 <style scoped lang="scss">
253 </style>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 15:47:12 3 * @Date: 2023-02-28 15:47:12
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-03-02 16:35:36 5 * @LastEditTime: 2023-06-16 16:14:51
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 :data-qszt="hs.qszt" 37 :data-qszt="hs.qszt"
38 ref="hBsm" 38 ref="hBsm"
39 :key="hsIndex" 39 :key="hsIndex"
40 style="border-color: rgb(230, 230, 230)" 40 :style="{'border-color': borderColor}"
41 :class="hs.select ? 'tdSelect' : ''" 41 :class="hs.select ? 'tdSelect' : ''"
42 @click="handleClickH($event.target, hs.bsm, hs)" 42 @click="handleClickH($event.target, hs.bsm, hs)"
43 @dblclick="dbclick(hs.bsm)" 43 @dblclick="dbclick(hs.bsm)"
...@@ -82,7 +82,12 @@ ...@@ -82,7 +82,12 @@
82 <script> 82 <script>
83 export default { 83 export default {
84 name: "BdcdjWebCh", 84 name: "BdcdjWebCh",
85 inject: ["openMenu", "selectAll"], 85 inject: {
86 openMenu:{value:'openMenu',default:null},
87 selectAll:{value:'selectAll',default:null},
88 changeChoosedObj:{value:'changeChoosedObj',default:null},
89 clearChangeChoosedObj:{value:'clearChangeChoosedObj',default:null}
90 },
86 props: { 91 props: {
87 ch: { 92 ch: {
88 type: Array, 93 type: Array,
...@@ -101,6 +106,8 @@ export default { ...@@ -101,6 +106,8 @@ export default {
101 hqsztList: [], 106 hqsztList: [],
102 //区分单双击事件的定时器 107 //区分单双击事件的定时器
103 time: null, 108 time: null,
109 // 边框颜色
110 borderColor:'rgb(230, 230, 230)'
104 }; 111 };
105 }, 112 },
106 mounted() {}, 113 mounted() {},
...@@ -108,48 +115,32 @@ export default { ...@@ -108,48 +115,32 @@ export default {
108 // 层选中事件 115 // 层选中事件
109 handleClickC(e, item) { 116 handleClickC(e, item) {
110 //判断点击的层是否选中 117 //判断点击的层是否选中
111 if (e.target.className.indexOf("tdSelect") == -1) { 118 // if (e.target.className.indexOf("tdSelect") == -1) {
112 //未选中→选中 119 // //未选中→选中
113 e.target.className += " tdSelect"; //加边框 120 // e.target.className += " tdSelect"; //加边框
114 this.cbsmList.push(item.bsm); 121 // this.cbsmList.push(item.bsm);
115 } else { 122 // } else {
116 //选中→未选中 123 // //选中→未选中
117 e.target.className = "floor"; 124 // e.target.className = "floor";
118 this.cbsmList = this.cbsmList.filter((i) => i != item.bsm); 125 // this.cbsmList = this.cbsmList.filter((i) => i != item.bsm);
119 } 126 // }
120 // this.$parent.getCbsm(this.cbsmList); 127 // this.$parent.getCbsm(this.cbsmList);
121 }, 128 },
122 //户单击事件 129 //户单击事件
123 handleClickH(e, bsm, hs) { 130 handleClickH(e, bsm, hs) {
124 let self = this;
125 // 开启延时器,200ms的间隔区分单击和双击,解决双击时执行两次单击事件
126 clearTimeout(self.time);
127 self.time = setTimeout(() => {
128 // this.closeMenu();
129 //判断点击的户是否选中
130 if (!hs.select) {
131 //未选中→选中
132 hs.select = true; //加边框
133 this.hbsmList.push(bsm); // 将户bsm放进hbsmList
134 this.hqsztList.push(hs.qszt); // 将户qszt放进hqsztList
135 } else {
136 //选中→未选中
137 hs.select = false;
138 this.hbsmList = this.hbsmList.filter((i) => i != bsm);
139 this.hqsztList = this.hqsztList.filter((i) => i != hs.qszt);
140 }
141 }, 200);
142 }, 131 },
143 // 户单元状态点击事件 132 // 户单元状态点击事件
144 hDyztClick(e, bsm, hs) { 133 hDyztClick(e, bsm, hs) {
145 this.handleClickH(e.target.parentNode, bsm, hs); 134 // this.handleClickH(e.target.parentNode, bsm, hs);
146 }, 135 },
147 //户双击事件 136 //户双击事件
148 dbclick(bsm) { 137 dbclick(bsm) {
149 clearTimeout(this.time); 138 // clearTimeout(this.time);
150 }, 139 },
151 //幢单元全选/反选 140 //幢单元全选/反选
152 zdySelectAll(val) { 141 zdySelectAll(val,flag) {
142 // 手动点击全部取消选中
143 !flag && this.clearChangeChoosedObj()
153 this.ch.forEach((c) => { 144 this.ch.forEach((c) => {
154 c.hs.forEach((h) => { 145 c.hs.forEach((h) => {
155 if (val) { 146 if (val) {
...@@ -158,10 +149,16 @@ export default { ...@@ -158,10 +149,16 @@ export default {
158 this.hbsmList.push(h.bsm) 149 this.hbsmList.push(h.bsm)
159 } else { 150 } else {
160 h.select = false; 151 h.select = false;
152 this.borderColor = 'rgb(230, 230, 230)'
161 this.hbsmList = [] 153 this.hbsmList = []
162 } 154 }
163 }); 155 });
164 }); 156 });
157 this.$refs.hBsm && this.$refs.hBsm.forEach((item) => {
158 // item.style.borderColor = this.borderColor
159 item.style.backgroundColor = '#fff';
160 // item.style.border = `1px solid ${this.borderColor}`
161 });
165 }, 162 },
166 }, 163 },
167 watch: { 164 watch: {
...@@ -172,6 +169,34 @@ export default { ...@@ -172,6 +169,34 @@ export default {
172 immediate: true, 169 immediate: true,
173 deep: true, 170 deep: true,
174 }, 171 },
172 changeChoosedObj: {
173 handler(val) {
174 debugger
175 //清除选中户
176 this.borderColor = 'rgb(230, 230, 230)';
177 this.zdySelectAll(false,true)
178 if (val.bsms.length) {
179 this.$refs.hBsm.forEach((item) => {
180 val.bsms.forEach((i,ind) => {
181 if (item.dataset.bsm == i) {
182 if (ind == 0) {
183 //定位到第一个户所在位置
184 window.lpbContent.$refs.lpbContent.scrollTop = item.offsetTop;
185 window.lpbContent.$refs.lpbContent.scrollLeft = item.offsetLeft;
186 }
187 item.style.border = '1px solid '+ val.color;
188 // item.style.backgroundColor = val.color;
189 }
190 });
191 });
192 }else{
193 this.borderColor = 'rgb(230, 230, 230)'
194 }
195
196 },
197 immediate: true,
198 deep: true,
199 },
175 }, 200 },
176 }; 201 };
177 </script> 202 </script>
...@@ -181,16 +206,26 @@ export default { ...@@ -181,16 +206,26 @@ export default {
181 display: flex; 206 display: flex;
182 flex-direction: column-reverse; 207 flex-direction: column-reverse;
183 .chTable { 208 .chTable {
184 margin-left: -1px; 209 // margin-left: -1px;
185 border-color: #e4ebf4 !important; 210 border-color: #e4ebf4 !important;
186 border-collapse: collapse; 211 border-collapse: collapse;
187 border-spacing: 0; 212 border-spacing: 0;
188 // position: relative; 213 // position: relative;
189 tr { 214 tr {
215 .floor {
216 min-width: 56px;
217 background: #e8f2ff;
218 border: 1px solid #acbae8;
219 }
220 &:first-child {
221 .floor {
222 border-radius: 4px 0px 0px 1px;
223 }
224 }
190 td { 225 td {
191 min-width: 138px; 226 min-width: 138px;
192 height: 72px; 227 height: 64px;
193 line-height: 72px; 228 line-height: 64px;
194 text-align: center; 229 text-align: center;
195 cursor: pointer; 230 cursor: pointer;
196 position: relative; 231 position: relative;
...@@ -204,7 +239,7 @@ export default { ...@@ -204,7 +239,7 @@ export default {
204 left: 6px; 239 left: 6px;
205 top: 6px; 240 top: 6px;
206 border: 1px solid; 241 border: 1px solid;
207 border-radius: 8px; 242 border-radius: 3px 0px 3px 0px;
208 } 243 }
209 .lin { 244 .lin {
210 color: #f7b500; 245 color: #f7b500;
...@@ -223,7 +258,7 @@ export default { ...@@ -223,7 +258,7 @@ export default {
223 width: 138px; 258 width: 138px;
224 height: 18px; 259 height: 18px;
225 position: absolute; 260 position: absolute;
226 bottom: 32px; 261 bottom: 28px;
227 box-sizing: border-box; 262 box-sizing: border-box;
228 padding: 0 6px; 263 padding: 0 6px;
229 li { 264 li {
...@@ -239,7 +274,8 @@ export default { ...@@ -239,7 +274,8 @@ export default {
239 } 274 }
240 } 275 }
241 .tdSelect { 276 .tdSelect {
242 border: 1px solid #006cff !important; 277 border: 1px solid ;
278 border-color: #5A78DE !important;
243 background-image: url("./images/tdSelect.png"); 279 background-image: url("./images/tdSelect.png");
244 background-repeat: no-repeat; 280 background-repeat: no-repeat;
245 background-position: right top; 281 background-position: right top;
......
1 <template> 1 <template>
2 <div class="lpbContent-wrap" ref="lpbContentWrap"> 2 <div class="lpbContent-wrap" ref="lpbContentWrap">
3 <div class="lpbContent"> 3 <div class="lpbContent" ref="lpbContent">
4 <!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 --> 4 <!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 -->
5 <div class="ch-zdy-wrap"> 5 <div class="ch-zdy-wrap">
6 <!-- 幢单元 --> 6 <!-- 幢单元 -->
...@@ -13,9 +13,10 @@ ...@@ -13,9 +13,10 @@
13 </div> 13 </div>
14 <!-- 自然幢名称 --> 14 <!-- 自然幢名称 -->
15 <p class="lpb-xmmc"> 15 <p class="lpb-xmmc">
16 <el-checkbox @change="zdySelectAll($event)">{{ 16 <!-- <el-checkbox @change="zdySelectAll($event)">{{
17 lpbData.xmmc 17 lpbData.xmmc
18 }}</el-checkbox> 18 }}</el-checkbox> -->
19 {{lpbData.xmmc}}
19 </p> 20 </p>
20 <!-- 右键菜单 --> 21 <!-- 右键菜单 -->
21 <ul 22 <ul
...@@ -38,6 +39,8 @@ export default { ...@@ -38,6 +39,8 @@ export default {
38 return { 39 return {
39 openMenu: this.openMenu, 40 openMenu: this.openMenu,
40 selectAll: this.selectAllObj, 41 selectAll: this.selectAllObj,
42 changeChoosedObj:this.changeChoosedObj,
43 clearChangeChoosedObj:this.clearChangeChoosedObj
41 }; 44 };
42 }, 45 },
43 name: "", 46 name: "",
...@@ -72,20 +75,27 @@ export default { ...@@ -72,20 +75,27 @@ export default {
72 //右键菜单定位位置 75 //右键菜单定位位置
73 lpbChLeft: 100, 76 lpbChLeft: 100,
74 lpbChTop: 100, 77 lpbChTop: 100,
78 // 改变户选中状态
79 changeChoosedObj:{
80 bsms:[],
81 color:''
82 }
75 }; 83 };
76 }, 84 },
77 mounted() { 85 mounted() {
78 this.getLpb("dfc08a0cc6a25188990ea53d1d2c500e"); 86 this.getLpb(this.zrzbsm);
79 // setTimeout(() => { 87 window.lpbContent = this;
80 // //让滚动条滚动至最下面 -6是横向滚动条的高度
81 // this.$refs.lpbContent.scrollTop =
82 // this.$refs.lpbContent.scrollHeight -
83 // this.$refs.lpbContent.clientHeight -
84 // 6;
85 // }, 200);
86 // window.lpbContent = this;
87 }, 88 },
88 methods: { 89 methods: {
90 // 改变户选中状态
91 changeChoosed(bsms, color){
92 debugger
93 this.changeChoosedObj.bsms = bsms;
94 this.changeChoosedObj.color = color;
95 },
96 clearChangeChoosedObj(){
97 this.changeChoosedObj.bsms = [];
98 },
89 //全选户 99 //全选户
90 zdySelectAll(val) { 100 zdySelectAll(val) {
91 this.selectAllObj.selectAll = val; 101 this.selectAllObj.selectAll = val;
...@@ -113,7 +123,7 @@ export default { ...@@ -113,7 +123,7 @@ export default {
113 openMenu(e, item, type) { 123 openMenu(e, item, type) {
114 this.lpbChLeft = e.pageX - 96; 124 this.lpbChLeft = e.pageX - 96;
115 this.lpbChTop = e.pageY - 23; 125 this.lpbChTop = e.pageY - 23;
116 this.lpbChVisible = true; 126 // this.lpbChVisible = true;
117 }, 127 },
118 //关闭户右键菜单 128 //关闭户右键菜单
119 closeMenu() { 129 closeMenu() {
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 --> 10 -->
11 <template> 11 <template>
12 <div class="ljzs-wrap"> 12 <div class="ljzs-wrap">
13 <div v-for="ljzarr in ljzsCptd" :key="ljzarr[0].bsm"> 13 <div v-for="ljzarr in ljzsCptd" :style="{'margin-bottom': ljzarr.length == 1 ? '34px':'80px'}" :key="ljzarr[0].bsm">
14 <!-- 多个同起始层逻辑幢 横向排列 --> 14 <!-- 多个同起始层逻辑幢 横向排列 -->
15 <div class="ch-zdy-wrap" v-if="ljzarr.length > 1"> 15 <div class="ch-zdy-wrap" v-if="ljzarr.length > 1">
16 <div v-for="ljz in ljzarr" :key="ljz.ljzmc" class="same-floor-ljz"> 16 <div v-for="ljz in ljzarr" :key="ljz.ljzmc" class="same-floor-ljz">
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
94 display: flex; 94 display: flex;
95 flex-direction: column-reverse; 95 flex-direction: column-reverse;
96 > div { 96 > div {
97 margin-bottom: 80px; 97 // margin-bottom: 80px;
98 margin-right: 20px; 98 margin-right: 20px;
99 display: flex; 99 display: flex;
100 flex-direction: column; 100 flex-direction: column;
...@@ -110,8 +110,8 @@ export default { ...@@ -110,8 +110,8 @@ export default {
110 } 110 }
111 .ljz-xmmc { 111 .ljz-xmmc {
112 position: absolute; 112 position: absolute;
113 width: calc(100% + 1px); 113 width: calc(100% - 4px);
114 bottom: -60px; 114 bottom: -34px;
115 } 115 }
116 } 116 }
117 .cs-none { 117 .cs-none {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-28 16:29:04 3 * @Date: 2023-02-28 16:29:04
4 * @LastEditors: yangwei 4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-03-02 14:45:19 5 * @LastEditTime: 2023-06-08 13:58:58
6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue 6 * @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -13,9 +13,10 @@ ...@@ -13,9 +13,10 @@
13 <div v-for="zdy in realZdys" :key="zdy.bsm"> 13 <div v-for="zdy in realZdys" :key="zdy.bsm">
14 <!-- 幢单元名称 --> 14 <!-- 幢单元名称 -->
15 <p class="lpb-xmmc"> 15 <p class="lpb-xmmc">
16 <el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{ 16 <!-- <el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{
17 zdy.zdymc 17 zdy.zdymc
18 }}</el-checkbox> 18 }}</el-checkbox> -->
19 {{zdy.zdymc}}
19 </p> 20 </p>
20 <!-- 每个幢单元下的层户 --> 21 <!-- 每个幢单元下的层户 -->
21 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" /> 22 <ch-cpn :ref="zdy.bsm" :ch="zdy.cs" />
......
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
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 ]"> 22 ]">
23 <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="deleteDialog(row)">删除</el-button>
26 </div>
23 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
24 正在办理 28 正在办理
25 </div> 29 </div>
......
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
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 ]"> 22 ]">
23 <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="deleteDialog(row)">删除</el-button>
26 </div>
23 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
24 正在办理 28 正在办理
25 </div> 29 </div>
......
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
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'">
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="deleteDialog(row)">删除</el-button>
28 </div>
25 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 29 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
26 正在办理 30 正在办理
27 </div> 31 </div>
...@@ -67,6 +71,11 @@ ...@@ -67,6 +71,11 @@
67 }, 71 },
68 methods: { 72 methods: {
69 loadData () { 73 loadData () {
74 if(this.$parent.addRepairRecord){
75 this.columns.unshift({prop:"cz",
76 label:"操作"
77 })
78 }
70 getJsydsyqList({ 79 getJsydsyqList({
71 bdcdyid: this.propsParam.bdcdyid, 80 bdcdyid: this.propsParam.bdcdyid,
72 qllx: this.propsParam.qllx, 81 qllx: this.propsParam.qllx,
......
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
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 ]"> 22 ]">
23 <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="deleteDialog(row)">删除</el-button>
26 </div>
23 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
24 正在办理 28 正在办理
25 </div> 29 </div>
......
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
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'">
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="deleteDialog(row)">删除</el-button>
28 </div>
25 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 29 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
26 正在办理 30 正在办理
27 </div> 31 </div>
...@@ -67,6 +71,11 @@ ...@@ -67,6 +71,11 @@
67 }, 71 },
68 methods: { 72 methods: {
69 loadData () { 73 loadData () {
74 if(this.$parent.addRepairRecord){
75 this.columns.unshift({prop:"cz",
76 label:"操作"
77 })
78 }
70 getJsydsyqList({ 79 getJsydsyqList({
71 bdcdyid: this.propsParam.bdcdyid, 80 bdcdyid: this.propsParam.bdcdyid,
72 qllx: this.propsParam.qllx, 81 qllx: this.propsParam.qllx,
......
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 22 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
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'">
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="deleteDialog(row)">删除</el-button>
28 </div>
25 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 29 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
26 正在办理 30 正在办理
27 </div> 31 </div>
...@@ -96,6 +100,11 @@ ...@@ -96,6 +100,11 @@
96 }, 100 },
97 methods: { 101 methods: {
98 loadData () { 102 loadData () {
103 if(this.$parent.addRepairRecord){
104 this.columns.unshift({prop:"cz",
105 label:"操作"
106 })
107 }
99 getNydsyqList({ 108 getNydsyqList({
100 bdcdyid: this.propsParam.bdcdyid, 109 bdcdyid: this.propsParam.bdcdyid,
101 qllx: this.propsParam.qllx, 110 qllx: this.propsParam.qllx,
......
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
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 ]"> 22 ]">
23 <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="deleteDialog(row)">删除</el-button>
26 </div>
23 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
24 正在办理 28 正在办理
25 </div> 29 </div>
...@@ -61,6 +65,12 @@ export default { ...@@ -61,6 +65,12 @@ export default {
61 }, 65 },
62 methods: { 66 methods: {
63 loadData () { 67 loadData () {
68 // 判断是否在登记簿补录调的子页面
69 if(this.$parent.addRepairRecord){
70 this.columns.unshift({prop:"cz",
71 label:"操作"
72 })
73 }
64 getYgdjList({ 74 getYgdjList({
65 bdcdyid: this.propsParam.bdcdyid, 75 bdcdyid: this.propsParam.bdcdyid,
66 qllx: this.propsParam.qllx, 76 qllx: this.propsParam.qllx,
......
...@@ -61,6 +61,11 @@ export default { ...@@ -61,6 +61,11 @@ export default {
61 }, 61 },
62 methods: { 62 methods: {
63 loadData () { 63 loadData () {
64 if(this.$parent.addRepairRecord){
65 this.columns.unshift({prop:"cz",
66 label:"操作"
67 })
68 }
64 getYydjList({ 69 getYydjList({
65 bdcdyid: this.propsParam.bdcdyid, 70 bdcdyid: this.propsParam.bdcdyid,
66 qllx: this.propsParam.qllx, 71 qllx: this.propsParam.qllx,
...@@ -95,6 +100,62 @@ export default { ...@@ -95,6 +100,62 @@ export default {
95 } 100 }
96 return name; 101 return name;
97 }, 102 },
103 // 编辑
104 editDialog(row){
105 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
106 confirmButtonText: '确定',
107 cancelButtonText: '取消',
108 type: 'warning'
109 }).then(() => {
110 this.$parent.addRepairRecord(row)
111
112 this.$message({
113 type: 'success',
114 message: '补录成功!'
115 });
116 }).catch(() => {
117 this.$message({
118 type: 'info',
119 message: '取消编辑'
120 });
121 });
122
123 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
124 // datalist:this.columns,
125 // data: row,
126
127 // })
128
129 },
130 // 删除
131 deleteDialog(row){
132 this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
133 confirmButtonText: '确定',
134 cancelButtonText: '取消',
135 type: 'warning'
136 }).then(() => {
137 // let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
138 // deleteClmx(bsmClmx).then(res => {
139 // if (res.code == 200) {
140 // that.$emit('updateList', res.result)
141 // that.$message({
142 // message: '删除成功!',
143 // type: 'success'
144 // })
145 // }
146 // })
147 this.$message({
148 type: 'success',
149 message: '删除成功!'
150 });
151 }).catch(() => {
152 this.$message({
153 type: 'info',
154 message: '已取消删除'
155 });
156 });
157
158 }
98 }, 159 },
99 }; 160 };
100 </script> 161 </script>
......
...@@ -28,6 +28,19 @@ class data extends filter { ...@@ -28,6 +28,19 @@ class data extends filter {
28 } 28 }
29 }, 29 },
30 { 30 {
31 prop: "status",
32 label: "状态",
33 render: (h, scope) => {
34 return (
35 <div>
36 {/* <a v-on:click="doSomething"></a> */}
37 <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
38 <span v-show={scope.row.sfbl == 1}>,正在补录</span>
39 </div>
40 )
41 }
42 },
43 {
31 label: "权属状态", 44 label: "权属状态",
32 width: '80', 45 width: '80',
33 render: (h, scope) => { 46 render: (h, scope) => {
...@@ -55,10 +68,7 @@ class data extends filter { ...@@ -55,10 +68,7 @@ class data extends filter {
55 ) 68 )
56 } 69 }
57 }, 70 },
58 { 71
59 prop: "ywh",
60 label: "业务号",
61 },
62 { 72 {
63 prop: "qllxmc", 73 prop: "qllxmc",
64 label: "权利类型", 74 label: "权利类型",
......