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

@@ -233,7 +233,7 @@
                         <span>调查意见</span>
                         <span>调查意见</span>
                     </td>
                     </td>
                     <td   colspan="10"  >
                     <td   colspan="10"  >
-                        <el-input v-model="form.name"></el-input>
+                        <el-input v-model="form.dcyj"></el-input>
                     </td>
                     </td>
                 </tr>
                 </tr>
 
 
@@ -242,15 +242,16 @@
                         <span>审查员</span>
                         <span>审查员</span>
                     </td>
                     </td>
                     <td   colspan="2"  >
                     <td   colspan="2"  >
-                        <el-input v-model="form.name"></el-input>
+                        <el-input v-model="form.scy"></el-input>
                     </td>
                     </td>
-                    <td   colspan="2" rowspan="2" align="right"  style="width:8.33%;padding-right:10px">
+                    <td   colspan="2" align="right"  style="width:8.33%;padding-right:10px">
                         <span>审查日期</span>
                         <span>审查日期</span>
                     </td>
                     </td>
                     <td   colspan="2"  >
                     <td   colspan="2"  >
                         <el-date-picker
                         <el-date-picker
                                 v-model="form.date"
                                 v-model="form.date"
                                 type="date"
                                 type="date"
+                                style="width: 100%"
                                 placeholder="选择日期">
                                 placeholder="选择日期">
                         </el-date-picker>
                         </el-date-picker>
                     </td>
                     </td>
@@ -312,8 +313,10 @@
                     fwcbbsm:'',  //房屋产别ID
                     fwcbbsm:'',  //房屋产别ID
                     fwcqlybsm:'',  //房屋产权来源ID
                     fwcqlybsm:'',  //房屋产权来源ID
                     ydybsm:'',  //原单元标识码
                     ydybsm:'',  //原单元标识码
+                    dcyj:'',  //调查意见
+                    scy:'',  //审查员
                     name:'',
                     name:'',
-                    date:'',
+                    date:'',  //审查日期
                     fwytList:[{
                     fwytList:[{
                         glbsm:'',     //关联标识码
                         glbsm:'',     //关联标识码
                         fwytzdbsm:'',  //房屋用途字典标识码
                         fwytzdbsm:'',  //房屋用途字典标识码
@@ -496,9 +499,6 @@
                 this.form.zrzbsm=this.$route.query.bsm;
                 this.form.zrzbsm=this.$route.query.bsm;
                 this.getZrzDetailByBsm(this.$route.query.bsm)
                 this.getZrzDetailByBsm(this.$route.query.bsm)
             }
             }
-            if(this.source!==1){
-                this.getZrzDetailByBsm(this.$route.query.bsm)
-            }
         },
         },
         mounted() {},
         mounted() {},
         computed: {
         computed: {