Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev
Showing
4 changed files
with
16 additions
and
20 deletions
This diff is collapsed.
Click to expand it.
... | @@ -384,7 +384,7 @@ | ... | @@ -384,7 +384,7 @@ |
384 | </el-radio-group> | 384 | </el-radio-group> |
385 | </el-form-item> | 385 | </el-form-item> |
386 | </el-col> | 386 | </el-col> |
387 | <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'"> | 387 | <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'"> |
388 | <el-form-item label="是否分别持证:"> | 388 | <el-form-item label="是否分别持证:"> |
389 | <el-radio-group | 389 | <el-radio-group |
390 | v-model="ruleForm.qlxx.sqfbcz" | 390 | v-model="ruleForm.qlxx.sqfbcz" |
... | @@ -410,7 +410,7 @@ | ... | @@ -410,7 +410,7 @@ |
410 | </el-option> | 410 | </el-option> |
411 | </el-select> | 411 | </el-select> |
412 | </el-form-item> | 412 | </el-form-item> |
413 | </el-col> | 413 | </el-col> --> |
414 | </el-row> | 414 | </el-row> |
415 | <qlrCommonTable | 415 | <qlrCommonTable |
416 | :tableData="ruleForm.qlrData" | 416 | :tableData="ruleForm.qlrData" | ... | ... |
... | @@ -345,7 +345,7 @@ | ... | @@ -345,7 +345,7 @@ |
345 | </el-radio-group> | 345 | </el-radio-group> |
346 | </el-form-item> | 346 | </el-form-item> |
347 | </el-col> | 347 | </el-col> |
348 | <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'"> | 348 | <!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'"> |
349 | <el-form-item label="是否分别持证:"> | 349 | <el-form-item label="是否分别持证:"> |
350 | <el-radio-group | 350 | <el-radio-group |
351 | v-model="ruleForm.qlxx.sqfbcz" | 351 | v-model="ruleForm.qlxx.sqfbcz" |
... | @@ -375,7 +375,7 @@ | ... | @@ -375,7 +375,7 @@ |
375 | </el-option> | 375 | </el-option> |
376 | </el-select> | 376 | </el-select> |
377 | </el-form-item> | 377 | </el-form-item> |
378 | </el-col> | 378 | </el-col> --> |
379 | </el-row> | 379 | </el-row> |
380 | <qlrCommonTable | 380 | <qlrCommonTable |
381 | :tableData="ruleForm.qlrData" | 381 | :tableData="ruleForm.qlrData" |
... | @@ -408,7 +408,7 @@ | ... | @@ -408,7 +408,7 @@ |
408 | </template> | 408 | </template> |
409 | <script> | 409 | <script> |
410 | import { mapGetters } from "vuex"; | 410 | import { mapGetters } from "vuex"; |
411 | import ywmix from "@/views/ywbl/mixin/index"; | 411 | // import ywmix from "@/views/ywbl/mixin/index"; |
412 | import { | 412 | import { |
413 | init, | 413 | init, |
414 | getSsQlxx, | 414 | getSsQlxx, |
... | @@ -421,7 +421,7 @@ import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable"; | ... | @@ -421,7 +421,7 @@ import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable"; |
421 | import tdytTable from "@/views/workflow/components/tdytTable"; | 421 | import tdytTable from "@/views/workflow/components/tdytTable"; |
422 | import selectTable from "@/components/selectTable/index.vue"; | 422 | import selectTable from "@/components/selectTable/index.vue"; |
423 | export default { | 423 | export default { |
424 | mixins: [ywmix], | 424 | // mixins: [ywmix], |
425 | components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable }, | 425 | components: { qlrCommonTable, ywrCommonTable, tdytTable, selectTable }, |
426 | computed: { | 426 | computed: { |
427 | ...mapGetters(["dictData", "flag"]), | 427 | ...mapGetters(["dictData", "flag"]), |
... | @@ -711,24 +711,17 @@ export default { | ... | @@ -711,24 +711,17 @@ export default { |
711 | return false; | 711 | return false; |
712 | } | 712 | } |
713 | this.ruleForm.qlrData[0].sfczr = "1"; | 713 | this.ruleForm.qlrData[0].sfczr = "1"; |
714 | } | ||
715 | if (this.ruleForm.qlxx.gyfs == "1") { | ||
716 | //是否分别持证 | ||
717 | if (this.ruleForm.qlxx.sqfbcz == "1") { | ||
718 | //是 | ||
719 | this.ruleForm.qlrData.forEach((item, index) => { | ||
720 | item.sfczr = "1"; | ||
721 | }); | ||
722 | } else { | ||
723 | this.ruleForm.qlrData.forEach((item, index) => { | ||
724 | if (item.zjh == this.ruleForm.czr) { | ||
725 | item.sfczr = "1"; | ||
726 | } else { | 714 | } else { |
727 | item.sfczr = "0"; | 715 | if (this.ruleForm.qlrData.length <= 1) { |
728 | } | 716 | this.$message({ |
717 | showClose: true, | ||
718 | message: "共有方式:共同所有,按份所有,其他所有,权利人必须是两个以上", | ||
719 | type: "error", | ||
729 | }); | 720 | }); |
721 | return false; | ||
730 | } | 722 | } |
731 | } | 723 | } |
724 | |||
732 | save(this.ruleForm).then((res) => { | 725 | save(this.ruleForm).then((res) => { |
733 | if (res.code === 200) { | 726 | if (res.code === 200) { |
734 | this.$message({ | 727 | this.$message({ | ... | ... |
1 | import { log } from "bpmn-js-token-simulation" | ||
2 | |||
1 | /* | 3 | /* |
2 | * @Description: | 4 | * @Description: |
3 | * @Autor: renchao | 5 | * @Autor: renchao |
... | @@ -11,6 +13,7 @@ export default { | ... | @@ -11,6 +13,7 @@ export default { |
11 | watch: { | 13 | watch: { |
12 | 'ruleForm.sldy.gyfs': { | 14 | 'ruleForm.sldy.gyfs': { |
13 | handler: function (val, oldVal) { | 15 | handler: function (val, oldVal) { |
16 | console.log("单独所有",val,oldVal); | ||
14 | if (val == '0' && this.ruleForm.qlrList.length > 1 && oldVal) { | 17 | if (val == '0' && this.ruleForm.qlrList.length > 1 && oldVal) { |
15 | this.ruleForm.sldy.gyfs = oldVal | 18 | this.ruleForm.sldy.gyfs = oldVal |
16 | this.$message({ | 19 | this.$message({ | ... | ... |
-
Please register or sign in to post a comment