Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -379,7 +379,7 @@ export default {
 }
 }
 
 
 .edit-content {
 .edit-content {
-  height: 400px;
+  height: 450px;
   overflow-y: auto;
   overflow-y: auto;
   overflow-x: hidden;
   overflow-x: hidden;
   padding-right: 1px;
   padding-right: 1px;

@@ -65,7 +65,7 @@
       </lb-table>
       </lb-table>
     </div>
     </div>
     <!-- 编辑 -->
     <!-- 编辑 -->
-    <dataDetails ref="editLog" :title="title" />
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlCfdj'" />
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>

@@ -73,7 +73,7 @@
       </lb-table>
       </lb-table>
     </div>
     </div>
     <!-- 编辑 -->
     <!-- 编辑 -->
-    <dataDetails ref="editLog" :title="title" />
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlDyiq'" />
   </div>
   </div>
 </template>
 </template>
 
 

@@ -13,7 +13,7 @@
           </el-col>
           </el-col>
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="权属状态">
             <el-form-item label="权属状态">
-              <el-select  class="width100" v-model="form.QSZT" placeholder="权属状态">
+              <el-select class="width100" v-model="form.QSZT" placeholder="权属状态">
                 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
@@ -63,7 +63,7 @@
         :data="tableData.data">
         :data="tableData.data">
       </lb-table>
       </lb-table>
     </div>
     </div>
-    <dataDetails ref="editLog" :title="title"  :tabsActiveName="'qltFwFdcqDz'"/>
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qltFwFdcqDz'"/>
   </div>
   </div>
 </template>
 </template>
 
 

@@ -35,7 +35,7 @@
         :data="tableData.data">
         :data="tableData.data">
       </lb-table>
       </lb-table>
     </div>
     </div>
-    <dataDetails ref="editLog" :title="title" />
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfFwFdcqQfsyq'" />
   </div>
   </div>
 </template>
 </template>
 
 

@@ -63,7 +63,7 @@
         :data="tableData.data">
         :data="tableData.data">
       </lb-table>
       </lb-table>
     </div>
     </div>
-    <dataDetails ref="editLog" :title="title" />
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qltFwFdcqYz'"/>
   </div>
   </div>
 </template>
 </template>
 
 

@@ -60,7 +60,7 @@
         :data="tableData.data">
         :data="tableData.data">
       </lb-table>
       </lb-table>
     </div>
     </div>
-    <dataDetails ref="editLog" :title="title" />
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qltQlGjzwsyq'" />
   </div>
   </div>
 </template>
 </template>
 
 

@@ -61,7 +61,7 @@
       </lb-table>
       </lb-table>
       <message-tips ref="msg" :message="message" />
       <message-tips ref="msg" :message="message" />
     </div>
     </div>
-    <dataDetails ref="editLog" :title="title" />
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlHysyq'" />
   </div>
   </div>
 </template>
 </template>
 
 

@@ -56,7 +56,7 @@
         :data="tableData.data">
         :data="tableData.data">
       </lb-table>
       </lb-table>
     </div>
     </div>
-    <dataDetails ref="editLog" :title="title" />
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qltQlLq'" />
   </div>
   </div>
 </template>
 </template>
 
 

@@ -60,7 +60,7 @@
         :data="tableData.data">
         :data="tableData.data">
       </lb-table>
       </lb-table>
     </div>
     </div>
-    <dataDetails ref="editLog" :title="title" />
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlNydsyq'" />
   </div>
   </div>
 </template>
 </template>
 
 

@@ -67,7 +67,7 @@
       </lb-table>
       </lb-table>
     </div>
     </div>
     <!-- 编辑 -->
     <!-- 编辑 -->
-    <dataDetails ref="editLog" :title="title" />
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlYgdj'" />
   </div>
   </div>
 </template>
 </template>
 
 

@@ -57,7 +57,7 @@
       </lb-table>
       </lb-table>
     </div>
     </div>
     <!-- 编辑 -->
     <!-- 编辑 -->
-    <dataDetails ref="editLog" :title="title" />
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlYydj'" />
   </div>
   </div>
 </template>
 </template>
 
 

@@ -61,7 +61,7 @@
       </lb-table>
       </lb-table>
     </div>
     </div>
     <!-- 编辑 -->
     <!-- 编辑 -->
-    <dataDetails ref="editLog" :title="title" />
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlZxdj'" />
   </div>
   </div>
 </template>
 </template>