Skip to content

bdc / bdcdj-web

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

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

2 parents 764328bc 249c8a6b
Expand all
Inline Side-by-side
Showing 15 changed files with 122 additions and 74 deletions
...@@ -49,7 +49,7 @@ export function deleteRepairRecord (params) { ...@@ -49,7 +49,7 @@ export function deleteRepairRecord (params) {
49 */ 49 */
50 export function init (params) { 50 export function init (params) {
51 return request({ 51 return request({
52 url: SERVER.SERVERAPI + '/rest/djbRepair/init?bsmRepair='+params, 52 url: SERVER.SERVERAPI + '/rest/djbRepair/init?bsmRepair='+params.bsmRepair+'&isEdit='+params.isEdit,
53 method: 'get', 53 method: 'get',
54 }) 54 })
55 } 55 }
......
...@@ -175,8 +175,9 @@ export default { ...@@ -175,8 +175,9 @@ export default {
175 mounted() {}, 175 mounted() {},
176 methods: { 176 methods: {
177 loadData() { 177 loadData() {
178 console.log("预告登记",this.propsParam); 178 console.log("查封登记",this.propsParam);
179 init(this.propsParam.bsmRepair).then((res) => { 179 this.propsParam.isEdit=this.$parent.isEdit
180 init(this.propsParam).then((res) => {
180 if (res.code == 200) { 181 if (res.code == 200) {
181 this.ruleForm = res.result; 182 this.ruleForm = res.result;
182 console.log("this.ruleForm",this.ruleForm); 183 console.log("this.ruleForm",this.ruleForm);
......
...@@ -303,8 +303,9 @@ ...@@ -303,8 +303,9 @@
303 mounted () { }, 303 mounted () { },
304 methods: { 304 methods: {
305 loadData () { 305 loadData () {
306 console.log("预告登记", this.propsParam); 306 console.log("地役权", this.propsParam);
307 init(this.propsParam.bsmRepair).then((res) => { 307 this.propsParam.isEdit=this.$parent.isEdit
308 init(this.propsParam).then((res) => {
308 if (res.code == 200) { 309 if (res.code == 200) {
309 this.ruleForm = res.result; 310 this.ruleForm = res.result;
310 console.log("this.ruleForm", this.ruleForm); 311 console.log("this.ruleForm", this.ruleForm);
......
...@@ -392,7 +392,9 @@ export default { ...@@ -392,7 +392,9 @@ export default {
392 mounted() {}, 392 mounted() {},
393 methods: { 393 methods: {
394 loadData() { 394 loadData() {
395 init(this.propsParam.bsmRepair).then((res) => { 395 console.log("房屋", this.propsParam);
396 this.propsParam.isEdit=this.$parent.isEdit
397 init(this.propsParam).then((res) => {
396 if (res.code == 200) { 398 if (res.code == 200) {
397 this.ruleForm = res.result; 399 this.ruleForm = res.result;
398 if( this.ruleForm.tdytqxList.length>0){ 400 if( this.ruleForm.tdytqxList.length>0){
......
...@@ -90,17 +90,43 @@ ...@@ -90,17 +90,43 @@
90 </el-select> 90 </el-select>
91 </el-form-item> 91 </el-form-item>
92 </el-col> 92 </el-col>
93
93 <el-col :span="8"> 94 <el-col :span="8">
95 <el-form-item label="登记原因：">
96 <el-input v-model="ruleForm.jsydsyq.djyy"></el-input>
97 </el-form-item>
98 </el-col>
99 <!-- <el-col :span="8">
94 <el-form-item label="房地坐落："> 100 <el-form-item label="房地坐落：">
95 <el-input v-model="ruleForm.qlxx.zl"></el-input> 101 <el-input v-model="ruleForm.qlxx.zl"></el-input>
96 </el-form-item> 102 </el-form-item>
97 </el-col> 103 </el-col> -->
98 <el-col :span="8"> 104 <el-col :span="8">
99 <el-form-item label="使用权面积："> 105 <el-form-item label="使用权面积：">
100 <el-input v-model="ruleForm.jsydsyq.syqmj"></el-input> 106 <el-input v-model="ruleForm.jsydsyq.syqmj"></el-input>
101 </el-form-item> 107 </el-form-item>
102 </el-col> 108 </el-col>
103 <el-col :span="8"> 109 <el-col :span="8">
110 <el-form-item label="使用权起始时间">
111 <el-input v-model="ruleForm.jsydsyq.syqqssj"></el-input>
112 </el-form-item>
113 </el-col>
114 <el-col :span="8">
115 <el-form-item label="使用权结束时间">
116 <el-input v-model="ruleForm.jsydsyq.syqjssj"></el-input>
117 </el-form-item>
118 </el-col>
119 <el-col :span="8">
120 <el-form-item label="土地使用期限">
121 <el-input v-model="ruleForm.jsydsyq.tdsyqx"></el-input>
122 </el-form-item>
123 </el-col>
124 <el-col :span="8">
125 <el-form-item label="土地用途">
126 <el-input v-model="ruleForm.jsydsyq.yt"></el-input>
127 </el-form-item>
128 </el-col>
129 <el-col :span="8">
104 <el-form-item label="取得价格："> 130 <el-form-item label="取得价格：">
105 <div style="display: flex"> 131 <div style="display: flex">
106 <el-input 132 <el-input
...@@ -292,7 +318,8 @@ export default { ...@@ -292,7 +318,8 @@ export default {
292 return store.getters.dictData[val]; 318 return store.getters.dictData[val];
293 }, 319 },
294 loadData() { 320 loadData() {
295 init(this.propsParam.bsmRepair).then((res) => { 321 this.propsParam.isEdit=this.$parent.isEdit
322 init(this.propsParam).then((res) => {
296 if (res.code == 200) { 323 if (res.code == 200) {
297 this.ruleForm = res.result; 324 this.ruleForm = res.result;
298 if( this.ruleForm.tdytqxList.length>0){ 325 if( this.ruleForm.tdytqxList.length>0){
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 </el-col> 66 </el-col>
67 <el-col :span="8"> 67 <el-col :span="8">
68 <el-form-item label="登记原因："> 68 <el-form-item label="登记原因：">
69 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input> 69 <el-input disabled v-model="ruleForm.ygdj.djyy"></el-input>
70 </el-form-item> 70 </el-form-item>
71 </el-col> 71 </el-col>
72 <el-col :span="8"> 72 <el-col :span="8">
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
128 128
129 <el-col :span="8"> 129 <el-col :span="8">
130 <el-form-item label="预告登记种类"> 130 <el-form-item label="预告登记种类">
131 <el-select v-model="ruleForm.qlxx.djlx"> 131 <el-select v-model="ruleForm.ygdj.ygdjlx">
132 <el-option 132 <el-option
133 v-for="item in dictData['A29']" 133 v-for="item in dictData['A29']"
134 :key="item.dcode" 134 :key="item.dcode"
...@@ -141,12 +141,12 @@ ...@@ -141,12 +141,12 @@
141 </el-col> 141 </el-col>
142 <el-col :span="8"> 142 <el-col :span="8">
143 <el-form-item label="土地使用权人"> 143 <el-form-item label="土地使用权人">
144 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 144 <el-input v-model="ruleForm.ygdj.tdsyqr"></el-input>
145 </el-form-item> 145 </el-form-item>
146 </el-col> 146 </el-col>
147 <el-col :span="8"> 147 <el-col :span="8">
148 <el-form-item label="规划用途"> 148 <el-form-item label="规划用途">
149 <el-select v-model="ruleForm.qlxx.djlx"> 149 <el-select v-model="ruleForm.ygdj.ghyt">
150 <el-option 150 <el-option
151 v-for="item in dictData['A17']" 151 v-for="item in dictData['A17']"
152 :key="item.dcode" 152 :key="item.dcode"
...@@ -159,12 +159,12 @@ ...@@ -159,12 +159,12 @@
159 </el-col> 159 </el-col>
160 <el-col :span="8"> 160 <el-col :span="8">
161 <el-form-item label="用途名称"> 161 <el-form-item label="用途名称">
162 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 162 <el-input v-model="ruleForm.ygdj.ytmc"></el-input>
163 </el-form-item> 163 </el-form-item>
164 </el-col> 164 </el-col>
165 <el-col :span="8"> 165 <el-col :span="8">
166 <el-form-item label="房屋性质"> 166 <el-form-item label="房屋性质">
167 <el-select v-model="ruleForm.qlxx.djlx"> 167 <el-select v-model="ruleForm.ygdj.fwxz">
168 <el-option 168 <el-option
169 v-for="item in dictData['A19']" 169 v-for="item in dictData['A19']"
170 :key="item.dcode" 170 :key="item.dcode"
...@@ -177,12 +177,12 @@ ...@@ -177,12 +177,12 @@
177 </el-col> 177 </el-col>
178 <el-col :span="8"> 178 <el-col :span="8">
179 <el-form-item label="房屋性质名称"> 179 <el-form-item label="房屋性质名称">
180 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 180 <el-input v-model="ruleForm.ygdj.fwxzmc"></el-input>
181 </el-form-item> 181 </el-form-item>
182 </el-col> 182 </el-col>
183 <el-col :span="8"> 183 <el-col :span="8">
184 <el-form-item label="房屋结构"> 184 <el-form-item label="房屋结构">
185 <el-select v-model="ruleForm.qlxx.djlx"> 185 <el-select v-model="ruleForm.ygdj.fwjg">
186 <el-option 186 <el-option
187 v-for="item in dictData['A46']" 187 v-for="item in dictData['A46']"
188 :key="item.dcode" 188 :key="item.dcode"
...@@ -195,62 +195,62 @@ ...@@ -195,62 +195,62 @@
195 </el-col> 195 </el-col>
196 <el-col :span="8"> 196 <el-col :span="8">
197 <el-form-item label="所在层"> 197 <el-form-item label="所在层">
198 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 198 <el-input v-model="ruleForm.ygdj.szc"></el-input>
199 </el-form-item> 199 </el-form-item>
200 </el-col> 200 </el-col>
201 <el-col :span="8"> 201 <el-col :span="8">
202 <el-form-item label="总层数"> 202 <el-form-item label="总层数">
203 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 203 <el-input v-model="ruleForm.ygdj.zcs"></el-input>
204 </el-form-item> 204 </el-form-item>
205 </el-col> 205 </el-col>
206 <el-col :span="8"> 206 <el-col :span="8">
207 <el-form-item label="建筑面积"> 207 <el-form-item label="建筑面积">
208 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 208 <el-input v-model="ruleForm.ygdj.jzmj"></el-input>
209 </el-form-item> 209 </el-form-item>
210 </el-col> 210 </el-col>
211 <el-col :span="8"> 211 <el-col :span="8">
212 <el-form-item label="注销预告业务号"> 212 <el-form-item label="注销预告业务号">
213 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 213 <el-input v-model="ruleForm.ygdj.zxygywh"></el-input>
214 </el-form-item> 214 </el-form-item>
215 </el-col> 215 </el-col>
216 <el-col :span="8"> 216 <el-col :span="8">
217 <el-form-item label="注销预告原因"> 217 <el-form-item label="注销预告原因">
218 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 218 <el-input v-model="ruleForm.ygdj.zxygyy"></el-input>
219 </el-form-item> 219 </el-form-item>
220 </el-col> 220 </el-col>
221 <el-col :span="8"> 221 <el-col :span="8">
222 <el-form-item label="注销时间"> 222 <el-form-item label="注销时间">
223 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 223 <el-input v-model="ruleForm.ygdj.zxsj"></el-input>
224 </el-form-item> 224 </el-form-item>
225 </el-col> 225 </el-col>
226 <el-col :span="8"> 226 <el-col :span="8">
227 <el-form-item label="取得价格/被担保主债权数额"> 227 <el-form-item label="取得价格/被担保主债权数额">
228 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 228 <el-input v-model="ruleForm.ygdj.qdjg"></el-input>
229 </el-form-item> 229 </el-form-item>
230 </el-col> 230 </el-col>
231 <el-col :span="8"> 231 <el-col :span="8">
232 <el-form-item label="金额单位"> 232 <el-form-item label="金额单位">
233 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 233 <el-input v-model="ruleForm.ygdj.jedw"></el-input>
234 </el-form-item> 234 </el-form-item>
235 </el-col> 235 </el-col>
236 <el-col :span="8"> 236 <el-col :span="8">
237 <el-form-item label="担保范围"> 237 <el-form-item label="担保范围">
238 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 238 <el-input v-model="ruleForm.ygdj.dbfw"></el-input>
239 </el-form-item> 239 </el-form-item>
240 </el-col> 240 </el-col>
241 <el-col :span="8"> 241 <el-col :span="8">
242 <el-form-item label="是否存在禁止或限制转让抵押不动产的约定"> 242 <el-form-item label="是否存在禁止或限制转让抵押不动产的约定">
243 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 243 <el-input v-model="ruleForm.ygdj.sfczjzhxz"></el-input>
244 </el-form-item> 244 </el-form-item>
245 </el-col> 245 </el-col>
246 <el-col :span="8"> 246 <el-col :span="8">
247 <el-form-item label="不动产登记证明号"> 247 <el-form-item label="不动产登记证明号">
248 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 248 <el-input v-model="ruleForm.ygdj.bdcdjzmh"></el-input>
249 </el-form-item> 249 </el-form-item>
250 </el-col> 250 </el-col>
251 <el-col :span="24"> 251 <el-col :span="24">
252 <el-form-item label="附记："> 252 <el-form-item label="附记：">
253 <el-input v-model="ruleForm.qlxx.fj"></el-input> 253 <el-input v-model="ruleForm.ygdj.fj"></el-input>
254 </el-form-item> 254 </el-form-item>
255 </el-col> 255 </el-col>
256 </el-row> 256 </el-row>
...@@ -340,7 +340,8 @@ export default { ...@@ -340,7 +340,8 @@ export default {
340 methods: { 340 methods: {
341 loadData() { 341 loadData() {
342 console.log("预告登记", this.propsParam); 342 console.log("预告登记", this.propsParam);
343 init(this.propsParam.bsmRepair).then((res) => { 343 this.propsParam.isEdit=this.$parent.isEdit
344 init(this.propsParam).then((res) => {
344 if (res.code == 200) { 345 if (res.code == 200) {
345 this.ruleForm = res.result; 346 this.ruleForm = res.result;
346 console.log("this.ruleForm", this.ruleForm); 347 console.log("this.ruleForm", this.ruleForm);
......
...@@ -59,17 +59,17 @@ ...@@ -59,17 +59,17 @@
59 </el-col> 59 </el-col>
60 </el-row> 60 </el-row>
61 <el-row :gutter="10"> 61 <el-row :gutter="10">
62 <el-col :span="8"> 62 <!-- <el-col :span="8">
63 <el-form-item label="权利类型："> 63 <el-form-item label="权利类型：">
64 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input> 64 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
65 </el-form-item> 65 </el-form-item>
66 </el-col> 66 </el-col> -->
67 <el-col :span="8"> 67 <!-- <el-col :span="8">
68 <el-form-item label="登记原因："> 68 <el-form-item label="登记原因：">
69 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input> 69 <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
70 </el-form-item> 70 </el-form-item>
71 </el-col> 71 </el-col> -->
72 <el-col :span="8"> 72 <!-- <el-col :span="8">
73 <el-form-item label="登记类型："> 73 <el-form-item label="登记类型：">
74 <el-select v-model="ruleForm.qlxx.djlx"> 74 <el-select v-model="ruleForm.qlxx.djlx">
75 <el-option 75 <el-option
...@@ -81,17 +81,17 @@ ...@@ -81,17 +81,17 @@
81 </el-option> 81 </el-option>
82 </el-select> 82 </el-select>
83 </el-form-item> 83 </el-form-item>
84 </el-col> 84 </el-col> -->
85 <el-col :span="8"> 85 <!-- <el-col :span="8">
86 <el-form-item label="不动产坐落："> 86 <el-form-item label="不动产坐落：">
87 <el-input v-model="ruleForm.qlxx.zl"></el-input> 87 <el-input v-model="ruleForm.qlxx.zl"></el-input>
88 </el-form-item> 88 </el-form-item>
89 </el-col> 89 </el-col> -->
90 <el-col :span="8"> 90 <!-- <el-col :span="8">
91 <el-form-item label="不动产权证号："> 91 <el-form-item label="不动产权证号：">
92 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input> 92 <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
93 </el-form-item> 93 </el-form-item>
94 </el-col> 94 </el-col> -->
95 <el-col :span="8"> 95 <el-col :span="8">
96 <el-form-item label="区县代码："> 96 <el-form-item label="区县代码：">
97 <el-input v-model="ruleForm.qlxx.qxdm"></el-input> 97 <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
...@@ -128,42 +128,42 @@ ...@@ -128,42 +128,42 @@
128 128
129 <el-col :span="8"> 129 <el-col :span="8">
130 <el-form-item label="异议事项"> 130 <el-form-item label="异议事项">
131 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 131 <el-input v-model="ruleForm.yydj.yysx"></el-input>
132 </el-form-item> 132 </el-form-item>
133 </el-col> 133 </el-col>
134 <el-col :span="8"> 134 <el-col :span="8">
135 <el-form-item label="不动产登记证明号"> 135 <el-form-item label="不动产登记证明号">
136 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 136 <el-input v-model="ruleForm.yydj.bdcdjzmh"></el-input>
137 </el-form-item> 137 </el-form-item>
138 </el-col> 138 </el-col>
139 <el-col :span="8"> 139 <el-col :span="8">
140 <el-form-item label="登记时间："> 140 <el-form-item label="注销异议业务号">
141 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 141 <el-input v-model="ruleForm.yydj.zxyyywh"></el-input>
142 </el-form-item> 142 </el-form-item>
143 </el-col> 143 </el-col>
144 <el-col :span="8"> 144 <el-col :span="8">
145 <el-form-item label="登记时间："> 145 <el-form-item label="注销异议原因">
146 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 146 <el-input v-model="ruleForm.yydj.zxyyyy"></el-input>
147 </el-form-item> 147 </el-form-item>
148 </el-col> 148 </el-col>
149 <el-col :span="8"> 149 <el-col :span="8">
150 <el-form-item label="登记时间："> 150 <el-form-item label="注销异议登簿人">
151 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 151 <el-input v-model="ruleForm.yydj.zxyydbr"></el-input>
152 </el-form-item> 152 </el-form-item>
153 </el-col> 153 </el-col>
154 <el-col :span="8"> 154 <el-col :span="8">
155 <el-form-item label="登记时间："> 155 <el-form-item label="注销异议登记时间">
156 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 156 <el-input v-model="ruleForm.yydj.zxyydjsj"></el-input>
157 </el-form-item> 157 </el-form-item>
158 </el-col> 158 </el-col>
159 <el-col :span="8"> 159 <el-col :span="8">
160 <el-form-item label="登记时间："> 160 <el-form-item label="登记时间：">
161 <el-input v-model="ruleForm.qlxx.djsj"></el-input> 161 <el-input v-model="ruleForm.yydj.djsj"></el-input>
162 </el-form-item> 162 </el-form-item>
163 </el-col> 163 </el-col>
164 <el-col :span="24"> 164 <el-col :span="24">
165 <el-form-item label="附记："> 165 <el-form-item label="附记：">
166 <el-input v-model="ruleForm.qlxx.fj"></el-input> 166 <el-input v-model="ruleForm.yydj.fj"></el-input>
167 </el-form-item> 167 </el-form-item>
168 </el-col> 168 </el-col>
169 </el-row> 169 </el-row>
...@@ -252,8 +252,9 @@ export default { ...@@ -252,8 +252,9 @@ export default {
252 mounted() {}, 252 mounted() {},
253 methods: { 253 methods: {
254 loadData() { 254 loadData() {
255 console.log("预告登记", this.propsParam); 255 console.log("异议登记", this.propsParam);
256 init(this.propsParam.bsmRepair).then((res) => { 256 this.propsParam.isEdit=this.$parent.isEdit
257 init(this.propsParam).then((res) => {
257 if (res.code == 200) { 258 if (res.code == 200) {
258 this.ruleForm = res.result; 259 this.ruleForm = res.result;
259 console.log("this.ruleForm", this.ruleForm); 260 console.log("this.ruleForm", this.ruleForm);
......
...@@ -109,6 +109,7 @@ export default { ...@@ -109,6 +109,7 @@ export default {
109 qllx: this.$route.query.qllx, 109 qllx: this.$route.query.qllx,
110 //设置那个表单选中 110 //设置那个表单选中
111 tabName: "", 111 tabName: "",
112 isEdit:true,
112 // 弹框显示 113 // 弹框显示
113 dialogVisible: true, 114 dialogVisible: true,
114 //表单集合 115 //表单集合
...@@ -214,7 +215,7 @@ export default { ...@@ -214,7 +215,7 @@ export default {
214 }, 215 },
215 //切换选项卡内容组件 216 //切换选项卡内容组件
216 getFromRouter(tabname) { 217 getFromRouter(tabname) {
217 console.log("tabnameeeeeeeeeeeeeeeeee", tabname,this.tabList); 218 console.log("切换选项卡内容组件", tabname,this.tabList);
218 this.componentTag = getForm(tabname); 219 this.componentTag = getForm(tabname);
219 }, 220 },
220 closefp() { 221 closefp() {
......
...@@ -111,6 +111,7 @@ export default { ...@@ -111,6 +111,7 @@ export default {
111 tabName: "", 111 tabName: "",
112 // 弹框显示 112 // 弹框显示
113 dialogVisible: true, 113 dialogVisible: true,
114 isEdit:false,
114 //表单集合 115 //表单集合
115 tabList: [], 116 tabList: [],
116 type: "READ_ONLY", 117 type: "READ_ONLY",
...@@ -216,11 +217,9 @@ export default { ...@@ -216,11 +217,9 @@ export default {
216 }, 217 },
217 //切换选项卡内容组件 218 //切换选项卡内容组件
218 getFromRouter(tabname) { 219 getFromRouter(tabname) {
219 console.log("tabnameeeeeeeeeeeeeeeeee", tabname,this.tabList);
220 this.componentTag = getForm(tabname); 220 this.componentTag = getForm(tabname);
221 }, 221 },
222 closefp() { 222 closefp() {
223 console.log("点击分屏");
224 this.splitScreen = this.splitScreen ? false : true; 223 this.splitScreen = this.splitScreen ? false : true;
225 this.$store.dispatch("app/set1tScreen", this.splitScreen); 224 this.$store.dispatch("app/set1tScreen", this.splitScreen);
226 this.getFromRouter(this.tabList[0].value); 225 this.getFromRouter(this.tabList[0].value);
......
...@@ -83,6 +83,9 @@ ...@@ -83,6 +83,9 @@
83 qszt: this.checkList, 83 qszt: this.checkList,
84 }).then((res) => { 84 }).then((res) => {
85 if (res.code === 200) { 85 if (res.code === 200) {
86 res.result.length && res.result.forEach(i => {
87 i.ytmc == 'null' ? i.ytmc = "" : i.ytmc = i.ytmc;
88 });
86 this.tableData = res.result; 89 this.tableData = res.result;
87 this.tableData.forEach(item => { 90 this.tableData.forEach(item => {
88 item.sjlx = getSjlx(item.sjlx) 91 item.sjlx = getSjlx(item.sjlx)
......
...@@ -65,9 +65,10 @@ ...@@ -65,9 +65,10 @@
65 </el-table-column> 65 </el-table-column>
66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" /> 66 <el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" /> 67 <el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
68 <el-table-column label="创建时间" prop="createTime" width="160" align="center" /> 68 <el-table-column label="转入时间" prop="createTime" :formatter="formatDate" width="160" align="center" />
69 <el-table-column label="办结时间" prop="endTime" width="160" align="center" /> 69 <el-table-column label="认领时间" prop="claimTime" :formatter="formatDate" width="160" align="center" />
70 <el-table-column label="操作方式" prop="businessName" align="center"/> 70 <el-table-column label="转出时间" prop="endTime" :formatter="formatDate" width="160" align="center" />
71 <el-table-column label="操作方式" prop="controls" align="center"/>
71 <el-table-column label="意见" prop="idea" align="center"/> 72 <el-table-column label="意见" prop="idea" align="center"/>
72 </el-table> 73 </el-table>
73 </div> 74 </div>
...@@ -118,6 +119,14 @@ ...@@ -118,6 +119,14 @@
118 this.clearViewer() 119 this.clearViewer()
119 }, 120 },
120 methods: { 121 methods: {
122 formatDate(row, column) {
123 let data = row[column.property]
124 if(data == null) {
125 return null
126 }
127 let dt = new Date(data)
128 return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' ' + dt.getHours() + ':' + dt.getMinutes() + ':' + dt.getSeconds()
129 },
121 processReZoom () { 130 processReZoom () {
122 this.defaultZoom = 1 131 this.defaultZoom = 1
123 this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto') 132 this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto')
...@@ -240,6 +249,7 @@ ...@@ -240,6 +249,7 @@
240 item.comments.forEach(element => { 249 item.comments.forEach(element => {
241 if(element.type=="COMPLETE"){ 250 if(element.type=="COMPLETE"){
242 this.formData.allCommentList[index].idea=element.message 251 this.formData.allCommentList[index].idea=element.message
252 this.formData.allCommentList[index].controls="完成"
243 } 253 }
244 }); 254 });
245 this.formData.allCommentList[index].agent=item.assignee.name 255 this.formData.allCommentList[index].agent=item.assignee.name
......
...@@ -86,64 +86,64 @@ ...@@ -86,64 +86,64 @@
86 <el-row :gutter="10"> 86 <el-row :gutter="10">
87 <el-col :span="8"> 87 <el-col :span="8">
88 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型："> 88 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利类型：">
89 <el-input disabled v-model="ruleForm.ssQlxx.qllxmc"></el-input> 89 <el-input disabled v-model="ruleForm.ztQlxx.qllxmc"></el-input>
90 </el-form-item> 90 </el-form-item>
91 </el-col> 91 </el-col>
92 92
93 <el-col :span="8"> 93 <el-col :span="8">
94 <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号：" prop="qlxx.bdcqzh"> 94 <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产权证号：" prop="qlxx.bdcqzh">
95 <el-input disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input> 95 <el-input disabled v-model="ruleForm.ztQlxx.bdcqzh"></el-input>
96 </el-form-item> 96 </el-form-item>
97 </el-col> 97 </el-col>
98 <el-col :span="8"> 98 <el-col :span="8">
99 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有情况："> 99 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有情况：">
100 <el-input disabled v-model="ruleForm.ssQlxx.gyqk"></el-input> 100 <el-input disabled v-model="ruleForm.ztQlxx.gyqk"></el-input>
101 </el-form-item> 101 </el-form-item>
102 </el-col> 102 </el-col>
103 </el-row> 103 </el-row>
104 <el-row :gutter="10"> 104 <el-row :gutter="10">
105 <el-col :span="8"> 105 <el-col :span="8">
106 <el-form-item :class="flag ? 'marginBot0' : ''" label="被执行人：" prop="qlxx.qlrmc"> 106 <el-form-item :class="flag ? 'marginBot0' : ''" label="被执行人：" prop="qlxx.qlrmc">
107 <el-input disabled v-model="ruleForm.ssQlxx.qlrmc"></el-input> 107 <el-input disabled v-model="ruleForm.ztQlxx.qlrmc"></el-input>
108 </el-form-item> 108 </el-form-item>
109 </el-col> 109 </el-col>
110 <el-col :span="8"> 110 <el-col :span="8">
111 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类："> 111 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类：">
112 <el-input disabled v-model="ruleForm.ssQlxx.qlrzjzl"></el-input> 112 <el-input disabled v-model="ruleForm.ztQlxx.qlrzjzl"></el-input>
113 </el-form-item> 113 </el-form-item>
114 </el-col> 114 </el-col>
115 <el-col :span="8"> 115 <el-col :span="8">
116 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件号："> 116 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件号：">
117 <el-input disabled v-model="ruleForm.ssQlxx.qlrzjhm"></el-input> 117 <el-input disabled v-model="ruleForm.ztQlxx.qlrzjhm"></el-input>
118 </el-form-item> 118 </el-form-item>
119 </el-col> 119 </el-col>
120 </el-row> 120 </el-row>
121 <el-row :gutter="10"> 121 <el-row :gutter="10">
122 <el-col :span="8"> 122 <el-col :span="8">
123 <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号：" prop="qlxx.bdcdyh"> 123 <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号：" prop="qlxx.bdcdyh">
124 <el-input disabled v-model="ruleForm.ssQlxx.bdcdyh"></el-input> 124 <el-input disabled v-model="ruleForm.ztQlxx.bdcdyh"></el-input>
125 </el-form-item> 125 </el-form-item>
126 </el-col> 126 </el-col>
127 <el-col :span="16"> 127 <el-col :span="16">
128 <el-form-item :class="flag ? 'marginBot0' : ''" label="坐落："> 128 <el-form-item :class="flag ? 'marginBot0' : ''" label="坐落：">
129 <el-input disabled v-model="ruleForm.ssQlxx.zl"></el-input> 129 <el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
130 </el-form-item> 130 </el-form-item>
131 </el-col> 131 </el-col>
132 </el-row> 132 </el-row>
133 <el-row :gutter="10"> 133 <el-row :gutter="10">
134 <el-col :span="8"> 134 <el-col :span="8">
135 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质："> 135 <el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质：">
136 <el-input disabled v-model="ruleForm.ssQlxx.qlxzmc"></el-input> 136 <el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input>
137 </el-form-item> 137 </el-form-item>
138 </el-col> 138 </el-col>
139 <el-col :span="8"> 139 <el-col :span="8">
140 <el-form-item :class="flag ? 'marginBot0' : ''" label="用途："> 140 <el-form-item :class="flag ? 'marginBot0' : ''" label="用途：">
141 <el-input disabled v-model="ruleForm.ssQlxx.ytmc"></el-input> 141 <el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input>
142 </el-form-item> 142 </el-form-item>
143 </el-col> 143 </el-col>
144 <el-col :span="8"> 144 <el-col :span="8">
145 <el-form-item :class="flag ? 'marginBot0' : ''" label="面积："> 145 <el-form-item :class="flag ? 'marginBot0' : ''" label="面积：">
146 <el-input disabled v-model="ruleForm.ssQlxx.mjmc"></el-input> 146 <el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input>
147 </el-form-item> 147 </el-form-item>
148 </el-col> 148 </el-col>
149 </el-row> 149 </el-row>
......
...@@ -198,10 +198,9 @@ ...@@ -198,10 +198,9 @@
198 "/djbworkFrameview?bsmSlsq=" + 198 "/djbworkFrameview?bsmSlsq=" +
199 item.bsmSlsq + 199 item.bsmSlsq +
200 "&bestepid=" + 200 "&bestepid=" +
201 item.bestepid + 201 item.bestepid+
202 "&bsmBusiness=" + 202 "&isEdit=" +
203 "&sqywbm=" + 203 true
204 item.djywbm
205 ); 204 );
206 window.open(href, `urlname${item.bsmSlsq}`); 205 window.open(href, `urlname${item.bsmSlsq}`);
207 }else{ 206 }else{
......
...@@ -95,6 +95,9 @@ export default { ...@@ -95,6 +95,9 @@ export default {
95 this.$endLoading() 95 this.$endLoading()
96 if (res.code === 200) { 96 if (res.code === 200) {
97 let { total, records } = res.result; 97 let { total, records } = res.result;
98 records.length && records.forEach(i => {
99 i.ytmc == 'null' ? i.ytmc = "" : i.ytmc = i.ytmc;
100 });
98 this.tableData.data = records; 101 this.tableData.data = records;
99 this.tableData.total = total; 102 this.tableData.total = total;
100 } 103 }
......