Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
b8816fbb by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 7e5bc2c9 dd0bb7b0
Inline Side-by-side
Showing 1 changed file with 34 additions and 8 deletions
......@@ -53,8 +53,8 @@
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li>批准用途</li>
<li>实际用途</li>
<li><i class="requisite">*</i>批准用途</li>
<li><i class="requisite">*</i>实际用途</li>
<li><i class="requisite">*</i>土地使用起始时间</li>
</ul>
</el-col>
......@@ -69,6 +69,7 @@
class="formSelect percent30"
v-if="show"
:default-expand-all="defaultExpandAll"
ref="pzytdm"
:multiple="multiple"
:placeholder="placeholder"
:disabled="formData.qszt!='0'"
......@@ -84,6 +85,7 @@
class="formSelect percent30"
v-if="show"
:default-expand-all="defaultExpandAll"
ref="sjytdm"
:multiple="multiple"
:placeholder="placeholder"
:disabled="formData.qszt!='0'"
......@@ -234,8 +236,8 @@
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li>批准用途</li>
<li>实际用途</li>
<li><i class="requisite">*</i>批准用途</li>
<li><i class="requisite">*</i>实际用途</li>
<li><i class="requisite">*</i>土地使用起始时间</li>
</ul>
</el-col>
......@@ -249,6 +251,7 @@
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
ref="pzytdm"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
......@@ -263,6 +266,7 @@
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
ref="sjytdm"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disabled"
......@@ -627,6 +631,20 @@ export default {
// val:this.$refs.tdsyjssj[temp+ind].value,
rule: /^\s*$/g, //非空
},
{
data:item.list[ind].pzytdm,
name:'批准用途',
dom:this.$refs.pzytdm[temp+ind],
// val:this.$refs.tdsyjssj[temp+ind].value,
rule: /^\s*$/g, //非空
},
{
data:item.list[ind].sjytdm,
name:'实际用途',
dom:this.$refs.sjytdm[temp+ind],
// val:this.$refs.tdsyjssj[temp+ind].value,
rule: /^\s*$/g, //非空
},
)
if(this.hasSyqx){
rules.push(
......@@ -696,10 +714,18 @@ export default {
watch:{
countList: {
handler : function (newVal, oldVal) {
newVal.forEach((item,ind)=>{
if(item.qlxzdm != ''){
this.$refs.qlxzdm[ind].$el.style.border=""
}
newVal.forEach((i,ind)=>{
i.list.forEach((item,index)=>{
if(item.qlxzdm != '' &&item.qlxzdm != null){
this.$refs.qlxzdm[ind].$el.style.border=""
}
if(item.sjytdm != '' &&item.sjytdm != null){
this.$refs.sjytdm[ind].$el.style.border=""
}
if(item.pzytdm != '' &&item.pzytdm != null){
this.$refs.pzytdm[ind].$el.style.border=""
}
})
})
},
deep:true
......