2b66282e by renchao@pashanhoo.com

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

2 parents 4010abbb a883347d
...@@ -384,6 +384,19 @@ ...@@ -384,6 +384,19 @@
384 @upDateQlrxxList="upDateQlrxxList" 384 @upDateQlrxxList="upDateQlrxxList"
385 :disabled="viewEdit" 385 :disabled="viewEdit"
386 :gyfs="ruleForm.sldy.gyfs" /> 386 :gyfs="ruleForm.sldy.gyfs" />
387
388 <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0 && ruleForm.qlxx.djlx==200">
389 <div class="slxx_title title-block">
390 义务人信息
391 <div class="triangle"></div>
392 </div>
393 <ywrCommonTable
394 v-if="ruleForm.ywrList"
395 :disabled="viewEdit"
396 :tableData="ruleForm.ywrList"
397 :key="key"
398 @upDateQlrxxList="upDateYwrxxList" />
399 </div>
387 <div class="slxx_title title-block"> 400 <div class="slxx_title title-block">
388 登记原因 401 登记原因
389 <div class="triangle"></div> 402 <div class="triangle"></div>
...@@ -414,6 +427,7 @@ ...@@ -414,6 +427,7 @@
414 <script> 427 <script>
415 import ywmix from "@/views/ywbl/mixin/index"; 428 import ywmix from "@/views/ywbl/mixin/index";
416 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; 429 import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
430 import ywrCommonTable from "@/views/workflow/components/ywrCommonTable";
417 import tdytTable from "@/views/workflow/components/tdytTable"; 431 import tdytTable from "@/views/workflow/components/tdytTable";
418 import { Init, saveData } from "@/api/workflow/fwsyqFlow.js"; 432 import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
419 import { mapGetters } from "vuex"; 433 import { mapGetters } from "vuex";
...@@ -460,7 +474,7 @@ ...@@ -460,7 +474,7 @@
460 this.isSave = false 474 this.isSave = false
461 }) 475 })
462 }, 476 },
463 components: { qlrCommonTable, tdytTable }, 477 components: { qlrCommonTable, tdytTable, ywrCommonTable},
464 computed: { 478 computed: {
465 ...mapGetters(["dictData", "flag"]), 479 ...mapGetters(["dictData", "flag"]),
466 }, 480 },
......