Merge remote-tracking branch 'origin/master'

@@ -56,6 +56,7 @@
                 <hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
                 <hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
                 <div class="btnGroup">
                 <div class="btnGroup">
                     <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
                     <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="hbjResetInfo">重置</el-button>
                     <el-button type="primary" @click="hbjVisible = false">取消</el-button>
                     <el-button type="primary" @click="hbjVisible = false">取消</el-button>
                 </div>
                 </div>
@@ -110,6 +111,11 @@
                 this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
                 this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
                 this.getData({pageSize:15});
                 this.getData({pageSize:15});
             },
             },
+            //户提交
+            hbjSubmitInfo() {
+                this.$refs.hbj.onSubmit(this.hbsm, this.tabPosition);
+                this.getData({pageSize:15});
+            },
             //户编辑表单重置
             //户编辑表单重置
             hbjResetInfo() {
             hbjResetInfo() {
                 this.$refs.hbj.onReset();
                 this.$refs.hbj.onReset();

@@ -118,8 +118,8 @@ export default {
       );
       );
 
 
       const tooltip = new G6.Tooltip({
       const tooltip = new G6.Tooltip({
-        offsetX: 10 + 10,
-        offsetY: 10 + 10,
+        offsetX: 210,
+        offsetY: 210,
         itemTypes: ['node', 'edge'],
         itemTypes: ['node', 'edge'],
         getContent: (e) => {
         getContent: (e) => {
           const outDiv = document.createElement('div');
           const outDiv = document.createElement('div');
@@ -294,7 +294,7 @@ export default {
     }
     }
 
 
     #mountNode{
     #mountNode{
-        margin-left: 15%;
+        margin-left: 200px;
     }
     }
 
 
     .slot{
     .slot{

@@ -403,7 +403,8 @@
     import Qlr from "./../../../../../components/formMenu/qlr";
     import Qlr from "./../../../../../components/formMenu/qlr";
     import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
     import Qlxz from "./../../../../../components/formMenu/qlxz_simple";
     import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
     import {getQjHDetailByBsm,updateQjH} from "./../../../../../api/h";
-    import {getBdcdyh} from "./../../../../../api/zrz"
+    import {getBdcdyh} from "./../../../../../api/zrz";
+    import {submit} from "./../../../../../api/common"
     export default {
     export default {
         name:'zrz',
         name:'zrz',
         components:{
         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(){
             onReset(){
                 this.form.bdcdyh='',  //不动产单元号
                 this.form.bdcdyh='',  //不动产单元号
                 this.form.mjdwbsm='',  //面积单位编号
                 this.form.mjdwbsm='',  //面积单位编号

@@ -259,6 +259,7 @@
 			<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
 			<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
 			<div class="btnGroup">
 			<div class="btnGroup">
 				<el-button type="primary" @click="hbjSaveInfo">保存</el-button>
 				<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="hbjResetInfo">重置</el-button>
 				<el-button type="primary" @click="hbjVisible = false">取消</el-button>
 				<el-button type="primary" @click="hbjVisible = false">取消</el-button>
 			</div>
 			</div>
@@ -592,6 +593,10 @@ export default {
 		hbjSaveInfo() {
 		hbjSaveInfo() {
 			this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
 			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() {
 		hbjResetInfo() {
 			this.$refs.hbj.onReset();
 			this.$refs.hbj.onReset();