Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

 <template>
 <template>
   <div v-Loading="Loading">
   <div v-Loading="Loading">
-    <el-steps :active="activeStep" finish-status="success">
+
+    <el-steps :active="activeStep" finish-status="success" v-if="isADD">
+      <el-step title="条件录入"></el-step>
+      <el-step title="查询结果"></el-step>
+    </el-steps>
+    <el-steps :active="activeStep" finish-status="success" v-else>
       <el-step title="条件录入" @click.native="on_click(0)" class="pointer"></el-step>
       <el-step title="条件录入" @click.native="on_click(0)" class="pointer"></el-step>
       <el-step title="查询结果" @click.native="on_click(2)" class="pointer"></el-step>
       <el-step title="查询结果" @click.native="on_click(2)" class="pointer"></el-step>
     </el-steps>
     </el-steps>
@@ -74,6 +79,7 @@
     },
     },
     data () {
     data () {
       return {
       return {
+        isADD: true,
         Loading: false,
         Loading: false,
         activeStep: 0,
         activeStep: 0,
         //是否查询
         //是否查询
@@ -102,6 +108,7 @@
     },
     },
     mounted () {
     mounted () {
       this.loadData()
       this.loadData()
+      this.isADD = this.formData.isAdd
       if (this.formData.sqcxBsm != '') {
       if (this.formData.sqcxBsm != '') {
         this.activeStep = 2;
         this.activeStep = 2;
         this.isSearch = true;
         this.isSearch = true;
@@ -181,6 +188,7 @@
             store.dispatch('user/reWorkFresh', true)
             store.dispatch('user/reWorkFresh', true)
             this.activeStep = 2;
             this.activeStep = 2;
             this.isSearch = true;
             this.isSearch = true;
+            this.isADD = false
             this.$nextTick(() => {
             this.$nextTick(() => {
               this.$refs.dydjbInfo.setResult(res.result)
               this.$refs.dydjbInfo.setResult(res.result)
             })
             })

@@ -132,7 +132,8 @@
        */
        */
       openAddDialog () {
       openAddDialog () {
         this.$popupDialog("房屋明细查询", "sqcx/dydjb/components/addDydjb", {
         this.$popupDialog("房屋明细查询", "sqcx/dydjb/components/addDydjb", {
-          sqcxBsm: ''
+          sqcxBsm: '',
+          isAdd: true
         })
         })
       }
       }
     },
     },

@@ -77,6 +77,7 @@
         this.ruleForm = {
         this.ruleForm = {
           cllx: "",
           cllx: "",
           clmc: "",
           clmc: "",
+          clbm: ""
         }
         }
       },
       },
       /**
       /**
@@ -90,6 +91,7 @@
             this.ruleForm = {
             this.ruleForm = {
               cllx: "",
               cllx: "",
               clmc: "",
               clmc: "",
+              clbm: ""
             }
             }
             this.$emit("input", false);
             this.$emit("input", false);
           } else {
           } else {

@@ -247,7 +247,8 @@
         let obj = {
         let obj = {
           bsmCompany: this.formData.bsmCompany,
           bsmCompany: this.formData.bsmCompany,
           clmc: data.clmc,
           clmc: data.clmc,
-          cllx: data.cllx
+          cllx: data.cllx,
+          clbm: data.clbm
         };
         };
         addCompanyMaterial(obj).then(async (res) => {
         addCompanyMaterial(obj).then(async (res) => {
           if (res.code == 200) {
           if (res.code == 200) {