999bc88c by renchao@pashanhoo.com

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

2 parents 48007f87 c1b96e41
......@@ -219,7 +219,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -291,6 +291,11 @@
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.diyaq.sfczjzhxz = "0";
}
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
this.$endLoading();
})
},
......@@ -304,6 +309,7 @@
viewEdit: true,
disabled: true,
czrOptions: [],
czr:"",
ruleForm: {
slsq: {},
ssQlxx: {},
......@@ -357,7 +363,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -366,7 +372,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -177,7 +177,7 @@
</el-form-item>
</el-col>
<el-col :span="5" v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-form-item label="持证人1:">
<el-select v-model="czr" placeholder="持证人" :disabled="!viewEdit">
<el-option
v-for="item in czrOptions"
......@@ -277,7 +277,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
czr:'',
ruleForm: {
flow: {
ywh: "",
......
......@@ -331,7 +331,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -398,6 +398,11 @@
...res.result,
...res.result.qlxxdatas,
}
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
......@@ -425,6 +430,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
ruleForm: {
flow: {
ywh: ''
......@@ -529,7 +535,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -538,7 +544,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -212,7 +212,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -272,6 +272,11 @@
...res.result.qlxxdatas,
...res.result.jsydsyqdatas,
};
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null ? this.ruleForm.slsq.fzfs = '1' : this.ruleForm.slsq.fzfs;
this.czrOptions = this.ruleForm.qlrList;
......@@ -290,6 +295,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
ruleForm: {
flow: {
ywh: ''
......@@ -433,7 +439,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -442,7 +448,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -162,7 +162,7 @@
<el-col :span="6" v-if="ruleForm.sldyList[0].gyfs!=0&&ruleForm.sldyList[0].sqfbcz=='0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -252,6 +252,7 @@
zdjbxx: {}, //宗地基本信息
},
czrOptions: [],
czr:"",
//传递参数
propsParam: this.$attrs,
//表单是否可操作
......@@ -284,6 +285,11 @@
this.gyfs = this.ruleForm.sldyList[0].gyfs;
this.splicingFdcq2Info();
}
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
});
},
methods: {
......@@ -378,7 +384,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -387,7 +393,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -157,7 +157,7 @@
</el-col>
<el-col :span="5" v-show="ruleForm.gyfs != '1' && ruleForm.sffbcz=='0'">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit">
<el-select v-model="czr" placeholder="持证人" :disabled="!viewEdit">
<el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
......@@ -207,6 +207,11 @@
...res.result.qlxxdatas,
...res.result.jsydsyqdatas,
};
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
this.czrOptions = this.ruleForm.qlrList;
}
});
......@@ -222,6 +227,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
ruleForm: {
ywh: "",
slry: "",
......@@ -341,7 +347,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -350,7 +356,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -175,7 +175,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -245,6 +245,11 @@
that.$endLoading();
that.isShow = true;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
})
})
},
......@@ -265,6 +270,7 @@
mjdw: "1",
//表单是否可操作
viewEdit: true,
czr:"",
key: 0,
isShow: false,
disabled: true,
......@@ -355,7 +361,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -364,7 +370,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -170,7 +170,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -235,6 +235,11 @@
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
}
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
this.$endLoading();
});
},
......@@ -248,6 +253,7 @@
viewEdit: false,
disabled: true,
czrOptions: [],
czr:"",
ruleForm: {
slywxx: {},
qlxx: {},
......@@ -329,7 +335,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -338,7 +344,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -208,7 +208,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -285,6 +285,11 @@
...res.result,
...res.result.qlxxdatas,
};
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null
? (this.ruleForm.slsq.fzfs = "1")
......@@ -302,6 +307,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
ruleForm: {
flow: {
ywh: "",
......@@ -396,7 +402,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -405,7 +411,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -199,7 +199,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -260,6 +260,11 @@
Init(formdata).then((res) => {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
this.$endLoading();
})
},
......@@ -272,6 +277,7 @@
disabled: true,
//持证人选项
czrOptions: [],
czr:"",
ruleForm: {
zdjbxx: {
ghytmc: ''
......@@ -326,7 +332,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -335,7 +341,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -199,7 +199,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -265,6 +265,11 @@
Init(formdata).then((res) => {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
this.$endLoading();
})
......@@ -279,6 +284,7 @@
viewEdit: true,
disabled: true,
czrOptions: [],
czr:"",
ruleForm: {},
//传递参数
propsParam: {},
......@@ -327,7 +333,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -336,7 +342,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -208,7 +208,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -285,6 +285,11 @@
...res.result,
...res.result.qlxxdatas,
};
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
//初始化发证方式,1:小证,2:大正
this.ruleForm.slsq.fzfs == null
? (this.ruleForm.slsq.fzfs = "1")
......@@ -302,6 +307,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
ruleForm: {
flow: {
ywh: "",
......@@ -396,7 +402,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -405,7 +411,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -279,7 +279,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -363,6 +363,11 @@
that.$endLoading();
that.isShow = true;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
});
});
},
......@@ -389,6 +394,7 @@
isShow: false,
disabled: true,
czrOptions: [],
czr:"",
ruleForm: {},
//传递参数
propsParam: {},
......@@ -475,7 +481,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -484,7 +490,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -200,7 +200,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -263,6 +263,11 @@
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.$endLoading();
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
}
})
},
......@@ -278,6 +283,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
ruleForm: {
qlxx: {}
, sldy: {}
......@@ -349,7 +355,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -358,7 +364,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -136,7 +136,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -199,6 +199,11 @@
this.$endLoading();
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
}
});
},
......@@ -213,6 +218,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
ruleForm: {},
//传递参数
propsParam: this.$attrs,
......@@ -292,7 +298,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -301,7 +307,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -203,7 +203,7 @@
</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="!viewEdit">
<el-select v-model="czr" placeholder="持证人" :disabled="!viewEdit">
<el-option
v-for="item in czrOptions"
:key="item.zjh"
......@@ -274,6 +274,11 @@
if (res.code === 200 && res.result) {
that.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
setTimeout(() => {
that.loading = false;
}, 300);
......@@ -292,6 +297,7 @@
disabled: true,
tdytOption: [],
czrOptions: [],
czr:"",
ruleForm: {},
//传递参数
propsParam: this.$attrs,
......@@ -357,7 +363,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -366,7 +372,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -162,7 +162,7 @@
</el-col>
<el-col :span="5" v-show="ruleForm.sldyList[0].gyfs != '0'&&ruleForm.sldyList[0].sqfbcz == '0' ">
<el-form-item label="持证人:">
<el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit">
<el-select v-model="czr" placeholder="持证人" :disabled="!viewEdit">
<el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
......@@ -224,6 +224,11 @@
if (res.code === 200 && res.result) {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
} else {
this.$message.error(res.message);
}
......@@ -239,6 +244,7 @@
viewEdit: true,
disabled: true,
czrOptions: [],
czr:"",
ruleForm: {},
//传递参数
propsParam: {},
......@@ -287,7 +293,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -296,7 +302,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......
......@@ -218,7 +218,7 @@
v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
<el-form-item label="持证人:">
<el-select
v-model="ruleForm.czr"
v-model="czr"
placeholder="持证人"
:disabled="!viewEdit">
<el-option
......@@ -282,6 +282,11 @@
if (res.code === 200 && res.result) {
this.ruleForm = res.result;
this.czrOptions = this.ruleForm.qlrList;
this.ruleForm.qlrList.forEach((item) => {
if(item.sfczr==1){
this.czr=item.sqrmc
}
})
this.$endLoading();
}
})
......@@ -296,6 +301,7 @@
viewEdit: true,
disabled: true,
czrOptions: [],
czr:"",
ruleForm: {},
//传递参数
propsParam: {},
......@@ -355,7 +361,7 @@
item.sfczr = "1";
});
} else {
if (!that.ruleForm.czr) {
if (!that.czr) {
that.$message({
showClose: true,
message: "请选择持证人",
......@@ -364,7 +370,7 @@
return false;
}
this.ruleForm.qlrList.forEach((item, index) => {
if (item.zjh == this.ruleForm.czr) {
if (item.zjh == this.czr) {
item.sfczr = "1";
} else {
item.sfczr = "0";
......