08a70785 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents d61359c6 664b70f4
......@@ -312,38 +312,11 @@
this.isVisible = val
},
plzlData: {
handler(val){
console.log(val,'批量坐落规则');
// 宗地坐落
if (+val.zd === 1) {
this.zrzgz[0].disabled = true;
this.zrzgz[1].disabled = false;
return
} else if (+val.zd === 2) {
this.zrzgz[0].disabled = false;
this.zrzgz[1].disabled = true;
return
}else {
this.zrzgz[0].disabled = false;
this.zrzgz[1].disabled = false;
return
}
// 自然幢坐落
if (+val.zrz === 1) {
this.zdgz[0].disabled = true;
this.zdgz[1].disabled = false;
return
} else if (+val.zrz === 2) {
this.zdgz[0].disabled = false;
this.zdgz[1].disabled = true;
return
}else {
this.zdgz[0].disabled = false;
this.zdgz[1].disabled = false;
return
}
handler(val) {
this.zrzgz[0].disabled = +val.zd === 1;
this.zdgz[0].disabled = +val.zrz === 1;
},
deep:true
deep: true
}
}
}
......
......@@ -2,7 +2,7 @@
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl" @click="loading">
<el-tab-pane label="附件材料" name="fjcl">
<fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane>
</el-tabs>
</div>
......@@ -11,6 +11,7 @@
<script>
import dzxx from "./dzxx";
import fjcl from "./../zd/fjcl/fjcl"
import {queryStatus} from "@api/search"
export default {
name: "",
components: {
......@@ -19,16 +20,25 @@
props: {},
data() {
return {
isDisabled:false,
activeName: "dzxx",
dzJbxxVisble:true,
fjclVisible:false
};
},
methods: {
loading(){
this.$refs.fjcl.isUpload(this.$store.state.dzbsm)
loadingStatus() {
debugger
let bsm=this.$store.state.dzbsm;
queryStatus(bsm).then(res => {
if (res.success) {
let qszt = res.result.qszt;
this.isDisabled = +qszt !== 0;
}
})
},
handleClick(tab, event) {
this.loadingStatus();
switch (tab.name) {
case 'dzxx':
this.dzJbxxVisble = true;
......
......@@ -7,8 +7,8 @@
<el-tab-pane label="登记簿" name="djb">
<djb v-if="djbVisible"></djb>
</el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl" @click="loading">
<fjcl v-if="fjclVisible" ref="fjcl"></fjcl>
<el-tab-pane label="附件材料" name="fjcl">
<fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl>
</el-tab-pane>
</el-tabs>
</div>
......@@ -26,6 +26,7 @@
},
data() {
return {
isDisabled:false,
hbsm:this.$store.state.hbsm,
activeName: "hjbxx",
djbVisible: false,
......@@ -36,10 +37,19 @@
},
methods: {
loading(){
this.$refs.fjcl.isUpload(this.$store.state.hbsm)
loadingStatus() {
debugger
console.log("是否禁用")
let bsm=this.$store.state.hbsm;
queryStatus(bsm).then(res => {
if (res.success) {
let qszt = res.result.qszt;
this.isDisabled = +qszt !== 0;
}
})
},
handleClick(tab, event) {
this.loadingStatus()
// console.log(tab, event);
switch (tab.name) {
case 'djb':
......
......@@ -12,9 +12,9 @@
:show-file-list="false"
multiple
:on-exceed="handleExceed"
:disabled="isUpload"
:disabled="isDisabled"
>
<el-button size="small" type="primary" :disabled="isUpload" >上传</el-button>
<el-button size="small" type="primary" :disabled="isDisabled" >上传</el-button>
</el-upload>
<table border="2">
<tr>
......@@ -52,7 +52,6 @@
name: "fjcl",
data() {
return {
isUpload: false, //是否可以上传
fileData: {
glbsm: '',
dylx: ''
......@@ -66,15 +65,13 @@
created(){
},
props: {
isDisabled:{
type:Boolean,
default:false
}
},
methods: {
isUpdate(bsm) {
queryStatus(bsm).then(res => {
if (res.success) {
let qszt = res.result.qszt;
this.isUpload = +qszt !== 0;
}
})
},
deleteFile(bsm) {
this.$confirm('将删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
......@@ -126,7 +123,6 @@
default:
break
}
this.isUpdate(this.fileData.glbsm);
getFileLis(this.fileData.glbsm).then(res => {
if (res.success) {
this.list = res.result;
......
......@@ -2,13 +2,17 @@
<!-- <div class="content_box"> -->
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible"></mjftb></el-tab-pane>
<el-tab-pane label="界址点" name="jzd"><jzd v-if="jzdVisible"></jzd></el-tab-pane>
<el-tab-pane label="界址线" name="jzx"><jzx v-if="jzxVisible"></jzx></el-tab-pane>
<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
<el-tab-pane label="界址点" name="jzd">
<jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd>
</el-tab-pane>
<el-tab-pane label="界址线" name="jzx" >
<jzx v-if="jzxVisible" :is-disabled="isDisabled"></jzx>
</el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl" @click="loading">
<fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl">
<fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
</el-tabs>
<!-- </div> -->
</template>
......@@ -21,6 +25,7 @@ import jzx from "./jzx";
import djb from "./djb";
import lshs from "./lshs";
import fjcl from "./fjcl/fjcl"
import {queryStatus} from "@api/search"
export default {
name: "",
components: {
......@@ -29,6 +34,7 @@ export default {
props: {},
data() {
return {
isDisabled:false,
activeName: "djdcb",
mjftbVisible:false,
jzdVisible:false,
......@@ -39,11 +45,24 @@ export default {
};
},
methods: {
loading(){
loadingStatus() {
debugger
console.log("是否禁用")
let bsm=this.$store.state.zdbsm;
queryStatus(bsm).then(res => {
if (res.success) {
let qszt = res.result.qszt;
this.isDisabled = +qszt !== 0;
}
})
},
/* loading(){
console.log("附件材料是否禁用")
this.$refs.fjcl.isUpload(this.$store.state.zdbsm)
},
},*/
handleClick(tab, event) {
// console.log(tab, event);
this.loadingStatus();
switch (tab.name) {
case 'mjftb':
this.mjftbVisible = true;
......
<template>
<div class="main">
<div class="button">
<el-button type="primary" @click="oneExit">编辑</el-button>
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="batchExit">批量修改</el-button>
<el-button type="primary" @click="oneExit" :disabled="isDisabled">编辑</el-button>
<el-button type="primary" @click="save" :disabled="isDisabled">保存</el-button>
<el-button type="primary" @click="batchExit" :disabled="isDisabled">批量修改</el-button>
</div>
<div class="table">
<table border="1">
......@@ -18,7 +18,7 @@
<th class="">界标类型</th>
<th class="">界址点类型</th>
</tr>
<tr v-if="jzdlist.length==0">
<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>
......@@ -109,12 +109,18 @@
<script>
import {queryjzd, jzdsingleModify, jzdbatchModify} from '@api/zd'
import {queryStatus} from "@api/search"
import {Message} from 'element-ui'
export default {
name: "jzd",
components: {},
props: {},
props: {
isDisabled:{
type:Boolean,
default:false
}
},
data() {
return {
bsm: '',
......
<template>
<div class="main">
<div class="button">
<el-button type="primary" @click="oneExit">编辑</el-button>
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="batchExit">批量修改</el-button>
<el-button type="primary" @click="oneExit" :disabled="isDisabled">编辑</el-button>
<el-button type="primary" @click="save" :disabled="isDisabled">保存</el-button>
<el-button type="primary" @click="batchExit" :disabled="isDisabled">批量修改</el-button>
</div>
<div class="table">
<table border="1">
......@@ -19,7 +19,7 @@
<th class="">界限性质</th>
<th class="">说明</th>
</tr>
<tr v-if="jzxlist.length==0">
<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>
......@@ -137,7 +137,12 @@
export default {
name: "jzx",
components: {},
props: {},
props: {
isDisabled:{
type:Boolean,
default:false
}
},
data() {
return {
bsm: '',
......@@ -246,13 +251,13 @@
}
},
created() {
},
mounted() {
let bsm = this.$store.state.zdbsm
let bsm = this.$store.state.zdbsm;
this.bsm = bsm;
this.getData(bsm)
},
mounted() {
},
methods: {
result() {
this.batchJzx.jzxlx = '';
......
......@@ -2,22 +2,23 @@
<div class="main" ref="mainBox">
<table border="1">
<tr>
<td colspan="2">土地坐落</td>
<td colspan="3"><input type="text" class="formInput" v-model="tdzl" disabled/></td>
<th colspan="2">土地坐落</th>
<th colspan="3"><el-input v-model="tdzl" disabled></el-input></th>
</tr>
<tr>
<td colspan="2">宗地代码</td>
<td colspan="3"><input type="text" class="formInput" v-model="zddm " disabled/></td>
<th colspan="2">宗地代码</th>
<td colspan="3"><el-input v-model="zddm " disabled></el-input></td>
</tr>
<tr>
<td colspan="2">宗地面积(㎡)</td>
<td><input type="number" class="formInput" v-model.number="zdmj" disabled/></td>
<td>定着物数量</td>
<th colspan="2">宗地面积(㎡)</th>
<th>
<el-input v-model="zdmj" disabled/></th>
<th>定着物数量</th>
<td class="dzwsl">{{dzwdsl}}</td>
</tr>
<tr>
<td colspan="2">备注</td>
<td colspan="3"><input type="text" class="formInput" v-model="mjftData.bz"/></td>
<th colspan="2">备注</th>
<td colspan="3"><el-input v-model="mjftData.bz" :disabled="isDisabled"></el-input></td>
</tr>
</table>
<table border="1">
......@@ -26,12 +27,13 @@
type="primary"
class="changeBtn inAdd addMinus"
@click="addRow"
:disabled="isDisabled"
>+</el-button
></td>
<td class="dzwdm">定着物代码</td>
<td class="syqmj">土地所有权/使用权面积(㎡)</td>
<td class="dytdmj">独有独用土地面积(㎡)</td>
<td class="fttjmj">分摊土地面积(㎡)</td>
<th class="dzwdm">定着物代码</th>
<th class="syqmj">土地所有权/使用权面积(㎡)</th>
<th class="dytdmj">独有独用土地面积(㎡)</th>
<th class="fttjmj">分摊土地面积(㎡)</th>
</tr>
<tr v-for="(item,i) in mjftData.list" :key="i">
<td class="cz">
......@@ -39,42 +41,40 @@
type="primary"
class="changeBtn inMinus addMinus"
@click="delRow(i)"
:disabled="isDisabled"
>-</el-button
>
</td>
<td class="dzwdm">
<el-input v-model="item.dzwdm"
maxlength="9"
<el-input v-model="item.dzwdm"
maxlength="9"
:disabled="isDisabled"
>
</el-input>
</td>
<td class="syqmj">
<el-input style="ime-mode:inactive"
oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"
v-model="item.tdsyqsyqmj"
oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"
v-model="item.tdsyqsyqmj" :disabled="isDisabled"
></el-input>
</td>
<td class="dytdmj">
<el-input v-model="item.dydytdmj" style="ime-mode:inactive" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
<el-input v-model="item.dydytdmj" style="ime-mode:inactive" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null" :disabled="isDisabled"></el-input>
</td>
<td class="fttjmj">
<el-input v-model="item.fttdmj" style="ime-mode:inactive" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
<el-input v-model="item.fttdmj" style="ime-mode:inactive" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null" :disabled="isDisabled"></el-input>
</td>
</tr>
<tr>
<td class="cz"></td>
<td class="dzwdm">统计</td>
<th class="dzwdm">统计</th>
<td class="syqmj">{{sumTdsyqsyqmj}}</td>
<td class="dytdmj">{{sumDydytdmj}}</td>
<td class="fttjmj">{{sumFttdmj}}</td>
</tr>
</table>
<!-- <div class="pers">
<el-button @click="save" type="primary">保存</el-button>
</div> -->
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
<el-button type="primary" class="saveBtn" @click="save" :disabled="isDisabled">保存</el-button>
</div>
</div>
</template>
......@@ -85,6 +85,12 @@
export default {
name: "index",
props: {
isDisabled:{
type:Boolean,
default:false
}
},
data() {
return {
tdzl: '', // 土地坐落 继承获取
......@@ -250,16 +256,6 @@
font-size: 14px;
width: 100%;
cursor: pointer;
.formInput {
margin: 0;
height: 36px;
outline: none;
border: none;
color: #606764;
overflow: visible;
text-align: center;
cursor: text;
}
td {
text-align: center;
height: 36px;
......@@ -303,11 +299,11 @@
width: 50px;
}
.dzwdm {
.dzwdm ,.syqmj,.dytdmj,.fttjmj{
width: 150px;
}
.syqmj {
/* .syqmj {
width: 150px;
}
......@@ -317,6 +313,6 @@
.fttjmj {
width: 150px;
}
}*/
</style>
......
......@@ -6,7 +6,7 @@
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
<el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl" @click="loading"><fjcl ref="fjcl"></fjcl></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
</el-tabs>
</div>
</template>
......@@ -18,6 +18,7 @@ import djb from "./djb";
import lpb from "./lpb";
import lshs from "./lshs";
import fjcl from "./../zd/fjcl/fjcl";
import {queryStatus} from "@api/search"
export default {
name: "",
components: {
......@@ -26,16 +27,26 @@ export default {
props: {},
data() {
return {
isDisabled:false,
activeName: "zrzxx",
lpbLoad:false, //默认不加载楼盘表组件
yzgyLoad:false,
};
},
methods: {
loading(){
this.$refs.fjcl.isUpload(this.$store.state.zrzbsm);
},
loadingStatus() {
debugger
console.log("是否禁用")
let bsm=this.$store.state.zrzbsm;
queryStatus(bsm).then(res => {
if (res.success) {
let qszt = res.result.qszt;
this.isDisabled = +qszt !== 0;
}
})
},
handleClick(tab, event) {
this.loadingStatus()
if(!this.lpbLoad){
this.lpbLoad = tab.name == 'lpb' ? true : false
}
......