Merge branch 'dev_xzeq_xz' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq_xz

src/views/index/ypbg.vue

@@ -33,16 +33,14 @@
                                 value-format="yyyy-MM-dd">
                 </el-date-picker>
               </div>
-              <!-- <div v-else-if="item.type == 'codeTreeDialog'">
-                <select-tree-dialog
-                  :placeholder="'请选择' + item.name"
+              <div v-else-if="item.type == 'codeTreeDialog'">
+                <select-tree-dialog :placeholder="'请选择' + item.name"
                                     :sendId="item.id"
                                     :formData="formData"
                                     :currentItem="item"
                                     :multiple="item.multiple"
-                  @getDialogSeleted="getCodeSeleted($event, item)"
-                />
-              </div> -->
+                                    @getDialogSeleted="getCodeSeleted($event, item)" />
+              </div>
             </el-form-item>
             <el-form-item>
               <div class="btn"
@@ -395,6 +393,7 @@ import Mytable from '@/components/Mytable.vue'
 import { zyfaData } from "./echarts/zyfa";
 
 // import SelectTreeDialog from "@c/treeCode_components.vue";
+import SelectTreeDialog from "@c/treeCode_components.vue";
 // import {
 //   EsNldQuery,
 //   EshjfbQuery,
@@ -405,7 +404,7 @@ import { zyfaData } from "./echarts/zyfa";
 // } from "@/api/ypbg.js";
 export default {
   components: {
-    Mytable
+    Mytable, SelectTreeDialog
   },
   name: "ypbg",
   // components: {