Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
8cb9ef98 by 杨威
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents faa23b76 75ea9880
Inline Side-by-side
Showing 8 changed files with 98 additions and 50 deletions
......@@ -20,4 +20,7 @@ yarn-error.log*
*.sln
*.sw?
package-lock.json
CadastralSystem.iml
CadastralSyst
em.iml
*.env
*.gitignore
......
......@@ -6,7 +6,7 @@
width="50%"
@close="close"
:modal-append-to-body="false"
>
>
<div>
<span class="xl" @click="xl">祥例</span>
<table border="1">
......@@ -128,13 +128,30 @@
key: '2',
label: '实际层',
value: '2'
}, {
key: '3',
label: '空',
value: '3'
}
]
}
},
methods: {
lodding:function(){
this.$emit('lodding')
test: function () {
for (let key in this.plshData) {
console.log(key)
console.log(this.plshData[key])
if (key === 'chqbl') {
continue;
}
if (this.plshData[key] !== '' && this.plshData[key] !== '3' && this.plshData[key] !== false) {
return true;
}
}
return false;
},
lodding: function () {
this.$emit('lodding')
},
xl: function () {
this.xlVisible = true;
......@@ -156,6 +173,10 @@
}
},
save: function () {
if (!this.test()) {
this.$message.info("请选择")
return;
}
this.plshData['bsms'] = this.bsms
updateSh(this.plshData).then(res => {
if (res.success) {
......@@ -174,25 +195,25 @@
computed: {
gz: function () {
let gz = "";
if (this.plshData.shqz != "") {
if (this.plshData.shqz !== "") {
gz += this.plshData.shqz
}
if (this.plshData.selectDyh) {
gz += "[单元号]"
}
if (this.plshData.fgfA != "") {
if (this.plshData.fgfA !== "") {
gz += this.plshData.fgfA
}
if (this.plshData.c == 1) {
if (this.plshData.c === 1) {
gz += "[名义层]"
} else if (this.plshData.c == 2) {
} else if (this.plshData.c === 2) {
gz += "[实际层]"
}
if (this.plshData.fgfB != "") {
if (this.plshData.fgfB !== "") {
gz += this.plshData.fgfB
}
gz += "[户号]";
if (this.plshData.shhz != "") {
if (this.plshData.shhz !== "") {
gz += this.plshData.shhz
}
return gz;
......
......@@ -6,7 +6,7 @@
width="60%"
@close="close"
:modal-append-to-body="false"
>
>
<div>
<table border="1">
<tr>
......@@ -121,12 +121,12 @@
isVisible: false,
plzlData: {
qz: '',
zd: '',
zrz: '',
ljz: '',
zdy: '',
c: '',
h: '',
zd: '3',
zrz: '3',
ljz: '3',
zdy: '3',
c: '3',
h: '3',
hz: ''
},
zdgz: [
......@@ -160,6 +160,9 @@
}, {
label: "逻辑幢号",
value: '2'
}, {
label: "空",
value: '3'
}
],
zdygz: [
......@@ -169,6 +172,9 @@
}, {
label: "幢单元号",
value: '2'
}, {
label: "空",
value: '3'
}
],
cgz: [
......@@ -180,6 +186,9 @@
key: '2',
label: '实际层',
value: '2'
}, {
label: "空",
value: '3'
}
],
hgz: [
......@@ -191,15 +200,22 @@
key: '2',
label: '户号',
value: '2'
}, {
label: "空",
value: '3'
}
]
}
},
methods: {
lodding:function(){
lodding: function () {
this.$emit('lodding')
},
save: function () {
if (!this.test()) {
this.$message.info("请选择")
return;
}
this.plzlData['bsms'] = this.bsms;
updateZl(this.plzlData).then(res => {
if (res.success) {
......@@ -210,8 +226,15 @@
}
})
},
test: function () {
for (let key in this.plzlData) {
if (this.plzlData[key] !== '' && this.plzlData[key] !== '3') {
return true;
}
}
return false;
},
cancel: function () {
console.log("cancel......")
this.close();
},
close: function () {
......@@ -220,7 +243,6 @@
this.result();
},
result: function () {
console.log("重置")
this.plzlData = {
qz: '',
zd: '',
......@@ -237,45 +259,45 @@
gz: function () {
// [前缀][宗地][自然幢][单元][室号][室号][后缀]
let gz = "";
if (this.plzlData.qz != '') {
if (this.plzlData.qz !== '') {
gz += this.plzlData.qz
}
if (this.plzlData.zd == 1) {
if (this.plzlData.zd === 1) {
gz += "[宗地坐落]";
} else if (this.plzlData.zd == 2) {
} else if (this.plzlData.zd === 2) {
gz += "[宗地名称]";
}
if (this.plzlData.zrz == 1) {
if (this.plzlData.zrz === 1) {
gz += "[自然幢坐落]"
} else if (this.plzlData.zrz == 2) {
} else if (this.plzlData.zrz === 2) {
gz += "[自然幢名称]";
}
if (this.plzlData.ljz == 1) {
if (this.plzlData.ljz === 1) {
gz += "[逻辑幢名称]"
} else if (this.plzlData.ljz == 2) {
} else if (this.plzlData.ljz === 2) {
gz += "[逻辑幢号]"
}
if (this.plzlData.zdy == 1) {
if (this.plzlData.zdy === 1) {
gz += "[幢单元名称]";
} else if (this.plzlData.zdy == 2) {
} else if (this.plzlData.zdy === 2) {
gz += "[幢单元号]"
}
if (this.plzlData.c == 1) {
if (this.plzlData.c === 1) {
gz += "[名义层]"
} else if (this.plzlData.c == 2) {
} else if (this.plzlData.c === 2) {
gz += "[实际层]"
}
if (this.plzlData.h == 1) {
if (this.plzlData.h === 1) {
gz += "[室号]"
} else if (this.plzlData.h == 2) {
} else if (this.plzlData.h === 2) {
gz += "[户号]"
}
if (this.plzlData.hz != "") {
if (this.plzlData.hz !== "") {
gz += this.plzlData.hz
}
if (gz == "") {
if (gz === "") {
gz += "无"
}
return gz;
......
......@@ -50,7 +50,8 @@
uploadUrl: '',
isVisible: false,
sxdrData: {
bsm: ''
bsm: '',
type:''
},
errorData: []
}
......@@ -72,13 +73,12 @@
this.reset();
},
downloadTemplate() {
window.open(`/api/tx/excelGeo/zdTemplate?type=` + this.dylx);
window.open(`/api/tx/excelGeo/template?type=` + this.dylx);
},
uploadSuccess(res, file, fileList) {
this.errorData = [];
if (res.success) {
this.$message.success("上传成功")
debugger
this.loading();
this.close()
} else {
......@@ -96,9 +96,10 @@
this.isVisible = val;
},
dylx(val) {
this.sxdrData.type=val;
switch (val) {
case "zd":
this.uploadUrl = "/api/tx/excelGeo/Zdimport";
this.uploadUrl = "/api/tx/excelGeo/import";
break;
default:
break;
......
......@@ -318,7 +318,7 @@ export default {
xmmc:'测试自然幢',
bdcqzh:'A12111111111111111',
dylx:'zrz',
zrzbsm:'b7162d97848b0d31d301f8d4a5b4596b'
zrzbsm:'1a94f3ab0f95ecc7137c5c3e51c15ac6'
}
]
},
......
......@@ -189,7 +189,7 @@ export default {
getLshsData(){
let _this = this;
const data = {
"bsm": "d85a274a332ad2d35c922a3a95eb154f",
"bsm": this.$store.state.zdbsm,
"type": "zd"
};
getLshs(data).then((res)=>{
......
......@@ -43,7 +43,9 @@
>
</td>
<td class="dzwdm">
<el-input v-model="item.dzwdm" placeholder="请输入定着物代码">
<el-input v-model="item.dzwdm" placeholder="请输入定着物代码"
maxlength="9"
>
</el-input>
</td>
<td class="syqmj">
......@@ -70,7 +72,7 @@
<!-- <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>
</div>
......@@ -237,7 +239,7 @@
padding: 18px;
height: auto;
width: 100%;
table {
margin-top: 10px;
background-color: #fff;
......
......@@ -524,8 +524,10 @@
},
created(){
let bsm=this.$store.state.hbsm
console.log(bsm,'户BSM')
this.getHInfo(bsm);
// console.log(bsm,'户BSM')
if (bsm) {
this.getHInfo(bsm);
}
this.$nextTick(()=>{
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
this.formHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320
......@@ -585,8 +587,7 @@
},
//根据户bsm查询户信息
getHInfo(hbsm){
this.bsm = hbsm;
console.log(hbsm);
//this.bsm = hbsm;
getQjHDetailByBsm(hbsm).then((res)=>{
if(res.code===200){
this.form = res.result;
......@@ -621,8 +622,6 @@
this.$set(this.form,"ycftxs", this.form.glftxs)
}
console.log("=============")
console.log(this.form)
if(res.result.fwytList.length===0){
this.form.fwytList.push({
glbsm:'', //关联标识码
......