Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
2d2c1958 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 35ac0856 7f9095f1
Expand all
Inline Side-by-side
Showing 11 changed files with 57 additions and 54 deletions
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-02 11:00:09
* @LastEditTime: 2023-08-04 10:59:11
-->
<template>
<!-- 受理信息 -->
......@@ -366,7 +366,7 @@
<el-form-item label="共有方式：">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.qlxx.gyfs">
v-model="ruleForm.sldy.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -374,10 +374,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-form-item label="是否分别持证：">
<el-radio-group
v-model="ruleForm.qlxx.sqfbcz"
v-model="ruleForm.sldy.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
......@@ -386,7 +386,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs == '1'">
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人：">
<el-select
v-model="ruleForm.czr"
......@@ -433,7 +433,7 @@
<script>
import { mapGetters } from "vuex";
import ywmix from "@/views/ywbl/mixin/index"
import { init, getSsQlxx, getZtQlxx, getQlxxByQlxxBsm,save } from "@/api/djbRepair.js";
import { init, getSsQlxx, getZtQlxx, getQlxxByQlxxBsm, save } from "@/api/djbRepair.js";
import qlrCommonTable from "@/views/djbworkflow/components/qlrCommonTable";
import ywrCommonTable from "@/views/djbworkflow/components/ywrCommonTable";
import tdytTable from "@/views/workflow/components/tdytTable";
......@@ -549,11 +549,11 @@
ssQlxxchange (val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ywh;
this.ssQlxxchangediolog (val)
this.ssQlxxchangediolog(val)
},
// 弹框事件
ssQlxxchangediolog (val) {
console.log("确定了",this.ruleForm)
console.log("确定了", this.ruleForm)
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
......@@ -714,7 +714,7 @@
});
return false;
}
if (this.ruleForm.qlxx.gyfs == "0") {
if (this.ruleForm.sldy.gyfs == "0") {
if (this.ruleForm.qlrData.length > 1) {
this.$message({
showClose: true,
......@@ -724,16 +724,23 @@
return false;
}
this.ruleForm.qlrData[0].sfczr = "1";
}
if (this.ruleForm.qlxx.gyfs == "1") {
} else {
//是否分别持证
if (this.ruleForm.qlxx.sqfbcz == "1") {
if (this.ruleForm.sldy.sqfbcz == "1") {
//是
this.ruleForm.qlrData.forEach((item, index) => {
this.ruleForm.qlrList.forEach((item, index) => {
item.sfczr = "1";
});
} else {
this.ruleForm.qlrData.forEach((item, index) => {
if (!that.ruleForm.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
type: "error",
});
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
item.sfczr = "1";
} else {
......
<!--
* @Description :宗地基本信息
* @Autor : miaofang
* @LastEditTime : 2023-07-31 17:21:56
* @LastEditTime: 2023-08-04 10:06:45
-->
<template>
<div class="tableDivCss">
......@@ -87,30 +87,11 @@
<td colspan="3">{{ zdjbxx.zdszb }}</td>
</tr>
<tr>
<td>登记时间</td>
<td colspan="2">{{ zdjbxx.bz }}</td>
<td>登簿人</td>
<td>{{ zdjbxx.bz }}</td>
</tr>
<tr>
<td>附记</td>
<td colspan="4">{{ zdjbxx.fj }}</td>
</tr>
<!-- <tr>
<td>状态</td>
<td colspan="2">{{ zdjbxx.zt }}</td>
<td>区县代码</td>
<td>{{ zdjbxx.qxdm }}</td>
</tr> -->
<tr v-if="showGroup">
<td rowspan="4">变化情况</td>
<!-- <table cellspacing="0" cellpadding="0" :width="bhqkTableWidth">
<tr v-for="(item, index) in bhqkColumns" :key="index">
<td class="bhqkTh">{{ item.label }}</td>
</tr>
</table> -->
</tr>
<tr v-if="showGroup">
......@@ -130,11 +111,11 @@
</template>
<script>
import store from "@/store/index.js";
import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js";
import store from "@/store/index.js";
import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js";
export default {
data() {
export default {
data () {
return {
bhqkColumns: [
{
......@@ -213,7 +194,7 @@ export default {
}
},
},
created() {
created () {
this.loadData();
},
methods: {
......@@ -221,7 +202,7 @@ export default {
* @description: loadData
* @author: renchao
*/
loadData() {
loadData () {
getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
if (res.code === 200) {
this.zdjbxx = res.result.zdjbxx;
......@@ -233,8 +214,8 @@ export default {
});
},
},
};
};
</script>
<style lang="scss" scoped>
@import "~@/styles/tablecss.scss";
@import "~@/styles/tablecss.scss";
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-02 08:45:57
* @LastEditTime: 2023-08-04 10:56:39
-->
<template>
<!-- 受理信息 -->
......@@ -312,6 +312,7 @@
* @author: renchao
*/
onSubmit () {
let that = this
if (this.ruleForm.qlrList.length == 0) {
this.$message({
showClose: true,
......@@ -320,7 +321,6 @@
});
return false;
}
if (this.ruleForm.sldy.gyfs == "0") {
if (this.ruleForm.qlrList.length > 1) {
this.$message({
......@@ -331,21 +331,29 @@
return false;
}
this.ruleForm.qlrList[0].sfczr = "1";
}
if (this.ruleForm.sldy.gyfs == "1") {
} else {
//是否分别持证
if (this.ruleForm.sldy.sqfbcz == '1') { //是
if (this.ruleForm.sldy.sqfbcz == "1") {
//是
this.ruleForm.qlrList.forEach((item, index) => {
item.sfczr = "1"
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
type: "error",
});
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
item.sfczr = "1"
item.sfczr = "1";
} else {
item.sfczr = "0"
item.sfczr = "0";
}
})
});
}
}
/**
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-01 18:15:20
* @LastEditTime: 2023-08-04 10:59:55
-->
<template>
<!-- 受理信息 -->
......@@ -449,8 +449,7 @@
return false;
}
this.ruleForm.qlrList[0].sfczr = "1";
}
if (this.ruleForm.sldy.gyfs == "1") {
} else {
//是否分别持证
if (this.ruleForm.sldy.sqfbcz == "1") {
//是
......@@ -458,6 +457,14 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
type: "error",
});
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
item.sfczr = "1";
......