f5913113 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 369d41b4 0f1d30de
......@@ -56,6 +56,7 @@
<hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
<div class="btnGroup">
<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
<el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
<el-button type="primary" @click="hbjResetInfo">重置</el-button>
<el-button type="primary" @click="hbjVisible = false">取消</el-button>
</div>
......@@ -110,6 +111,11 @@
this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
this.getData({pageSize:15});
},
//户提交
hbjSubmitInfo() {
this.$refs.hbj.onSubmit(this.hbsm, this.tabPosition);
this.getData({pageSize:15});
},
//户编辑表单重置
hbjResetInfo() {
this.$refs.hbj.onReset();
......
......@@ -118,8 +118,8 @@ export default {
);
const tooltip = new G6.Tooltip({
offsetX: 10 + 10,
offsetY: 10 + 10,
offsetX: 210,
offsetY: 210,
itemTypes: ['node', 'edge'],
getContent: (e) => {
const outDiv = document.createElement('div');
......@@ -294,7 +294,7 @@ export default {
}
#mountNode{
margin-left: 15%;
margin-left: 200px;
}
.slot{
......
......@@ -403,7 +403,8 @@
import Qlr from "./../../../../../components/formMenu/qlr";
import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
import {getBdcdyh} from "./../../../../../api/zrz"
import {getBdcdyh} from "./../../../../../api/zrz";
import {submit} from "./../../../../../api/common"
export default {
name:'zrz',
components:{
......@@ -697,6 +698,18 @@
}
})
},
onSubmit(bsm,yclx){
let data={
glbsm:bsm,
status:1,
type:"h"
}
submit(data).then((res)=>{
if(res.code===200){
this.$message.success("提交完成!");
}
})
},
onReset(){
this.form.bdcdyh='', //不动产单元号
this.form.mjdwbsm='', //面积单位编号
......
......@@ -259,6 +259,7 @@
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
<div class="btnGroup">
<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
<el-button type="primary" @click="hbjSubmitInfo">提交</el-button>
<el-button type="primary" @click="hbjResetInfo">重置</el-button>
<el-button type="primary" @click="hbjVisible = false">取消</el-button>
</div>
......@@ -592,6 +593,10 @@ export default {
hbjSaveInfo() {
this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
},
//户保存
hbjSubmitInfo() {
this.$refs.hbj.onSubmit(this.bsms[this.bsms.length - 1], this.tabPosition);
},
//户编辑表单重置
hbjResetInfo() {
this.$refs.hbj.onReset();
......