Merge remote-tracking branch 'origin/master'

@@ -168,7 +168,7 @@
                 hzl(this.hcxlzData).then(res => {
                 hzl(this.hcxlzData).then(res => {
                     if (res.success) {
                     if (res.success) {
                         this.$router.push({
                         this.$router.push({
-                            path:'zrz',
+                            path:'/zrz',
                             query: {
                             query: {
                                 bsm:this.hcxlzData.zrzbsm,
                                 bsm:this.hcxlzData.zrzbsm,
                                 source: 2,
                                 source: 2,

@@ -117,6 +117,7 @@
                     xmmc: "",
                     xmmc: "",
                     zddm: "",
                     zddm: "",
                     zl: "",
                     zl: "",
+                    cxlz:this.isCxlz,
                     pageNo: 1,
                     pageNo: 1,
                     pageSize: 10,
                     pageSize: 10,
                 },
                 },
@@ -158,6 +159,7 @@
                     xmmc: "",
                     xmmc: "",
                     zddm: "",
                     zddm: "",
                     zl: "",
                     zl: "",
+                    cxlz:this.isCxlz,
                     pageNo: 1,
                     pageNo: 1,
                     pageSize: 10
                     pageSize: 10
                 };
                 };

@@ -297,10 +297,6 @@
             }else {
             }else {
                 this.bsm=this.$route.query.bsm;
                 this.bsm=this.$route.query.bsm;
                 this.form.dzbsm=this.$route.query.bsm;
                 this.form.dzbsm=this.$route.query.bsm;
-            }
-            if(this.source!==1){
-                this.bsm=this.$route.query.bsm;
-                this.form.dzbsm=this.$route.query.bsm;
                 this.getDzDetailByBsm(this.$route.query.bsm)
                 this.getDzDetailByBsm(this.$route.query.bsm)
             }
             }
         },
         },
@@ -536,6 +532,7 @@
                     type:"dz"
                     type:"dz"
                 }
                 }
                 submit(data).then((res)=>{
                 submit(data).then((res)=>{
+                    debugger
                     if(res.code===200){
                     if(res.code===200){
                         this.$message.success("提交完成！");
                         this.$message.success("提交完成！");
                         this.getDzDetailByBsm(this.$route.query.bsm)
                         this.getDzDetailByBsm(this.$route.query.bsm)
@@ -595,6 +592,8 @@
         watch:{
         watch:{
 
 
             dzbsm:function (val) {
             dzbsm:function (val) {
+                debugger
+                console.log(val,'多幢BSM')
                 this.getDzDetailByBsm(val)
                 this.getDzDetailByBsm(val)
             },
             },
 
 

@@ -119,7 +119,7 @@
                                         </el-select>
                                         </el-select>
                                     </td>
                                     </td>
                                     <td class="xmmc">
                                     <td class="xmmc">
-                                        <input type="text" v-model="item.xmmc" class="formInput"/>
+                                        <el-input v-model="item.xmmc"></el-input>
                                     </td>
                                     </td>
                                 </tr>
                                 </tr>
                                 <tr :key="index+100">
                                 <tr :key="index+100">
@@ -635,8 +635,13 @@
                 saveDzFg(this.dzFghData).then(res => {
                 saveDzFg(this.dzFghData).then(res => {
                     if (res.success) {
                     if (res.success) {
                         this.getRightTree(res.result,'0,1,2');
                         this.getRightTree(res.result,'0,1,2');
-                        Message.success("保存成功")
-                        //TO DO 多幢分割完成后的操作
+                        this.$router.push({
+                            path: '/dz',
+                            query: {
+                                bsm: res.result,
+                                source: 3, //分割标识
+                            }
+                        });
                     } else {
                     } else {
                         Message.error("保存失败")
                         Message.error("保存失败")
                     }
                     }