Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
a037f693 by xiaomiao
Options

Merge branch 'dev'

2 parents f901e658 d5ab5c3a
Inline Side-by-side
Showing 9 changed files with 36 additions and 36 deletions
...@@ -466,7 +466,7 @@ ...@@ -466,7 +466,7 @@
466 <el-form-item label="共有方式："> 466 <el-form-item label="共有方式：">
467 <el-radio-group 467 <el-radio-group
468 :disabled="!ableOperation" 468 :disabled="!ableOperation"
469 v-model="ruleForm.sldy.gyfs"> 469 v-model="ruleForm.qlxx.gyfs">
470 <el-radio label="0">单独所有</el-radio> 470 <el-radio label="0">单独所有</el-radio>
471 <el-radio label="1">共同共有</el-radio> 471 <el-radio label="1">共同共有</el-radio>
472 <el-radio label="2">按份所有</el-radio> 472 <el-radio label="2">按份所有</el-radio>
...@@ -474,10 +474,10 @@ ...@@ -474,10 +474,10 @@
474 </el-radio-group> 474 </el-radio-group>
475 </el-form-item> 475 </el-form-item>
476 </el-col> 476 </el-col>
477 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'"> 477 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
478 <el-form-item label="是否分别持证："> 478 <el-form-item label="是否分别持证：">
479 <el-radio-group 479 <el-radio-group
480 v-model="ruleForm.sldy.sqfbcz" 480 v-model="ruleForm.qlxx.sqfbcz"
481 :disabled="!ableOperation"> 481 :disabled="!ableOperation">
482 <el-radio :label="1">是</el-radio> 482 <el-radio :label="1">是</el-radio>
483 <el-radio :label="0">否</el-radio> 483 <el-radio :label="0">否</el-radio>
...@@ -486,7 +486,7 @@ ...@@ -486,7 +486,7 @@
486 </el-col> 486 </el-col>
487 <el-col 487 <el-col
488 :span="6" 488 :span="6"
489 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'"> 489 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
490 <el-form-item label="持证人："> 490 <el-form-item label="持证人：">
491 <el-select 491 <el-select
492 v-model="ruleForm.czr" 492 v-model="ruleForm.czr"
......
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
366 <el-form-item label="共有方式："> 366 <el-form-item label="共有方式：">
367 <el-radio-group 367 <el-radio-group
368 :disabled="!ableOperation" 368 :disabled="!ableOperation"
369 v-model="ruleForm.sldy.gyfs"> 369 v-model="ruleForm.qlxx.gyfs">
370 <el-radio label="0">单独所有</el-radio> 370 <el-radio label="0">单独所有</el-radio>
371 <el-radio label="1">共同共有</el-radio> 371 <el-radio label="1">共同共有</el-radio>
372 <el-radio label="2">按份所有</el-radio> 372 <el-radio label="2">按份所有</el-radio>
...@@ -374,10 +374,10 @@ ...@@ -374,10 +374,10 @@
374 </el-radio-group> 374 </el-radio-group>
375 </el-form-item> 375 </el-form-item>
376 </el-col> 376 </el-col>
377 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'"> 377 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
378 <el-form-item label="是否分别持证："> 378 <el-form-item label="是否分别持证：">
379 <el-radio-group 379 <el-radio-group
380 v-model="ruleForm.sldy.sqfbcz" 380 v-model="ruleForm.qlxx.sqfbcz"
381 :disabled="!ableOperation"> 381 :disabled="!ableOperation">
382 <el-radio :label="1">是</el-radio> 382 <el-radio :label="1">是</el-radio>
383 <el-radio :label="0">否</el-radio> 383 <el-radio :label="0">否</el-radio>
...@@ -386,7 +386,7 @@ ...@@ -386,7 +386,7 @@
386 </el-col> 386 </el-col>
387 <el-col 387 <el-col
388 :span="6" 388 :span="6"
389 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'"> 389 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
390 <el-form-item label="持证人："> 390 <el-form-item label="持证人：">
391 <el-select 391 <el-select
392 v-model="ruleForm.czr" 392 v-model="ruleForm.czr"
......
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
402 <el-form-item label="共有方式："> 402 <el-form-item label="共有方式：">
403 <el-radio-group 403 <el-radio-group
404 :disabled="!ableOperation" 404 :disabled="!ableOperation"
405 v-model="ruleForm.sldy.gyfs"> 405 v-model="ruleForm.qlxx.gyfs">
406 <el-radio label="0">单独所有</el-radio> 406 <el-radio label="0">单独所有</el-radio>
407 <el-radio label="1">共同共有</el-radio> 407 <el-radio label="1">共同共有</el-radio>
408 <el-radio label="2">按份所有</el-radio> 408 <el-radio label="2">按份所有</el-radio>
...@@ -410,10 +410,10 @@ ...@@ -410,10 +410,10 @@
410 </el-radio-group> 410 </el-radio-group>
411 </el-form-item> 411 </el-form-item>
412 </el-col> 412 </el-col>
413 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'"> 413 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
414 <el-form-item label="是否分别持证："> 414 <el-form-item label="是否分别持证：">
415 <el-radio-group 415 <el-radio-group
416 v-model="ruleForm.sldy.sqfbcz" 416 v-model="ruleForm.qlxx.sqfbcz"
417 :disabled="!ableOperation"> 417 :disabled="!ableOperation">
418 <el-radio :label="1">是</el-radio> 418 <el-radio :label="1">是</el-radio>
419 <el-radio :label="0">否</el-radio> 419 <el-radio :label="0">否</el-radio>
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
422 </el-col> 422 </el-col>
423 <el-col 423 <el-col
424 :span="6" 424 :span="6"
425 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'"> 425 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
426 <el-form-item label="持证人："> 426 <el-form-item label="持证人：">
427 <el-select 427 <el-select
428 v-model="ruleForm.czr" 428 v-model="ruleForm.czr"
......
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
252 <el-form-item label="共有方式："> 252 <el-form-item label="共有方式：">
253 <el-radio-group 253 <el-radio-group
254 :disabled="!ableOperation" 254 :disabled="!ableOperation"
255 v-model="ruleForm.sldy.gyfs"> 255 v-model="ruleForm.qlxx.gyfs">
256 <el-radio label="0">单独所有</el-radio> 256 <el-radio label="0">单独所有</el-radio>
257 <el-radio label="1">共同共有</el-radio> 257 <el-radio label="1">共同共有</el-radio>
258 <el-radio label="2">按份所有</el-radio> 258 <el-radio label="2">按份所有</el-radio>
...@@ -260,10 +260,10 @@ ...@@ -260,10 +260,10 @@
260 </el-radio-group> 260 </el-radio-group>
261 </el-form-item> 261 </el-form-item>
262 </el-col> 262 </el-col>
263 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'"> 263 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
264 <el-form-item label="是否分别持证："> 264 <el-form-item label="是否分别持证：">
265 <el-radio-group 265 <el-radio-group
266 v-model="ruleForm.sldy.sqfbcz" 266 v-model="ruleForm.qlxx.sqfbcz"
267 :disabled="!ableOperation"> 267 :disabled="!ableOperation">
268 <el-radio :label="1">是</el-radio> 268 <el-radio :label="1">是</el-radio>
269 <el-radio :label="0">否</el-radio> 269 <el-radio :label="0">否</el-radio>
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
272 </el-col> 272 </el-col>
273 <el-col 273 <el-col
274 :span="6" 274 :span="6"
275 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'"> 275 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
276 <el-form-item label="持证人："> 276 <el-form-item label="持证人：">
277 <el-select 277 <el-select
278 v-model="ruleForm.czr" 278 v-model="ruleForm.czr"
......
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
348 <el-form-item label="共有方式："> 348 <el-form-item label="共有方式：">
349 <el-radio-group 349 <el-radio-group
350 :disabled="!ableOperation" 350 :disabled="!ableOperation"
351 v-model="ruleForm.sldy.gyfs"> 351 v-model="ruleForm.qlxx.gyfs">
352 <el-radio label="0">单独所有</el-radio> 352 <el-radio label="0">单独所有</el-radio>
353 <el-radio label="1">共同共有</el-radio> 353 <el-radio label="1">共同共有</el-radio>
354 <el-radio label="2">按份所有</el-radio> 354 <el-radio label="2">按份所有</el-radio>
...@@ -356,10 +356,10 @@ ...@@ -356,10 +356,10 @@
356 </el-radio-group> 356 </el-radio-group>
357 </el-form-item> 357 </el-form-item>
358 </el-col> 358 </el-col>
359 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'"> 359 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
360 <el-form-item label="是否分别持证："> 360 <el-form-item label="是否分别持证：">
361 <el-radio-group 361 <el-radio-group
362 v-model="ruleForm.sldy.sqfbcz" 362 v-model="ruleForm.qlxx.sqfbcz"
363 :disabled="!ableOperation"> 363 :disabled="!ableOperation">
364 <el-radio :label="1">是</el-radio> 364 <el-radio :label="1">是</el-radio>
365 <el-radio :label="0">否</el-radio> 365 <el-radio :label="0">否</el-radio>
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
368 </el-col> 368 </el-col>
369 <el-col 369 <el-col
370 :span="6" 370 :span="6"
371 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'"> 371 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
372 <el-form-item label="持证人："> 372 <el-form-item label="持证人：">
373 <el-select 373 <el-select
374 v-model="ruleForm.czr" 374 v-model="ruleForm.czr"
......
...@@ -407,7 +407,7 @@ ...@@ -407,7 +407,7 @@
407 <el-form-item label="共有方式："> 407 <el-form-item label="共有方式：">
408 <el-radio-group 408 <el-radio-group
409 :disabled="!ableOperation" 409 :disabled="!ableOperation"
410 v-model="ruleForm.sldy.gyfs"> 410 v-model="ruleForm.qlxx.gyfs">
411 <el-radio label="0">单独所有</el-radio> 411 <el-radio label="0">单独所有</el-radio>
412 <el-radio label="1">共同共有</el-radio> 412 <el-radio label="1">共同共有</el-radio>
413 <el-radio label="2">按份所有</el-radio> 413 <el-radio label="2">按份所有</el-radio>
...@@ -415,10 +415,10 @@ ...@@ -415,10 +415,10 @@
415 </el-radio-group> 415 </el-radio-group>
416 </el-form-item> 416 </el-form-item>
417 </el-col> 417 </el-col>
418 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'"> 418 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
419 <el-form-item label="是否分别持证："> 419 <el-form-item label="是否分别持证：">
420 <el-radio-group 420 <el-radio-group
421 v-model="ruleForm.sldy.sqfbcz" 421 v-model="ruleForm.qlxx.sqfbcz"
422 :disabled="!ableOperation"> 422 :disabled="!ableOperation">
423 <el-radio :label="1">是</el-radio> 423 <el-radio :label="1">是</el-radio>
424 <el-radio :label="0">否</el-radio> 424 <el-radio :label="0">否</el-radio>
...@@ -427,7 +427,7 @@ ...@@ -427,7 +427,7 @@
427 </el-col> 427 </el-col>
428 <el-col 428 <el-col
429 :span="6" 429 :span="6"
430 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'"> 430 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
431 <el-form-item label="持证人："> 431 <el-form-item label="持证人：">
432 <el-select 432 <el-select
433 v-model="ruleForm.czr" 433 v-model="ruleForm.czr"
......
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
328 <el-form-item label="共有方式："> 328 <el-form-item label="共有方式：">
329 <el-radio-group 329 <el-radio-group
330 :disabled="!ableOperation" 330 :disabled="!ableOperation"
331 v-model="ruleForm.sldy.gyfs"> 331 v-model="ruleForm.qlxx.gyfs">
332 <el-radio label="0">单独所有</el-radio> 332 <el-radio label="0">单独所有</el-radio>
333 <el-radio label="1">共同共有</el-radio> 333 <el-radio label="1">共同共有</el-radio>
334 <el-radio label="2">按份所有</el-radio> 334 <el-radio label="2">按份所有</el-radio>
...@@ -336,10 +336,10 @@ ...@@ -336,10 +336,10 @@
336 </el-radio-group> 336 </el-radio-group>
337 </el-form-item> 337 </el-form-item>
338 </el-col> 338 </el-col>
339 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'"> 339 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
340 <el-form-item label="是否分别持证："> 340 <el-form-item label="是否分别持证：">
341 <el-radio-group 341 <el-radio-group
342 v-model="ruleForm.sldy.sqfbcz" 342 v-model="ruleForm.qlxx.sqfbcz"
343 :disabled="!ableOperation"> 343 :disabled="!ableOperation">
344 <el-radio :label="1">是</el-radio> 344 <el-radio :label="1">是</el-radio>
345 <el-radio :label="0">否</el-radio> 345 <el-radio :label="0">否</el-radio>
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
348 </el-col> 348 </el-col>
349 <el-col 349 <el-col
350 :span="6" 350 :span="6"
351 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'"> 351 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
352 <el-form-item label="持证人："> 352 <el-form-item label="持证人：">
353 <el-select 353 <el-select
354 v-model="ruleForm.czr" 354 v-model="ruleForm.czr"
......
...@@ -316,10 +316,10 @@ ...@@ -316,10 +316,10 @@
316 </el-radio-group> 316 </el-radio-group>
317 </el-form-item> 317 </el-form-item>
318 </el-col> 318 </el-col>
319 <el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'"> 319 <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
320 <el-form-item label="是否分别持证："> 320 <el-form-item label="是否分别持证：">
321 <el-radio-group 321 <el-radio-group
322 v-model="ruleForm.sldy.sqfbcz" 322 v-model="ruleForm.qlxx.sqfbcz"
323 :disabled="!ableOperation"> 323 :disabled="!ableOperation">
324 <el-radio :label="1">是</el-radio> 324 <el-radio :label="1">是</el-radio>
325 <el-radio :label="0">否</el-radio> 325 <el-radio :label="0">否</el-radio>
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
328 </el-col> 328 </el-col>
329 <el-col 329 <el-col
330 :span="6" 330 :span="6"
331 v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs == '1'"> 331 v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
332 <el-form-item label="持证人："> 332 <el-form-item label="持证人：">
333 <el-select 333 <el-select
334 v-model="ruleForm.czr" 334 v-model="ruleForm.czr"
......
...@@ -157,12 +157,13 @@ export default { ...@@ -157,12 +157,13 @@ export default {
157 this.tableData.forEach((item) => { 157 this.tableData.forEach((item) => {
158 item.show = true; 158 item.show = true;
159 if (this.$parent.dqhj == item.jddm) { 159 if (this.$parent.dqhj == item.jddm) {
160 item["stepid"] = this.$route.query.bestepid;
161 item.shjssj = getNewDatesh();
162 item.shkssj = getNewDatesh();
163 item["shryxm"] = this.userInfo.name;
164 item["userid"] = this.userInfo.id;
160 item.show = false; 165 item.show = false;
161 } 166 }
162 item.shjssj = getNewDatesh();
163 item.shkssj = getNewDatesh();
164 item["shryxm"] = this.userInfo.name;
165 item["userid"] = this.userInfo.id;
166 }); 167 });
167 } 168 }
168 }); 169 });
...@@ -180,7 +181,6 @@ export default { ...@@ -180,7 +181,6 @@ export default {
180 onSubmit() { 181 onSubmit() {
181 this.tableData.forEach((item, index) => { 182 this.tableData.forEach((item, index) => {
182 item["bsmBusiness"] = this.propsParam.bsmBusiness; 183 item["bsmBusiness"] = this.propsParam.bsmBusiness;
183 item["stepid"] = this.$route.query.bestepid;
184 item["czjg"] = "1"; 184 item["czjg"] = "1";
185 }); 185 });
186 saveSpyjBySlsq(this.tableData).then((res) => { 186 saveSpyjBySlsq(this.tableData).then((res) => {
......