48f0cac3 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents b260924e 51a2fe9d
......@@ -8,20 +8,20 @@
<th colspan="12"><font size="4"></font>多幢基本信息</th>
</tr>
<tr height="30">
<td colspan="2" align="center" >宗地代码</td>
<td colspan="2" align="center">宗地代码</td>
<td colspan="4" >
<input class="formInput" :disabled="disabled" maxlength="19" v-model="form.zddm">
<input class="formInput" disabled maxlength="19" v-model="form.zddm">
</td>
<td colspan="2" align="center" >不动产单元号</td>
<td colspan="2" align="center" ><i class="requisite">*</i>不动产单元号</td>
<td colspan="4" class="psr">
<input class="formInput percent80" :disabled="disabled" maxlength="28" v-model="form.bdcdyh">
<input class="formInput percent80" :disabled="disabled" maxlength="28" v-model="form.bdcdyh" @blur="inputBlur($event)" ref="bdcdyh">
<el-button @click.prevent="generatorCode" :disabled="disabled" size="mini" class="createBtn" type="warning">生成</el-button>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >项目名称</td>
<td colspan="2" align="center" ><i class="requisite">*</i>项目名称</td>
<td colspan="4" >
<input class="formInput" :disabled="disabled" v-model="form.xmmc">
<input class="formInput" :disabled="disabled" v-model="form.xmmc" @blur="inputBlur($event)" ref="xmmc">
</td>
<td colspan="2" align="center" >房屋性质</td>
<td colspan="4" >
......@@ -142,10 +142,10 @@
<tr height="30">
<td colspan="2" align="center" >
<span>坐落</span>
<span><i class="requisite">*</i>坐落</span>
</td>
<td colspan="10" >
<input class="formInput" v-model="form.zl" :disabled="disabled">
<input class="formInput" v-model="form.zl" :disabled="disabled" @blur="inputBlur($event)" ref="zl">
</td>
</tr>
......@@ -284,6 +284,8 @@
value: '',
ytTitleRowspan:1, //用途的单元格垂直合并数量
mainBoxWidth: 0,
rules:[],
}
},
created() {
......@@ -382,6 +384,15 @@
this.form.qlxzList
},
inputBlur(e) {
if (e.target.value != '') {
e.target.style.border = ""
} else {
e.target.style.border = "1px solid red";
e.target.style.boxSizing = 'border-box';
}
},
deleteQlxzItem(index){
},
......@@ -434,21 +445,84 @@
onSave(){
this.rules=[
{
data:this.form.bdcdyh,
name:'不动产单元号',
dom:this.$refs.bdcdyh,
rule: /^\s*$/g, //非空
},
{
data:this.form.xmmc,
name:'项目名称',
dom:this.$refs.xmmc,
rule: /^\s*$/g, //非空
},
{
data:this.form.zl,
name:'坐落',
dom:this.$refs.zl,
rule: /^\s*$/g, //非空
},
]
this.form.fwytList.forEach((item,index)=>{
this.rules.push(
{
data:item.fwytzdbsm,
name:'规划用途',
dom:this.$refs.ghyt[index],
rule: /^\s*$/g, //非空
},
{
data:item.fwytzdbsm,
name:'用途',
dom:this.$refs.yt[index],
rule: /^\s*$/g, //非空
},
)
})
console.log(this.form)
this.form.dzbsm=this.bsm;
let flag = true;
this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
if(1>0){
saveDzInfo(this.form).then((res)=>{
if(res.code===200){
this.$message.success("保存完成!")
}else {
this.$message({
message: res.message,
type: "warning",
});
this.$refs.qlxzModule.getRules();
this.rules.forEach(item=>{
if(item.rule.test(item.data) || item.data == null){
if(item.dom.$el){
item.dom.$el.style.border = '1px solid red';
item.dom.$el.style.boxSizing = 'border-box';
}else{
item.dom.style.border = '1px solid red';
item.dom.style.boxSizing = 'border-box';
}
})
}
flag = false;
return false
}
})
this.$nextTick(()=> {
if (flag && this.$refs.qlxzModule.getRulesResult()) {
saveDzInfo(this.form).then((res)=>{
if(res.code===200){
this.$message.success("保存完成!")
}else {
this.$message({
message: res.message,
type: "warning",
});
}
})
}else {
this.$message({
// message: item.name+'不能为空',
message: '请完善表单后再继续操作',
type: "warning",
});
}
})
},
onSubmit(){
console.log(this.form)
......@@ -519,6 +593,24 @@
this.getDzDetailByBsm(val)
},
"form.fwytList": {
handler : function (newVal, oldVal) {
newVal.forEach((item,ind)=>{
if(item.fwytzdbsm != ''){
this.$refs.ghyt[ind].$el.style.border=""
this.$refs.yt[ind].$el.style.border=""
}
})
},
deep:true
},
"form.bdcdyh":function (val) {
if (val != '') {
this.$refs.bdcdyh.style.border = '';
}
},
"$store.state.sxdrType": {
handler(n) {
this.$nextTick(()=>{
......
......@@ -13,17 +13,17 @@
</td>
<td colspan="2" align="center" >项目名称</td>
<td colspan="4" >
<input class="formInput" v-model="form.xmmc" :disabled="form.qszt!=='0'">
<input class="formInput" v-model="form.xmmc" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="xmmc">
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >坐落</td>
<td colspan="4" >
<input class="formInput" v-model="form.zl" :disabled="form.qszt!=='0'">
<input class="formInput" v-model="form.zl" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="zl">
</td>
<td colspan="2" align="center" >不动产单元号</td>
<td colspan="4" class="psr">
<input class="formInput percent80" maxlength="28" v-model="form.bdcdyh" :disabled="form.qszt!=='0'">
<input class="formInput percent80" maxlength="28" v-model="form.bdcdyh" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="bdcdyh">
<el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning" :disabled="form.qszt!=='0'">生成</el-button>
</td>
</tr>
......@@ -129,6 +129,7 @@
bsm:'',
},
zdbsm:'',
rules:[],
}
},
methods:{
......@@ -140,6 +141,16 @@
}
})
},
inputBlur(e) {
if (e.target.value != '') {
e.target.style.border = ""
} else {
e.target.style.border = "1px solid red";
e.target.style.boxSizing = 'border-box';
}
},
generatorCode(){
if(this.form.bdcdyh!=null&&this.form.bdcdyh!==''){
this.open();
......@@ -182,15 +193,58 @@
});
},
onSave(){
console.log(this.form,'this.form');
this.bsm=this.$route.query.bsm;
this.form.bsm=this.bsm;
this.form.jgsj=this.form.jgrq;
updateGzwjbxx(this.form).then((res)=>{
if(res.code === 200){
this.$message.success("保存完成!");
this.rules=[
{
data:this.form.bdcdyh,
name:'不动产单元号',
dom:this.$refs.bdcdyh,
rule: /^\s*$/g, //非空
},
{
data:this.form.xmmc,
name:'项目名称',
dom:this.$refs.xmmc,
rule: /^\s*$/g, //非空
},
{
data:this.form.zl,
name:'坐落',
dom:this.$refs.zl,
rule: /^\s*$/g, //非空
},
]
let flag = true;
this.rules.forEach(item=>{
if(item.rule.test(item.data) || item.data == null){
if(item.dom.$el){
item.dom.$el.style.border = '1px solid red';
item.dom.$el.style.boxSizing = 'border-box';
}else{
item.dom.style.border = '1px solid red';
item.dom.style.boxSizing = 'border-box';
}
flag = false;
return false
}
})
this.$nextTick(()=> {
if (flag) {
console.log(this.form,'this.form');
this.bsm=this.$route.query.bsm;
this.form.bsm=this.bsm;
this.form.jgsj=this.form.jgrq;
updateGzwjbxx(this.form).then((res)=>{
if(res.code === 200){
this.$message.success("保存完成!");
}
})
}
})
},
getGzwDetailInfo(data){
getQjGzwDetailInfo(data).then((res)=>{
......@@ -252,6 +306,12 @@
this.getGzwDetailInfo(val)
this.reload()
},
"form.bdcdyh":function (val) {
if (val != '') {
this.$refs.bdcdyh.style.border = '';
}
},
}
}
</script>
......