Commit b5e95b53 by yuhao

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

parents 82663466 c353ccc9
...@@ -33,16 +33,14 @@ ...@@ -33,16 +33,14 @@
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</div> </div>
<!-- <div v-else-if="item.type == 'codeTreeDialog'"> <div v-else-if="item.type == 'codeTreeDialog'">
<select-tree-dialog <select-tree-dialog :placeholder="'请选择' + item.name"
:placeholder="'请选择' + item.name"
:sendId="item.id" :sendId="item.id"
:formData="formData" :formData="formData"
:currentItem="item" :currentItem="item"
:multiple="item.multiple" :multiple="item.multiple"
@getDialogSeleted="getCodeSeleted($event, item)" @getDialogSeleted="getCodeSeleted($event, item)" />
/> </div>
</div> -->
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div class="btn" <div class="btn"
...@@ -395,6 +393,7 @@ import Mytable from '@/components/Mytable.vue' ...@@ -395,6 +393,7 @@ import Mytable from '@/components/Mytable.vue'
import { zyfaData } from "./echarts/zyfa"; import { zyfaData } from "./echarts/zyfa";
// import SelectTreeDialog from "@c/treeCode_components.vue"; // import SelectTreeDialog from "@c/treeCode_components.vue";
import SelectTreeDialog from "@c/treeCode_components.vue";
// import { // import {
// EsNldQuery, // EsNldQuery,
// EshjfbQuery, // EshjfbQuery,
...@@ -405,7 +404,7 @@ import { zyfaData } from "./echarts/zyfa"; ...@@ -405,7 +404,7 @@ import { zyfaData } from "./echarts/zyfa";
// } from "@/api/ypbg.js"; // } from "@/api/ypbg.js";
export default { export default {
components: { components: {
Mytable Mytable, SelectTreeDialog
}, },
name: "ypbg", name: "ypbg",
// components: { // components: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment