2fe36949 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents ff5c535b 4b2ce327
......@@ -8,26 +8,26 @@
<div class="table">
<table border="1">
<tr>
<td><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td>
<td>界址点号</td>
<td>顺序号</td>
<td>X坐标值</td>
<td>Y坐标值</td>
<td>界标类型</td>
<td>界址点类型</td>
<td class="cz"><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td>
<td class="jzdh">界址点号</td>
<td class="sxh">顺序号</td>
<td class="xzbz">X坐标值</td>
<td class="yzbz">Y坐标值</td>
<td class="jblx">界标类型</td>
<td class="jzdlx">界址点类型</td>
</tr>
<tr v-if="jzdlist.length==0">
<td colspan="7"><span class="nodata">暂无数据</span></td>
</tr>
<tr v-for="(item,index) in jzdlist" :key="index" v-else>
<td><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td>
<td><input type="text" class="formInput" v-model="item.jzdh" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="item.sxh" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="item.xzbz" :readonly="item.iszb"
@keydown="oninput"/></td>
<td><input tepe="text" class="formInput" v-model="item.yzbz" :readonly="item.iszb"
@keydown="oninput"/></td>
<td>
<td class="cz"><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td>
<td class="jzdh"><input type="text" class="formInput" v-model="item.jzdh" readonly="readonly"/></td>
<td class="sxh"><input type="text" class="formInput" v-model="item.sxh" readonly="readonly"/></td>
<td class="xzbz"><input type="text" class="formInput" v-model="item.xzbz" :readonly="item.iszb"
@keydown="oninput"/></td>
<td class="yzbz"><input tepe="text" class="formInput" v-model="item.yzbz" :readonly="item.iszb"
@keydown="oninput"/></td>
<td class="jblx">
<el-select v-model="item.jblx" :disabled="item.jzdisdisabled">
<el-option
v-for="i in jblx"
......@@ -37,7 +37,7 @@
></el-option>
</el-select>
</td>
<td>
<td class="jzdlx">
<el-select v-model="item.jzdlx" :disabled="item.jzdisdisabled">
<el-option
v-for="i in jzdlx"
......@@ -310,5 +310,32 @@
}
}
.cz {
width: 50px;
}
.jzdh {
width: 120px;
}
.sxh {
width: 120px
}
.xzbz {
width: 120px
}
.yzbz {
width: 120px
}
.jblx {
width: 150px
}
.jzdlx {
width: 180px
}
</style>
......
......@@ -8,24 +8,25 @@
<div class="table">
<table border="1">
<tr>
<td><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td>
<td>起始点</td>
<td>终止点</td>
<td>界址点距(m)</td>
<td>界址线类型</td>
<td>界址线位置</td>
<td>界限性质</td>
<td>说明</td>
<td class="cz"><input type="checkbox" @click="allcheck" v-model="isCheckAll"/></td>
<td class="qsd">起始点</td>
<td class="zzd">终止点</td>
<td class="jzdj">界址点距(m)</td>
<td class="jzxlx">界址线类型</td>
<td class="jzxwz">界址线位置</td>
<td class="jxxz">界限性质</td>
<td class="sm">说明</td>
</tr>
<tr v-if="jzxlist.length==0">
<td colspan="8"><span class="nodata">暂无数据</span></td>
</tr>
<tr v-for="(item,index) in jzxlist" :key="index" v-else>
<td><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td>
<td><input type="text" class="formInput" v-model="item.qdh" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="item.zdh" readonly="readonly"/></td>
<td><input type="text" class="formInput" v-model="item.jzjj" :readonly="item.jjisdisabled"/></td>
<td>
<td class="cz"><input type="checkbox" v-model="item.isCheck" @change="changeAll"/></td>
<td class="qsd"><input type="text" class="formInput" v-model="item.qdh" readonly="readonly"/></td>
<td class="zzd"><input type="text" class="formInput" v-model="item.zdh" readonly="readonly"/></td>
<td class="jzdj"><input type="text" class="formInput" v-model="item.jzjj"
:readonly="item.jjisdisabled"/></td>
<td class="jzxlx">
<el-select v-model="item.jzxlb" :disabled="item.jzxisdisabled">
<el-option
v-for="i in jzxlx"
......@@ -35,7 +36,7 @@
></el-option>
</el-select>
</td>
<td>
<td class="jzxwz">
<el-select v-model="item.jzxwz" :disabled="item.jzxisdisabled">
<el-option
v-for="i in jzxwz"
......@@ -45,7 +46,7 @@
></el-option>
</el-select>
</td>
<td>
<td class="jxxz">
<el-select v-model="item.jxxz" :disabled="item.jzxisdisabled">
<el-option
v-for="i in jxxz"
......@@ -55,7 +56,7 @@
></el-option>
</el-select>
</td>
<td>
<td class="sm">
<input type="text" class="formInput" v-model="item.sm" readonly="readonly"/>
</td>
</tr>
......@@ -375,5 +376,29 @@
height: 100px;
}
}
.cz {
width: 50px;
}
.qsd {
width: 150px;
}
.zzd {
width: 150px;
}
.jzdj {
width: 150px;
}
.jzxlx {
width: 180px;
}
.jzxwz {
width: 150px;
}
.jxxz {
width: 150px;
}
.sm {
width: 150px;
}
</style>
......
......@@ -22,25 +22,28 @@
</table>
<table border="1">
<tr>
<td @click="addRow">+</td>
<td>定着物代码</td>
<td>土地所有权/使用权面积(㎡)</td>
<td>独有独用土地面积(㎡)</td>
<td>分摊土地面积(㎡)</td>
<td @click="addRow" class="cz">+</td>
<td class="dzwdm">定着物代码</td>
<td class="syqmj">土地所有权/使用权面积(㎡)</td>
<td class="dytdmj">独有独用土地面积(㎡)</td>
<td class="fttjmj">分摊土地面积(㎡)</td>
</tr>
<tr v-for="(item,i) in mjftData.list" :key="i">
<td @click="delRow(i)">-</td>
<td><input type="text" class="formInput" v-model="item.dzwdm"/></td>
<td><input type="number" class="formInput" v-model="item.tdsyqsyqmj" @keydown="oninput"/></td>
<td><input type="number" class="formInput" v-model="item.dydytdmj" @keydown="oninput"/></td>
<td><input type="number" class="formInput" v-model="item.fttdmj" @keydown="oninput"/></td>
<td @click="delRow(i)" class="cz">-</td>
<td class="dzwdm"><input type="text" class="formInput" v-model="item.dzwdm"/></td>
<td class="syqmj"><input type="number" class="formInput" v-model="item.tdsyqsyqmj" @keydown="oninput"/>
</td>
<td class="dytdmj"><input type="number" class="formInput" v-model="item.dydytdmj" @keydown="oninput"/>
</td>
<td class="fttjmj"><input type="number" class="formInput" v-model="item.fttdmj" @keydown="oninput"/>
</td>
</tr>
<tr>
<td></td>
<td>统计</td>
<td>{{sumTdsyqsyqmj}}</td>
<td>{{sumDydytdmj}}</td>
<td>{{sumFttdmj}}</td>
<td class="cz"></td>
<td class="dzwdm">统计</td>
<td class="syqmj">{{sumTdsyqsyqmj}}</td>
<td class="dytdmj">{{sumDydytdmj}}</td>
<td class="fttjmj">{{sumFttdmj}}</td>
</tr>
</table>
<div class="pers">
......@@ -178,10 +181,10 @@
},
mounted() {
console.log("mounted init...")
this.mjftData.zdbsm=this.$store.state.zdbsm
this.zdmj=this.$store.state.zdmj
this.tdzl=this.$store.state.zdzl
this.zddm=this.$store.state.zddm
this.mjftData.zdbsm = this.$store.state.zdbsm
this.zdmj = this.$store.state.zdmj
this.tdzl = this.$store.state.zdzl
this.zddm = this.$store.state.zddm
if (this.mjftData.zdbsm) {
this.getData(this.mjftData.zdbsm)
}
......@@ -203,7 +206,7 @@
}
</script>
<style scoped>
<style scoped lang="less">
.main {
box-sizing: border-box;
padding: 18px;
......@@ -216,12 +219,12 @@
background-color: #fff;
font-size: 14px;
width: 100%;
}
td {
text-align: center;
height: 36px;
min-width: 50px;
cursor: pointer;
td {
text-align: center;
height: 36px;
min-width: 50px;
}
}
table .formInput {
......@@ -248,4 +251,24 @@
width: 200px;
}
.cz {
width: 50px;
}
.dzwdm {
width: 150px;
}
.syqmj {
width: 150px;
}
.dytdmj {
width: 150px;
}
.fttjmj {
width: 150px;
}
</style>
......
......@@ -414,13 +414,14 @@ export default {
};
},
created() {
this.getZdjbxxData();
let bsm=this.$store.state.zdbsm;
this.getZdjbxxData(bsm);
},
mounted() {},
methods: {
//根据zdbsm查询基本信息
getZdjbxxData() {
getQjZdjbxxDetailById(this.$store.state.zdbsm)
getZdjbxxData(bsm) {
getQjZdjbxxDetailById(bsm)
.then((res) => {
if (res.result) {
this.formData = res.result;
......