Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
3cba72e9 by 田浩浩
Options

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

2 parents f5b76728 7f33f084
Inline Side-by-side
Showing 35 changed files with 276 additions and 281 deletions
1 export default { 1 export default {
2 SERVERAPI: '/service-bdcdj-Tian', 2 SERVERAPI: '/service-bdcdj9',
3 SERVERCAI: '/service-bdcdj-Tian' 3 // SERVERCAI: '/service-bdcdj-Tian'
4 } 4 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -13,8 +13,7 @@ export function getQlxxDictList (data) { ...@@ -13,8 +13,7 @@ export function getQlxxDictList (data) {
13 return request({ 13 return request({
14 url: SERVER.SERVERAPI + '/rest/sys/dict/getQlxxDictList', 14 url: SERVER.SERVERAPI + '/rest/sys/dict/getQlxxDictList',
15 method: 'post', 15 method: 'post',
16 data, 16 data
17 showLoading: true
18 }) 17 })
19 } 18 }
20 /* 19 /*
...@@ -36,8 +35,6 @@ export function editDictNode (data) { ...@@ -36,8 +35,6 @@ export function editDictNode (data) {
36 return request({ 35 return request({
37 url: SERVER.SERVERAPI + '/rest/sys/dict/editDictNode', 36 url: SERVER.SERVERAPI + '/rest/sys/dict/editDictNode',
38 method: 'post', 37 method: 'post',
39 data, 38 data
40 showLoading: true,
41 loadingTarget: '正在提交中...'
42 }) 39 })
43 } 40 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -13,8 +13,6 @@ export function addJtfcCxjgXx (data) { ...@@ -13,8 +13,6 @@ export function addJtfcCxjgXx (data) {
13 return request({ 13 return request({
14 url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/addJtfcCxjgXx', 14 url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/addJtfcCxjgXx',
15 method: 'post', 15 method: 'post',
16 data, 16 data
17 showLoading: true,
18 loadingTarget: '正在查询中...'
19 }) 17 })
20 } 18 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,12 +4,11 @@ import SERVER from './config' ...@@ -4,12 +4,11 @@ import SERVER from './config'
4 /* 4 /*
5 业务办理-选择单元-查询宗地基本信息 5 业务办理-选择单元-查询宗地基本信息
6 */ 6 */
7 export function selectZdjbxx(data) { 7 export function selectZdjbxx (data) {
8 return request({ 8 return request({
9 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxx', 9 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxx',
10 method: 'post', 10 method: 'post',
11 data, 11 data
12 showLoading: true
13 }) 12 })
14 } 13 }
15 14
...@@ -17,36 +16,33 @@ export function selectZdjbxx(data) { ...@@ -17,36 +16,33 @@ export function selectZdjbxx(data) {
17 /* 16 /*
18 业务办理-选择单元-查询建设用地、宅基地信息 17 业务办理-选择单元-查询建设用地、宅基地信息
19 */ 18 */
20 export function selectJsydQlxx(data) { 19 export function selectJsydQlxx (data) {
21 return request({ 20 return request({
22 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectJsydQlxx', 21 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectJsydQlxx',
23 method: 'post', 22 method: 'post',
24 data, 23 data
25 showLoading: true
26 }) 24 })
27 } 25 }
28 26
29 /* 27 /*
30 业务办理-选择单元-查询自然幢信息 28 业务办理-选择单元-查询自然幢信息
31 */ 29 */
32 export function selectZrz(data) { 30 export function selectZrz (data) {
33 return request({ 31 return request({
34 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrz', 32 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrz',
35 method: 'post', 33 method: 'post',
36 data, 34 data
37 showLoading: true
38 }) 35 })
39 } 36 }
40 37
41 /* 38 /*
42 业务办理-选择单元-查询户信息 39 业务办理-选择单元-查询户信息
43 */ 40 */
44 export function selectH(data) { 41 export function selectH (data) {
45 return request({ 42 return request({
46 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectH', 43 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectH',
47 method: 'post', 44 method: 'post',
48 data, 45 data
49 showLoading: true
50 }) 46 })
51 } 47 }
52 48
...@@ -56,8 +52,7 @@ export function selectOtherH (data) { ...@@ -56,8 +52,7 @@ export function selectOtherH (data) {
56 return request({ 52 return request({
57 url: 'ywbl/ywsq/selectOtherH', 53 url: 'ywbl/ywsq/selectOtherH',
58 method: 'post', 54 method: 'post',
59 data, 55 data
60 showLoading: true
61 }) 56 })
62 } 57 }
63 58
...@@ -76,52 +71,48 @@ export function selectOtherH (data) { ...@@ -76,52 +71,48 @@ export function selectOtherH (data) {
76 /* 71 /*
77 业务办理-选择权利信息-根据条件进行列表查询 72 业务办理-选择权利信息-根据条件进行列表查询
78 */ 73 */
79 export function selectQlxx(data) { 74 export function selectQlxx (data) {
80 return request({ 75 return request({
81 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectQlxx', 76 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectQlxx',
82 method: 'post', 77 method: 'post',
83 data, 78 data
84 showLoading: true
85 }) 79 })
86 } 80 }
87 /* 81 /*
88 业务办理-选择抵押权信息-根据条件进行列表查询 82 业务办理-选择抵押权信息-根据条件进行列表查询
89 */ 83 */
90 export function selectDiyaq(data) { 84 export function selectDiyaq (data) {
91 return request({ 85 return request({
92 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectDiyaq', 86 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectDiyaq',
93 method: 'post', 87 method: 'post',
94 data, 88 data
95 showLoading: true
96 }) 89 })
97 } 90 }
98 /* 91 /*
99 业务办理-选择查封信息-根据条件进行列表查询 92 业务办理-选择查封信息-根据条件进行列表查询
100 */ 93 */
101 export function selectCfdj(data) { 94 export function selectCfdj (data) {
102 return request({ 95 return request({
103 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectCfdj', 96 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectCfdj',
104 method: 'post', 97 method: 'post',
105 data, 98 data
106 showLoading: true
107 }) 99 })
108 } 100 }
109 101
110 /* 102 /*
111 业务办理-业务申请-添加收藏业务 103 业务办理-业务申请-添加收藏业务
112 */ 104 */
113 export function deleteCollectBiz(bsmSqyw) { 105 export function deleteCollectBiz (bsmSqyw) {
114 return request({ 106 return request({
115 url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/deleteCollectBiz?bsmSqyw=' + bsmSqyw, 107 url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/deleteCollectBiz?bsmSqyw=' + bsmSqyw,
116 method: 'post' 108 method: 'post'
117 }) 109 })
118 } 110 }
119 // 国有建设用地使用权/房屋使用权 -选择不动产单元 111 // 国有建设用地使用权/房屋使用权 -选择不动产单元
120 export function choiceBdcdy(data) { 112 export function choiceBdcdy (data) {
121 return request({ 113 return request({
122 url: SERVER.SERVERAPI + '/rest/business/workFlow/choiceBdcdy', 114 url: SERVER.SERVERAPI + '/rest/business/workFlow/choiceBdcdy',
123 method: 'post', 115 method: 'post',
124 data, 116 data
125 showLoading: true
126 }) 117 })
127 } 118 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -8,8 +8,7 @@ export function getSysSqdjywBysearch (data) { ...@@ -8,8 +8,7 @@ export function getSysSqdjywBysearch (data) {
8 return request({ 8 return request({
9 url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getSysSqdjywBysearch', 9 url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getSysSqdjywBysearch',
10 method: 'post', 10 method: 'post',
11 data, 11 data
12 showLoading: true
13 }) 12 })
14 } 13 }
15 /* 14 /*
...@@ -38,9 +37,7 @@ export function saveSqdjyw (data) { ...@@ -38,9 +37,7 @@ export function saveSqdjyw (data) {
38 return request({ 37 return request({
39 url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/saveSqdjyw', 38 url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/saveSqdjyw',
40 method: 'post', 39 method: 'post',
41 data, 40 data
42 showLoading: true,
43 loadingTarget: '正在保存中...'
44 }) 41 })
45 } 42 }
46 43
...@@ -51,8 +48,7 @@ export function sysSqywmbszSearch (data) { ...@@ -51,8 +48,7 @@ export function sysSqywmbszSearch (data) {
51 return request({ 48 return request({
52 url: SERVER.SERVERAPI + '/rest/system/sysSqywmbsz/search', 49 url: SERVER.SERVERAPI + '/rest/system/sysSqywmbsz/search',
53 method: 'post', 50 method: 'post',
54 data, 51 data
55 showLoading: true
56 }) 52 })
57 } 53 }
58 /* 54 /*
...@@ -71,7 +67,6 @@ export function updateSysSqywmbsz (data) { ...@@ -71,7 +67,6 @@ export function updateSysSqywmbsz (data) {
71 return request({ 67 return request({
72 url: SERVER.SERVERAPI + '/rest/system/sysSqywmbsz/updateSysSqywmbsz', 68 url: SERVER.SERVERAPI + '/rest/system/sysSqywmbsz/updateSysSqywmbsz',
73 method: 'put', 69 method: 'put',
74 data, 70 data
75 showLoading: true
76 }) 71 })
77 } 72 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -7,8 +7,7 @@ export function getErrorLogList (data) { ...@@ -7,8 +7,7 @@ export function getErrorLogList (data) {
7 return request({ 7 return request({
8 url: SERVER.SERVERAPI + '/rest/xtjk/view/getErrorLogList', 8 url: SERVER.SERVERAPI + '/rest/xtjk/view/getErrorLogList',
9 method: 'post', 9 method: 'post',
10 data, 10 data
11 showLoading: true
12 }) 11 })
13 } 12 }
14 13
...@@ -19,8 +18,7 @@ export function getOperationLogList (data) { ...@@ -19,8 +18,7 @@ export function getOperationLogList (data) {
19 return request({ 18 return request({
20 url: SERVER.SERVERAPI + '/rest/xtjk/view/getOperationLogList', 19 url: SERVER.SERVERAPI + '/rest/xtjk/view/getOperationLogList',
21 method: 'post', 20 method: 'post',
22 data, 21 data
23 showLoading: true
24 }) 22 })
25 } 23 }
26 24
...@@ -30,7 +28,6 @@ export function getOperationLogList (data) { ...@@ -30,7 +28,6 @@ export function getOperationLogList (data) {
30 export function getServerInfo () { 28 export function getServerInfo () {
31 return request({ 29 return request({
32 url: SERVER.SERVERAPI + '/rest/xtjk/view/getServerInfo', 30 url: SERVER.SERVERAPI + '/rest/xtjk/view/getServerInfo',
33 method: 'get', 31 method: 'get'
34 showLoading: true
35 }) 32 })
36 } 33 }
......
...@@ -3,11 +3,10 @@ import SERVER from './config' ...@@ -3,11 +3,10 @@ import SERVER from './config'
3 /* 3 /*
4 业务办理-获取收藏业务集合 4 业务办理-获取收藏业务集合
5 */ 5 */
6 export function getCollectBiz (headers) { 6 export function getCollectBiz () {
7 return request({ 7 return request({
8 url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getCollectBiz', 8 url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getCollectBiz',
9 method: 'post', 9 method: 'post'
10 headers
11 }) 10 })
12 } 11 }
13 12
...@@ -17,20 +16,16 @@ export function getCollectBiz (headers) { ...@@ -17,20 +16,16 @@ export function getCollectBiz (headers) {
17 export function getleftMenu () { 16 export function getleftMenu () {
18 return request({ 17 return request({
19 url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getleftMenu', 18 url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getleftMenu',
20 method: 'post', 19 method: 'post'
21 headers: {
22 showLoading: false
23 }
24 }) 20 })
25 } 21 }
26 /* 22 /*
27 业务办理-获取下个节点内容 23 业务办理-获取下个节点内容
28 */ 24 */
29 export function getNextNode (bsmSqyw, headers) { 25 export function getNextNode (bsmSqyw) {
30 return request({ 26 return request({
31 url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getNextNode?parentid=' + bsmSqyw, 27 url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getNextNode?parentid=' + bsmSqyw,
32 method: 'post', 28 method: 'post'
33 headers
34 }) 29 })
35 } 30 }
36 31
...@@ -52,18 +47,17 @@ export function selectScBdcdy (data) { ...@@ -52,18 +47,17 @@ export function selectScBdcdy (data) {
52 // return request({ 47 // return request({
53 // url: 'ywbl/ywsq/selectFwsyq', 48 // url: 'ywbl/ywsq/selectFwsyq',
54 // method: 'post', 49 // method: 'post',
55 // data, 50 // data
56 // showLoading: true 51 // showLoading: true
57 // }) 52 // })
58 // } 53 // }
59 54
60 // 待办箱列表查询接口 55 // 待办箱列表查询接口
61 export function searchTaskToDo (data, headers) { 56 export function searchTaskToDo (data) {
62 return request({ 57 return request({
63 url: SERVER.SERVERAPI + '/rest/workBox/search/searchTaskToDo', 58 url: SERVER.SERVERAPI + '/rest/workBox/search/searchTaskToDo',
64 method: 'post', 59 method: 'post',
65 data, 60 data
66 headers
67 }) 61 })
68 } 62 }
69 // 待办箱/不动产单元删除接口 63 // 待办箱/不动产单元删除接口
...@@ -81,8 +75,7 @@ export function startBusinessFlow (data) { ...@@ -81,8 +75,7 @@ export function startBusinessFlow (data) {
81 return request({ 75 return request({
82 url: SERVER.SERVERAPI + '/rest/business/workFlow/startBusinessFlow', 76 url: SERVER.SERVERAPI + '/rest/business/workFlow/startBusinessFlow',
83 method: 'post', 77 method: 'post',
84 data, 78 data
85 showLoading: true
86 }) 79 })
87 } 80 }
88 /* 81 /*
...@@ -92,19 +85,17 @@ export function searchTaskDone (data) { ...@@ -92,19 +85,17 @@ export function searchTaskDone (data) {
92 return request({ 85 return request({
93 url: SERVER.SERVERAPI + '/rest/workBox/search/searchTaskDone', 86 url: SERVER.SERVERAPI + '/rest/workBox/search/searchTaskDone',
94 method: 'post', 87 method: 'post',
95 data, 88 data
96 showLoading: true
97 }) 89 })
98 } 90 }
99 /* 91 /*
100 业务办理-选择权利信息-根据条件进行列表查询 92 业务办理-选择权利信息-根据条件进行列表查询
101 */ 93 */
102 export function selectQlxx (data, headers) { 94 export function selectQlxx (data) {
103 return request({ 95 return request({
104 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectQlxx', 96 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectQlxx',
105 method: 'post', 97 method: 'post',
106 data, 98 data
107 headers
108 }) 99 })
109 } 100 }
110 /* 101 /*
...@@ -114,8 +105,7 @@ export function selectDiyaq (data) { ...@@ -114,8 +105,7 @@ export function selectDiyaq (data) {
114 return request({ 105 return request({
115 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectDiyaq', 106 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectDiyaq',
116 method: 'post', 107 method: 'post',
117 data, 108 data
118 showLoading: true
119 }) 109 })
120 } 110 }
121 /* 111 /*
...@@ -125,8 +115,7 @@ export function selectCfdj (data) { ...@@ -125,8 +115,7 @@ export function selectCfdj (data) {
125 return request({ 115 return request({
126 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectCfdj', 116 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectCfdj',
127 method: 'post', 117 method: 'post',
128 data, 118 data
129 showLoading: true
130 }) 119 })
131 } 120 }
132 /* 121 /*
...@@ -152,8 +141,7 @@ export function choiceBdcdy (data) { ...@@ -152,8 +141,7 @@ export function choiceBdcdy (data) {
152 return request({ 141 return request({
153 url: SERVER.SERVERAPI + '/rest/business/workFlow/choiceBdcdy', 142 url: SERVER.SERVERAPI + '/rest/business/workFlow/choiceBdcdy',
154 method: 'post', 143 method: 'post',
155 data, 144 data
156 showLoading: true
157 }) 145 })
158 } 146 }
159 147
...@@ -162,8 +150,7 @@ export function deleteBdcdy (data) { ...@@ -162,8 +150,7 @@ export function deleteBdcdy (data) {
162 return request({ 150 return request({
163 url: SERVER.SERVERAPI + '/rest/business/workFlow/deleteBdcdy', 151 url: SERVER.SERVERAPI + '/rest/business/workFlow/deleteBdcdy',
164 method: 'post', 152 method: 'post',
165 data, 153 data
166 showLoading: true
167 }) 154 })
168 } 155 }
169 156
...@@ -172,7 +159,22 @@ export function selectOtherH (data) { ...@@ -172,7 +159,22 @@ export function selectOtherH (data) {
172 return request({ 159 return request({
173 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectOtherH', 160 url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectOtherH',
174 method: 'post', 161 method: 'post',
175 data, 162 data
176 showLoading: true 163 })
164 }
165
166 // 认领任务
167 export function claimTask (bsmSlsq,bestepid) {
168 return request({
169 url: SERVER.SERVERAPI + '/rest/business/workFlow/claimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
170 method: 'get',
171 })
172 }
173
174 // 取消认领任务
175 export function unClaimTask (bsmSlsq,bestepid) {
176 return request({
177 url: SERVER.SERVERAPI + '/rest/business/workFlow/unClaimTask?bsmSlsq=' + bsmSlsq + '&bestepid=' + bestepid,
178 method: 'get',
177 }) 179 })
178 } 180 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -17,8 +17,7 @@ export function getZsglrkList (data) { ...@@ -17,8 +17,7 @@ export function getZsglrkList (data) {
17 return request({ 17 return request({
18 url: SERVER.SERVERAPI + '/rest/sys/zsgl/getZsglrkList', 18 url: SERVER.SERVERAPI + '/rest/sys/zsgl/getZsglrkList',
19 method: 'post', 19 method: 'post',
20 data, 20 data
21 showLoading: true
22 }) 21 })
23 } 22 }
24 /* 23 /*
...@@ -28,9 +27,7 @@ export function zsrk (data) { ...@@ -28,9 +27,7 @@ export function zsrk (data) {
28 return request({ 27 return request({
29 url: SERVER.SERVERAPI + '/rest/sys/zsgl/zsrk', 28 url: SERVER.SERVERAPI + '/rest/sys/zsgl/zsrk',
30 method: 'post', 29 method: 'post',
31 data, 30 data
32 showLoading: true,
33 loadingTarget: '正在保存中...'
34 }) 31 })
35 } 32 }
36 /* 33 /*
...@@ -60,8 +57,7 @@ export function getZsglffList (data) { ...@@ -60,8 +57,7 @@ export function getZsglffList (data) {
60 return request({ 57 return request({
61 url: SERVER.SERVERAPI + '/rest/sys/zsgl/getZsglffList', 58 url: SERVER.SERVERAPI + '/rest/sys/zsgl/getZsglffList',
62 method: 'post', 59 method: 'post',
63 data, 60 data
64 showLoading: true
65 }) 61 })
66 } 62 }
67 /* 63 /*
...@@ -90,9 +86,7 @@ export function zsff (data) { ...@@ -90,9 +86,7 @@ export function zsff (data) {
90 return request({ 86 return request({
91 url: SERVER.SERVERAPI + '/rest/sys/zsgl/zsff', 87 url: SERVER.SERVERAPI + '/rest/sys/zsgl/zsff',
92 method: 'post', 88 method: 'post',
93 data, 89 data
94 showLoading: true,
95 loadingTarget: '正在保存中...'
96 }) 90 })
97 } 91 }
98 /* 92 /*
...@@ -112,8 +106,7 @@ export function getZssyqkList (data) { ...@@ -112,8 +106,7 @@ export function getZssyqkList (data) {
112 return request({ 106 return request({
113 url: SERVER.SERVERAPI + '/rest/sys/zsgl/getZssyqkList', 107 url: SERVER.SERVERAPI + '/rest/sys/zsgl/getZssyqkList',
114 method: 'post', 108 method: 'post',
115 data, 109 data
116 showLoading: true
117 }) 110 })
118 } 111 }
119 /* 112 /*
......
...@@ -2,9 +2,12 @@ import Vue from 'vue' ...@@ -2,9 +2,12 @@ import Vue from 'vue'
2 import Popup from './index.vue' 2 import Popup from './index.vue'
3 3
4 const PopupBox = Vue.extend(Popup) 4 const PopupBox = Vue.extend(Popup)
5 Popup.install = function (title, editItem, data) { 5 Popup.install = function (title, editItem, data, formData) {
6 data.title = title 6 data.title = title
7 data.editItem = editItem 7 data.editItem = editItem
8 if (formData) {
9 data.formData = formData
10 }
8 let instance = new PopupBox({ 11 let instance = new PopupBox({
9 data 12 data
10 }).$mount() 13 }).$mount()
...@@ -13,5 +16,4 @@ Popup.install = function (title, editItem, data) { ...@@ -13,5 +16,4 @@ Popup.install = function (title, editItem, data) {
13 instance.isShow = true 16 instance.isShow = true
14 }) 17 })
15 } 18 }
16
17 export default Popup
...\ No newline at end of file ...\ No newline at end of file
19 export default Popup
......
...@@ -55,21 +55,21 @@ export default { ...@@ -55,21 +55,21 @@ export default {
55 }, 55 },
56 mounted () { 56 mounted () {
57 // 计算滚动条高度 57 // 计算滚动条高度
58 // setTimeout(() => { 58 setTimeout(() => {
59 // if (this.btnShow) { 59 if (this.btnShow) {
60 // if (this.height == 'auto') { 60 if (this.height == 'auto') {
61 // this.contentHeight = (this.$refs.contentRef.offsetHeight - 200) + 'px' 61 this.contentHeight = (this.$refs.contentRef.offsetHeight - 200) + 'px'
62 // } else { 62 } else {
63 // this.contentHeight = this.height 63 this.contentHeight = this.height
64 // } 64 }
65 // } else { 65 } else {
66 // if (this.height == 'auto') { 66 if (this.height == 'auto') {
67 // this.contentHeight = this.$refs.contentRef.offsetHeight 67 this.contentHeight = this.$refs.contentRef.offsetHeight
68 // } else { 68 } else {
69 // this.contentHeight = this.height 69 this.contentHeight = this.height
70 // } 70 }
71 // } 71 }
72 // }, 500) 72 }, 300)
73 }, 73 },
74 methods: { 74 methods: {
75 onCancel () { 75 onCancel () {
...@@ -78,12 +78,12 @@ export default { ...@@ -78,12 +78,12 @@ export default {
78 }, 78 },
79 onConfirm () { 79 onConfirm () {
80 this.loading = true 80 this.loading = true
81 let isOk = this.$refs.childRef.childFn() //子组件方法 必须命名一致 81 let res = new Promise((resolve, reject) => {
82 if (isOk || isOk == undefined) { //如果子组件没有 return false 就代表子组件方法一切正常
83 this.isShow = false
84 this.confirm() 82 this.confirm()
85 } else { //否则 83 resolve(true)
86 console.log('弹窗不关闭') 84 })
85 if (res) {
86 this.isShow = false
87 } 87 }
88 }, 88 },
89 loadingFn (e) { //加载状态 89 loadingFn (e) { //加载状态
...@@ -93,11 +93,10 @@ export default { ...@@ -93,11 +93,10 @@ export default {
93 return (r) => 93 return (r) =>
94 require.ensure([], () => 94 require.ensure([], () =>
95 r(require(`@/views/${view}.vue`)) 95 r(require(`@/views/${view}.vue`))
96 ); 96 )
97 } 97 }
98 }, 98 },
99 destroyed () { 99 destroyed () {
100 // if appendToBody is true, remove DOM node after destroy
101 if (this.appendToBody && this.$el && this.$el.parentNode) { 100 if (this.appendToBody && this.$el && this.$el.parentNode) {
102 this.$el.parentNode.removeChild(this.$el); 101 this.$el.parentNode.removeChild(this.$el);
103 } 102 }
...@@ -146,6 +145,8 @@ export default { ...@@ -146,6 +145,8 @@ export default {
146 .ls-mask-content { 145 .ls-mask-content {
147 padding: 20px; 146 padding: 20px;
148 width: 100%; 147 width: 100%;
148 min-height: 30%;
149 max-height: 95%;
149 overflow: scroll; 150 overflow: scroll;
150 } 151 }
151 152
......
1 弹窗封装 1 弹窗封装
2 2.用法以及参数： 2 2.用法以及参数：
3 this.$popup('提示','ywbl/dbx/aa',{ 3 this.$popup('提示','ywbl/dbx/aa',{
4 formData:this.formData, //父组件传给子组件的参数 4 width: '75%', // 初始化75% 不需要改的话 可以直接不要
5 cancel: function () {}, //取消事件的回调 5 formData: this.formData, // 父组件传给子组件的参数
6 confirm: function () {}, //确认事件的回调 6 cancel: function () {}, //取消事件的回调 没有按钮可以不需要
7 }) 7 confirm: function () {} //确认事件的回调 没有按钮可以不需要
8 3.子组件的方法名字必须统一为 childFn() 8 })
9 4.子组件切记props接收 父组件传参formData
10 以及在使用结束后传loading状态给父组件
11 9
12 5.后续有修改请添加在此处文档说明作用 10 5.后续有修改请添加在此处文档说明作用
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -8,11 +8,15 @@ import './styles/element-variables.scss' ...@@ -8,11 +8,15 @@ import './styles/element-variables.scss'
8 import '@/styles/index.scss' 8 import '@/styles/index.scss'
9 import Base from './components/Base/base' // 全局组件引入 9 import Base from './components/Base/base' // 全局组件引入
10 import mixin from '@/utils/mixin/theme.js' 10 import mixin from '@/utils/mixin/theme.js'
11 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading'
11 Vue.mixin(mixin); 12 Vue.mixin(mixin);
12 13
13 import rules from './utils/rule.js' 14 import rules from './utils/rule.js'
14 // 全局方法挂载 15 // 全局方法挂载
15 Vue.prototype.$rules = rules 16 Vue.prototype.$rules = rules
17 // 全局加载
18 Vue.prototype.$startLoading = startLoadingAddCount
19 Vue.prototype.$endLoading = endLoadingSubCount
16 20
17 import Popup from './components/tanchuang/index' 21 import Popup from './components/tanchuang/index'
18 Vue.prototype.$popup = Popup.install 22 Vue.prototype.$popup = Popup.install
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 */ 3 */
4 import axios from 'axios' 4 import axios from 'axios'
5 import { Message } from 'element-ui' 5 import { Message } from 'element-ui'
6 import { startLoadingAddCount, endLoadingSubCount } from './requestLoading' 6 import { endLoadingSubCount } from './requestLoading'
7 7
8 // create an axios instance 8 // create an axios instance
9 const service = axios.create({ 9 const service = axios.create({
...@@ -12,11 +12,6 @@ const service = axios.create({ ...@@ -12,11 +12,6 @@ const service = axios.create({
12 headers: { 12 headers: {
13 'Content-Type': 'application/json; charset=utf-8', 13 'Content-Type': 'application/json; charset=utf-8',
14 'Authorization': 'bearer AT-4-MxSrO29Coe7VTazx8uuixtqqgO-hvCB6' 14 'Authorization': 'bearer AT-4-MxSrO29Coe7VTazx8uuixtqqgO-hvCB6'
15 //token列表
16 //'Authorization': 'bearer AT-12-eRKHta5I8ZWftIU86sSyJ8rUkPhMvMJU'
17 //renc:bearer AT-30-KHB4LXc8-CZXwBEyaFJa9lRmMTc5sHVI
18 //tianh:bearer AT-33-3zFTGkhQ4eUv4nXvzAmbgN5RPZppzEY6
19 //zhangh:bearer AT-7-Tx8dlZH0LNRc33UjD1CX1xwa-1D7kQmQ
20 }, 15 },
21 timeout: 15000 16 timeout: 15000
22 }) 17 })
...@@ -24,20 +19,12 @@ const service = axios.create({ ...@@ -24,20 +19,12 @@ const service = axios.create({
24 // request interceptor 19 // request interceptor
25 service.interceptors.request.use( 20 service.interceptors.request.use(
26 config => { 21 config => {
27 if (config.headers.showLoading !== false) {
28 startLoadingAddCount(config.headers.loadingTarget ? config.headers.loadingTarget : '正在加载中...',
29 config.headers.target ? config.headers.target : 'body');
30 }
31 config.headers.Authorization = 22 config.headers.Authorization =
32 'bearer AT-4-MxSrO29Coe7VTazx8uuixtqqgO-hvCB6' 23 'bearer AT-4-MxSrO29Coe7VTazx8uuixtqqgO-hvCB6'
33 config.headers.Accept = 'application/json' 24 config.headers.Accept = 'application/json'
34 return config 25 return config
35 }, 26 },
36 error => { 27 error => {
37 if (error.headers.showLoading !== false) {
38 endLoadingSubCount(config.headers.loadingTarget ? config.headers.loadingTarget : '正在加载中...',
39 config.headers.target ? config.headers.target : 'body');
40 }
41 Message.error('请求超时!'); 28 Message.error('请求超时!');
42 return Promise.reject(error) 29 return Promise.reject(error)
43 } 30 }
...@@ -46,9 +33,6 @@ service.interceptors.request.use( ...@@ -46,9 +33,6 @@ service.interceptors.request.use(
46 // response interceptor 33 // response interceptor
47 service.interceptors.response.use( 34 service.interceptors.response.use(
48 response => { 35 response => {
49 if (response.config.headers.showLoading !== false) {
50 endLoadingSubCount();
51 }
52 /** 36 /**
53 * 对响应数据判断: 37 * 对响应数据判断:
54 * 如果成功返回数据，就通过return把数据返出去 38 * 如果成功返回数据，就通过return把数据返出去
...@@ -62,15 +46,13 @@ service.interceptors.response.use( ...@@ -62,15 +46,13 @@ service.interceptors.response.use(
62 return response; 46 return response;
63 }, 47 },
64 error => { 48 error => {
49 endLoadingSubCount()
65 // 对响应错误做点什么 50 // 对响应错误做点什么
66 Message({ 51 Message({
67 message: '服务器异常,请联系管理员', 52 message: '服务器异常,请联系管理员',
68 type: 'error', 53 type: 'error',
69 duration: 5 * 1000 54 duration: 5 * 1000
70 }) 55 })
71 if (error.config.headers.showLoading !== false) {
72 endLoadingSubCount();
73 }
74 return Promise.reject(error); 56 return Promise.reject(error);
75 } 57 }
76 ) 58 )
...@@ -92,12 +74,6 @@ function handleErrorData (errMes) { ...@@ -92,12 +74,6 @@ function handleErrorData (errMes) {
92 case 500: 74 case 500:
93 Message.error("服务器错误!"); 75 Message.error("服务器错误!");
94 break; 76 break;
95 case 504:
96 Message.error("网络超时!");
97 break;
98 case 2002:
99 Message.error(errMes.message);
100 break;
101 default: 77 default:
102 Message.error("服务正在联调中，请稍后!"); 78 Message.error("服务正在联调中，请稍后!");
103 break; 79 break;
......
1 // import { Loading } from 'element-ui'
2 import Loading from '@/components/loading/index.js'; 1 import Loading from '@/components/loading/index.js';
3 // 定义 loading 2 // 定义 loading
4 let loading 3 let loading
5 4
6 // loading开始 方法 5 // loading开始 方法
7 function startLoading (LoadingText = '正在加载中...', target = "body") { 6 function startLoading (target, loadingText = '正在加载中...') {
8 loading = Loading.service({ 7 loading = Loading.service({
9 text: LoadingText, 8 text: loadingText,
10 spinner: 'el-icon-loading', 9 spinner: 'el-icon-loading',
11 background: 'rgba(255, 255, 255, 0.5)', 10 background: 'rgba(255, 255, 255, 0.5)',
12 target: target 11 target: target ? '#' + target : 'body'
13 }) 12 })
14 } 13 }
15 14
......
...@@ -328,8 +328,7 @@ export default { ...@@ -328,8 +328,7 @@ export default {
328 }; 328 };
329 }, 329 },
330 mounted () { 330 mounted () {
331 this.getLpb('9434bdb243ba342cc6c043065fc9e480'); 331 this.getLpb(this.zrzbsm ? this.zrzbsm : '9434bdb243ba342cc6c043065fc9e480');
332 // this.getLpb(this.zrzbsm);
333 setTimeout(() => { 332 setTimeout(() => {
334 //让滚动条滚动至最下面 -6是横向滚动条的高度 333 //让滚动条滚动至最下面 -6是横向滚动条的高度
335 this.$refs.lpbContent.scrollTop = 334 this.$refs.lpbContent.scrollTop =
...@@ -679,7 +678,6 @@ export default { ...@@ -679,7 +678,6 @@ export default {
679 handleAddH () { }, 678 handleAddH () { },
680 handleMoveH () { 679 handleMoveH () {
681 // 移动户 680 // 移动户
682 console.log(this.chData, "chData");
683 console.log(this.$parent.scyclx, "实预测类型"); 681 console.log(this.$parent.scyclx, "实预测类型");
684 this.moveHvisible = true; 682 this.moveHvisible = true;
685 }, 683 },
...@@ -726,7 +724,7 @@ export default { ...@@ -726,7 +724,7 @@ export default {
726 type: "warning", 724 type: "warning",
727 }); 725 });
728 } 726 }
729 }); 727 })
730 }) 728 })
731 .catch(() => { }); 729 .catch(() => { });
732 }, 730 },
...@@ -743,15 +741,14 @@ export default { ...@@ -743,15 +741,14 @@ export default {
743 } else { 741 } else {
744 this.$message({ 742 this.$message({
745 message: res.message, 743 message: res.message,
746 type: "warning", 744 type: "warning"
747 }); 745 })
748 } 746 }
749 }); 747 })
750 }, 748 },
751 //户合并 749 //户合并
752 handleHb (type) { 750 handleHb (type) {
753 let olbBsms = ''; 751 let olbBsms = '';
754 console.log(this.fghbChoosedList, 'fghbChoosedList');
755 this.hbsmList.forEach((item, index) => { 752 this.hbsmList.forEach((item, index) => {
756 olbBsms += index < this.hbsmList.length - 1 ? item + ',' : item 753 olbBsms += index < this.hbsmList.length - 1 ? item + ',' : item
757 }) 754 })
...@@ -771,7 +768,6 @@ export default { ...@@ -771,7 +768,6 @@ export default {
771 "zdybsm": this.fghbChoosedList[0].zdybsm, 768 "zdybsm": this.fghbChoosedList[0].zdybsm,
772 "zrzbsm": this.fghbChoosedList[0].zrzbsm 769 "zrzbsm": this.fghbChoosedList[0].zrzbsm
773 } 770 }
774 vm.loadingShow('请求发送中');
775 // hhb(params).then((res) => { 771 // hhb(params).then((res) => {
776 // vm.loadingHide(); 772 // vm.loadingHide();
777 // if (res.code == 200) { 773 // if (res.code == 200) {
...@@ -801,7 +797,6 @@ export default { ...@@ -801,7 +797,6 @@ export default {
801 }, 797 },
802 //户分割保存 798 //户分割保存
803 savefgData () { 799 savefgData () {
804 vm.loadingShow('请求发送中');
805 // hfg(this.fgData).then((res) => { 800 // hfg(this.fgData).then((res) => {
806 // vm.loadingHide(); 801 // vm.loadingHide();
807 // if (res.code == 200) { 802 // if (res.code == 200) {
...@@ -1040,8 +1035,8 @@ export default { ...@@ -1040,8 +1035,8 @@ export default {
1040 1035
1041 .zdy-name { 1036 .zdy-name {
1042 width: 100%; 1037 width: 100%;
1043 bottom: 0; 1038 // bottom: 0;
1044 position: absolute; 1039 // position: absolute;
1045 height: 40px; 1040 height: 40px;
1046 // background-color: rosybrown; 1041 // background-color: rosybrown;
1047 // border:1px solid #E6E6E6 1042 // border:1px solid #E6E6E6
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 } 39 }
40 40
41 .xxTable { 41 .xxTable {
42 border-spacing: 1px; 42 //border-spacing: 1px;
43 width: 100%; 43 width: 100%;
44 44
45 tr>th { 45 tr>th {
...@@ -146,4 +146,4 @@ ...@@ -146,4 +146,4 @@
146 margin-left: 2px; 146 margin-left: 2px;
147 } 147 }
148 } 148 }
149 }
...\ No newline at end of file ...\ No newline at end of file
149 }
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
28 </div> 28 </div>
29 <!-- 表格 --> 29 <!-- 表格 -->
30 <div class="from-clues-content"> 30 <div class="from-clues-content">
31 <lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.current" 31 <lb-table :page-size="pageData.size" id="dydjb" border @sort-change="handleSort"
32 :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 32 :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
33 :column="tableData.columns" :data="tableData.data"> 33 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
34 </lb-table> 34 </lb-table>
35 </div> 35 </div>
36 </div> 36 </div>
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
66 methods: { 66 methods: {
67 // 初始化数据 67 // 初始化数据
68 fetchData () { 68 fetchData () {
69 getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => { 69 getJtfcPage({ ...this.queryForm, ...this.pageData }, { 'target': '#dydjb' }).then((res) => {
70 let { records, total } = res.result; 70 let { records, total } = res.result;
71 this.tableData.data = records; 71 this.tableData.data = records;
72 this.tableData.total = total; 72 this.tableData.total = total;
...@@ -78,27 +78,22 @@ export default { ...@@ -78,27 +78,22 @@ export default {
78 78
79 dydjbClick (scope) { 79 dydjbClick (scope) {
80 // var sqcxBsm = scope.row.bsmSqcx; 80 // var sqcxBsm = scope.row.bsmSqcx;
81 this.$popup({ 81 this.$popup("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
82 title: "打印登记薄",
83 width: "65%",
84 btnShow: true, 82 btnShow: true,
85 editItem: "sqcx/dydjb/components/dydjbInfo", // 弹窗内容
86 height: "800px", 83 height: "800px",
87 formData: { 84 formData: {
88 sqcxdata: scope.row, 85 sqcxdata: scope.row,
89 }, 86 },
90 cancel: function () { }, //取消事件的回调 87 cancel: function () { }, //取消事件的回调
91 confirm: function () { 88 confirm: function () {
92 // that.loadBdcdylist(); 89 }
93 }, //确认事件的回调 90 })
94 });
95 }, 91 },
96
97 queryClick () { 92 queryClick () {
98 this.fetchData(); 93 this.fetchData();
99 }, 94 }
100 }, 95 }
101 }; 96 }
102 </script> 97 </script>
103 <style scoped lang="scss"> 98 <style scoped lang="scss">
104 @import "~@/styles/public.scss"; 99 @import "~@/styles/public.scss";
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
25 </div> 25 </div>
26 <!-- 表格 --> 26 <!-- 表格 -->
27 <div class="from-clues-content"> 27 <div class="from-clues-content">
28 <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total" 28 <lb-table :page-size="pageData.size" border id="jtfc" :current-page.sync="pageData.current"
29 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 29 :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
30 :data="tableData.data"> 30 :column="tableData.columns" :data="tableData.data">
31 </lb-table> 31 </lb-table>
32 </div> 32 </div>
33 <addjtfc v-model="isDialog" /> 33 <addjtfc v-model="isDialog" />
...@@ -66,10 +66,9 @@ export default { ...@@ -66,10 +66,9 @@ export default {
66 queryClick () { 66 queryClick () {
67 this.fetchData(); 67 this.fetchData();
68 }, 68 },
69
70 // 初始化数据 69 // 初始化数据
71 fetchData () { 70 fetchData () {
72 getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => { 71 getJtfcPage({ ...this.queryForm, ...this.pageData }, { 'target': '#jtfc' }).then((res) => {
73 let { records, total } = res.result; 72 let { records, total } = res.result;
74 this.tableData.data = records; 73 this.tableData.data = records;
75 this.tableData.total = total; 74 this.tableData.total = total;
...@@ -80,9 +79,9 @@ export default { ...@@ -80,9 +79,9 @@ export default {
80 }, 79 },
81 handleAdd () { 80 handleAdd () {
82 this.isDialog = true; 81 this.isDialog = true;
83 }, 82 }
84 }, 83 }
85 }; 84 }
86 </script> 85 </script>
87 <style scoped lang="scss"> 86 <style scoped lang="scss">
88 @import "~@/styles/public.scss"; 87 @import "~@/styles/public.scss";
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
27 </div> 27 </div>
28 <!-- 表格 --> 28 <!-- 表格 -->
29 <div class="from-clues-content"> 29 <div class="from-clues-content">
30 <lb-table :page-size="pageData.size" border @sort-change="handleSort" :current-page.sync="pageData.current" 30 <lb-table :page-size="pageData.size" border id="sqcxjl" @sort-change="handleSort"
31 :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 31 :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
32 :column="tableData.columns" :data="tableData.data"> 32 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
33 </lb-table> 33 </lb-table>
34 </div> 34 </div>
35 </div> 35 </div>
...@@ -61,11 +61,10 @@ export default { ...@@ -61,11 +61,10 @@ export default {
61 queryClick () { 61 queryClick () {
62 this.fetchData(); 62 this.fetchData();
63 }, 63 },
64
65 // 初始化数据 64 // 初始化数据
66 fetchData () { 65 fetchData () {
67 66
68 getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => { 67 getJtfcPage({ ...this.queryForm, ...this.pageData }, { 'target': '#sqcxjl' }).then((res) => {
69 let { records, total } = res.result; 68 let { records, total } = res.result;
70 this.tableData.data = records; 69 this.tableData.data = records;
71 this.tableData.total = total; 70 this.tableData.total = total;
...@@ -74,7 +73,6 @@ export default { ...@@ -74,7 +73,6 @@ export default {
74 handleSort (name, sort) { 73 handleSort (name, sort) {
75 console.log(name, sort); 74 console.log(name, sort);
76 }, 75 },
77
78 // 查看 76 // 查看
79 handleViewClick (scope) { 77 handleViewClick (scope) {
80 var sqcxBsm = scope.row.bsmSqcx; 78 var sqcxBsm = scope.row.bsmSqcx;
...@@ -91,10 +89,10 @@ export default { ...@@ -91,10 +89,10 @@ export default {
91 confirm: function () { 89 confirm: function () {
92 // that.loadBdcdylist(); 90 // that.loadBdcdylist();
93 }, //确认事件的回调 91 }, //确认事件的回调
94 }); 92 })
95 }, 93 }
96 }, 94 }
97 }; 95 }
98 </script> 96 </script>
99 <style scoped lang="scss"> 97 <style scoped lang="scss">
100 @import "~@/styles/public.scss"; 98 @import "~@/styles/public.scss";
......
...@@ -81,7 +81,7 @@ import { ...@@ -81,7 +81,7 @@ import {
81 getStepFormInfo, 81 getStepFormInfo,
82 } from "@/api/fqsq.js"; 82 } from "@/api/fqsq.js";
83 import { mapGetters } from "vuex" 83 import { mapGetters } from "vuex"
84 import { deleteFlow } from "@/api/ywbl.js"; 84 import { deleteFlow,unClaimTask} from "@/api/ywbl.js";
85 import ProcessViewer from './components/processViewer.vue' 85 import ProcessViewer from './components/processViewer.vue'
86 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"; 86 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js";
87 import { getForm } from "./flowform.js"; 87 import { getForm } from "./flowform.js";
...@@ -132,16 +132,36 @@ export default { ...@@ -132,16 +132,36 @@ export default {
132 clxxIndex: "", 132 clxxIndex: "",
133 //材料信息选项卡对象 133 //材料信息选项卡对象
134 clxxTab: {}, 134 clxxTab: {},
135 //页面监听时间
136 _beforeUnload_time: "",
135 }; 137 };
136 }, 138 },
137 mounted () { 139 mounted () {
138 this.loadBdcdylist(); 140 this.loadBdcdylist();
139 this.flowInitParam(); 141 this.flowInitParam();
142 //添加页面监听事件
143 window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
144 window.addEventListener('unload', e => this.unloadHandler(e))
145 },
146 destroyed() {
147 window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
148 window.removeEventListener('unload', e => this.unloadHandler(e))
140 }, 149 },
141 computed: { 150 computed: {
142 ...mapGetters(["oldDetail", "newDetail"]) 151 ...mapGetters(["oldDetail", "newDetail"])
143 }, 152 },
144 methods: { 153 methods: {
154 beforeunloadHandler() {
155 this._beforeUnload_time = new Date().getTime()
156 },
157 unloadHandler(e) {
158 this._gap_time = new Date().getTime() - this._beforeUnload_time
159 //判断是窗口关闭还是刷新
160 if (this._gap_time <= 5) {
161 //取消认领
162 unClaimTask(this.bsmSlsq,this.bestepid)
163 }
164 },
145 changeLoadIndex () { 165 changeLoadIndex () {
146 this.loadIndex++ 166 this.loadIndex++
147 }, 167 },
...@@ -367,6 +387,8 @@ export default { ...@@ -367,6 +387,8 @@ export default {
367 break; 387 break;
368 case "signout": 388 case "signout":
369 window.close(); 389 window.close();
390 //取消认领
391 unClaimTask(this.bsmSlsq,this.bestepid)
370 break; 392 break;
371 case "B9": 393 case "B9":
372 var formdata = new FormData(); 394 var formdata = new FormData();
......
...@@ -70,7 +70,7 @@ import searchBox from '../components/search.vue' ...@@ -70,7 +70,7 @@ import searchBox from '../components/search.vue'
70 import table from "@/utils/mixin/table" 70 import table from "@/utils/mixin/table"
71 import searchMin from "../components/mixin/index" 71 import searchMin from "../components/mixin/index"
72 import { datas, sendThis } from "./dbxdata" 72 import { datas, sendThis } from "./dbxdata"
73 import { searchTaskToDo, deleteFlow } from "@/api/ywbl.js" 73 import { searchTaskToDo, deleteFlow ,claimTask} from "@/api/ywbl.js"
74 export default { 74 export default {
75 name: "dbx", 75 name: "dbx",
76 components: { searchBox }, 76 components: { searchBox },
...@@ -114,8 +114,10 @@ export default { ...@@ -114,8 +114,10 @@ export default {
114 }, 114 },
115 // 列表渲染接口 115 // 列表渲染接口
116 fetchData () { 116 fetchData () {
117 searchTaskToDo({ ...this.queryForm, ...this.pageData }, { 'target': '#dbx' }).then(res => { 117 this.$startLoading('dbx')
118 searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => {
118 if (res.code === 200) { 119 if (res.code === 200) {
120 this.$endLoading()
119 let { total, records } = res.result 121 let { total, records } = res.result
120 records.forEach(item => { 122 records.forEach(item => {
121 item.qlrmc = item.qlrmc.join(',') 123 item.qlrmc = item.qlrmc.join(',')
...@@ -172,6 +174,9 @@ export default { ...@@ -172,6 +174,9 @@ export default {
172 ywhClick (item) { 174 ywhClick (item) {
173 const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm); 175 const { href } = this.$router.resolve('/workFrame?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + '&sqywbm=' + item.djywbm);
174 window.open(href, '_blank'); 176 window.open(href, '_blank');
177
178 //从待办箱进入的调取任务领取接口
179 claimTask(item.bsmSlsq,item.bestepid)
175 } 180 }
176 } 181 }
177 } 182 }
......
...@@ -43,7 +43,7 @@ class data extends filter { ...@@ -43,7 +43,7 @@ class data extends filter {
43 case '2': 43 case '2':
44 return <div class='prohibit'>已结束</div> 44 return <div class='prohibit'>已结束</div>
45 case '3': 45 case '3':
46 return <span>进行中</span> 46 return <div class='allow'>进行中</div>
47 } 47 }
48 } 48 }
49 }, 49 },
......
...@@ -355,4 +355,4 @@ export default { ...@@ -355,4 +355,4 @@ export default {
355 /deep/.el-form-item__label { 355 /deep/.el-form-item__label {
356 padding-bottom: 0px; 356 padding-bottom: 0px;
357 } 357 }
358 </style>
...\ No newline at end of file ...\ No newline at end of file
358 </style>
......
...@@ -140,6 +140,15 @@ ...@@ -140,6 +140,15 @@
140 </el-radio-group> 140 </el-radio-group>
141 </el-form-item> 141 </el-form-item>
142 </el-col> 142 </el-col>
143 <el-col :span="5">
144 <el-form-item :class="flag ? 'marginBot0' : ''" label="发证方式：">
145 <el-radio-group v-model="ruleForm.slywxx.fzfs">
146 <el-radio label="1">小证</el-radio>
147 <el-radio label="2">大证</el-radio>
148 </el-radio-group>
149 </el-form-item>
150 </el-col>
151
143 <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'"> 152 <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'">
144 <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证："> 153 <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证：">
145 <el-radio-group v-model="ruleForm.slywxx.sffbcz"> 154 <el-radio-group v-model="ruleForm.slywxx.sffbcz">
...@@ -195,9 +204,7 @@ export default { ...@@ -195,9 +204,7 @@ export default {
195 if (res.code === 200 && res.result) { 204 if (res.code === 200 && res.result) {
196 this.ruleForm = { 205 this.ruleForm = {
197 ...res.result, 206 ...res.result,
198 ...res.result.zdjbxxdatas,
199 ...res.result.qlxxdatas, 207 ...res.result.qlxxdatas,
200 ...res.result.jsydsyqdatas,
201 } 208 }
202 } 209 }
203 }); 210 });
...@@ -231,8 +238,18 @@ export default { ...@@ -231,8 +238,18 @@ export default {
231 }, 238 },
232 onSubmit () { 239 onSubmit () {
233 saveBatchData(this.ruleForm).then((res) => { 240 saveBatchData(this.ruleForm).then((res) => {
234 if (res.code === 200 && res.result) { 241 if (res.code === 200) {
235 console.log(res); 242 this.$message({
243 showClose: true,
244 message: "保存成功！",
245 type: "success",
246 });
247 } else {
248 this.$message({
249 showClose: true,
250 message: res.message,
251 type: "error",
252 });
236 } 253 }
237 }); 254 });
238 }, 255 },
......
...@@ -249,10 +249,18 @@ export default { ...@@ -249,10 +249,18 @@ export default {
249 }, 249 },
250 onSubmit () { 250 onSubmit () {
251 saveData(this.ruleForm).then((res) => { 251 saveData(this.ruleForm).then((res) => {
252 console.log(this.ruleForm); 252 if (res.code === 200) {
253 if (res.code === 200 && res.result) { 253 this.$message({
254 console.log(res); 254 showClose: true,
255 //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas } 255 message: "保存成功！",
256 type: "success",
257 });
258 } else {
259 this.$message({
260 showClose: true,
261 message: res.message,
262 type: "error",
263 });
256 } 264 }
257 }); 265 });
258 }, 266 },
......
...@@ -253,24 +253,12 @@ export default { ...@@ -253,24 +253,12 @@ export default {
253 }, 253 },
254 methods: { 254 methods: {
255 onClick(){ 255 onClick(){
256 this.$popup({ 256 this.$popup("房屋信息比对","ywbl/fdcq2/slxxCompareDetai",
257 titleStyle: "left", 257 {
258 title: "登记簿详情", // 弹窗标题 258 formData: {
259 editItem: "ywbl/fdcq2/slxxCompareDetai", // 弹窗内容 259 bsmSldy: this.propsParam.bsmSldy,
260 formData: { 260 qllx: this.propsParam.qllx
261 bsmSldy: this.propsParam.bsmSldy, 261 }
262 qllx: this.propsParam.qllx
263 },
264 width: "1220px",
265 height: "790px",
266 // cancelText: '取消摆烂', // 右边按钮文本
267 // confirmText: '确定点击', //左边按钮文本
268 cancel: () => {
269 console.log("取消回调");
270 },
271 confirm: () => {
272 console.log("确认回调");
273 },
274 }); 262 });
275 }, 263 },
276 // 更新权利人信息 264 // 更新权利人信息
...@@ -284,9 +272,18 @@ export default { ...@@ -284,9 +272,18 @@ export default {
284 272
285 onSubmit () { 273 onSubmit () {
286 saveGZBatchData(this.ruleForm).then((res) => { 274 saveGZBatchData(this.ruleForm).then((res) => {
287 if (res.code === 200 && res.result) { 275 if (res.code === 200) {
288 console.log(res); 276 this.$message({
289 //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas } 277 showClose: true,
278 message: "保存成功！",
279 type: "success",
280 });
281 } else {
282 this.$message({
283 showClose: true,
284 message: res.message,
285 type: "error",
286 });
290 } 287 }
291 }); 288 });
292 }, 289 },
......
...@@ -266,9 +266,18 @@ export default { ...@@ -266,9 +266,18 @@ export default {
266 }, 266 },
267 onSubmit () { 267 onSubmit () {
268 saveLogoutData(this.ruleForm).then((res) => { 268 saveLogoutData(this.ruleForm).then((res) => {
269 if (res.code === 200 && res.result) { 269 if (res.code === 200) {
270 console.log(res); 270 this.$message({
271 //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas } 271 showClose: true,
272 message: "保存成功！",
273 type: "success",
274 });
275 } else {
276 this.$message({
277 showClose: true,
278 message: res.message,
279 type: "error",
280 });
272 } 281 }
273 }); 282 });
274 }, 283 },
......
...@@ -228,26 +228,20 @@ export default { ...@@ -228,26 +228,20 @@ export default {
228 upDateYwrxxList (val) { 228 upDateYwrxxList (val) {
229 this.ruleForm.ywrList = _.cloneDeep(val); 229 this.ruleForm.ywrList = _.cloneDeep(val);
230 }, 230 },
231 list (bsmSldy) {
232 var formdata = new FormData();
233 formdata.append("bsmSldy", bsmSldy);
234 Init(formdata).then((res) => {
235 if (res.code === 200 && res.result) {
236 this.ruleForm = {
237 ...res.result,
238 ...res.result.zdjbxxdatas,
239 ...res.result.qlxxdatas,
240 ...res.result.jsydsyqdatas,
241 };
242 }
243 });
244 },
245 onSubmit () { 231 onSubmit () {
246 saveBHZData(this.ruleForm).then((res) => { 232 saveBHZData(this.ruleForm).then((res) => {
247 console.log(this.ruleForm); 233 if (res.code === 200) {
248 if (res.code === 200 && res.result) { 234 this.$message({
249 console.log(res); 235 showClose: true,
250 //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas } 236 message: "保存成功！",
237 type: "success",
238 });
239 } else {
240 this.$message({
241 showClose: true,
242 message: res.message,
243 type: "error",
244 });
251 } 245 }
252 }); 246 });
253 }, 247 },
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
44 <script> 44 <script>
45 import {getFdcqLSInfo} from "@/api/registerBook.js"; 45 import {getFdcqLSInfo} from "@/api/registerBook.js";
46 import { datas } from "@/views/registerBook/qlxxFormData.js"; 46 import { datas } from "@/views/registerBook/qlxxFormData.js";
47
47 export default { 48 export default {
48 data() { 49 data() {
49 return { 50 return {
...@@ -73,7 +74,6 @@ export default { ...@@ -73,7 +74,6 @@ export default {
73 }, 74 },
74 methods: { 75 methods: {
75 loadData() { 76 loadData() {
76 console.log(this.propsParam.formData);
77 var formdata = new FormData(); 77 var formdata = new FormData();
78 formdata.append("bsmSldy", this.propsParam.formData.bsmSldy); 78 formdata.append("bsmSldy", this.propsParam.formData.bsmSldy);
79 formdata.append("qllx", this.propsParam.formData.qllx); 79 formdata.append("qllx", this.propsParam.formData.qllx);
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
60 </div> 60 </div>
61 <!-- 表格 --> 61 <!-- 表格 -->
62 <div class="from-clues-content"> 62 <div class="from-clues-content">
63 <lb-table :page-size="pageData.size" :heightNum="300" @sort-change="handleSort" border 63 <lb-table :page-size="pageData.size" id="ybxLoading" :heightNum="300" @sort-change="handleSort" border
64 :current-page.sync="pageData.current" :total="pageData.total" @size-change="handleSizeChange" 64 :current-page.sync="pageData.current" :total="pageData.total" @size-change="handleSizeChange"
65 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data"> 65 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
66 </lb-table> 66 </lb-table>
...@@ -111,7 +111,7 @@ export default { ...@@ -111,7 +111,7 @@ export default {
111 }, 111 },
112 // 列表渲染接口 112 // 列表渲染接口
113 fetchData () { 113 fetchData () {
114 searchTaskDone({ ...this.queryForm, ...this.pageData }).then(res => { 114 searchTaskDone({ ...this.queryForm, ...this.pageData }, { 'target': '#ybxLoading' }).then(res => {
115 if (res.code === 200) { 115 if (res.code === 200) {
116 let { total, records } = res.result 116 let { total, records } = res.result
117 this.pageData.total = total; 117 this.pageData.total = total;
......
1 <template> 1 <template>
2 <dialogBox title="查询权利信息" width="85%" :isButton="false" :isMain="true" @closeDialog="closeDialog" v-model="myValue"> 2 <dialogBox title="查询权利信息" width="85%" :isButton="false" :isMain="true" @closeDialog="closeDialog" v-model="myValue">
3 <component :is="editItem" @closeDialog="closeDialog" :isJump="isJump" @updateDialog="updateDialog" :djywbm="djywbm" :djywmc="djywmc" 3 <component :is="editItem" @closeDialog="closeDialog" :isJump="isJump" id="slectBdc" @updateDialog="updateDialog"
4 :key="key" /> 4 :djywbm="djywbm" :key="key" />
5 </dialogBox> 5 </dialogBox>
6 </template> 6 </template>
7 <script> 7 <script>
...@@ -24,12 +24,12 @@ export default { ...@@ -24,12 +24,12 @@ export default {
24 this.myValue = val 24 this.myValue = val
25 this.key++ 25 this.key++
26 if (this.$route.query.sqywbm) { 26 if (this.$route.query.sqywbm) {
27 let dd = queueDjywmc(this.$route.query.sqywbm) 27 let dd = queueDjywmc(this.$route.query.sqywbm, { 'target': '#slectBdc' })
28 this.editItem = this.loadView(dd) 28 this.editItem = this.loadView(dd)
29 } 29 }
30 }, 30 },
31 'djywbm' (val) { 31 'djywbm' (val) {
32 let dd = queueDjywmc(val) 32 let dd = queueDjywmc(val, { 'target': '#slectBdc' })
33 this.editItem = this.loadView(dd) 33 this.editItem = this.loadView(dd)
34 } 34 }
35 }, 35 },
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 <el-button type="primary" :disabled="btnDisabled" @click="bthSelectClick">选择不动产</el-button> 66 <el-button type="primary" :disabled="btnDisabled" @click="bthSelectClick">选择不动产</el-button>
67 </div> 67 </div>
68 </div> 68 </div>
69 <fqsqDialog v-model="isDialog" :djywbm="djywbm" :djywmc="djywmc"/> 69 <fqsqDialog v-model="isDialog" :djywbm="djywbm"/>
70 </div> 70 </div>
71 </template> 71 </template>
72 <script> 72 <script>
......
...@@ -111,15 +111,8 @@ export default { ...@@ -111,15 +111,8 @@ export default {
111 moreQueryClick () { }, 111 moreQueryClick () { },
112 openDialog (scroll) { 112 openDialog (scroll) {
113 this.$popup('登记簿详情', 'registerBook/djbFrame', { 113 this.$popup('登记簿详情', 'registerBook/djbFrame', {
114 formData: scroll, 114 width: '90%',
115 width: "1220px", 115 formData: scroll
116 height: "790px",
117 cancel: () => {
118 console.log("取消回调");
119 },
120 confirm: () => {
121 console.log("确认回调");
122 },
123 }); 116 });
124 }, 117 },
125 handleLpbClick (item) { 118 handleLpbClick (item) {
......
...@@ -108,6 +108,9 @@ export default { ...@@ -108,6 +108,9 @@ export default {
108 if (item.ywrmc.length != 0) { 108 if (item.ywrmc.length != 0) {
109 item.ywrmcStr = String(item.ywrmc) 109 item.ywrmcStr = String(item.ywrmc)
110 } 110 }
111 if(item.zlList.length != 0){
112 item.zlStr = String(item.zlList)
113 }
111 }) 114 })
112 this.pageData.total = total; 115 this.pageData.total = total;
113 this.tableData.data = records 116 this.tableData.data = records
......
...@@ -21,14 +21,21 @@ class data extends filter { ...@@ -21,14 +21,21 @@ class data extends filter {
21 }, 21 },
22 { 22 {
23 label: "流程状态", 23 label: "流程状态",
24 width: '80',
24 render: (h, scope) => { 25 render: (h, scope) => {
26 if(scope.row.cfgqzt == '1'){
27 return <div class='suspend'>查封挂起</div>
28 }
29 if(scope.row.yygqzt == '1'){
30 return <div class='suspend'>异议挂起</div>
31 }
25 switch (scope.row.lczt) { 32 switch (scope.row.lczt) {
26 case '1': 33 case '1':
27 return <span>进行中</span> 34 return <div class='allow'>进行中</div>
28 case '2': 35 case '2':
29 return <span>已结束</span> 36 return <div class='prohibit'>已结束</div>
30 case '3': 37 case '3':
31 return <span>进行中</span> 38 return <div class='allow'>进行中</div>
32 } 39 }
33 } 40 }
34 }, 41 },
...@@ -77,7 +84,7 @@ class data extends filter { ...@@ -77,7 +84,7 @@ class data extends filter {
77 } 84 }
78 }, 85 },
79 { 86 {
80 prop: "zl", 87 prop: "zlStr",
81 label: "坐落", 88 label: "坐落",
82 }, 89 },
83 { 90 {
......