bf492ecf by 单帅旗

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	public/config.json
2 parents b21f285e 272383f1
Showing 60 changed files with 1632 additions and 676 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-02 09:47:57 4 * @LastEditTime: 2023-06-20 09:56:19
5 --> 5 -->
6 <!DOCTYPE html> 6 <!DOCTYPE html>
7 <html> 7 <html>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 cloudEnable: false, 22 cloudEnable: false,
23 baseUrl: location.origin || location.protocol + '//' + location.host, 23 baseUrl: location.origin || location.protocol + '//' + location.host,
24 // 是否启用单点登录 24 // 是否启用单点登录
25 casEnable: true, 25 casEnable: false,
26 // cas 基地址 26 // cas 基地址
27 casBaseURL: 'http://192.168.2.38/cas', 27 casBaseURL: 'http://192.168.2.38/cas',
28 services: { 28 services: {
......
...@@ -71,12 +71,6 @@ export function leftMenubl (params) { ...@@ -71,12 +71,6 @@ export function leftMenubl (params) {
71 * @param {*} params 71 * @param {*} params
72 * @author: renchao 72 * @author: renchao
73 */ 73 */
74 // export function getQllxByBdcdyid (params) {
75 // return request({
76 // url: SERVER.SERVERAPI + '/rest/djbDetail/getQllxByBdcdyid?bdcdyid='+params,
77 // method: 'get',
78 // })
79 // }
80 export function getQllxByBdcdyid (params) { 74 export function getQllxByBdcdyid (params) {
81 return request({ 75 return request({
82 url: SERVER.SERVERAPI + '/rest/djbDetail/getQllxByBdcdyid', 76 url: SERVER.SERVERAPI + '/rest/djbDetail/getQllxByBdcdyid',
......
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 : JSON.parse(localStorage.getItem("ApiUrl"));
10 const url = SERVER.SERVERAPI + "/rest/zhcx/lpcx/";
9 // 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 })
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
25 import { mapGetters } from 'vuex' 25 import { mapGetters } from 'vuex'
26 import NoticeBar from '@/components/NoticeBar/index' 26 import NoticeBar from '@/components/NoticeBar/index'
27 import { getHomeNoticeList } from "@/api/home" 27 import { getHomeNoticeList } from "@/api/home"
28 import {setToken} from "@/utils/util";
28 export default { 29 export default {
29 components: { 30 components: {
30 NoticeBar 31 NoticeBar
...@@ -64,23 +65,11 @@ ...@@ -64,23 +65,11 @@
64 }) 65 })
65 }, 66 },
66 logout () { 67 logout () {
67 axios.post(this.BASE_API.ip + "/management/logout").then(() => { 68 axios.post(window._config.services.management + "/management/logout").then(() => {
68 if (process.env.NODE_ENV === 'development') { 69 setToken(undefined)
69 localStorage.removeItem('token') 70 sessionStorage.removeItem('token')
70 } else { 71 localStorage.setItem('dj-location',window.location.href)
71 Cookies.remove('ACCESS_TOKEN')
72 }
73 if (window._config.casEnable) {
74 window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href); 72 window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href);
75 } else {
76 this.$router.push({
77 path: '/login',
78 replace: true,
79 query: {
80 redirect: router.currentRoute.value.fullPath
81 }
82 })
83 }
84 }) 73 })
85 }, 74 },
86 75
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-30 15:28:52 4 * @LastEditTime: 2023-06-20 10:02:14
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import App from './App' 7 import App from './App'
...@@ -16,12 +16,10 @@ import Loading from '@/components/Loading/index.js'; ...@@ -16,12 +16,10 @@ import Loading from '@/components/Loading/index.js';
16 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading' 16 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading'
17 Vue.mixin(mixin); 17 Vue.mixin(mixin);
18 Vue.use(Loading.directive); 18 Vue.use(Loading.directive);
19 import rules from './utils/rule.js'
20 // 引入xml 19 // 引入xml
21 import x2js from 'x2js' 20 import x2js from 'x2js'
22 Vue.prototype.$x2js = new x2js() 21 Vue.prototype.$x2js = new x2js()
23 // 全局方法挂载 22 // 全局方法挂载
24 Vue.prototype.$rules = rules
25 // 全局加载 23 // 全局加载
26 Vue.prototype.$startLoading = startLoadingAddCount 24 Vue.prototype.$startLoading = startLoadingAddCount
27 Vue.prototype.$endLoading = endLoadingSubCount 25 Vue.prototype.$endLoading = endLoadingSubCount
......
1 /* 1 /*
2 * @Description: 项目权限 2 * @Description: 项目权限
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-13 16:28:25 4 * @LastEditTime: 2023-06-20 10:07:56
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import axios from 'axios' 7 import axios from 'axios'
...@@ -9,10 +9,10 @@ import router from './router' ...@@ -9,10 +9,10 @@ import router from './router'
9 import store from './store' 9 import store from './store'
10 import Cookies from 'js-cookie' 10 import Cookies from 'js-cookie'
11 import { getMenuInfo } from '@/api/user' 11 import { getMenuInfo } from '@/api/user'
12 import { getUrlParam } from '@/utils/operation'
13 import NProgress from 'nprogress' // progress bar 12 import NProgress from 'nprogress' // progress bar
14 import 'nprogress/nprogress.css' // progress bar style 13 import 'nprogress/nprogress.css' // progress bar style
15 import getPageTitle from '@/utils/get-page-title' 14 import getPageTitle from '@/utils/get-page-title'
15 import {getToken, getUrlParam, setToken} from "@/utils/util";
16 16
17 NProgress.configure({ showSpinner: false }) // NProgress Configuration 17 NProgress.configure({ showSpinner: false }) // NProgress Configuration
18 18
...@@ -23,44 +23,25 @@ router.beforeEach(async (to, from, next) => { ...@@ -23,44 +23,25 @@ router.beforeEach(async (to, from, next) => {
23 let hasAddDict = store.state.dict.addDict 23 let hasAddDict = store.state.dict.addDict
24 let hasAddRoute = store.state.permission.addRoutes 24 let hasAddRoute = store.state.permission.addRoutes
25 // cas操作 25 // cas操作
26 const token = localStorage.getItem("token") || Cookies.get('ACCESS_TOKEN'); 26 const token = getToken()
27 if (to.path === '/login') { 27 let locationUrl = window.location.origin + window.location.pathname;
28 if (token) { 28 function casValidate (ticket){
29 next('/') 29 axios.get(window._config.services.management + "/management/cas/validate", {
30 } else {
31 next()
32 }
33 return
34 }
35 if (window._config.casEnable === true) {
36 let locationUrl = window.location.protocol + '//' + window.location.host + window.location.pathname;
37 if (!token) {
38 let ticket = getUrlParam('ticket');
39 if (ticket) {
40 axios.get(Vue.prototype.BASE_API.ip + "/management/cas/validate", {
41 params: { 30 params: {
42 'ticket': ticket, 31 ticket: ticket,
43 'service': locationUrl 32 service: locationUrl,
44 } 33 },
45 }).then(async (res) => { 34 }).then(async (res) => {
46 if (process.env.NODE_ENV === 'development') { 35 if (res.data.status === 1) {
47 localStorage.setItem('token', res.data.content.accessToken) 36 setToken(res.data.content.accessToken)
37 window.location.href = localStorage.getItem('dj-location') + '#' + localStorage.getItem('hash')
48 } else { 38 } else {
49 Cookies.set('ACCESS_TOKEN', res.data.content.accessToken) 39 alert(res.data.message)
50 } 40 }
51 window.location.href = localStorage.getItem('location') 41 }).catch((e) => {
52 42 console.log(e);
53 }).catch(e => { 43 });
54 console.log(e)
55 })
56 } else {
57 localStorage.setItem("location", window.location.href)
58 window.location.href = window._config.casBaseURL + '/login?service=' + encodeURIComponent(locationUrl);
59 } 44 }
60 } else {
61 permission()
62 }
63
64 async function permission () { 45 async function permission () {
65 if (!hasAddDict) { 46 if (!hasAddDict) {
66 store.dispatch('dict/generateDic') 47 store.dispatch('dict/generateDic')
...@@ -82,22 +63,55 @@ router.beforeEach(async (to, from, next) => { ...@@ -82,22 +63,55 @@ router.beforeEach(async (to, from, next) => {
82 } 63 }
83 } 64 }
84 } 65 }
66 if (window._config.casEnable === true) {
67 if (!token) {
68 let ticket = getUrlParam("ticket");
69 if (ticket) {
70 casValidate(ticket)
71 } else {
72 localStorage.setItem("location", window.location.href)
73 window.location.href = window._config.casBaseURL + '/login?service=' + encodeURIComponent(locationUrl);
74 }
75 } else {
76 permission()
77 }
85 } else { 78 } else {
79 // 使用自定义页面实现单点登录
86 if (!token) { 80 if (!token) {
87 const redirectData = { 81 let ticket = getUrlParam('ticket');
88 path: '/login', 82 if (ticket) {
89 replace: true, 83 casValidate(ticket)
84 } else {
85 if (to.path === '/login') {
86 if (getUrlParam('_flag') === '1') {
87 next();
88 return
89 } else {
90 //todo: loginUrl 需要业务系统根据登录页面路由地址获取,这里只是简写
91 localStorage.setItem('dj-location',locationUrl)
92 localStorage.setItem('hash',to.fullPath)
93 window.location.href = window._config.services.management + `/management/cas/status?loginUrl=${window._config.baseUrl}/dj/&hash=/login&`
94 return
90 } 95 }
91 if (to.path) {
92 redirectData.query = {
93 ...redirectData.query,
94 redirect: to.path,
95 };
96 } 96 }
97 next(redirectData) 97 localStorage.setItem('dj-location',locationUrl)
98 localStorage.setItem('hash',to.fullPath)
99 //todo: loginUrl 需要业务系统根据登录页面路由地址获取,这里只是简写
100 window.location.href = window._config.services.management + `/management/cas/status?loginUrl=${window._config.baseUrl}/dj/&hash=/login`
101 }
102 }else{
103 if (to.path === '/login') {
104 const redirectUrl = getUrlParam('redirectUrl');
105 if (redirectUrl && redirectUrl !== '') {
106 window.location.href = redirectUrl
107 return
108 } else {
109 next('/');
98 return 110 return
99 } 111 }
100 next() 112 }
113 permission()
114 }
101 } 115 }
102 NProgress.done() 116 NProgress.done()
103 }) 117 })
......
...@@ -72,6 +72,14 @@ export const constantRoutes = [ ...@@ -72,6 +72,14 @@ export const constantRoutes = [
72 } 72 }
73 ] 73 ]
74 }, 74 },
75 // 登录页
76 {
77 path: '/login',
78 component: () => import('@/views/login/index'),
79 name: 'login',
80 hidden: true,
81 meta: { title: '登录' }
82 },
75 ] 83 ]
76 /** 84 /**
77 * asyncRoutes 85 * asyncRoutes
......
1 export function getSjlx (level) {
2 const resultMap = {
3 1: '系统数据',
4 2: '存量数据',
5 3: '补录数据',
6 }
7 return resultMap[level] || resultMap.default;
8 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -114,27 +114,6 @@ export function down (index, data) { ...@@ -114,27 +114,6 @@ export function down (index, data) {
114 } 114 }
115 } 115 }
116 116
117 export function getUrlParam (paraName) {
118 let url = document.location.toString();
119 let arrObj = url.split('?');
120
121 if (arrObj.length > 1) {
122 let arrPara = arrObj[1].split('&');
123 let arr;
124
125 for (let i = 0; i < arrPara.length; i++) {
126 arr = arrPara[i].split('=');
127
128 if (arr != null && arr[0] === paraName) {
129 const index = arr[1].indexOf("#");
130 return arr[1].substring(0, index);
131 }
132 }
133 return '';
134 } else {
135 return '';
136 }
137 }
138 /** 117 /**
139 * @description: 身份证读卡器 118 * @description: 身份证读卡器
140 * @author: renchao 119 * @author: renchao
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
2 /* 2 /*
3 * @Description: 此文件主要创建 axios 实例,然后添加请求拦截器和响应拦截器 3 * @Description: 此文件主要创建 axios 实例,然后添加请求拦截器和响应拦截器
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-06-13 17:16:13 5 * @LastEditTime: 2023-06-20 10:12:53
6 */ 6 */
7 import axios from 'axios' 7 import axios from 'axios'
8 import Router from '@/router' 8 import Router from '@/router'
9 import Cookies from 'js-cookie'
10 import { Message } from 'element-ui' 9 import { Message } from 'element-ui'
11 import { endLoadingSubCount } from './requestLoading' 10 import { endLoadingSubCount } from './requestLoading'
11 import {getToken, setToken} from "@/utils/util";
12 12
13 // create an axios instance 13 // create an axios instance
14 const service = axios.create({ 14 const service = axios.create({
...@@ -27,7 +27,7 @@ const service = axios.create({ ...@@ -27,7 +27,7 @@ const service = axios.create({
27 service.interceptors.request.use( 27 service.interceptors.request.use(
28 config => { 28 config => {
29 if (process.env.NODE_ENV === 'development') { 29 if (process.env.NODE_ENV === 'development') {
30 const token = localStorage.getItem('token') 30 const token = getToken()
31 // 添加请求头 31 // 添加请求头
32 if (token) { 32 if (token) {
33 config.headers['Authorization'] = 'Bearer ' + token 33 config.headers['Authorization'] = 'Bearer ' + token
...@@ -67,11 +67,8 @@ service.interceptors.response.use( ...@@ -67,11 +67,8 @@ service.interceptors.response.use(
67 window.__isNeedLogin = false 67 window.__isNeedLogin = false
68 Message.error('token失效,请重新登录'); 68 Message.error('token失效,请重新登录');
69 let locationUrl = window.location.protocol + '//' + window.location.host + window.location.pathname; 69 let locationUrl = window.location.protocol + '//' + window.location.host + window.location.pathname;
70 if (process.env.NODE_ENV === 'development') { 70 setToken(undefined)
71 localStorage.removeItem('token') 71 sessionStorage.removeItem('token')
72 } else {
73 Cookies.remove('ACCESS_TOKEN')
74 }
75 if (window._config.casEnable) { 72 if (window._config.casEnable) {
76 window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(locationUrl); 73 window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(locationUrl);
77 } else { 74 } else {
......
1 // 手机号码验证
2 const validatePhone = (rule, value, callback) => {
3 const patter = new RegExp('^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$')
4 if (!patter.test(value)) {
5 return callback(new Error('请输入正确格式的手机号!'))
6 } else {
7 callback() // 必须有此项回调,否则验证会一直不通过
8 }
9 }
10 export default {
11 common: {
12 phone: [{// 手机号
13 required: true,
14 message: '手机号不能为空'
15 }, {
16 validator: validatePhone,
17 trigger: 'blur'
18 }]
19 }
20 }
...\ No newline at end of file ...\ No newline at end of file
1 import Cookies from 'js-cookie'
2
3 const cookies = {}
4
5 /**
6 * @description 存储 cookie 值
7 * @param {String} name cookie name
8 * @param {String} value cookie value
9 * @param {Object} setting cookie setting
10 */
11 cookies.set = function (name = 'default', value = '', cookieSetting = {}) {
12 let currentCookieSetting = {
13 expires: 1
14 }
15 Object.assign(currentCookieSetting, cookieSetting)
16 Cookies.set(`${name}`, value, currentCookieSetting)
17 }
18
19 /**
20 * @description 拿到 cookie 值
21 * @param {String} name cookie name
22 */
23 cookies.get = function (name = 'default') {
24 return Cookies.get(`${name}`)
25 }
26
27 /**
28 * @description 拿到 cookie 全部的值
29 */
30 cookies.getAll = function () {
31 return Cookies.get()
32 }
33
34 /**
35 * @description 删除 cookie
36 * @param {String} name cookie name
37 */
38 cookies.remove = function (name = 'default') {
39 return Cookies.remove(`${name}`)
40 }
41
42 export default cookies
1 import cookies from './util.cookies'
2 export function getUrlParam(paraName) {
3 let url = document.location.toString();
4 let arrObj = url.split('?');
5
6 if (arrObj.length > 1) {
7 let arrPara = arrObj[1].split('&');
8 let arr;
9
10 for (let i = 0; i < arrPara.length; i++) {
11 arr = arrPara[i].split('=');
12
13 if (arr != null && arr[0] === paraName) {
14 // 截取#之前的内容
15 let result = arr[1].endsWith('#/') ? arr[1].substr(0, arr[1].indexOf('#')) : arr[1];
16 return result;
17 }
18 }
19 return '';
20 } else {
21 return '';
22 }
23 }
24
25 export function setToken(token) {
26 if (token === undefined) {
27 if (process.env.NODE_ENV === 'development') {
28 sessionStorage.removeItem('token')
29 } else {
30 cookies.remove('ACCESS_TOKEN')
31 }
32 } else {
33 if (process.env.NODE_ENV === 'development') {
34 sessionStorage.setItem('token', token);
35 } else {
36 cookies.set('ACCESS_TOKEN', token)
37 }
38 }
39 }
40
41 export function getToken() {
42 if (process.env.NODE_ENV === 'development') {
43 return sessionStorage.getItem('token')
44 }
45 return cookies.get('ACCESS_TOKEN')
46 }
47
...@@ -30,12 +30,13 @@ ...@@ -30,12 +30,13 @@
30 :key="index" 30 :key="index"
31 > 31 >
32 <div> 32 <div>
33 <p>{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p> 33 <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p>
34 <p v-else >{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
35
34 <!-- <p class="title-detail">{{ item.zl }}</p> --> 36 <!-- <p class="title-detail">{{ item.zl }}</p> -->
35 </div> 37 </div>
36 <i 38 <i
37 class="el-icon-delete" 39 class="el-icon-delete"
38 v-if="supplementarylist.length > 1"
39 @click.stop="handleDel(item)" 40 @click.stop="handleDel(item)"
40 ></i> 41 ></i>
41 </el-menu-item> 42 </el-menu-item>
...@@ -120,15 +121,17 @@ export default { ...@@ -120,15 +121,17 @@ export default {
120 }, 121 },
121 methods: { 122 methods: {
122 //读取申请单元信息 123 //读取申请单元信息
123 loadBdcdylist() { 124 loadBdcdylist(add) {
124 var formdata = new FormData(); 125 var formdata = new FormData();
125 formdata.append("bsmSlsq", this.bsmSlsq); 126 formdata.append("bsmSlsq", this.bsmSlsq);
126 formdata.append("bestepid", this.bestepid); 127 formdata.append("bestepid", this.bestepid);
127 leftMenu(formdata).then((res) => { 128 leftMenu(formdata).then((res) => {
128 if (res.code === 200 && res.result) { 129 if (res.code === 200 && res.result) {
129 this.currentSelectProps = res.result[0]; 130 this.currentSelectProps = res.result[0];
130 console.log("this.currentSelectProps",this.currentSelectProps);
131 this.$emit("getCurrentSelectProps", this.currentSelectProps); 131 this.$emit("getCurrentSelectProps", this.currentSelectProps);
132 if(add){
133 this.$parent.getQllxByBdcdyid()
134 }
132 } 135 }
133 }); 136 });
134 this.getleftMenubl(); 137 this.getleftMenubl();
...@@ -137,10 +140,11 @@ export default { ...@@ -137,10 +140,11 @@ export default {
137 getleftMenubl(row) { 140 getleftMenubl(row) {
138 leftMenubl(this.bsmSlsq).then((res) => { 141 leftMenubl(this.bsmSlsq).then((res) => {
139 this.supplementarylist = res.result; 142 this.supplementarylist = res.result;
143 console.log("this.supplementarylist",this.supplementarylist);
140 if(row){ 144 if(row){
141 this.supplementarylist.forEach((item,index) => { 145 this.supplementarylist.forEach((item,index) => {
142 if(item.bsmRepair==row.bsmRepair){ 146 if(item.bsmRepair==row.bsmRepair){
143 this.activeIndex=index 147 this.activeIndex=index.toString()
144 this.unitClick(index) 148 this.unitClick(index)
145 } 149 }
146 }) 150 })
......
...@@ -316,7 +316,6 @@ export default { ...@@ -316,7 +316,6 @@ export default {
316 }; 316 };
317 }, 317 },
318 created() { 318 created() {
319 console.log("受理信息",this.ruleForm);
320 this.loadData(); 319 this.loadData();
321 }, 320 },
322 mounted() {}, 321 mounted() {},
......
...@@ -316,7 +316,6 @@ export default { ...@@ -316,7 +316,6 @@ export default {
316 }; 316 };
317 }, 317 },
318 created() { 318 created() {
319 console.log("受理信息",this.ruleForm);
320 this.loadData(); 319 this.loadData();
321 }, 320 },
322 mounted() {}, 321 mounted() {},
......
...@@ -244,22 +244,6 @@ ...@@ -244,22 +244,6 @@
244 </el-radio-group> 244 </el-radio-group>
245 </el-form-item> 245 </el-form-item>
246 </el-col> 246 </el-col>
247 <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
248 <el-form-item label="是否分别持证:">
249 <el-radio-group v-model="ruleForm.qlxx.sqfbcz">
250 <el-radio :label=1></el-radio>
251 <el-radio :label=0></el-radio>
252 </el-radio-group>
253 </el-form-item>
254 </el-col> -->
255 <!-- <el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
256 <el-form-item label="持证人:">
257 <el-select v-model="ruleForm.czr" placeholder="持证人">
258 <el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh">
259 </el-option>
260 </el-select>
261 </el-form-item>
262 </el-col> -->
263 </el-row> 247 </el-row>
264 <qlrCommonTable 248 <qlrCommonTable
265 :tableData="ruleForm.qlrList" 249 :tableData="ruleForm.qlrList"
...@@ -316,7 +300,6 @@ export default { ...@@ -316,7 +300,6 @@ export default {
316 }; 300 };
317 }, 301 },
318 created() { 302 created() {
319 console.log("受理信息",this.ruleForm);
320 this.loadData(); 303 this.loadData();
321 }, 304 },
322 mounted() {}, 305 mounted() {},
...@@ -325,6 +308,7 @@ export default { ...@@ -325,6 +308,7 @@ export default {
325 init(this.propsParam.bsmRepair).then((res) => { 308 init(this.propsParam.bsmRepair).then((res) => {
326 if (res.code == 200) { 309 if (res.code == 200) {
327 this.ruleForm = res.result; 310 this.ruleForm = res.result;
311 console.log("this.ruleFormssssssssssssssssssssssssssssss",this.ruleForm);
328 this.isShow = true; 312 this.isShow = true;
329 // this.tableData = res.result; 313 // this.tableData = res.result;
330 // if (this.tableData.length < datas.columns().emptycolNum) { 314 // if (this.tableData.length < datas.columns().emptycolNum) {
......
...@@ -227,6 +227,16 @@ ...@@ -227,6 +227,16 @@
227 </el-col> 227 </el-col>
228 </el-row> 228 </el-row>
229 <div class="slxx_title title-block"> 229 <div class="slxx_title title-block">
230 土地用途
231 <div class="triangle"></div>
232 </div>
233 <tdytTable
234 :tableData="ruleForm.tdxxList"
235 @upDateQlrxxList="upDateQlrxxList"
236 :viewtype="$route.query.viewtype"
237 :gyfs="ruleForm.qlxx.gyfs"
238 />
239 <div class="slxx_title title-block">
230 权利人信息 240 权利人信息
231 <div class="triangle"></div> 241 <div class="triangle"></div>
232 </div> 242 </div>
...@@ -244,22 +254,22 @@ ...@@ -244,22 +254,22 @@
244 </el-radio-group> 254 </el-radio-group>
245 </el-form-item> 255 </el-form-item>
246 </el-col> 256 </el-col>
247 <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'"> 257 <el-col :span="6" v-show="ruleForm.qlxx.gyfs == '1'">
248 <el-form-item label="是否分别持证:"> 258 <el-form-item label="是否分别持证:">
249 <el-radio-group v-model="ruleForm.qlxx.sqfbcz"> 259 <el-radio-group v-model="ruleForm.qlxx.sqfbcz">
250 <el-radio :label=1></el-radio> 260 <el-radio :label=1></el-radio>
251 <el-radio :label=0></el-radio> 261 <el-radio :label=0></el-radio>
252 </el-radio-group> 262 </el-radio-group>
253 </el-form-item> 263 </el-form-item>
254 </el-col> --> 264 </el-col>
255 <!-- <el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'"> 265 <el-col :span="6" v-show="ruleForm.qlxx.sqfbcz == '0'&&ruleForm.qlxx.gyfs == '1'">
256 <el-form-item label="持证人:"> 266 <el-form-item label="持证人:">
257 <el-select v-model="ruleForm.czr" placeholder="持证人"> 267 <el-select v-model="ruleForm.czr" placeholder="持证人">
258 <el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh"> 268 <el-option v-for="item in czrOptions" :key="item.zjh" :label="item.sqrmc" :value="item.zjh">
259 </el-option> 269 </el-option>
260 </el-select> 270 </el-select>
261 </el-form-item> 271 </el-form-item>
262 </el-col> --> 272 </el-col>
263 </el-row> 273 </el-row>
264 <qlrCommonTable 274 <qlrCommonTable
265 :tableData="ruleForm.qlrList" 275 :tableData="ruleForm.qlrList"
...@@ -296,8 +306,9 @@ import { mapGetters } from "vuex"; ...@@ -296,8 +306,9 @@ import { mapGetters } from "vuex";
296 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js"; 306 import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
297 import { init } from "@/api/djbbl.js"; 307 import { init } from "@/api/djbbl.js";
298 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 308 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
309 import tdytTable from "@/views/workflow/components/tdytTable";
299 export default { 310 export default {
300 components: { qlrCommonTable }, 311 components: { qlrCommonTable,tdytTable },
301 computed: { 312 computed: {
302 ...mapGetters(["dictData", "flag"]), 313 ...mapGetters(["dictData", "flag"]),
303 }, 314 },
...@@ -316,7 +327,6 @@ export default { ...@@ -316,7 +327,6 @@ export default {
316 }; 327 };
317 }, 328 },
318 created() { 329 created() {
319 console.log("受理信息",this.ruleForm);
320 this.loadData(); 330 this.loadData();
321 }, 331 },
322 mounted() {}, 332 mounted() {},
...@@ -324,7 +334,9 @@ export default { ...@@ -324,7 +334,9 @@ export default {
324 loadData() { 334 loadData() {
325 init(this.propsParam.bsmRepair).then((res) => { 335 init(this.propsParam.bsmRepair).then((res) => {
326 if (res.code == 200) { 336 if (res.code == 200) {
337
327 this.ruleForm = res.result; 338 this.ruleForm = res.result;
339 console.log("this.ruleFormssssssssssssssssssssssssssssss",this.ruleForm);
328 this.isShow = true; 340 this.isShow = true;
329 // this.tableData = res.result; 341 // this.tableData = res.result;
330 // if (this.tableData.length < datas.columns().emptycolNum) { 342 // if (this.tableData.length < datas.columns().emptycolNum) {
......
...@@ -316,7 +316,6 @@ export default { ...@@ -316,7 +316,6 @@ export default {
316 }; 316 };
317 }, 317 },
318 created() { 318 created() {
319 console.log("受理信息",this.ruleForm);
320 this.loadData(); 319 this.loadData();
321 }, 320 },
322 mounted() {}, 321 mounted() {},
......
...@@ -316,7 +316,6 @@ export default { ...@@ -316,7 +316,6 @@ export default {
316 }; 316 };
317 }, 317 },
318 created() { 318 created() {
319 console.log("受理信息",this.ruleForm);
320 this.loadData(); 319 this.loadData();
321 }, 320 },
322 mounted() {}, 321 mounted() {},
......
...@@ -316,7 +316,6 @@ export default { ...@@ -316,7 +316,6 @@ export default {
316 }; 316 };
317 }, 317 },
318 created() { 318 created() {
319 console.log("受理信息",this.ruleForm);
320 this.loadData(); 319 this.loadData();
321 }, 320 },
322 mounted() {}, 321 mounted() {},
......
...@@ -316,7 +316,6 @@ export default { ...@@ -316,7 +316,6 @@ export default {
316 }; 316 };
317 }, 317 },
318 created() { 318 created() {
319 console.log("受理信息",this.ruleForm);
320 this.loadData(); 319 this.loadData();
321 }, 320 },
322 mounted() {}, 321 mounted() {},
......
...@@ -11,88 +11,77 @@ ...@@ -11,88 +11,77 @@
11 :visible.sync="dialogVisible" 11 :visible.sync="dialogVisible"
12 custom-class="insetDialog" 12 custom-class="insetDialog"
13 append-to-body 13 append-to-body
14 width="20%" 14 width="60%"
15 > 15 >
16 <el-select v-model="qllxvalue" placeholder="请选择"> 16 <el-radio-group v-model="radio">
17 <el-option 17 <el-radio-button
18 v-for="item in options" 18 v-for="(value, key) in qllxlistdata"
19 :key="item.value" 19 :key="key"
20 :label="item.label" 20 :label="value"
21 :value="item.value" 21 ></el-radio-button>
22 > 22 </el-radio-group>
23 </el-option> 23 <div class="btn">
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> 24 <el-button type="primary" @click="handleSubmit">确定</el-button>
30 <el-button type="primary" @click="closeDialog">取消</el-button> 25 <el-button type="primary" @click="closeDialog">取消</el-button>
26 </div>
31 </el-dialog> 27 </el-dialog>
32 </template> 28 </template>
33 29
34 <script> 30 <script>
35 export default { 31 export default {
36 32 data() {
37 data () {
38 return { 33 return {
39 dialogVisible:false, 34 dialogVisible: false,
40 options: [ 35 qllxlistdata: {},
41 { 36 radio: "",
42 value: "选项1", 37 qllx:""
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 }; 38 };
70 }, 39 },
40
71 methods: { 41 methods: {
72 closeDialog () { 42 closeDialog() {
73 this.dialogVisible=false 43 this.dialogVisible = false;
74 }, 44 },
75 handleSubmit () { 45 handleSubmit() {
76 let qllxobj={ 46 for (const key in this.qllxlistdata) {
77 qllx:this.value, 47 if (this.qllxlistdata[key] === this.radio) {
78 bsmQlxx:this.value 48 this.qllx= key;
49 }
50 }
51 if(this.qllx){
52 let qllxobj = {
53 qllx:this.qllx,
54 bsmQlxx:""
55 };
79 56
57 this.$parent.addRepairRecord(qllxobj)
58 }else{
59 this.$message({
60 type: "warning",
61 message: "请选择权利类型!",
62 });
80 } 63 }
81 // this.$parent.addRepairRecord(qllxobj) 64
82 }, 65 },
83 }, 66 },
84 }; 67 };
85 </script> 68 </script>
86 <style scoped lang="scss"> 69 <style scoped lang="scss">
87 .qllxdialog{ 70 .qllxdialog {
88 margin-top: 200px; 71 margin-top: 200px;
89 /deep/.el-dialog__body{ 72 /deep/.el-dialog__body {
90 margin-top: 10px; 73 margin-top: 10px;
91 height: 100px; 74 // height: 100px;
75 padding: 30px;
92 } 76 }
93 .el-button{ 77 .btn{
78 margin:30px;
79 text-align: center;
80 .el-button {
94 margin-top: 10px; 81 margin-top: 10px;
95 margin-left: 20px; 82 margin-left: 20px;
96 } 83 }
84 }
85
97 } 86 }
98 </style> 87 </style>
......
1 <!-- 1 <!--
2 * @Description : 房地产权2 2 * @Description : 房地产权2
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-06-16 16:53:36 4 * @LastEditTime: 2023-06-20 09:59:18
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 row.qszt == '0' ? 'linshi' : '', 25 row.qszt == '0' ? 'linshi' : '',
26 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 26 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
27 ]"> 27 ]">
28 <div class="setbut" v-if="item.prop == 'cz'"> 28 <div class="setbut" v-if="item.prop == 'cz'&&item.sjlx !='系统数据'">
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)">编辑</el-button>
30 <el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button> 30 <el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button>
31 </div> 31 </div>
...@@ -47,9 +47,9 @@ ...@@ -47,9 +47,9 @@
47 </template> 47 </template>
48 48
49 <script> 49 <script>
50 import { getFdcq2List } from "@/api/registerBook.js"; 50 import { getFdcq2List } from "@/api/registerBook.js";
51 import { datas } from "./qlxxFormData.js"; 51 import { datas } from "./qlxxFormData.js";
52 export default { 52 export default {
53 data () { 53 data () {
54 return { 54 return {
55 title: "房地产权登记信息(独幢、层、套、间房屋)", 55 title: "房地产权登记信息(独幢、层、套、间房屋)",
...@@ -76,7 +76,6 @@ export default { ...@@ -76,7 +76,6 @@ export default {
76 qszt: this.checkList, 76 qszt: this.checkList,
77 }).then((res) => { 77 }).then((res) => {
78 if (res.code === 200) { 78 if (res.code === 200) {
79 console.log("国有建设",res);
80 this.tableData = res.result; 79 this.tableData = res.result;
81 if (this.tableData.length < datas.columns().emptycolNum) { 80 if (this.tableData.length < datas.columns().emptycolNum) {
82 this.emptycolNum = 81 this.emptycolNum =
...@@ -107,7 +106,7 @@ export default { ...@@ -107,7 +106,7 @@ export default {
107 }, 106 },
108 107
109 // 编辑 108 // 编辑
110 editDialog(row){ 109 editDialog (row) {
111 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 110 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
112 confirmButtonText: '确定', 111 confirmButtonText: '确定',
113 cancelButtonText: '取消', 112 cancelButtonText: '取消',
...@@ -134,7 +133,7 @@ export default { ...@@ -134,7 +133,7 @@ export default {
134 133
135 }, 134 },
136 // 删除 135 // 删除
137 deleteDialog(row){ 136 deleteDialog (row) {
138 this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', { 137 this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
139 confirmButtonText: '确定', 138 confirmButtonText: '确定',
140 cancelButtonText: '取消', 139 cancelButtonText: '取消',
...@@ -164,9 +163,9 @@ export default { ...@@ -164,9 +163,9 @@ export default {
164 } 163 }
165 164
166 }, 165 },
167 }; 166 };
168 </script> 167 </script>
169 168
170 <style lang="scss" scoped> 169 <style lang="scss" scoped>
171 @import "./qlxxCommon.scss"; 170 @import "./qlxxCommon.scss";
172 </style> 171 </style>
......
...@@ -136,8 +136,10 @@ export default { ...@@ -136,8 +136,10 @@ export default {
136 136
137 // break; 137 // break;
138 case "B5": 138 case "B5":
139 this.$refs.Menu.loadBdcdylist("add")
139 // this.$popupDialog("选择新增权力类型", "djbworkflow/djbBook/components/qllxcloseDailog", this.currentSelectProps, '50%', true) 140 // this.$popupDialog("选择新增权力类型", "djbworkflow/djbBook/components/qllxcloseDailog", this.currentSelectProps, '50%', true)
140 this.$refs.qllxlist.dialogVisible=true 141
142
141 break; 143 break;
142 case "B6": 144 case "B6":
143 //根据编号获取对应信息 145 //根据编号获取对应信息
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 } 102 }
103 103
104 .animation-map-drawer { 104 .animation-map-drawer {
105 width: 260px; 105 width: 290px;
106 height: calc(100% - 80px); 106 height: calc(100% - 80px);
107 } 107 }
108 108
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 </div> 63 </div>
64 </div> 64 </div>
65 <!-- 新增补录信息勾选权利类型 --> 65 <!-- 新增补录信息勾选权利类型 -->
66 <qllxDailog ref="qllxlist"/> 66 <qllxDailog ref="qllxlist" />
67 </div> 67 </div>
68 </template> 68 </template>
69 <style scoped lang="scss"> 69 <style scoped lang="scss">
...@@ -109,8 +109,6 @@ export default { ...@@ -109,8 +109,6 @@ export default {
109 tabName: "", 109 tabName: "",
110 // 弹框显示 110 // 弹框显示
111 dialogVisible: true, 111 dialogVisible: true,
112 // 权利类型数组
113 qllxlist: [],
114 //表单集合 112 //表单集合
115 tabList: [], 113 tabList: [],
116 //选择加载哪一个组件 114 //选择加载哪一个组件
...@@ -126,20 +124,23 @@ export default { ...@@ -126,20 +124,23 @@ export default {
126 treedata: {}, 124 treedata: {},
127 tabdata: [], 125 tabdata: [],
128 defaultNode: {}, 126 defaultNode: {},
129
130 }; 127 };
131 }, 128 },
132 mounted() {}, 129 mounted() {},
133 130
134 methods: { 131 methods: {
135 getQllxByBdcdyid() { 132 getQllxByBdcdyid() {
133 if(this.currentSelectProps.bdcdyid){
136 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then( 134 getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
137 (res) => { 135 (res) => {
138 if (res.code === 200) { 136 if (res.code === 200) {
139 console.log("Qllxlist", res); 137 this.$refs.qllxlist.qllxlistdata = res.result;
138 this.$refs.qllxlist.dialogVisible = true;
140 } 139 }
141 } 140 }
142 ); 141 );
142 }
143
143 }, 144 },
144 // 获取右侧选项卡 145 // 获取右侧选项卡
145 getCurrentSelectProps(val) { 146 getCurrentSelectProps(val) {
...@@ -180,7 +181,6 @@ export default { ...@@ -180,7 +181,6 @@ export default {
180 arr[index].value = item.id; 181 arr[index].value = item.id;
181 }); 182 });
182 this.tabList = this.tabdata; 183 this.tabList = this.tabdata;
183 this.getQllxByBdcdyid();
184 }, 200); 184 }, 200);
185 }, 185 },
186 186
...@@ -215,6 +215,7 @@ export default { ...@@ -215,6 +215,7 @@ export default {
215 }, 215 },
216 //切换选项卡内容组件 216 //切换选项卡内容组件
217 getFromRouter(tabname) { 217 getFromRouter(tabname) {
218 console.log("tabname",tabname);
218 for (let item of this.tabList) { 219 for (let item of this.tabList) {
219 if (item.value === tabname) { 220 if (item.value === tabname) {
220 this.currentSelectTab = item; 221 this.currentSelectTab = item;
...@@ -225,29 +226,45 @@ export default { ...@@ -225,29 +226,45 @@ export default {
225 }, 226 },
226 227
227 // 增加补录记录 228 // 增加补录记录
228 addRepairRecord(row) { 229 addRepairRecord(row,del) {
229 let from = { 230 let from = {
230 bsmQlxx: "", 231 bsmQlxx: "",
231 bsmSlsq: this.bsmSlsq, 232 bsmSlsq: this.bsmSlsq,
232 bsmSldy: this.currentSelectProps.bsmSldy, 233 bsmSldy: this.currentSelectProps.bsmSldy,
233 operate: "C", 234 operate: "C",
234 qllx: this.currentSelectProps.qllx, 235 qllx: "",
235 }; 236 };
236 if (row) { 237 if (row) {
237 from.bsmQlxx = row.bsmQlxx; 238 from.bsmQlxx = row.bsmQlxx;
238 from.operate = "U"; 239 if(del){
240 from.operate = del;
241 }else{
242 from.operate = row.bsmQlxx ? "U" : "C";
243 }
239 from.qllx = row.qllx; 244 from.qllx = row.qllx;
240 } 245 }
241
242 addRepairRecord(from).then((res) => { 246 addRepairRecord(from).then((res) => {
247 if(res.code=='200'){
248 this.$refs.qllxlist.dialogVisible = false;
243 this.$nextTick(() => { 249 this.$nextTick(() => {
244 this.$refs.Menu.getleftMenubl(res.result); 250 this.$refs.Menu.getleftMenubl(res.result);
251 this.$message({
252 type: "success",
253 message: "补录成功!",
245 }); 254 });
246 }); 255 });
247 }, 256 }else{
257 this.$alert(res.message, '提示', {
258 confirmButtonText: '确定',
259 type: 'warning'
260 });
261 }
262 }).catch((res) => {
248 263
264 console.log("错i了哦",res);
265 });;
266 },
249 }, 267 },
250 }; 268 };
251 </script> 269 </script>
252 <style scoped lang="scss"> 270 <style scoped lang="scss"></style>
253 </style>
......
1 <?xml version="1.0" encoding="UTF-8"?>
2 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
4 <title>隐藏</title>
5 <desc>Created with Sketch.</desc>
6 <g id="隐藏" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
7 <path d="M6.03072945,10.4919039 L5.73253111,12.7244564 C5.69597191,12.998168 5.44444773,13.190418 5.17073614,13.1538588 C4.89702455,13.1172996 4.70477455,12.8657754 4.74133375,12.5920638 L5.06197696,10.1914709 C4.16952851,9.84883526 3.3412638,9.33963486 2.57840414,8.66573829 L1.54490653,10.84056 C1.42638298,11.0899729 1.12811158,11.1960797 0.878698712,11.0775561 C0.629285844,10.9590326 0.52317909,10.6607612 0.641702643,10.4113483 L1.82431508,7.92273947 C1.1849111,7.22355926 0.59765863,6.39438608 0.0634190527,5.43653783 C-0.0710917064,5.19537095 0.0153701679,4.89082404 0.256537054,4.75631328 C0.49770394,4.62180252 0.802250844,4.7082644 0.936761603,4.94943128 C2.7218512,8.14995221 5.0622906,9.71807475 8.00009033,9.71807475 C10.9378901,9.71807475 13.2783295,8.14995221 15.0634191,4.94943128 C15.1979298,4.7082644 15.5024767,4.62180252 15.7436436,4.75631328 C15.9848105,4.89082404 16.0712724,5.19537095 15.9367616,5.43653783 C15.4384416,6.32998517 14.8939977,7.11147869 14.304129,7.77994884 L15.554597,10.4113483 C15.6731206,10.6607612 15.5670138,10.9590326 15.3176009,11.0775561 C15.0681881,11.1960797 14.7699167,11.0899729 14.6513931,10.84056 L13.5590961,8.54200484 C12.6449311,9.38205401 11.6347609,9.98078996 10.5307537,10.3348952 L10.8296734,12.5728484 C10.8662326,12.84656 10.6739826,13.0980842 10.400271,13.1346434 C10.1265594,13.1712026 9.87503523,12.9789526 9.83847602,12.705241 L9.5545725,10.5797109 C9.05379094,10.671864 8.53557174,10.7180748 8.00009033,10.7180748 C7.31528214,10.7180748 6.6587062,10.6424973 6.03072945,10.4919039 Z" id="形状结合" fill="#B4B4B4" fill-rule="nonzero"></path>
8 </g>
9 </svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
4 <title>显示</title>
5 <desc>Created with Sketch.</desc>
6 <g id="显示" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
7 <path d="M8,13.5944821 C5.08783139,13.5944821 2.47901047,11.8330303 0.184843129,8.37324049 L3.55271368e-15,8.09448212 L0.184843129,7.81572374 C2.47901047,4.35593396 5.08783139,2.59448212 8,2.59448212 C10.9121686,2.59448212 13.5209895,4.35593396 15.8151569,7.81572374 L16,8.09448212 L15.8151569,8.37324049 C13.5209895,11.8330303 10.9121686,13.5944821 8,13.5944821 Z M8,3.59448212 C5.53379057,3.59448212 3.26813906,5.07524663 1.19270822,8.09448212 C3.26813906,11.1137176 5.53379057,12.5944821 8,12.5944821 C10.4662094,12.5944821 12.7318609,11.1137176 14.8072918,8.09448212 C12.7318609,5.07524663 10.4662094,3.59448212 8,3.59448212 Z M9.12299335,5.45693297 C8.68456104,5.73514629 8.39327462,6.2269821 8.39327462,6.78731592 C8.39327462,7.65519196 9.09205701,8.3587445 9.95404878,8.3587445 C10.2357938,8.3587445 10.5001026,8.28358173 10.7282737,8.15208542 C10.6331828,9.58403639 9.44941475,10.7158874 8.00308108,10.7158874 C6.49459548,10.7158874 5.27172629,9.48467042 5.27172629,7.96588735 C5.27172629,6.44710429 6.49459548,5.21588735 8.00308108,5.21588735 C8.40216026,5.21588735 8.78124917,5.30206019 9.12299335,5.45693297 Z" id="形状结合" fill="#0091FF" fill-rule="nonzero"></path>
8 </g>
9 </svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
4 <title>password</title>
5 <desc>Created with Sketch.</desc>
6 <g id="password" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
7 <path d="M4.0011827,6.56400569 L4.0011827,4.87032377 C4.0011827,2.74881464 5.72100565,1.02899168 7.84251478,1.02899168 C9.96402392,1.02899168 11.6838469,2.74881464 11.6838469,4.87032377 L11.6838469,5.7928261 L10.7661998,5.7928261 L10.7661998,4.87032377 C10.7661998,3.25561712 9.45722144,1.94663874 7.84251478,1.94663874 C6.22780813,1.94663874 4.91882975,3.25561712 4.91882975,4.87032377 L4.91882975,6.56400569 L12.6850296,6.56400569 C13.4907156,6.56400569 14.1438531,7.21714323 14.1438531,8.02282922 L14.1438531,13.4028479 C14.1438531,14.2085339 13.4907156,14.8616714 12.6850296,14.8616714 L3,14.8616714 C2.19431401,14.8616714 1.54117647,14.2085339 1.54117647,13.4028479 L1.54117647,8.02282922 C1.54117647,7.21714323 2.19431401,6.56400569 3,6.56400569 L4.0011827,6.56400569 Z M3,7.48165275 C2.70111649,7.48165275 2.45882353,7.72394571 2.45882353,8.02282922 L2.45882353,13.4028479 C2.45882353,13.7017314 2.70111649,13.9440244 3,13.9440244 L12.6850296,13.9440244 C12.9839131,13.9440244 13.226206,13.7017314 13.226206,13.4028479 L13.226206,8.02282922 C13.226206,7.72394571 12.9839131,7.48165275 12.6850296,7.48165275 L3,7.48165275 Z" id="形状结合" fill="#6D7278" fill-rule="nonzero"></path>
8 </g>
9 </svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="UTF-8"?>
2 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3 <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
4 <title>user</title>
5 <desc>Created with Sketch.</desc>
6 <g id="user" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
7 <path d="M5.70040727,8.36338619 C4.96173204,8.70409103 4.31101884,9.24156453 3.78444015,9.95202823 C2.94870333,11.0788243 2.46666667,12.5978855 2.46666667,14.1120529 C2.46666667,14.2335891 2.59610246,14.3514362 2.77548069,14.3514362 L13.1661579,14.3514362 C13.3455361,14.3514362 13.4749719,14.2335891 13.4749719,14.1120529 C13.4749719,12.0278862 12.5626821,10.0351425 11.1096588,8.92092682 L11.6776024,8.18028444 C13.3693466,9.47755739 14.4083053,11.7469879 14.4083053,14.1120529 C14.4083053,14.7696063 13.8424825,15.2847695 13.1661579,15.2847695 L2.77548069,15.2847695 C2.09915609,15.2847695 1.53333333,14.7696063 1.53333333,14.1120529 C1.53333333,12.4013641 2.07738878,10.6868606 3.0347023,9.39614673 C3.53516209,8.7209228 4.13710805,8.17384176 4.81664416,7.7738283 C3.93912572,7.01707839 3.38576579,5.91929918 3.38576579,4.69637232 C3.38576579,2.40902821 5.3212908,0.556854908 7.69195361,0.556854908 C10.063179,0.556854908 11.9981414,2.40606943 11.9981414,4.69289423 C11.9981414,6.98023832 10.0626164,8.83241167 7.69195361,8.83241167 C6.97429417,8.83241167 6.29659602,8.66302531 5.70040727,8.36338619 Z M4.31909912,4.69637232 C4.31909912,6.45803072 5.82696798,7.89907833 7.69195361,7.89907833 C9.55611742,7.89907833 11.0648081,6.4553581 11.0648081,4.69289423 C11.0648081,2.93123585 9.55693923,1.49018824 7.69195361,1.49018824 C5.82778977,1.49018824 4.31909912,2.93390843 4.31909912,4.69637232 Z" id="形状结合" fill="#6D7278" fill-rule="nonzero"></path>
8 </g>
9 </svg>
...\ No newline at end of file ...\ No newline at end of file
1 <template>
2 <div id="login">
3 <div class="login-logo"><img src="./images/logo-login.png" /></div>
4 <div class="login-con">
5 <!-- <div class="login-title">用户登录</div>-->
6 <div class="login-user" :class="{ 'select-border': change.user }">
7 <img class="user-icon" src="./images/user.svg" />
8 <!-- <div class="line-mid"></div>-->
9 <input
10 type="text"
11 class="user-input"
12 placeholder="请输入您的账号"
13 v-model="userInfo.username"
14 @focus="reduceBorder('user')"
15 @blur="addBorder('user')"
16 />
17 <span class="warning" v-show="warning.user">账号不能为空</span>
18 </div>
19 <div class="login-user user-mt" :class="{ 'select-border': change.pass }">
20 <img class="user-icon" src="./images/password.svg" />
21 <!-- <div class="line-mid"></div>-->
22 <input
23 type="password"
24 class="user-input"
25 placeholder="请输入您的密码"
26 v-model="userInfo.password"
27 v-show="!selectEye"
28 @focus="reduceBorder('pass')"
29 @blur="addBorder('pass')"
30 />
31 <input
32 type="text"
33 class="user-input"
34 placeholder="请输入您的密码"
35 v-model="userInfo.password"
36 v-show="selectEye"
37 @focus="reduceBorder('pass')"
38 @blur="addBorder('pass')"
39 />
40 <img
41 class="password-eye"
42 src="./images/open.svg"
43 @click="selectEyes"
44 v-show="selectEye"
45 />
46 <img
47 class="password-eye"
48 src="./images/close.svg"
49 @click="selectEyes"
50 v-show="!selectEye"
51 />
52 <span class="warning" v-show="warning.pass">密码不能为空</span>
53 </div>
54 <!-- <div class="login-remake">
55 <i
56 class="icon iconfont iconfuxuan1 icon-style"
57 v-show="!selectIcon"
58 @click="selectRemeber"
59 ></i>
60 <i
61 class="icon iconfont iconfuxuan-xuanzhong icon-select"
62 v-show="selectIcon"
63 @click="selectRemeber"
64 ></i>
65 <span class="remake_txt" @click="selectRemeber">记住账号密码</span>
66 </div> -->
67 <div id="loginBtn" class="login-btn" @click="goHome">登录</div>
68 </div>
69 <div class="reserved-con">
70 <!-- <div class="reserved-words">版权所有:2020©某某市自然资源和规划</div> -->
71 <div class="reserved-words line-two">
72 技术支持:爬山虎科技股份有限公司
73 </div>
74 </div>
75 </div>
76 </template>
77 <script>
78 import {getUrlParam} from "@/utils/util";
79 import axios from "axios";
80 export default {
81 data() {
82 return {
83 selectIcon: true,
84 selectEye: false,
85 userInfo:{
86 username: 'admin',
87 password: '123',
88 redirectUrl: ''
89 },
90 change: {
91 //边框
92 user: false,
93 pass: false,
94 },
95 warning: {
96 user: false,
97 pass: false,
98 },
99 canDo: 1,
100 };
101 },
102 mounted() {
103 this.initPage();
104 this.userInfo.redirectUrl = localStorage.getItem('dj-location')
105 },
106 methods: {
107 initPage() {
108 let userInfo =
109 localStorage.getItem("userInfo") &&
110 JSON.parse(localStorage.getItem("userInfo"));
111 if (userInfo) {
112 this.userInfo.username = userInfo.username;
113 this.userInfo.password = userInfo.password;
114 }
115 },
116 selectRemeber() {
117 this.selectIcon = !this.selectIcon;
118 },
119 goHome() {
120 axios.post(window._config.services.management + "/management/cas/login", this.userInfo).then(response => {
121 if (response.data.status === 1) {
122 if (response.data.content.location) {
123 window.location.href = response.data.content.location
124 }
125 } else {
126 this.$message.error(response.data.message)
127 }
128 }).catch(error => {
129 console.log(error)
130 this.$message.error(error.message)
131 })
132 },
133 selectEyes() {
134 this.selectEye = !this.selectEye;
135 },
136 reduceBorder(type) {
137 //获取焦点
138 if (type == "user") {
139 this.change.user = true;
140 } else {
141 this.change.pass = true;
142 }
143 },
144 addBorder(type) {
145 //失去焦点
146 if (type == "user") {
147 this.change.user = false;
148 if (!this.userInfo.username) {
149 this.warning.user = true;
150 } else {
151 this.warning.user = false;
152 }
153 } else {
154 this.change.pass = false;
155 if (!this.userInfo.password) {
156 this.warning.pass = true;
157 } else {
158 this.warning.pass = false;
159 }
160 }
161 },
162 },
163 };
164 </script>
165 <style lang="scss" scoped>
166 #login {
167 width: 100vw;
168 height: 100vh;
169 background: url("./images/login-bg.png") no-repeat bottom center;
170 background-size: 100% 100%;
171 overflow: hidden;
172 .login-logo {
173 margin-top: 8%;
174 height: 38px;
175 width: 100%;
176 text-align: center;
177 }
178 .login-logo img {
179 height: 100%;
180 }
181 .login-con {
182 margin: 88px auto;
183 width: 380px;
184 }
185 .login-user {
186 width: 100%;
187 height: 46px;
188 border: 1px solid rgba(155, 155, 155, 1);
189 box-sizing: border-box;
190 margin: 38px auto auto auto;
191 border-radius: 2px;
192 position: relative;
193 .user-icon {
194 float: left;
195 margin: 13px auto auto 10px;
196 width: 28px;
197 height: 18px;
198 }
199 .user-input {
200 width: 80%;
201 float: left;
202 font-size: 16px;
203 outline: 0;
204 border: none;
205 color: #4a4a4a;
206 line-height: 260%;
207 background-color: transparent;
208 }
209 .password-eye {
210 float: right;
211 width: 16px;
212 height: 16px;
213 margin-right: 12px;
214 margin-top: 13px;
215 cursor: pointer;
216 }
217 .warning {
218 font-size: 12px;
219 color: red;
220 position: absolute;
221 left: 0;
222 bottom: -18px;
223 }
224 }
225 .user-mt {
226 margin-top: 26px;
227 }
228 .select-border {
229 border: 1px solid rgba(0, 113, 255, 1);
230 }
231 .login-remake {
232 width: 320px;
233 height: 14px;
234 margin: 0 auto;
235 margin-top: 26px;
236 .icon-style {
237 font-size: 12px;
238 color: #5b5b5b;
239 float: left;
240 line-height: 14px;
241 cursor: pointer;
242 }
243 .icon-select {
244 font-size: 12px;
245 color: rgba(0, 127, 255, 1);
246 float: left;
247 line-height: 14px;
248 cursor: pointer;
249 }
250 .remake_txt {
251 font-size: 12px;
252 line-height: 14px;
253 color: #5b5b5b;
254 margin-left: 6px;
255 float: left;
256 cursor: pointer;
257 }
258 }
259 .login-btn {
260 width: 100%;
261 height: 40px;
262 background: rgba(0, 127, 255, 1);
263 border-radius: 4px;
264 margin: 0 auto;
265 margin-top: 40px;
266 font-size: 16px;
267 line-height: 40px;
268 text-align: center;
269 color: #fff;
270 cursor: pointer;
271 }
272 .reserved-con {
273 margin: 38px auto;
274 }
275 .reserved-words {
276 font-size: 12px;
277 color: #b4b4b4;
278 text-align: center;
279 }
280 .line-two {
281 margin-top: 8px;
282 }
283 }
284 </style>
285
...\ No newline at end of file ...\ No newline at end of file
1 <template> 1 <template>
2 <div class="edit"> 2 <div class="edit">
3 <el-tabs type="card" v-model="activeName" > 3 <el-tabs type="card" v-model="activeName">
4 <el-tab-pane label="楼盘页面" name="first"></el-tab-pane> 4 <el-tab-pane label="楼盘页面" name="first"></el-tab-pane>
5 <el-tab-pane label="单元列表页面" name="second"></el-tab-pane> 5 <el-tab-pane label="单元列表页面" name="second"></el-tab-pane>
6 </el-tabs> 6 </el-tabs>
7 <div class="tab-content" v-if="activeName=='first'" ref="tabContent" :style="{ height: lpbContentHight + 'px' }" v-show="bjztFlag"> 7 <div
8 class="tab-content"
9 v-if="activeName == 'first'"
10 ref="tabContent"
11 :style="{ height: lpbContentHight + 'px' }"
12 v-show="bjztFlag"
13 >
8 <!-- 楼盘表主体 --> 14 <!-- 楼盘表主体 -->
9 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }"> 15 <div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
10 <lpbContent ref="lpbContent" :zrzbsm="formData.bsm" :key="time"></lpbContent> 16 <lpbContent
17 ref="lpbContent"
18 :zrzbsm="formData.bsm"
19 :key="time"
20 ></lpbContent>
11 </div> 21 </div>
12 <!-- 右侧图例 --> 22 <!-- 右侧图例 -->
13 <div class="lp-legend"> 23 <div class="lp-legend">
...@@ -16,46 +26,89 @@ ...@@ -16,46 +26,89 @@
16 <i v-show="!legendToggleFlag" class="el-icon-d-arrow-left"></i> 26 <i v-show="!legendToggleFlag" class="el-icon-d-arrow-left"></i>
17 <i v-show="legendToggleFlag" class="el-icon-d-arrow-right"></i> 27 <i v-show="legendToggleFlag" class="el-icon-d-arrow-right"></i>
18 </div> 28 </div>
19 <div :class="selectedZt == 'dyzt' ? 'dyzt selectedZt' : 'dyzt'" @click="selectedZt = 'dyzt'"> 29 <div
30 :class="selectedZt == 'dyzt' ? 'dyzt selectedZt' : 'dyzt'"
31 @click="selectedZt = 'dyzt'"
32 >
20 <span>单元状态</span> 33 <span>单元状态</span>
21 </div> 34 </div>
22 <div :class="selectedZt == 'fwxz' ? 'fwxz selectedZt' : 'fwxz'" @click="selectedZt = 'fwxz'"> 35 <div
36 :class="selectedZt == 'fwxz' ? 'fwxz selectedZt' : 'fwxz'"
37 @click="selectedZt = 'fwxz'"
38 >
23 <span>房屋性质</span> 39 <span>房屋性质</span>
24 </div> 40 </div>
25 <div :class="selectedZt == 'fwyt' ? 'fwyt selectedZt' : 'fwyt'" @click="selectedZt = 'fwyt'"> 41 <div
42 :class="selectedZt == 'fwyt' ? 'fwyt selectedZt' : 'fwyt'"
43 @click="selectedZt = 'fwyt'"
44 >
26 <span>房屋用途</span> 45 <span>房屋用途</span>
27 </div> 46 </div>
28 <div :class="selectedZt == 'qsx' ? 'qsx selectedZt' : 'qsx'" @click="selectedZt = 'qsx'"> 47 <div
48 :class="selectedZt == 'qsx' ? 'qsx selectedZt' : 'qsx'"
49 @click="selectedZt = 'qsx'"
50 >
29 <span>缺失项</span> 51 <span>缺失项</span>
30 </div> 52 </div>
31
32 </div> 53 </div>
33 <div class="legendTable-wrap" :style="{ width: legendToggleFlag ? '204px' : '0' }"> 54 <div
34 <table class="legendTable" v-show="selectedZt == 'dyzt'" cellspacing="1" cellpadding="1" border="1"> 55 class="legendTable-wrap"
56 :style="{ width: legendToggleFlag ? '200px' : '0' }"
57 >
58 <table
59 class="legendTable"
60 v-show="selectedZt == 'dyzt'"
61 cellspacing="1"
62 cellpadding="1"
63 border="1"
64 >
35 <tr> 65 <tr>
36 <th>状态</th> 66 <th>状态</th>
37 <th>套数</th> 67 <th>套数</th>
38 <th>面积</th> 68 <th>面积</th>
39 </tr> 69 </tr>
40 <tr v-for="(item, index) in dyztList" :key="index" class="cp" 70 <tr
41 @click="handleChoosedH(item.bsms, item.color)"> 71 v-for="(item, index) in dyztList"
72 :key="index"
73 class="cp"
74 @click="handleChoosedH(item.bsms, item.color)"
75 >
42 <td> 76 <td>
43 <i class="circle" :style="{ 'background-color': item.color }"></i>{{ item.name }} 77 <i
78 class="fa fa-circle"
79 :style="{ backgroundColor: item.color }"
80 ></i
81 >{{ item.name }}
44 </td> 82 </td>
45 <td>{{ item.ts }}</td> 83 <td>{{ item.ts }}</td>
46 <td>{{ item.mj }}</td> 84 <td>{{ item.mj }}</td>
47 </tr> 85 </tr>
48 </table> 86 </table>
49 <table class="legendTable" v-show="selectedZt == 'fwxz'" cellspacing="1" cellpadding="1" border="1"> 87
88 <table
89 class="legendTable"
90 v-show="selectedZt == 'fwxz'"
91 cellspacing="1"
92 cellpadding="1"
93 border="1"
94 >
50 <tr> 95 <tr>
51 <th>性质</th> 96 <th>性质</th>
52 <th>套数</th> 97 <th>套数</th>
53 <th>面积</th> 98 <th>面积</th>
54 </tr> 99 </tr>
55 <tr v-for="(item, index) in fwxzList" :key="index" class="cp" 100 <tr
56 @click="handleChoosedH(item.bsms, item.color)"> 101 v-for="(item, index) in fwxzList"
102 :key="index"
103 class="cp"
104 @click="handleChoosedH(item.bsms, item.color)"
105 >
57 <td> 106 <td>
58 <i class="circle" :style="{ 'background-color': item.color }"></i>{{ item.name }} 107 <i
108 class="fa fa-circle"
109 :style="{ backgroundColor: item.color }"
110 ></i
111 >{{ item.name }}
59 </td> 112 </td>
60 <td>{{ item.ts }}</td> 113 <td>{{ item.ts }}</td>
61 <td>{{ item.mj }}</td> 114 <td>{{ item.mj }}</td>
...@@ -65,16 +118,30 @@ ...@@ -65,16 +118,30 @@
65 </tr> 118 </tr>
66 </table> 119 </table>
67 120
68 <table class="legendTable" v-show="selectedZt == 'fwyt'" cellspacing="1" cellpadding="1" border="1"> 121 <table
122 class="legendTable"
123 v-show="selectedZt == 'fwyt'"
124 cellspacing="1"
125 cellpadding="1"
126 border="1"
127 >
69 <tr> 128 <tr>
70 <th>用途</th> 129 <th>用途</th>
71 <th>套数</th> 130 <th>套数</th>
72 <th>面积</th> 131 <th>面积</th>
73 </tr> 132 </tr>
74 <tr v-for="(item, index) in fwytList" :key="index" class="cp" 133 <tr
75 @click="handleChoosedH(item.bsms, item.color)"> 134 v-for="(item, index) in fwytList"
135 :key="index"
136 class="cp"
137 @click="handleChoosedH(item.bsms, item.color)"
138 >
76 <td> 139 <td>
77 <i class="circle" :style="{ 'background-color': item.color }"></i>{{ item.name }} 140 <i
141 class="fa fa-circle"
142 :style="{ backgroundColor: item.color }"
143 ></i
144 >{{ item.name }}
78 </td> 145 </td>
79 <td>{{ item.ts }}</td> 146 <td>{{ item.ts }}</td>
80 <td>{{ item.mj }}</td> 147 <td>{{ item.mj }}</td>
...@@ -84,15 +151,30 @@ ...@@ -84,15 +151,30 @@
84 </tr> 151 </tr>
85 </table> 152 </table>
86 153
87 <table class="legendTable" v-show="selectedZt == 'qsx'" cellspacing="1" cellpadding="1" border="1"> 154 <table
155 class="legendTable"
156 v-show="selectedZt == 'qsx'"
157 cellspacing="1"
158 cellpadding="1"
159 border="1"
160 >
88 <tr> 161 <tr>
89 <th>数据缺失项</th> 162 <th>数据缺失项</th>
90 <th>套数</th> 163 <th>套数</th>
91 <th>面积</th> 164 <th>面积</th>
92 </tr> 165 </tr>
93 <tr v-for="(item, index) in qsxList" :key="index" class="cp" @click="handleChoosedH(item.bsms, item.color)"> 166 <tr
167 v-for="(item, index) in qsxList"
168 :key="index"
169 class="cp"
170 @click="handleChoosedH(item.bsms, item.color)"
171 >
94 <td> 172 <td>
95 <i class="circle" :style="{ 'background-color': item.color }"></i>{{ item.name }} 173 <i
174 class="fa fa-circle"
175 :style="{ backgroundColor: item.color }"
176 ></i
177 >{{ item.name }}
96 </td> 178 </td>
97 <td>{{ item.ts }}</td> 179 <td>{{ item.ts }}</td>
98 <td>0</td> 180 <td>0</td>
...@@ -111,23 +193,23 @@ ...@@ -111,23 +193,23 @@
111 193
112 <script> 194 <script>
113 import lpbContent from "./lpbContent/index"; 195 import lpbContent from "./lpbContent/index";
114 import selectZrzH from "../ywbl/ywsq/components/selectZrzH" 196 import selectZrzH from "../ywbl/ywsq/components/selectZrzH";
115 import { getLpbFwytAndQlxz,getLpbQsxtj } from '@/api/lpb' 197 import { getLpbFwytAndQlxz, getLpbQsxtj, getLpbTj } from "@/api/lpb";
116 export default { 198 export default {
117 name: "lpb", 199 name: "lpb",
118 props: { 200 props: {
119 formData: { 201 formData: {
120 type: Object, 202 type: Object,
121 default: {} 203 default: {},
122 } 204 },
123 }, 205 },
124 components: { 206 components: {
125 lpbContent, 207 lpbContent,
126 selectZrzH 208 selectZrzH,
127 }, 209 },
128 data () { 210 data() {
129 return { 211 return {
130 activeName:"first", 212 activeName: "first",
131 bsms: [], 213 bsms: [],
132 dialogVisible: false, 214 dialogVisible: false,
133 scyclx: "0", //1是实测 0是预测 215 scyclx: "0", //1是实测 0是预测
...@@ -201,19 +283,23 @@ export default { ...@@ -201,19 +283,23 @@ export default {
201 qsztList: [], 283 qsztList: [],
202 }; 284 };
203 }, 285 },
204 created () { 286 created() {
205 window.addEventListener("resize", this.getHeight); 287 window.addEventListener("resize", this.getHeight);
206 console.log(this.formData); 288 console.log(this.formData);
207 this.getHeight(); 289 this.getHeight();
208 }, 290 },
209 mounted () { 291 mounted() {
210 //获取各项单元状态的户bsm 292 //获取各项单元状态的户bsm
211 // this.getDyztBsmList(); 293 this.getDyztBsmList();
212 //获取房屋用途统计数据 294 //获取房屋用途统计数据
213 this.getLpbFwytAndQlxz(); 295 this.getLpbFwytAndQlxz();
214 // 楼盘表绘制区域宽度计算:楼盘表区域宽度-图例宽度34-滚动条宽度6 296 // 楼盘表绘制区域宽度计算:楼盘表区域宽度-图例宽度34-滚动条宽度6
215 setTimeout(() => { 297 setTimeout(() => {
216 this.lpbContentwidth = ((document.documentElement.clientWidth || document.body.clientWidth) - 340) - 34 - 6; 298 this.lpbContentwidth =
299 (document.documentElement.clientWidth || document.body.clientWidth) -
300 340 -
301 34 -
302 6;
217 }, 100); 303 }, 100);
218 }, 304 },
219 methods: { 305 methods: {
...@@ -229,157 +315,146 @@ export default { ...@@ -229,157 +315,146 @@ export default {
229 } 315 }
230 },*/ 316 },*/
231 //获取高度计算lpb内容区高度 317 //获取高度计算lpb内容区高度
232 getHeight () { 318 getHeight() {
233 this.lpbContentHight = window.innerHeight - 190; 319 this.lpbContentHight = window.innerHeight - 190;
234 }, 320 },
235 //图例的展开收起 321 //图例的展开收起
236 legendToggle () { 322 legendToggle() {
237 this.legendToggleFlag = !this.legendToggleFlag; 323 this.legendToggleFlag = !this.legendToggleFlag;
238 }, 324 },
239 //切换房屋状态 325 //切换房屋状态
240 handleChoosedH (bsms, color) { 326 handleChoosedH(bsms, color) {
241 //每次切换房屋状态,将之前高亮的户边框颜色重置为默认 327 debugger
242 this.$refs.lpbContent.choosedList = []; 328 this.$refs.lpbContent.changeChoosed(bsms, color);
243 this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
244 item.style.border = '';
245 item.className = '';
246 });
247 this.bsms = bsms;
248 //清除选中户
249 this.$nextTick(() => {
250 //给hBsmList传值
251 // console.log(bsms,'bsms');
252 this.$refs.lpbContent.choosedList = bsms;
253 this.$refs.lpbContent.borderColor = color;
254 })
255 }, 329 },
256 //获取各项单元状态统计数据 330 //获取各项单元状态统计数据
257 getDyztBsmList () { 331 getDyztBsmList() {
258 let data = { 332 getLpbTj(this.formData.bsm).then((res) => {
259 zrzbsm: 'ca71bcc498794a1e0ec3ac93869719f6',
260 scyclx: 1,
261 };
262 getLpbTj(data).then((res) => {
263 if (res.code === 200) { 333 if (res.code === 200) {
264 this.dyztList = res.result; 334 this.dyztList = res.result;
265 this.dyztList.splice(1, 0, this.dyztList[8]); 335 this.dyztList.splice(1, 0, this.dyztList[8]);
266 this.dyztList.pop(); 336 this.dyztList.pop();
267 this.dyztList.forEach(item => { 337 this.dyztList.forEach((item) => {
268 item.ts = item.bsms.length; 338 item.ts = item.bsms.length;
269 switch (item.name) { 339 switch (item.name) {
270 case 'Qqzt': 340 case "Qqzt":
271 item.color = "#6EDEE1"; 341 item.color = "#6EDEE1";
272 item.name = "已确权" 342 item.name = "已确权";
273 break; 343 break;
274 case 'Wqqzt': 344 case "Wqqzt":
275 item.color = "#83AAFE"; 345 item.color = "#83AAFE";
276 item.name = "未确权" 346 item.name = "未确权";
277 break; 347 break;
278 case 'Bazt': 348 case "Bazt":
279 item.color = "#8ADC88"; 349 item.color = "#8ADC88";
280 item.name = "已备案" 350 item.name = "已备案";
281 break; 351 break;
282 case 'Ydyzt': 352 case "Ydyzt":
283 item.color = "#F2AD67"; 353 item.color = "#F2AD67";
284 item.name = "预抵押" 354 item.name = "预抵押";
285 break; 355 break;
286 case 'Zjgcdyzt': 356 case "Zjgcdyzt":
287 item.color = "#F191C8"; 357 item.color = "#F191C8";
288 item.name = "在建抵押" 358 item.name = "在建抵押";
289 break; 359 break;
290 case 'Dyzt': 360 case "Dyzt":
291 item.color = "#FF8282"; 361 item.color = "#FF8282";
292 item.name = "抵押" 362 item.name = "抵押";
293 break; 363 break;
294 case 'Cfzt': 364 case "Cfzt":
295 item.color = "#D7CECF"; 365 item.color = "#D7CECF";
296 item.name = "查封" 366 item.name = "查封";
297 break; 367 break;
298 case 'Yyzt': 368 case "Yyzt":
299 item.color = "#D4A3EB"; 369 item.color = "#D4A3EB";
300 item.name = "异议" 370 item.name = "异议";
301 break; 371 break;
302 case 'Xzzt': 372 case "Xzzt":
303 item.color = "#A5A3FB"; 373 item.color = "#A5A3FB";
304 item.name = "限制" 374 item.name = "限制";
305 break; 375 break;
306 default: 376 default:
307 break; 377 break;
308 } 378 }
309 }) 379 });
310 } 380 }
311 }); 381 });
312 }, 382 },
313 // 获取房屋用途和房屋性质及缺失项统计数据 383 // 获取房屋用途和房屋性质及缺失项统计数据
314 getLpbFwytAndQlxz () { 384 getLpbFwytAndQlxz() {
315 getLpbFwytAndQlxz('ca71bcc498794a1e0ec3ac93869719f6').then((res) => { 385 getLpbFwytAndQlxz(this.formData.bsm).then((res) => {
316 if (res.code === 200) { 386 if (res.code === 200) {
317 // this.fwytList = res.result 387 // this.fwytList = res.result
318 this.fwytList = res.result.fwyt; 388 this.fwytList = res.result.fwyt;
319 this.fwxzList = res.result.qlxz; 389 this.fwxzList = res.result.qlxz;
320 if (this.fwytList.length > 0) { 390 if (this.fwytList.length > 0) {
321 this.fwytList.forEach(item => { 391 this.fwytList.forEach((item) => {
322 item.color = "#2591FD"; 392 item.color = "#2591FD";
323 item.ts = item.bsms.length 393 item.ts = item.bsms.length;
324 }) 394 });
325 } 395 }
326 if (this.fwxzList.length > 0) { 396 if (this.fwxzList.length > 0) {
327 this.fwxzList.forEach(item => { 397 this.fwxzList.forEach((item) => {
328 item.color = "#2591FD"; 398 item.color = "#2591FD";
329 item.ts = item.bsms.length 399 item.ts = item.bsms.length;
330 }) 400 });
331 } 401 }
332 } 402 }
333 }); 403 });
334 // getLpbQsxtj('ca71bcc498794a1e0ec3ac93869719f6').then((res) => { 404 getLpbQsxtj(this.formData.bsm).then((res) => {
335 // if (res.code === 200) { 405 if (res.code === 200) {
336 // this.qsxList = [ 406 this.qsxList = [
337 // { 407 {
338 // name: '坐落', 408 name: "坐落",
339 // bsms: res.result.zl.bsms, 409 bsms: res.result.zl.bsms,
340 // color: '#2591FD', 410 color: "#2591FD",
341 // ts: res.result.zl.bsms.length 411 ts: res.result.zl.bsms.length,
342 // }, 412 },
343 // { 413 {
344 // name: '分层分户图', 414 name: "分层分户图",
345 // bsms: res.result.fcfht.bsms, 415 bsms: res.result.fcfht.bsms,
346 // color: '#2591FD', 416 color: "#2591FD",
347 // ts: res.result.fcfht.bsms.length 417 ts: res.result.fcfht.bsms.length,
348 // }, 418 },
349 // { 419 {
350 // name: '室号', 420 name: "室号",
351 // bsms: res.result.shbw.bsms, 421 bsms: res.result.shbw.bsms,
352 // color: '#2591FD', 422 color: "#2591FD",
353 // ts: res.result.shbw.bsms.length 423 ts: res.result.shbw.bsms.length,
354 // } 424 },
355 // ] 425 ];
356 // }
357 // });
358 } 426 }
427 });
428 },
359 }, 429 },
360 computed: {}, 430 computed: {},
361 destroyed () { 431 destroyed() {
362 window.removeEventListener("resize", this.getHeight); 432 window.removeEventListener("resize", this.getHeight);
363 }, 433 },
364 watch: { 434 watch: {
365 //树结构和图例伸缩时修改楼盘表主要内容区宽度 435 //树结构和图例伸缩时修改楼盘表主要内容区宽度
366 legendToggleFlag (n) { 436 legendToggleFlag(n) {
367 if (n) { 437 if (n) {
368 this.lpbContentwidth -= 204; 438 this.lpbContentwidth -= 204;
369 } else { 439 } else {
370 this.lpbContentwidth += 204; 440 this.lpbContentwidth += 204;
371 } 441 }
372 }, 442 },
373 selectedZt (n) { 443 selectedZt(n) {
374 this.legendToggleFlag = true; 444 this.legendToggleFlag = true;
375 }, 445 },
376 }, 446 },
377 }; 447 };
378 </script> 448 </script>
379 <style scoped lang="scss"> 449 <style scoped lang="scss">
450 table {
451 border-width: 0;
452 border-collapse: collapse;
453 border-spacing: 0;
454 }
380 .edit { 455 .edit {
381 height: 100%; 456 height: 100%;
382 background-color: #F4F9FF; 457 background-color: #f4f9ff;
383 .tab-content { 458 .tab-content {
384 border: 1px solid #dedede; 459 border: 1px solid #dedede;
385 background-color: #ffffff; 460 background-color: #ffffff;
...@@ -412,6 +487,7 @@ export default { ...@@ -412,6 +487,7 @@ export default {
412 margin-right: 10px; 487 margin-right: 10px;
413 box-sizing: border-box; 488 box-sizing: border-box;
414 } 489 }
490
415 .lp-legend { 491 .lp-legend {
416 transition: 0.5s; 492 transition: 0.5s;
417 height: 100%; 493 height: 100%;
...@@ -425,7 +501,7 @@ export default { ...@@ -425,7 +501,7 @@ export default {
425 height: 40px; 501 height: 40px;
426 line-height: 40px; 502 line-height: 40px;
427 text-align: center; 503 text-align: center;
428 background-color: #0091ff; 504 background-color: #5a78de;
429 color: #fff; 505 color: #fff;
430 border-bottom: 1px solid #e6e6e6; 506 border-bottom: 1px solid #e6e6e6;
431 } 507 }
...@@ -442,7 +518,6 @@ export default { ...@@ -442,7 +518,6 @@ export default {
442 cursor: pointer; 518 cursor: pointer;
443 border-bottom: 1px solid #e6e6e6; 519 border-bottom: 1px solid #e6e6e6;
444 border-left: 1px solid #e6e6e6; 520 border-left: 1px solid #e6e6e6;
445
446 span { 521 span {
447 text-align: center; 522 text-align: center;
448 height: 100%; 523 height: 100%;
...@@ -452,52 +527,43 @@ export default { ...@@ -452,52 +527,43 @@ export default {
452 letter-spacing: 2px; 527 letter-spacing: 2px;
453 } 528 }
454 } 529 }
455
456 .selectedZt { 530 .selectedZt {
457 background-color: #0091ff; 531 // background-color: #5A78DE;
458 color: #fff; 532 color: #3d59c4;
459 } 533 }
460 } 534 }
461
462 .legendTable-wrap { 535 .legendTable-wrap {
463 transition: 0.5s; 536 transition: 0.5s;
464 float: right; 537 float: right;
465 overflow: hidden; 538 overflow: hidden;
466
467 .legendTable { 539 .legendTable {
468 margin-top: -1px; 540 margin-top: -1px;
469 border-color: #e4ebf4 !important; 541 .fa-circle {
470 border-collapse: collapse; 542 display: inline-block;
471 border-spacing: 0; 543 width: 12px;
544 height: 12px;
545 border-radius: 50%;
546 vertical-align: middle;
547 margin-right: 4px;
548 }
472 tr { 549 tr {
473 height: 40px; 550 height: 40px;
474 line-height: 40px; 551 line-height: 40px;
475 552 border-color: #d8e0ea !important;
476 th:first-child { 553 th:first-child {
477 width: 80px; 554 width: 80px;
478 } 555 }
479
480 th { 556 th {
481 width: 60px; 557 width: 60px;
482 height: 40px; 558 height: 40px;
483 white-space: nowrap; 559 white-space: nowrap;
560 background-color: #eceef2;
484 } 561 }
485
486 td { 562 td {
487 height: 40px; 563 height: 40px;
488 text-align: center; 564 text-align: center;
489 white-space: nowrap; 565 white-space: nowrap;
490 .circle{
491 display: inline-block;
492 width: 12px;
493 height: 12px;
494 border-radius: 6px;
495 margin-right: 2px;
496 position: relative;
497 top: 1px;
498 } 566 }
499 }
500
501 td:first-child { 567 td:first-child {
502 text-align: left; 568 text-align: left;
503 text-indent: 2px; 569 text-indent: 2px;
......
...@@ -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" />
......
...@@ -8,8 +8,7 @@ ...@@ -8,8 +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 </el-checkbox-group> 12 </el-checkbox-group>
14 </div> 13 </div>
15 </div> 14 </div>
...@@ -24,11 +23,10 @@ ...@@ -24,11 +23,10 @@
24 row.qszt == '2' ? 'lishi' : '', 23 row.qszt == '2' ? 'lishi' : '',
25 row.qszt == '0' ? 'linshi' : '', 24 row.qszt == '0' ? 'linshi' : '',
26 item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))? 'linshiIcon' : '', 25 item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))? 'linshiIcon' : '',
27 ]" 26 ]">
28 > 27 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
29 <div class="setbut" v-if="item.prop == 'cz'">
30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 28 <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="deleteDialog(row)">删除</el-button> 29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
32 </div> 30 </div>
33 <div class="icon" v-if="item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))">正在办理</div> 31 <div class="icon" v-if="item.prop == 'qszt' && (row.qszt == '0' ||(row.qszt == '1' &&row.qlblzt == '1'&&row.zxywh != null))">正在办理</div>
34 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span> 32 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
...@@ -44,10 +42,11 @@ ...@@ -44,10 +42,11 @@
44 </template> 42 </template>
45 43
46 <script> 44 <script>
47 import { getCfdjList } from "@/api/registerBook.js"; 45 import { datas } from "./qlxxFormData.js";
48 import { datas } from "./qlxxFormData.js"; 46 import { getSjlx } from "@/utils/dictionary.js";
49 export default { 47 import { getCfdjList } from "@/api/registerBook.js";
50 data() { 48 export default {
49 data () {
51 return { 50 return {
52 title: "查封登记信息", 51 title: "查封登记信息",
53 qsztList: datas.columns().qsztList, 52 qsztList: datas.columns().qsztList,
...@@ -62,15 +61,13 @@ export default { ...@@ -62,15 +61,13 @@ export default {
62 columns: datas.columns().CFDJ, 61 columns: datas.columns().CFDJ,
63 }; 62 };
64 }, 63 },
65 created() { 64 created () {
66 this.loadData(); 65 this.loadData();
67 }, 66 },
68 methods: { 67 methods: {
69 loadData() { 68 loadData () {
70 if(this.$parent.addRepairRecord){ 69 if (this.$parent.addRepairRecord) {
71 this.columns.unshift({prop:"cz", 70 this.columns.unshift({ prop: "cz", label: "操作" });
72 label:"操作"
73 })
74 } 71 }
75 getCfdjList({ 72 getCfdjList({
76 bdcdyid: this.propsParam.bdcdyid, 73 bdcdyid: this.propsParam.bdcdyid,
...@@ -79,6 +76,9 @@ export default { ...@@ -79,6 +76,9 @@ export default {
79 }).then((res) => { 76 }).then((res) => {
80 if (res.code === 200) { 77 if (res.code === 200) {
81 this.tableData = res.result; 78 this.tableData = res.result;
79 this.tableData.forEach(item => {
80 item.sjlx = getSjlx(item.sjlx)
81 })
82 this.tableData.forEach((item, index) => { 82 this.tableData.forEach((item, index) => {
83 if (item.sfbxf == "1") { 83 if (item.sfbxf == "1") {
84 item.zxywh = ""; 84 item.zxywh = "";
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
95 } 95 }
96 }); 96 });
97 }, 97 },
98 checkChange() { 98 checkChange () {
99 if (this.checkList.length === 0) { 99 if (this.checkList.length === 0) {
100 this.tableData = []; 100 this.tableData = [];
101 this.emptycolNum = datas.columns().emptycolNum; 101 this.emptycolNum = datas.columns().emptycolNum;
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
103 this.loadData(); 103 this.loadData();
104 } 104 }
105 }, 105 },
106 getQsztName(code) { 106 getQsztName (code) {
107 let name = ""; 107 let name = "";
108 for (let item of this.qsztList) { 108 for (let item of this.qsztList) {
109 if (item.value == code) { 109 if (item.value == code) {
...@@ -113,10 +113,32 @@ export default { ...@@ -113,10 +113,32 @@ export default {
113 } 113 }
114 return name; 114 return name;
115 }, 115 },
116 // 新增一条补录信息
117 editDialog(row, del) {
118 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
119 confirmButtonText: "确定",
120 cancelButtonText: "取消",
121 type: "warning",
122 })
123 .then(() => {
124 this.$parent.addRepairRecord(row, del);
125
126 this.$message({
127 type: "success",
128 message: "补录成功!",
129 });
130 })
131 .catch(() => {
132 this.$message({
133 type: "info",
134 message: "取消编辑",
135 });
136 });
137 },
116 }, 138 },
117 }; 139 };
118 </script> 140 </script>
119 141
120 <style lang="scss" scoped> 142 <style lang="scss" scoped>
121 @import "./qlxxCommon.scss"; 143 @import "./qlxxCommon.scss";
122 </style> 144 </style>
......
...@@ -5,7 +5,12 @@ ...@@ -5,7 +5,12 @@
5 {{ title }} 5 {{ title }}
6 <div class="checkbox"> 6 <div class="checkbox">
7 <el-checkbox-group v-model="checkList" @change="checkChange"> 7 <el-checkbox-group v-model="checkList" @change="checkChange">
8 <el-checkbox v-for="item in qsztList" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox> 8 <el-checkbox
9 v-for="item in qsztList"
10 :key="item.value"
11 :label="item.value"
12 >{{ item.label }}</el-checkbox
13 >
9 </el-checkbox-group> 14 </el-checkbox-group>
10 </div> 15 </div>
11 </div> 16 </div>
...@@ -15,14 +20,28 @@ ...@@ -15,14 +20,28 @@
15 <td> 20 <td>
16 {{ item.label }} 21 {{ item.label }}
17 </td> 22 </td>
18 <td v-for="(row, index) in tableData" :key="index" :class="[ 23 <td
24 v-for="(row, index) in tableData"
25 :key="index"
26 :class="[
19 row.qszt == '2' ? 'lishi' : '', 27 row.qszt == '2' ? 'lishi' : '',
20 row.qszt == '0' ? 'linshi' : '', 28 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 29 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
22 ]"> 30 ]"
23 <div class="setbut" v-if="item.prop == 'cz'"> 31 >
24 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 32 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
25 <el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button> 33 <el-button
34 type="text"
35 icon="el-icon-edit-outline"
36 @click="editDialog(row)"
37 >编辑</el-button
38 >
39 <el-button
40 type="text"
41 icon="el-icon-edit-outline"
42 @click="editDialog(row, 'D')"
43 >删除</el-button
44 >
26 </div> 45 </div>
27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 46 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
28 正在办理 47 正在办理
...@@ -42,10 +61,11 @@ ...@@ -42,10 +61,11 @@
42 </template> 61 </template>
43 62
44 <script> 63 <script>
45 import { getDiyaqList } from "@/api/registerBook.js";
46 import { datas } from "./qlxxFormData.js"; 64 import { datas } from "./qlxxFormData.js";
65 import { getSjlx } from "@/utils/dictionary.js";
66 import { getDiyaqList } from "@/api/registerBook.js";
47 export default { 67 export default {
48 data () { 68 data() {
49 return { 69 return {
50 title: "抵押权登记信息", 70 title: "抵押权登记信息",
51 qsztList: datas.columns().qsztList, 71 qsztList: datas.columns().qsztList,
...@@ -60,15 +80,13 @@ export default { ...@@ -60,15 +80,13 @@ export default {
60 columns: datas.columns().DYAQ, 80 columns: datas.columns().DYAQ,
61 }; 81 };
62 }, 82 },
63 created () { 83 created() {
64 this.loadData(); 84 this.loadData();
65 }, 85 },
66 methods: { 86 methods: {
67 loadData () { 87 loadData() {
68 if(this.$parent.addRepairRecord){ 88 if (this.$parent.addRepairRecord) {
69 this.columns.unshift({prop:"cz", 89 this.columns.unshift({ prop: "cz", label: "操作" });
70 label:"操作"
71 })
72 } 90 }
73 getDiyaqList({ 91 getDiyaqList({
74 bdcdyid: this.propsParam.bdcdyid, 92 bdcdyid: this.propsParam.bdcdyid,
...@@ -77,6 +95,9 @@ export default { ...@@ -77,6 +95,9 @@ export default {
77 }).then((res) => { 95 }).then((res) => {
78 if (res.code === 200) { 96 if (res.code === 200) {
79 this.tableData = res.result; 97 this.tableData = res.result;
98 this.tableData.forEach((item) => {
99 item.sjlx = getSjlx(item.sjlx);
100 });
80 if (this.tableData.length < datas.columns().emptycolNum) { 101 if (this.tableData.length < datas.columns().emptycolNum) {
81 this.emptycolNum = 102 this.emptycolNum =
82 datas.columns().emptycolNum - this.tableData.length; 103 datas.columns().emptycolNum - this.tableData.length;
...@@ -86,7 +107,7 @@ export default { ...@@ -86,7 +107,7 @@ export default {
86 } 107 }
87 }); 108 });
88 }, 109 },
89 checkChange () { 110 checkChange() {
90 if (this.checkList.length === 0) { 111 if (this.checkList.length === 0) {
91 this.tableData = []; 112 this.tableData = [];
92 this.emptycolNum = datas.columns().emptycolNum; 113 this.emptycolNum = datas.columns().emptycolNum;
...@@ -94,7 +115,7 @@ export default { ...@@ -94,7 +115,7 @@ export default {
94 this.loadData(); 115 this.loadData();
95 } 116 }
96 }, 117 },
97 getQsztName (code) { 118 getQsztName(code) {
98 let name = ""; 119 let name = "";
99 for (let item of this.qsztList) { 120 for (let item of this.qsztList) {
100 if (item.value == code) { 121 if (item.value == code) {
...@@ -104,6 +125,28 @@ export default { ...@@ -104,6 +125,28 @@ export default {
104 } 125 }
105 return name; 126 return name;
106 }, 127 },
128 // 新增一条补录信息
129 editDialog(row, del) {
130 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
131 confirmButtonText: "确定",
132 cancelButtonText: "取消",
133 type: "warning",
134 })
135 .then(() => {
136 this.$parent.addRepairRecord(row, del);
137
138 this.$message({
139 type: "success",
140 message: "补录成功!",
141 });
142 })
143 .catch(() => {
144 this.$message({
145 type: "info",
146 message: "取消编辑",
147 });
148 });
149 },
107 }, 150 },
108 }; 151 };
109 </script> 152 </script>
......
...@@ -5,7 +5,12 @@ ...@@ -5,7 +5,12 @@
5 {{ title }} 5 {{ title }}
6 <div class="checkbox"> 6 <div class="checkbox">
7 <el-checkbox-group v-model="checkList" @change="checkChange"> 7 <el-checkbox-group v-model="checkList" @change="checkChange">
8 <el-checkbox v-for="item in qsztList" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox> 8 <el-checkbox
9 v-for="item in qsztList"
10 :key="item.value"
11 :label="item.value"
12 >{{ item.label }}</el-checkbox
13 >
9 </el-checkbox-group> 14 </el-checkbox-group>
10 </div> 15 </div>
11 </div> 16 </div>
...@@ -15,14 +20,18 @@ ...@@ -15,14 +20,18 @@
15 <td> 20 <td>
16 {{ item.label }} 21 {{ item.label }}
17 </td> 22 </td>
18 <td v-for="(row, index) in tableData" :key="index" :class="[ 23 <td
24 v-for="(row, index) in tableData"
25 :key="index"
26 :class="[
19 row.qszt == '2' ? 'lishi' : '', 27 row.qszt == '2' ? 'lishi' : '',
20 row.qszt == '0' ? 'linshi' : '', 28 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 29 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
22 ]"> 30 ]"
23 <div class="setbut" v-if="item.prop == 'cz'"> 31 >
32 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
24 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 33 <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> 34 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
26 </div> 35 </div>
27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 36 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
28 正在办理 37 正在办理
...@@ -42,10 +51,11 @@ ...@@ -42,10 +51,11 @@
42 </template> 51 </template>
43 52
44 <script> 53 <script>
45 import { getDiyiqList } from "@/api/registerBook.js";
46 import { datas } from "./qlxxFormData.js"; 54 import { datas } from "./qlxxFormData.js";
55 import { getSjlx } from "@/utils/dictionary.js";
56 import { getDiyiqList } from "@/api/registerBook.js";
47 export default { 57 export default {
48 data () { 58 data() {
49 return { 59 return {
50 title: "地役权登记信息", 60 title: "地役权登记信息",
51 qsztList: datas.columns().qsztList, 61 qsztList: datas.columns().qsztList,
...@@ -60,15 +70,13 @@ export default { ...@@ -60,15 +70,13 @@ export default {
60 columns: datas.columns().DYIQ, 70 columns: datas.columns().DYIQ,
61 }; 71 };
62 }, 72 },
63 created () { 73 created() {
64 this.loadData(); 74 this.loadData();
65 }, 75 },
66 methods: { 76 methods: {
67 loadData () { 77 loadData() {
68 if(this.$parent.addRepairRecord){ 78 if (this.$parent.addRepairRecord) {
69 this.columns.unshift({prop:"cz", 79 this.columns.unshift({ prop: "cz", label: "操作" });
70 label:"操作"
71 })
72 } 80 }
73 getDiyiqList({ 81 getDiyiqList({
74 bdcdyid: this.propsParam.bdcdyid, 82 bdcdyid: this.propsParam.bdcdyid,
...@@ -77,6 +85,9 @@ export default { ...@@ -77,6 +85,9 @@ export default {
77 }).then((res) => { 85 }).then((res) => {
78 if (res.code === 200) { 86 if (res.code === 200) {
79 this.tableData = res.result; 87 this.tableData = res.result;
88 this.tableData.forEach((item) => {
89 item.sjlx = getSjlx(item.sjlx);
90 });
80 if (this.tableData.length < datas.columns().emptycolNum) { 91 if (this.tableData.length < datas.columns().emptycolNum) {
81 this.emptycolNum = 92 this.emptycolNum =
82 datas.columns().emptycolNum - this.tableData.length; 93 datas.columns().emptycolNum - this.tableData.length;
...@@ -86,7 +97,7 @@ export default { ...@@ -86,7 +97,7 @@ export default {
86 } 97 }
87 }); 98 });
88 }, 99 },
89 checkChange () { 100 checkChange() {
90 if (this.checkList.length === 0) { 101 if (this.checkList.length === 0) {
91 this.tableData = []; 102 this.tableData = [];
92 this.emptycolNum = datas.columns().emptycolNum; 103 this.emptycolNum = datas.columns().emptycolNum;
...@@ -94,7 +105,7 @@ export default { ...@@ -94,7 +105,7 @@ export default {
94 this.loadData(); 105 this.loadData();
95 } 106 }
96 }, 107 },
97 getQsztName (code) { 108 getQsztName(code) {
98 let name = ""; 109 let name = "";
99 for (let item of this.qsztList) { 110 for (let item of this.qsztList) {
100 if (item.value == code) { 111 if (item.value == code) {
...@@ -104,6 +115,28 @@ export default { ...@@ -104,6 +115,28 @@ export default {
104 } 115 }
105 return name; 116 return name;
106 }, 117 },
118 // 新增一条补录信息
119 editDialog(row, del) {
120 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
121 confirmButtonText: "确定",
122 cancelButtonText: "取消",
123 type: "warning",
124 })
125 .then(() => {
126 this.$parent.addRepairRecord(row, del);
127
128 this.$message({
129 type: "success",
130 message: "补录成功!",
131 });
132 })
133 .catch(() => {
134 this.$message({
135 type: "info",
136 message: "取消编辑",
137 });
138 });
139 },
107 }, 140 },
108 }; 141 };
109 </script> 142 </script>
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
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'"> 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="deleteDialog(row)">删除</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 正在办理
...@@ -47,8 +47,9 @@ ...@@ -47,8 +47,9 @@
47 </template> 47 </template>
48 48
49 <script> 49 <script>
50 import { getJsydsyqList } from "@/api/registerBook.js";
51 import { datas } from "./qlxxFormData.js"; 50 import { datas } from "./qlxxFormData.js";
51 import { getSjlx } from "@/utils/dictionary.js";
52 import { getJsydsyqList } from "@/api/registerBook.js";
52 export default { 53 export default {
53 data () { 54 data () {
54 return { 55 return {
...@@ -82,6 +83,9 @@ ...@@ -82,6 +83,9 @@
82 }).then((res) => { 83 }).then((res) => {
83 if (res.code === 200) { 84 if (res.code === 200) {
84 this.tableData = res.result; 85 this.tableData = res.result;
86 this.tableData.forEach(item => {
87 item.sjlx = getSjlx(item.sjlx)
88 })
85 if (this.tableData.length < datas.columns().emptycolNum) { 89 if (this.tableData.length < datas.columns().emptycolNum) {
86 this.emptycolNum = 90 this.emptycolNum =
87 datas.columns().emptycolNum - this.tableData.length; 91 datas.columns().emptycolNum - this.tableData.length;
...@@ -109,6 +113,27 @@ ...@@ -109,6 +113,27 @@
109 } 113 }
110 return name; 114 return name;
111 }, 115 },
116 // 新增一条补录信息
117 editDialog(row,del){
118 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
119 confirmButtonText: '确定',
120 cancelButtonText: '取消',
121 type: 'warning'
122 }).then(() => {
123 this.$parent.addRepairRecord(row,del)
124
125 this.$message({
126 type: 'success',
127 message: '补录成功!'
128 });
129 }).catch(() => {
130 this.$message({
131 type: 'info',
132 message: '取消编辑'
133 });
134 });
135
136 },
112 }, 137 },
113 }; 138 };
114 </script> 139 </script>
......
...@@ -5,7 +5,12 @@ ...@@ -5,7 +5,12 @@
5 {{ title }} 5 {{ title }}
6 <div class="checkbox"> 6 <div class="checkbox">
7 <el-checkbox-group v-model="checkList" @change="checkChange"> 7 <el-checkbox-group v-model="checkList" @change="checkChange">
8 <el-checkbox v-for="item in qsztList" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox> 8 <el-checkbox
9 v-for="item in qsztList"
10 :key="item.value"
11 :label="item.value"
12 >{{ item.label }}</el-checkbox
13 >
9 </el-checkbox-group> 14 </el-checkbox-group>
10 </div> 15 </div>
11 </div> 16 </div>
...@@ -15,14 +20,28 @@ ...@@ -15,14 +20,28 @@
15 <td> 20 <td>
16 {{ item.label }} 21 {{ item.label }}
17 </td> 22 </td>
18 <td v-for="(row, index) in tableData" :key="index" :class="[ 23 <td
24 v-for="(row, index) in tableData"
25 :key="index"
26 :class="[
19 row.qszt == '2' ? 'lishi' : '', 27 row.qszt == '2' ? 'lishi' : '',
20 row.qszt == '0' ? 'linshi' : '', 28 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 29 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '',
22 ]"> 30 ]"
23 <div class="setbut" v-if="item.prop == 'cz'"> 31 >
24 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 32 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
25 <el-button type="text" icon="el-icon-edit-outline" @click="deleteDialog(row)">删除</el-button> 33 <el-button
34 type="text"
35 icon="el-icon-edit-outline"
36 @click="editDialog(row)"
37 >编辑</el-button
38 >
39 <el-button
40 type="text"
41 icon="el-icon-edit-outline"
42 @click="editDialog(row, 'D')"
43 >删除</el-button
44 >
26 </div> 45 </div>
27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 46 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
28 正在办理 47 正在办理
...@@ -42,10 +61,11 @@ ...@@ -42,10 +61,11 @@
42 </template> 61 </template>
43 62
44 <script> 63 <script>
45 import { getFdcq2List } from "@/api/registerBook.js";
46 import { datas } from "./qlxxFormData.js"; 64 import { datas } from "./qlxxFormData.js";
65 import { getSjlx } from "@/utils/dictionary.js";
66 import { getFdcq2List } from "@/api/registerBook.js";
47 export default { 67 export default {
48 data () { 68 data() {
49 return { 69 return {
50 title: "房地产权登记信息(独幢、层、套、间房屋)", 70 title: "房地产权登记信息(独幢、层、套、间房屋)",
51 qsztList: datas.columns().qsztList, 71 qsztList: datas.columns().qsztList,
...@@ -60,15 +80,13 @@ export default { ...@@ -60,15 +80,13 @@ export default {
60 columns: datas.columns().FDCQ2, 80 columns: datas.columns().FDCQ2,
61 }; 81 };
62 }, 82 },
63 created () { 83 created() {
64 this.loadData(); 84 this.loadData();
65 }, 85 },
66 methods: { 86 methods: {
67 loadData () { 87 loadData() {
68 if(this.$parent.addRepairRecord){ 88 if (this.$parent.addRepairRecord) {
69 this.columns.unshift({prop:"cz", 89 this.columns.unshift({ prop: "cz", label: "操作" });
70 label:"操作"
71 })
72 } 90 }
73 getFdcq2List({ 91 getFdcq2List({
74 bdcdyid: this.propsParam.bdcdyid, 92 bdcdyid: this.propsParam.bdcdyid,
...@@ -77,6 +95,9 @@ export default { ...@@ -77,6 +95,9 @@ export default {
77 }).then((res) => { 95 }).then((res) => {
78 if (res.code === 200) { 96 if (res.code === 200) {
79 this.tableData = res.result; 97 this.tableData = res.result;
98 this.tableData.forEach((item) => {
99 item.sjlx = getSjlx(item.sjlx);
100 });
80 if (this.tableData.length < datas.columns().emptycolNum) { 101 if (this.tableData.length < datas.columns().emptycolNum) {
81 this.emptycolNum = 102 this.emptycolNum =
82 datas.columns().emptycolNum - this.tableData.length; 103 datas.columns().emptycolNum - this.tableData.length;
...@@ -86,7 +107,7 @@ export default { ...@@ -86,7 +107,7 @@ export default {
86 } 107 }
87 }); 108 });
88 }, 109 },
89 checkChange () { 110 checkChange() {
90 if (this.checkList.length === 0) { 111 if (this.checkList.length === 0) {
91 this.tableData = []; 112 this.tableData = [];
92 this.emptycolNum = datas.columns().emptycolNum; 113 this.emptycolNum = datas.columns().emptycolNum;
...@@ -94,7 +115,7 @@ export default { ...@@ -94,7 +115,7 @@ export default {
94 this.loadData(); 115 this.loadData();
95 } 116 }
96 }, 117 },
97 getQsztName (code) { 118 getQsztName(code) {
98 let name = ""; 119 let name = "";
99 for (let item of this.qsztList) { 120 for (let item of this.qsztList) {
100 if (item.value == code) { 121 if (item.value == code) {
...@@ -104,62 +125,23 @@ export default { ...@@ -104,62 +125,23 @@ export default {
104 } 125 }
105 return name; 126 return name;
106 }, 127 },
107 // 编辑 128 // 新增一条补录信息
108 editDialog(row){ 129 editDialog(row, del) {
109 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 130 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
110 confirmButtonText: '确定', 131 confirmButtonText: "确定",
111 cancelButtonText: '取消', 132 cancelButtonText: "取消",
112 type: 'warning' 133 type: "warning",
113 }).then(() => { 134 })
114 this.$parent.addRepairRecord(row) 135 .then(() => {
115 136 this.$parent.addRepairRecord(row, del);
116 this.$message({ 137 })
117 type: 'success', 138 .catch(() => {
118 message: '补录成功!'
119 });
120 }).catch(() => {
121 this.$message({ 139 this.$message({
122 type: 'info', 140 type: "info",
123 message: '取消编辑' 141 message: "取消",
124 }); 142 });
125 }); 143 });
126
127 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
128 // datalist:this.columns,
129 // data: row,
130
131 // })
132
133 }, 144 },
134 // 删除
135 deleteDialog(row){
136 this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
137 confirmButtonText: '确定',
138 cancelButtonText: '取消',
139 type: 'warning'
140 }).then(() => {
141 // let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
142 // deleteClmx(bsmClmx).then(res => {
143 // if (res.code == 200) {
144 // that.$emit('updateList', res.result)
145 // that.$message({
146 // message: '删除成功!',
147 // type: 'success'
148 // })
149 // }
150 // })
151 this.$message({
152 type: 'success',
153 message: '删除成功!'
154 });
155 }).catch(() => {
156 this.$message({
157 type: 'info',
158 message: '已取消删除'
159 });
160 });
161
162 }
163 }, 145 },
164 }; 146 };
165 </script> 147 </script>
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
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'"> 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="deleteDialog(row)">删除</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 正在办理
...@@ -47,8 +47,9 @@ ...@@ -47,8 +47,9 @@
47 </template> 47 </template>
48 48
49 <script> 49 <script>
50 import { getJsydsyqList } from "@/api/registerBook.js";
51 import { datas } from "./qlxxFormData.js"; 50 import { datas } from "./qlxxFormData.js";
51 import { getSjlx } from "@/utils/dictionary.js";
52 import { getJsydsyqList } from "@/api/registerBook.js";
52 export default { 53 export default {
53 data () { 54 data () {
54 return { 55 return {
...@@ -70,6 +71,7 @@ ...@@ -70,6 +71,7 @@
70 }, 71 },
71 methods: { 72 methods: {
72 loadData () { 73 loadData () {
74
73 if(this.$parent.addRepairRecord){ 75 if(this.$parent.addRepairRecord){
74 this.columns.unshift({prop:"cz", 76 this.columns.unshift({prop:"cz",
75 label:"操作" 77 label:"操作"
...@@ -82,6 +84,9 @@ ...@@ -82,6 +84,9 @@
82 }).then((res) => { 84 }).then((res) => {
83 if (res.code === 200) { 85 if (res.code === 200) {
84 this.tableData = res.result; 86 this.tableData = res.result;
87 this.tableData.forEach(item => {
88 item.sjlx = getSjlx(item.sjlx)
89 })
85 if (this.tableData.length < datas.columns().emptycolNum) { 90 if (this.tableData.length < datas.columns().emptycolNum) {
86 this.emptycolNum = 91 this.emptycolNum =
87 datas.columns().emptycolNum - this.tableData.length; 92 datas.columns().emptycolNum - this.tableData.length;
...@@ -109,6 +114,27 @@ ...@@ -109,6 +114,27 @@
109 } 114 }
110 return name; 115 return name;
111 }, 116 },
117 // 新增一条补录信息
118 editDialog(row,del){
119 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
120 confirmButtonText: '确定',
121 cancelButtonText: '取消',
122 type: 'warning'
123 }).then(() => {
124 this.$parent.addRepairRecord(row,del)
125
126 this.$message({
127 type: 'success',
128 message: '补录成功!'
129 });
130 }).catch(() => {
131 this.$message({
132 type: 'info',
133 message: '取消编辑'
134 });
135 });
136
137 },
112 }, 138 },
113 }; 139 };
114 </script> 140 </script>
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
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'"> 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="deleteDialog(row)">删除</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 正在办理
...@@ -70,8 +70,9 @@ ...@@ -70,8 +70,9 @@
70 </template> 70 </template>
71 71
72 <script> 72 <script>
73 import { getNydsyqList } from "@/api/registerBook.js";
74 import { datas } from "./qlxxFormData.js"; 73 import { datas } from "./qlxxFormData.js";
74 import { getSjlx } from "@/utils/dictionary.js";
75 import { getNydsyqList } from "@/api/registerBook.js";
75 export default { 76 export default {
76 data () { 77 data () {
77 return { 78 return {
...@@ -111,6 +112,9 @@ ...@@ -111,6 +112,9 @@
111 }).then((res) => { 112 }).then((res) => {
112 if (res.code === 200) { 113 if (res.code === 200) {
113 this.tableData = res.result; 114 this.tableData = res.result;
115 this.tableData.forEach(item => {
116 item.sjlx = getSjlx(item.sjlx)
117 })
114 if (this.tableData.length < datas.columns().emptycolNum) { 118 if (this.tableData.length < datas.columns().emptycolNum) {
115 this.emptycolNum = 119 this.emptycolNum =
116 datas.columns().emptycolNum - this.tableData.length; 120 datas.columns().emptycolNum - this.tableData.length;
...@@ -138,6 +142,27 @@ ...@@ -138,6 +142,27 @@
138 } 142 }
139 return name; 143 return name;
140 }, 144 },
145 // 新增一条补录信息
146 editDialog(row,del){
147 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
148 confirmButtonText: '确定',
149 cancelButtonText: '取消',
150 type: 'warning'
151 }).then(() => {
152 this.$parent.addRepairRecord(row,del)
153
154 this.$message({
155 type: 'success',
156 message: '补录成功!'
157 });
158 }).catch(() => {
159 this.$message({
160 type: 'info',
161 message: '取消编辑'
162 });
163 });
164
165 },
141 }, 166 },
142 }; 167 };
143 </script> 168 </script>
......
...@@ -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,
...@@ -172,7 +172,7 @@ class data extends filter { ...@@ -172,7 +172,7 @@ class data extends filter {
172 label: "坐落", 172 label: "坐落",
173 }, 173 },
174 { 174 {
175 prop: "gyfs", 175 prop: "gyqk",
176 label: "共有情况", 176 label: "共有情况",
177 }, 177 },
178 { 178 {
...@@ -216,7 +216,7 @@ class data extends filter { ...@@ -216,7 +216,7 @@ class data extends filter {
216 label: "房地产交易价格(万元)", 216 label: "房地产交易价格(万元)",
217 }, 217 },
218 { 218 {
219 prop: "ytmc", 219 prop: "ghyt",
220 label: "规划用途", 220 label: "规划用途",
221 }, 221 },
222 { 222 {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 ]"> 22 ]">
23 <div class="setbut" v-if="item.prop == 'cz'"> 23 <div class="setbut" v-if="item.prop == 'cz'">
24 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 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> 25 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
26 </div> 26 </div>
27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 27 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'">
28 正在办理 28 正在办理
...@@ -105,6 +105,27 @@ export default { ...@@ -105,6 +105,27 @@ export default {
105 } 105 }
106 return name; 106 return name;
107 }, 107 },
108 // 新增一条补录信息
109 editDialog(row,del){
110 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
111 confirmButtonText: '确定',
112 cancelButtonText: '取消',
113 type: 'warning'
114 }).then(() => {
115 this.$parent.addRepairRecord(row,del)
116
117 this.$message({
118 type: 'success',
119 message: '补录成功!'
120 });
121 }).catch(() => {
122 this.$message({
123 type: 'info',
124 message: '取消编辑'
125 });
126 });
127
128 },
108 }, 129 },
109 }; 130 };
110 </script> 131 </script>
......
...@@ -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="editDialog(row,'D')">删除</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>
...@@ -100,14 +104,14 @@ export default { ...@@ -100,14 +104,14 @@ export default {
100 } 104 }
101 return name; 105 return name;
102 }, 106 },
103 // 编辑 107 // 新增一条补录信息
104 editDialog(row){ 108 editDialog(row,del){
105 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', { 109 this.$confirm('此操作将新增一条补录信息, 是否继续?', '提示', {
106 confirmButtonText: '确定', 110 confirmButtonText: '确定',
107 cancelButtonText: '取消', 111 cancelButtonText: '取消',
108 type: 'warning' 112 type: 'warning'
109 }).then(() => { 113 }).then(() => {
110 this.$parent.addRepairRecord(row) 114 this.$parent.addRepairRecord(row,del)
111 115
112 this.$message({ 116 this.$message({
113 type: 'success', 117 type: 'success',
...@@ -120,42 +124,7 @@ export default { ...@@ -120,42 +124,7 @@ export default {
120 }); 124 });
121 }); 125 });
122 126
123 // this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
124 // datalist:this.columns,
125 // data: row,
126
127 // })
128
129 }, 127 },
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 }
159 }, 128 },
160 }; 129 };
161 </script> 130 </script>
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
5 <el-row> 5 <el-row>
6 <el-col :span="24" class="btnColRight"> 6 <el-col :span="24" class="btnColRight">
7 <el-form-item> 7 <el-form-item>
8 {{ isRefresh }}
9 <el-button type="primary" @click="fetchData">查询</el-button> 8 <el-button type="primary" @click="fetchData">查询</el-button>
10 <el-button type="primary" @click="openAddDialog">新增</el-button> 9 <el-button type="primary" @click="openAddDialog">新增</el-button>
11 </el-form-item> 10 </el-form-item>
...@@ -25,12 +24,12 @@ ...@@ -25,12 +24,12 @@
25 </div> 24 </div>
26 </template> 25 </template>
27 <script> 26 <script>
28 import { mapGetters } from 'vuex' 27 import { mapGetters } from 'vuex'
29 import { getLodop } from "@/utils/LodopFuncs" 28 import { getLodop } from "@/utils/LodopFuncs"
30 import table from "@/utils/mixin/table" 29 import table from "@/utils/mixin/table"
31 import { datas, sendThis } from "./dymbgl" 30 import { datas, sendThis } from "./dymbgl"
32 import { selectPrintTemplateList, delPrintTemplate } from "@/api/system.js" 31 import { selectPrintTemplateList, delPrintTemplate } from "@/api/system.js"
33 export default { 32 export default {
34 name: "dymbgl", 33 name: "dymbgl",
35 mixins: [table], 34 mixins: [table],
36 data () { 35 data () {
...@@ -167,8 +166,8 @@ export default { ...@@ -167,8 +166,8 @@ export default {
167 LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后 166 LODOP.PRINT_DESIGN(); //打印设计或者打印维护需要放到最后
168 }, 167 },
169 }, 168 },
170 }; 169 };
171 </script> 170 </script>
172 <style scoped lang="scss"> 171 <style scoped lang="scss">
173 @import "~@/styles/public.scss"; 172 @import "~@/styles/public.scss";
174 </style> 173 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-31 16:04:44 4 * @LastEditTime: 2023-06-20 16:09:31
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
8 <!-- 表单部分 --> 8 <!-- 表单部分 -->
9 <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length > 1"> 9 <el-tabs v-model="activeName" @tab-click="handleClick" v-if="headTabBdcqz.length >1">
10 <el-tab-pane :label="item.qlr + '(' + item.bdcqzh + ')'" :name="item.bsmBdcqz" 10 <el-tab-pane :label="item.qlr + '(' + item.bdcqzh + ')'" :name="item.bdcqzlx"
11 v-for="(item, index) in headTabBdcqz" :key="index"></el-tab-pane> 11 v-for="(item, index) in headTabBdcqz" :key="index"></el-tab-pane>
12 </el-tabs> 12 </el-tabs>
13 <div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div> 13 <div class="no-data" v-if="headTabBdcqz.length == 0">暂无数据</div>
14 <!-- <img :src="previewImage" class="imgClass"> --> 14 <canvas ref="zs" width="1000" v-if="activeName==1" height="700"></canvas>
15 <canvas ref="canvas" :width="canvasWidth" :height="canvasHeight"></canvas> 15 <canvas ref="zm" width="1180" v-else height="780"></canvas>
16 </div> 16 </div>
17 </template> 17 </template>
18 18
...@@ -30,9 +30,7 @@ ...@@ -30,9 +30,7 @@
30 data () { 30 data () {
31 return { 31 return {
32 imgSrc: require('@/image/bdcqz/bdcqzs2.jpg'), 32 imgSrc: require('@/image/bdcqz/bdcqzs2.jpg'),
33 canvasWidth: 1018, 33 bdczmSrc: require('@/image/bdcqz/bdczm.jpg'),
34 canvasHeight: 720,
35
36 loading: false, 34 loading: false,
37 //印刷序列号集合 35 //印刷序列号集合
38 ysxlh: [], 36 ysxlh: [],
...@@ -79,10 +77,14 @@ ...@@ -79,10 +77,14 @@
79 getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(res => { 77 getSlsqBdcqzList({ bsmSlsq: this.formData.bsmSlsq }).then(res => {
80 if (res.code == 200) { 78 if (res.code == 200) {
81 if (res.result && res.result.length > 0) { 79 if (res.result && res.result.length > 0) {
82 this.activeName = res.result[0].bsmBdcqz 80 this.activeName = res.result[0].bdcqzlx
83 this.bdcqz = res.result[0] 81 this.bdcqz = res.result[0]
84 this.headTabBdcqz = res.result 82 this.headTabBdcqz = res.result
85 this.drawTextOnImage(); 83 if (this.activeName == 1) {
84 this.drawTextOnImage()
85 } else {
86 this.drawTextzmImage()
87 }
86 } 88 }
87 } 89 }
88 this.loading = false 90 this.loading = false
...@@ -91,26 +93,21 @@ ...@@ -91,26 +93,21 @@
91 //tab表头切换方法 93 //tab表头切换方法
92 handleClick (e) { 94 handleClick (e) {
93 this.bdcqz = this.headTabBdcqz[e.index - 0] 95 this.bdcqz = this.headTabBdcqz[e.index - 0]
94 this.activeName = this.headTabBdcqz.bsmBdcqz 96 this.activeName = this.headTabBdcqz.bdcqzlx
95 // this.getBdcqzPreview(); 97 if (this.activeName == 1) {
96 this.drawTextOnImage() 98 this.drawTextOnImage()
99 } else {
100 this.drawTextzmImage()
101 }
97 }, 102 },
98 // getBdcqzPreview () { 103 // 不动产证书
99 // bdcqzPreview(this.bdcqz).then(res => {
100 // this.loading = false
101 // let blob = new Blob([res]);
102 // let url = window.URL.createObjectURL(blob);
103 // this.previewImage = url;
104 // this.drawTextOnImage()
105 // })
106 // },
107 drawTextOnImage () { 104 drawTextOnImage () {
108 const canvas = this.$refs.canvas; 105 const canvas = this.$refs.zs;
109 const context = canvas.getContext('2d'); 106 const context = canvas.getContext('2d');
110 const image = new Image(); 107 const image = new Image();
111 image.onload = () => { 108 image.onload = () => {
112 context.drawImage(image, 0, 0); 109 context.drawImage(image, 0, 0);
113 context.font = '15px 楷体'; 110 context.font = '18px 楷体';
114 context.fillStyle = '#000000'; 111 context.fillStyle = '#000000';
115 context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 60, 56); 112 context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 60, 56);
116 context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 113, 56); 113 context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 113, 56);
...@@ -125,10 +122,79 @@ ...@@ -125,10 +122,79 @@
125 context.fillText(this.bdcqz.yt ? this.bdcqz.yt : '', 138, 346); 122 context.fillText(this.bdcqz.yt ? this.bdcqz.yt : '', 138, 346);
126 context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 138, 386); 123 context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 138, 386);
127 context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 138, 429); 124 context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 138, 429);
128 context.fillText(this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk : '', 138, 469); 125 // qlqtzk
126 const maxWidth = 280; // 最大宽度限制
127 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
128 lines.forEach((line, index) => {
129 const y = 469 + (index * 37); // 每行文本的垂直位置
130 let currentLine = '';
131 let arr = [];
132 for (let word of line) {
133 const testLine = currentLine + word;
134 const lineWidth = context.measureText(testLine).width;
135 if (lineWidth <= maxWidth) {
136 currentLine = testLine;
137 } else {
138 arr.push(currentLine);
139 currentLine = word;
140 }
141 }
142 arr.push(currentLine);
143 arr.forEach((line, index) => {
144 context.fillText(line, 138, y + (index * 20)); // 调整行高
145 })
146 })
129 context.fillText(this.bdcqz.fj ? this.bdcqz.fj : '', 580, 100); 147 context.fillText(this.bdcqz.fj ? this.bdcqz.fj : '', 580, 100);
130 } 148 }
131 image.src = this.imgSrc; 149 image.src = this.imgSrc
150 },
151 // 不动产证明
152 drawTextzmImage () {
153 const canvas = this.$refs.zm;
154 const context = canvas.getContext('2d');
155 const image = new Image();
156 image.onload = () => {
157 context.drawImage(image, 0, 0);
158 context.font = '18px 楷体';
159 context.fillStyle = '#000000';
160 context.fillText(this.bdcqz.sjjc ? this.bdcqz.sjjc : '', 620, 125);
161 context.fillText(this.bdcqz.djnd ? this.bdcqz.djnd : '', 665, 125);
162 context.fillText(this.bdcqz.sxqc ? this.bdcqz.sxqc : '', 750, 125);
163 context.fillText(this.bdcqz.sxh ? this.bdcqz.sxh : '', 960, 123);
164 context.fillText(this.bdcqz.zmqlhsx ? this.bdcqz.zmqlhsx : '', 775, 180);
165 context.fillText(this.bdcqz.qlr ? this.bdcqz.qlr : '', 775, 228);
166 // 义务人
167 context.fillText(this.bdcqz.ywr ? this.bdcqz.ywr : '', 775, 275);
168 context.fillText(this.bdcqz.zl ? this.bdcqz.zl : '', 775, 325);
169 // bdcdyh
170 context.fillText(this.bdcqz.bdcdyh ? this.bdcqz.bdcdyh : '', 775, 373);
171 // qlqtzk
172 const maxWidth = 280; // 最大宽度限制
173 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
174 lines.forEach((line, index) => {
175 const y = 415 + (index * 37); // 每行文本的垂直位置
176 let currentLine = '';
177 let arr = [];
178 for (let word of line) {
179 const testLine = currentLine + word;
180 const lineWidth = context.measureText(testLine).width;
181 if (lineWidth <= maxWidth) {
182 currentLine = testLine;
183 } else {
184 arr.push(currentLine);
185 currentLine = word;
186 }
187 }
188 arr.push(currentLine);
189 arr.forEach((line, index) => {
190 context.fillText(line, 775, y + (index * 20)); // 调整行高
191 });
192 });
193 // fj
194 context.fillText(this.bdcqz.fj ? this.bdcqz.fj : '', 775, 650);
195 };
196
197 image.src = this.bdczmSrc;
132 } 198 }
133 } 199 }
134 } 200 }
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-06-16 10:38:23
5 -->
6 <template>
7 <div>
8 <lb-table :column="column" :pagination="false" :key="key" :heightNumSetting="true" :minHeight="150"
9 :data="tableDataList">
10 </lb-table>
11 <addQlr v-model="dialog" :details="details" :showButton="showButton" @updateDetail="handleupdateDetail" />
12 </div>
13 </template>
14 <script>
15 import { mapGetters } from 'vuex'
16 import { getIdCardInfo } from '@/utils/operation.js'
17 import addQlr from './dialog/addQlr.vue'
18 export default {
19 components: {
20 addQlr
21 },
22 computed: {
23 ...mapGetters(["dictData"]),
24 },
25 props: {
26 tableData: {
27 type: Array,
28 default: function () {
29 return []
30 }
31 },
32 gyfs: {
33 type: String,
34 default: '1'
35 }
36 },
37 data () {
38 return {
39 key: 0,
40 dataIndex: 0,
41 dialog: false,
42 isaddupdate: false,
43 showButton: this.$route.query.viewtype ? false : true,
44 details: {},
45 tableDataList: [],
46 InformationTable: [
47 {
48 width: '50',
49 renderHeader: (h, scope) => {
50 return <div> {
51 this.$route.query.viewtype == 1 ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i>
52 }
53 </div>
54 },
55 render: (h, scope) => {
56 return (
57 <div>
58 {
59 this.$route.query.viewtype == 1 ? <span>{scope.$index + 1}</span> :
60 <i class="el-icon-minus pointer" onClick={() => { this.deleClick(scope.$index, scope.row) }}></i>
61 }
62 </div>
63 )
64 }
65 },
66 {
67 label: '土地用途',
68 align: 'center',
69 render: (h, scope) => {
70 return <el-input v-model={scope.row.zjzl} ></el-input>
71 }
72 },
73 {
74 prop: "sqrmc",
75 label: "土地使用起始时间",
76 render: (h, scope) => {
77 return <el-input v-model={scope.row.zjzl} ></el-input>
78 }
79 },
80 {
81 prop: "zjzl",
82 label: "土地使用结束时间",
83 render: (h, scope) => {
84 return <el-input v-model={scope.row.zjzl} ></el-input>
85 }
86 },
87 {
88 prop: "zjh",
89 label: "土地使用期限",
90 render: (h, scope) => {
91 return <el-input v-model={scope.row.zjzl} ></el-input>
92 }
93 }
94 ],
95 column: []
96 }
97 },
98 watch: {
99 tableData: {
100 handler: function (val, oldVal) {
101 let that = this
102 this.$nextTick(() => {
103 if (val.length == 0 || !val) {
104 that.tableDataList = _.cloneDeep([{
105 sqrmc: '',
106 dlrzjlx: '',
107 dlrzjh: '',
108 fr: ''
109 }])
110 } else {
111 that.tableDataList = _.cloneDeep(val)
112 }
113 })
114 },
115 immediate: true,
116 deep: true
117 },
118 gyfs: {
119 handler (newVal, oldValue) {
120 let dataList = _.cloneDeep(this.InformationTable)
121 if (newVal == 0) {
122 // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
123 this.column = _.cloneDeep(dataList)
124
125 } else if ((newVal == '1' || newVal == '3')) {
126 this.column = dataList
127 } else {
128 this.column = _.cloneDeep(dataList)
129 this.column.splice(
130 2, 0, {
131 prop: "fs",
132 label: "份数"
133 })
134 }
135 },
136 immediate: true
137 }
138 },
139 methods: {
140 handleupdateDetail (value) {
141 if (this.isaddupdate) {
142 if (!_.isEqual(value, this.tableData)) {
143 this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
144 this.$emit('upDateQlrxxList', this.tableDataList)
145 }
146 } else {
147 if (!_.isEqual(value, this.tableData)) {
148 this.tableDataList[this.dataIndex] = _.cloneDeep(value);
149 this.$emit('upDateQlrxxList', this.tableDataList)
150 }
151 }
152 this.key++
153 },
154 // 新增
155 addClick () {
156 if (this.gyfs == '0' && this.tableDataList.length > 0) {
157 this.$message.warning("当前共有方式为单独所有,无法添加多个权利人")
158 } else {
159 this.dialog = true
160 this.isaddupdate = true
161 }
162 },
163
164 // 删除
165 deleClick (index, row) {
166 this.$confirm('确定要删除吗, 是否继续?', '提示', {
167 confirmButtonText: '确定',
168 cancelButtonText: '取消',
169 type: 'warning'
170 }).then(() => {
171 this.tableData.splice(index, 1)
172 }).catch(() => {
173 });
174 },
175
176 // 身份证读取
177 readClick (row) {
178 getIdCardInfo().then(res => {
179 if (res.data.code == 0) {
180 let data = res.data.IDCardInfo
181 row.sqrmc = data.name
182 row.zjzl = '1'
183 row.zjh = data.cardID
184 row.xb = data.sexCode
185 row.txdz = data.address
186 row.fzjg = data.issueOrgan
187 this.$message({
188 message: '读取成功!',
189 type: 'success'
190 })
191 } else {
192 this.$message({
193 message: res.data.message,
194 type: 'warning'
195 })
196 }
197 })
198 },
199 // 修改
200 editClick (index, row) {
201 // popupDialog("申请人信息", "workflow/components/addQlr", {
202 // showButton: this.$route.query.viewtype ? false : true,
203 // dataIndex :index,
204 // details :row,
205 // isaddupdate :false
206 // });
207 this.dataIndex = index
208 this.dialog = true
209 this.details = row
210 this.isaddupdate = false
211 },
212 queryViewClick (index, row) {
213 // popupDialog("申请人信息", "workflow/components/addQlr", {
214 // showButton: this.$route.query.viewtype ? false : true,
215 // details: row,
216 // });
217 this.dialog = true
218 this.details = row
219 }
220 }
221 }
222 </script>
223 <style scoped lang="scss">
224 .el-input {
225 border: none !important;
226 }
227 </style>
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-18 15:01:31 4 * @LastEditTime: 2023-06-20 11:28:09
5 */ 5 */
6 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js"; 6 import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
7 import { getPrintTemplateByCode } from "@/api/system"; 7 import { getPrintTemplateByCode } from "@/api/system";
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
106 this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", { 106 this.$popupDialog("证书预览", "workflow/components/dialog/zsyl", {
107 bsmSlsq: this.bsmSlsq, 107 bsmSlsq: this.bsmSlsq,
108 entryType: '1' 108 entryType: '1'
109 }, '65%', true) 109 }, '1210px', true)
110 break; 110 break;
111 case "B6": 111 case "B6":
112 //根据编号获取对应信息 112 //根据编号获取对应信息
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-25 08:41:40 4 * @LastEditTime: 2023-06-20 10:27:45
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
224 ...res.result.qlxxdatas, 224 ...res.result.qlxxdatas,
225 } 225 }
226 //初始化发证方式,1:小证,2:大正 226 //初始化发证方式,1:小证,2:大正
227 this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs='1' : this.ruleForm.slsq.fzfs; 227 this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
228 } 228 }
229 }); 229 });
230 }, 230 },
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-25 08:41:33 4 * @LastEditTime: 2023-06-20 10:27:49
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
210 ...res.result.jsydsyqdatas, 210 ...res.result.jsydsyqdatas,
211 }; 211 };
212 //初始化发证方式,1:小证,2:大正 212 //初始化发证方式,1:小证,2:大正
213 this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs='1' : this.ruleForm.slsq.fzfs; 213 this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
214 } 214 }
215 }); 215 });
216 }, 216 },
......
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
110 <el-row :gutter="10"> 110 <el-row :gutter="10">
111 <el-col :span="8"> 111 <el-col :span="8">
112 <el-form-item label="房屋用途:"> 112 <el-form-item label="房屋用途:">
113 <el-input disabled v-model="ruleForm.fwyt"></el-input> 113 <el-input disabled v-model="ruleForm.ytmc"></el-input>
114 </el-form-item> 114 </el-form-item>
115 </el-col> 115 </el-col>
116 <el-col :span="8"> 116 <el-col :span="8">
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
8 <div class="slxx"> 8 <div class="slxx loadingtext">
9 <el-form :model="ruleForm" :rules="rules" class="loadingtext" ref="ruleForm" :label-position="flag ? 'top' : ''" 9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="flag ? 'top' : ''"
10 :inline="flag" label-width="120px"> 10 :inline="flag" label-width="120px">
11 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''"> 11 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
12 <div class="slxx_title title-block"> 12 <div class="slxx_title title-block">
...@@ -202,8 +202,8 @@ ...@@ -202,8 +202,8 @@
202 Init(formdata).then((res) => { 202 Init(formdata).then((res) => {
203 if (res.code === 200 && res.result) { 203 if (res.code === 200 && res.result) {
204 this.ruleForm = res.result; 204 this.ruleForm = res.result;
205 this.$endLoading();
206 } 205 }
206 this.$endLoading();
207 }); 207 });
208 }, 208 },
209 components: { qlrCommonTable }, 209 components: { qlrCommonTable },
......
...@@ -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: "权利类型",
......