Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
4465eff1 by renchao@pashanhoo.com
Options

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

2 parents 19d2e81e 177136d2
Expand all
Inline Side-by-side
Showing 9 changed files with 55 additions and 296 deletions
......@@ -107,7 +107,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="坐落：">
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -189,23 +189,11 @@
<el-form-item
label="是否被续封："
prop="cfdj.sfbxf"
<<<<<<< HEAD
:rules="rules.sfbxfrules">
<el-select v-model="ruleForm.cfdj.sfbxf" @change="djlxchange">
<el-option
v-for="item in sfbxflist"
:key="item.dcode"
:label="item.dname"
:value="item.dcode"></el-option>
</el-select>
=======
:rules="rules.sfbxfrules"
>
<el-radio-group v-model="ruleForm.cfdj.sfbxf">
<el-radio-group v-model="ruleForm.cfdj.sfbxf" @change="djlxchange">
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
>>>>>>> 1f8b14f926a91690cf660a297aa8a8f4a2658f8b
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -519,7 +507,6 @@
},
// 弹框事件
ssQlxxchangediolog (val) {
console.log("确定了", this.ruleForm);
this.$confirm("是否将上手权利信息同步到表单", "提示", {
iconClass: "el-icon-question", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
......@@ -530,8 +517,6 @@
getQlxxByQlxxBsm({ qlxxBsm: val.bsmQlxx }).then((res) => {
if (res.code == 200) {
this.nowlist = res.result;
console.log("his.nowlist", this.nowlist);
console.log("this.ruleForm", this.ruleForm);
for (var key in this.ruleForm.cfdj) {
if (
this.ruleForm.cfdj[key] == "" ||
......@@ -545,13 +530,11 @@
(this.ruleForm.qlxx[key] == null && key != "ywh") ||
this.ruleForm.qlxx[key] == null
) {
console.log("this.ruleForm.qlxx[key]", key);
if (key != "ywh") {
this.ruleForm.qlxx[key] = this.nowlist.qlxx[key];
}
}
}
console.log("this.ruleForm", this.ruleForm);
this.$message({
type: "success",
message: "同步成功!",
......
......@@ -103,7 +103,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="坐落：">
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -479,7 +479,7 @@
<el-form-item label="共有方式：">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -487,10 +487,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证：">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
......@@ -499,7 +499,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
<el-form-item label="持证人：">
<el-select
v-model="ruleForm.czr"
......@@ -513,7 +513,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrData"
......@@ -835,7 +835,7 @@
});
return false;
}
if (this.ruleForm.sldy.gyfs == "0") {
if (this.ruleForm.qlxx.gyfs == "0") {
if (this.ruleForm.qlrData.length > 1) {
this.$message({
showClose: true,
......@@ -846,7 +846,7 @@
}
this.ruleForm.qlrData[0].sfczr = "1";
} else {
if (this.ruleForm.qlrList.length <= 1) {
if (this.ruleForm.qlrData.length <= 1) {
this.$message({
showClose: true,
message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
......@@ -854,29 +854,29 @@
});
return false;
}
//是否分别持证
if (this.ruleForm.sldy.sqfbcz == "1") {
//是
this.ruleForm.qlrList.forEach((item, index) => {
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";
} else {
item.sfczr = "0";
}
})
}
// //是否分别持证
// if (this.ruleForm.qlxx.sqfbcz == "1") {
// //是
// this.ruleForm.qlrData.forEach((item, index) => {
// item.sfczr = "1";
// });
// } else {
// if (!that.ruleForm.czr) {
// that.$message({
// showClose: true,
// message: "请选择持证人",
// type: "error",
// });
// return false;
// }
// this.ruleForm.qlrData.forEach((item, index) => {
// if (item.zjh == this.ruleForm.czr) {
// item.sfczr = "1";
// } else {
// item.sfczr = "0";
// }
// })
// }
}
save(this.ruleForm).then((res) => {
if (res.code === 200) {
......
......@@ -105,7 +105,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="坐落：">
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
<el-input disabled v-model="ruleForm.ztQlxx.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -722,7 +722,7 @@
});
return false;
}
if (this.ruleForm.sldy.gyfs == "0") {
if (this.ruleForm.qlxx.gyfs == "0") {
if (this.ruleForm.qlrData.length > 1) {
this.$message({
showClose: true,
......@@ -731,7 +731,6 @@
});
return false;
}
this.ruleForm.qlrData[0].sfczr = "1";
} else {
if (this.ruleForm.qlrList.length <= 1) {
this.$message({
......@@ -741,29 +740,7 @@
});
return false;
}
//是否分别持证
if (this.ruleForm.sldy.sqfbcz == "1") {
//是
this.ruleForm.qlrList.forEach((item, index) => {
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";
} else {
item.sfczr = "0";
}
});
}
}
save(this.ruleForm).then((res) => {
if (res.code === 200) {
......
......@@ -399,7 +399,7 @@
<el-form-item label="共有方式：">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -407,33 +407,6 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-form-item label="是否分别持证：">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人：">
<el-select
v-model="ruleForm.czr"
placeholder="持证人"
:disabled="!ableOperation">
<el-option
v-for="item in czrOptions"
:key="item.zjh"
:label="item.sqrmc"
:value="item.zjh">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrData"
......@@ -762,7 +735,7 @@ djlxchange(val) {
return false;
}
}
if (this.ruleForm.sldy.gyfs == "0") {
if (this.ruleForm.qlxx.gyfs == "0") {
if (this.ruleForm.qlrData.length > 1) {
this.$message({
showClose: true,
......@@ -771,9 +744,8 @@ djlxchange(val) {
});
return false;
}
this.ruleForm.qlrData[0].sfczr = "1";
} else {
if (this.ruleForm.qlrList.length <= 1) {
if (this.ruleForm.qlrData.length <= 1) {
this.$message({
showClose: true,
message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
......@@ -781,29 +753,6 @@ djlxchange(val) {
});
return false;
}
//是否分别持证
if (this.ruleForm.sldy.sqfbcz == "1") {
//是
this.ruleForm.qlrList.forEach((item, index) => {
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";
} else {
item.sfczr = "0";
}
});
}
}
save(this.ruleForm).then((res) => {
if (res.code === 200) {
......
......@@ -271,33 +271,6 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证：">
<el-radio-group
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col
:span="6"
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
<el-form-item label="持证人：">
<el-select
v-model="ruleForm.czr"
placeholder="持证人"
:disabled="!ableOperation">
<el-option
v-for="item in czrOptions"
:key="item.zjh"
:label="item.sqrmc"
:value="item.zjh">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrData"
......@@ -612,9 +585,8 @@ export default {
});
return false;
}
this.ruleForm.qlrData[0].sfczr = "1";
} else {
if (this.ruleForm.qlrList.length <= 1) {
if (this.ruleForm.qlrData.length <= 1) {
this.$message({
showClose: true,
message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
......@@ -622,29 +594,6 @@ export default {
});
return false;
}
//是否分别持证
if (this.ruleForm.qlxx.sqfbcz == "1") {
//是
this.ruleForm.qlrList.forEach((item, index) => {
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";
} else {
item.sfczr = "0";
}
});
}
}
save(this.ruleForm).then((res) => {
if (res.code === 200) {
......
......@@ -364,7 +364,7 @@
</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.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证：">
<el-radio-group
v-model="ruleForm.qlxx.sqfbcz"
......@@ -373,8 +373,8 @@
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col
</el-col> -->
<!-- <el-col
:span="6"
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
<el-form-item label="持证人：">
......@@ -390,7 +390,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrData"
......@@ -691,38 +691,14 @@ export default {
});
return false;
}
this.ruleForm.qlrData[0].sfczr = "1";
} else {
if (this.ruleForm.qlrList.length <= 1) {
if (this.ruleForm.qlrData.length <= 1) {
this.$message({
showClose: true,
message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
type: "error",
});
return false;
}
//是否分别持证
if (this.ruleForm.qlxx.sqfbcz == "1") {
//是
this.ruleForm.qlrList.forEach((item, index) => {
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";
} else {
item.sfczr = "0";
}
});
return false;
}
}
save(this.ruleForm).then((res) => {
......
......@@ -105,7 +105,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="坐落：">
<el-input disabled v-model="ruleForm.sldy.zl"></el-input>
<el-input disabled v-model="ruleForm.qlxx.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -452,7 +452,7 @@
<el-form-item label="共有方式：">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -460,33 +460,6 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<el-form-item label="是否分别持证：">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人：">
<el-select
v-model="ruleForm.czr"
placeholder="持证人"
:disabled="!ableOperation">
<el-option
v-for="item in czrOptions"
:key="item.zjh"
:label="item.sqrmc"
:value="item.zjh">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrData"
......@@ -816,9 +789,8 @@ created() {
});
return false;
}
this.ruleForm.qlrData[0].sfczr = "1";
} else {
if (this.ruleForm.qlrList.length <= 1) {
if (this.ruleForm.qlrData.length <= 1) {
this.$message({
showClose: true,
message: "共有方式：共同所有，按份所有，其他所有，权利人必须是两个以上",
......@@ -826,29 +798,6 @@ created() {
});
return false;
}
//是否分别持证
if (this.ruleForm.sldy.sqfbcz == "1") {
//是
this.ruleForm.qlrList.forEach((item, index) => {
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";
} else {
item.sfczr = "0";
}
});
}
}
save(this.ruleForm).then((res) => {
if (res.code === 200) {
......
......@@ -368,7 +368,7 @@
<el-form-item label="共有方式：">
<el-radio-group
:disabled="!ableOperation"
v-model="ruleForm.sldy.gyfs">
v-model="ruleForm.qlxx.gyfs">
<el-radio label="0">单独所有</el-radio>
<el-radio label="1">共同共有</el-radio>
<el-radio label="2">按份所有</el-radio>
......@@ -376,10 +376,10 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-show="ruleForm.sldy.gyfs != '0'">
<!-- <el-col :span="6" v-show="ruleForm.qlxx.gyfs != '0'">
<el-form-item label="是否分别持证：">
<el-radio-group
v-model="ruleForm.sldy.sqfbcz"
v-model="ruleForm.qlxx.sqfbcz"
:disabled="!ableOperation">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
......@@ -388,7 +388,7 @@
</el-col>
<el-col
:span="6"
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
v-show="ruleForm.qlxx.sqfbcz == '0' && ruleForm.qlxx.gyfs != '0'">
<el-form-item label="持证人：">
<el-select
v-model="ruleForm.czr"
......@@ -402,7 +402,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<qlrCommonTable
:tableData="ruleForm.qlrData"
......@@ -712,7 +712,7 @@ created() {
});
return false;
}
if (this.ruleForm.sldy.gyfs == "0") {
if (this.ruleForm.qlxx.gyfs == "0") {
if (this.ruleForm.qlrData.length > 1) {
this.$message({
showClose: true,
......@@ -721,7 +721,6 @@ created() {
});
return false;
}
this.ruleForm.qlrData[0].sfczr = "1";
} else {
if (this.ruleForm.qlrList.length <= 1) {
this.$message({
......@@ -731,29 +730,6 @@ created() {
});
return false;
}
//是否分别持证
if (this.ruleForm.sldy.sqfbcz == "1") {
//是
this.ruleForm.qlrList.forEach((item, index) => {
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";
} else {
item.sfczr = "0";
}
});
}
}
save(this.ruleForm).then((res) => {
if (res.code === 200) {
......