添加搜索模块

.history/src/main_20190319174257.js

@@ -0,0 +1,21 @@
+import Vue from 'vue';
+import ElementUI from 'element-ui';
+import 'element-ui/lib/theme-chalk/index.css';
+import App from './App.vue';
+import router from './router';
+import axios from 'axios';
+import {post,fetch,patch,put} from './utils/http';
+import TitleBar from './pages/layout/titleBar';
+
+Vue.use(ElementUI);
+
+Vue.prototype.$post = post;
+Vue.prototype.$fetch = fetch;
+Vue.prototype.$patch = patch;
+Vue.prototype.$put = put;
+
+new Vue({
+  el: '#app',
+  router,
+  render: h => h(App)
+});

.history/src/main_20190319174329.js

@@ -0,0 +1,21 @@
+import Vue from 'vue';
+import ElementUI from 'element-ui';
+import 'element-ui/lib/theme-chalk/index.css';
+import App from './App.vue';
+import router from './router';
+import axios from 'axios';
+import {post,fetch,patch,put} from './utils/http';
+// import TitleBar from './pages/layout/titleBar';
+
+Vue.use(ElementUI);
+
+Vue.prototype.$post = post;
+Vue.prototype.$fetch = fetch;
+Vue.prototype.$patch = patch;
+Vue.prototype.$put = put;
+
+new Vue({
+  el: '#app',
+  router,
+  render: h => h(App)
+});

.history/src/pages/layout/Layout_20190314094846.vue

@@ -0,0 +1,32 @@
+<template>
+    <div class="container">
+        <Nav/>
+        <div class="right">
+            <TitleBar/>
+            <Main/>
+        </div>
+    </div>
+</template>
+<script>
+import Nav from './nav/Nav.vue';
+import TitleBar from './titleBar/TitleBar.vue';
+import Main from './main/Main'
+export default {
+ components: {
+    Nav,
+    TitleBar,
+    Main
+  },
+}
+</script>
+<style>
+    .container {
+        width: 100%;
+        height: 100%;
+    }
+    .right {
+        margin-left: 180px;
+        width: calc(100% - 180px);
+        height: 100%;
+    }
+</style>

.history/src/pages/layout/Layout_20190319171956.vue

@@ -0,0 +1,32 @@
+<template>
+    <div class="container">
+        <Nav/>
+        <div class="right">
+            <!-- <TitleBar/> -->
+            <Main/>
+        </div>
+    </div>
+</template>
+<script>
+import Nav from './nav/Nav.vue';
+import TitleBar from './titleBar/TitleBar.vue';
+import Main from './main/Main'
+export default {
+ components: {
+    Nav,
+    TitleBar,
+    Main
+  },
+}
+</script>
+<style>
+    .container {
+        width: 100%;
+        height: 100%;
+    }
+    .right {
+        margin-left: 180px;
+        width: calc(100% - 180px);
+        height: 100%;
+    }
+</style>

.history/src/pages/layout/Layout_20190319172016.vue

@@ -0,0 +1,32 @@
+<template>
+    <div class="container">
+        <Nav/>
+        <div class="right">
+            <!-- <TitleBar/> -->
+            <Main/>
+        </div>
+    </div>
+</template>
+<script>
+import Nav from './nav/Nav.vue';
+import TitleBar from './titleBar/TitleBar.vue';
+import Main from './main/Main'
+export default {
+ components: {
+    Nav,
+    TitleBar,
+    Main
+  },
+}
+</script>
+<style>
+    .container {
+        width: 100%;
+        height: 100%;
+    }
+    .right {
+        margin-left: 180px;
+        width: calc(100% - 100px);
+        height: 100%;
+    }
+</style>

.history/src/pages/layout/Layout_20190319172029.vue

@@ -0,0 +1,32 @@
+<template>
+    <div class="container">
+        <Nav/>
+        <div class="right">
+            <!-- <TitleBar/> -->
+            <Main/>
+        </div>
+    </div>
+</template>
+<script>
+import Nav from './nav/Nav.vue';
+import TitleBar from './titleBar/TitleBar.vue';
+import Main from './main/Main'
+export default {
+ components: {
+    Nav,
+    TitleBar,
+    Main
+  },
+}
+</script>
+<style>
+    .container {
+        width: 100%;
+        height: 100%;
+    }
+    .right {
+        margin-left: 100px;
+        width: calc(100% - 100px);
+        height: 100%;
+    }
+</style>

.history/src/pages/layout/Layout_20190319172043.vue

@@ -0,0 +1,32 @@
+<template>
+    <div class="container">
+        <Nav/>
+        <div class="right">
+            <!-- <TitleBar/> -->
+            <Main/>
+        </div>
+    </div>
+</template>
+<script>
+import Nav from './nav/Nav.vue';
+import TitleBar from './titleBar/TitleBar.vue';
+import Main from './main/Main'
+export default {
+ components: {
+    Nav,
+    TitleBar,
+    Main
+  },
+}
+</script>
+<style>
+    .container {
+        width: 100%;
+        height: 100%;
+    }
+    .right {
+        margin-left: 90px;
+        width: calc(100% - 110px);
+        height: 100%;
+    }
+</style>

.history/src/pages/layout/Layout_20190319172104.vue

@@ -0,0 +1,32 @@
+<template>
+    <div class="container">
+        <Nav/>
+        <div class="right">
+            <TitleBar/>
+            <Main/>
+        </div>
+    </div>
+</template>
+<script>
+import Nav from './nav/Nav.vue';
+import TitleBar from './titleBar/TitleBar.vue';
+import Main from './main/Main'
+export default {
+ components: {
+    Nav,
+    TitleBar,
+    Main
+  },
+}
+</script>
+<style>
+    .container {
+        width: 100%;
+        height: 100%;
+    }
+    .right {
+        margin-left: 90px;
+        width: calc(100% - 110px);
+        height: 100%;
+    }
+</style>

.history/src/pages/layout/Layout_20190319173714.vue

@@ -0,0 +1,32 @@
+<template>
+    <div class="container">
+        <Nav/>
+        <div class="right">
+            <!-- <TitleBar/> -->
+            <Main/>
+        </div>
+    </div>
+</template>
+<script>
+import Nav from './nav/Nav.vue';
+import TitleBar from './titleBar/TitleBar.vue';
+import Main from './main/Main'
+export default {
+ components: {
+    Nav,
+    TitleBar,
+    Main
+  },
+}
+</script>
+<style>
+    .container {
+        width: 100%;
+        height: 100%;
+    }
+    .right {
+        margin-left: 90px;
+        width: calc(100% - 110px);
+        height: 100%;
+    }
+</style>

.history/src/pages/layout/nav/Nav_20190318173111.vue

@@ -0,0 +1,63 @@
+<template>
+    <div class="nav">
+      <el-menu default-active="1-4-1" class="el-menu-vertical-demo" background-color="#545c64" text-color="#fff" active-text-color="#ffd04b" :router=true :default-active="$route.path">
+        <el-menu-item index="/manage/query">
+            <span slot="title">经营数据查询</span>
+        </el-menu-item>
+        <el-menu-item index="/manage/cost">
+            <span slot="title">经营数据成本</span>
+        </el-menu-item>
+        <el-menu-item index="/manage/index">
+            <span slot="title">经营数据收入</span>
+        </el-menu-item>
+        <el-menu-item index="/team/index">
+            <span slot="title">部门管理</span>
+        </el-menu-item>
+        <el-menu-item index="/project/index">
+            <span slot="title">项目管理</span>
+        </el-menu-item>
+        <el-menu-item index="/product/index">
+            <span slot="title">产品管理</span>
+        </el-menu-item>
+        <el-menu-item index="/costType/index">
+            <span slot="title">成本类型管理</span>
+        </el-menu-item>
+        <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+        -->
+      </el-menu>
+    </div>
+</template>
+<script>
+export default {
+     data() {
+      return {
+        isCollapse: true
+      };
+    },
+    methods: {
+     
+    }
+}
+</script>
+<style>
+    .nav {
+        transition: width 0.28s;
+        width: 180px !important;
+        height: 100%;
+        position: fixed;
+        font-size: 0px;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        z-index: 1001;
+        overflow: hidden;
+    }
+    .el-menu {
+        height: 100%;
+    }
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319164925.vue

@@ -0,0 +1,66 @@
+<template>
+    <div class="nav">
+        <el-button type="primary" icon="el-icon-edit" circle @click="open"></el-button>
+      <el-menu default-active="1-4-1" :collapse="isCollapse" class="el-menu-vertical-demo" background-color="#545c64" text-color="#fff" active-text-color="#ffd04b" :router=true :default-active="$route.path">
+        <el-menu-item index="/manage/query">
+            <span slot="title">经营数据查询</span>
+        </el-menu-item>
+        <el-menu-item index="/manage/cost">
+            <span slot="title">经营数据成本</span>
+        </el-menu-item>
+        <el-menu-item index="/manage/index">
+            <span slot="title">经营数据收入</span>
+        </el-menu-item>
+        <el-menu-item index="/team/index">
+            <span slot="title">部门管理</span>
+        </el-menu-item>
+        <el-menu-item index="/project/index">
+            <span slot="title">项目管理</span>
+        </el-menu-item>
+        <el-menu-item index="/product/index">
+            <span slot="title">产品管理</span>
+        </el-menu-item>
+        <el-menu-item index="/costType/index">
+            <span slot="title">成本类型管理</span>
+        </el-menu-item>
+        <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+        -->
+      </el-menu>
+    </div>
+</template>
+<script>
+export default {
+     data() {
+      return {
+        isCollapse: true
+      };
+    },
+    methods: {
+        open(){
+            this.isCollapse = !this.isCollapse;
+        }
+    }
+}
+</script>
+<style>
+    .nav {
+        transition: width 0.28s;
+        width: 180px !important;
+        height: 100%;
+        position: fixed;
+        font-size: 0px;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        z-index: 1001;
+        overflow: hidden;
+    }
+    .el-menu {
+        height: 100%;
+    }
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319165140.vue

@@ -0,0 +1,78 @@
+<template>
+  <div class="nav">
+    <el-button type="primary" icon="el-icon-edit" circle @click="open"></el-button>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-menu"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i class="el-icon-menu"></i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319165330.vue

@@ -0,0 +1,78 @@
+<template>
+  <div class="nav">
+    <el-button type="primary" icon="el-icon-arrow-right" circle @click="open"></el-button>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-menu"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i class="el-icon-menu"></i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319170313.vue

@@ -0,0 +1,78 @@
+<template>
+  <div class="nav">
+    <el-button type="primary" icon="el-icon-arrow-right" circle @click="open"></el-button>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-menu">查询</i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i class="el-icon-menu"></i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319170430.vue

@@ -0,0 +1,79 @@
+<template>
+  <div class="nav">
+    <el-button v-if="!isCollapse"  icon="el-icon-arrow-right" circle @click="open"></el-button>
+    <el-button v-if="isCollapse"  icon="el-icon-arrow-left" circle @click="open"></el-button>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-menu">查询</i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i class="el-icon-menu"></i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319170455.vue

@@ -0,0 +1,79 @@
+<template>
+  <div class="nav">
+    <el-button v-if="!isCollapse"  icon="el-icon-arrow-left" circle @click="open"></el-button>
+    <el-button v-if="isCollapse"  icon="el-icon-arrow-right" circle @click="open"></el-button>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-menu">查询</i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i class="el-icon-menu"></i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319170659.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="nav">
+    <el-button v-if="!isCollapse"  icon="el-icon-arrow-left" circle @click="open"></el-button>
+    <el-button v-if="isCollapse"  icon="el-icon-arrow-right" circle @click="open"></el-button>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i >费用</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+      <i >收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+      <i >部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319170731.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="nav">
+    <el-button v-if="!isCollapse"  icon="el-icon-arrow-left" circle @click="open"></el-button>
+    <el-button v-if="isCollapse"  icon="el-icon-arrow-right" circle @click="open"></el-button>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <span>成本</span>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+      <i >收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+      <i >部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319170744.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="nav">
+    <el-button v-if="!isCollapse"  icon="el-icon-arrow-left" circle @click="open"></el-button>
+    <el-button v-if="isCollapse"  icon="el-icon-arrow-right" circle @click="open"></el-button>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i>成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+      <i >收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+      <i >部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319171011.vue

@@ -0,0 +1,85 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button>
+    <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button  v-if="!isCollapse" :label="false" icon="el-icon-arrow-left"></el-radio-button>
+      <el-radio-button  v-if="isCollapse" :label="true" icon="el-icon-arrow-right"></el-radio-button>
+    </el-radio-group>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i>成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i>收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i>部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319171105.vue

@@ -0,0 +1,85 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button>
+    <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-button  v-if="!isCollapse" :label="false" icon="el-icon-arrow-left"></el-button>
+      <el-button  v-if="isCollapse" :label="true" icon="el-icon-arrow-right"></el-button>
+    </el-radio-group>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i>成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i>收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i>部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319171121.vue

@@ -0,0 +1,85 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button>
+    <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-button  :label="false" icon="el-icon-arrow-left"></el-button>
+      <el-button  :label="true" icon="el-icon-arrow-right"></el-button>
+    </el-radio-group>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i>成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i>收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i>部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319171144.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="nav">
+    <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button>
+    <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i>成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i>收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i>部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319171348.vue

@@ -0,0 +1,84 @@
+<template>
+  <div class="nav">
+    <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button>
+    <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i style="font-style:normal">成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i style="font-style:normal">收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i style="font-style:normal">部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+      <i style="font-style:normal">项目</i>
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+      <i style="font-style:normal">产品</i>
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+      <i style="font-style:normal">类型</i>
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319171534.vue

@@ -0,0 +1,88 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button> -->
+    <!-- <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button :label="false">展开</el-radio-button>
+      <el-radio-button :label="true">收起</el-radio-button>
+    </el-radio-group>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      :default-active="$route.path"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i style="font-style:normal">成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i style="font-style:normal">收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i style="font-style:normal">部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <i style="font-style:normal">项目</i>
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <i style="font-style:normal">产品</i>
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <i style="font-style:normal">类型</i>
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319171632.vue

@@ -0,0 +1,87 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button> -->
+    <!-- <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button :label="false">展开</el-radio-button>
+      <el-radio-button :label="true">收起</el-radio-button>
+    </el-radio-group>
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i style="font-style:normal">成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i style="font-style:normal">收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i style="font-style:normal">部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <i style="font-style:normal">项目</i>
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <i style="font-style:normal">产品</i>
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <i style="font-style:normal">类型</i>
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319171807.vue

@@ -0,0 +1,87 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button> -->
+    <!-- <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <!-- <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button :label="false">展开</el-radio-button>
+      <el-radio-button :label="true">收起</el-radio-button>
+    </el-radio-group> -->
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i style="font-style:normal">成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i style="font-style:normal">收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i style="font-style:normal">部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <i style="font-style:normal">项目</i>
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <i style="font-style:normal">产品</i>
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <i style="font-style:normal">类型</i>
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319172631.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button> -->
+    <!-- <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <!-- <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button :label="false">展开</el-radio-button>
+      <el-radio-button :label="true">收起</el-radio-button>
+    </el-radio-group> -->
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      select="itemClickHandleer"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i style="font-style:normal">成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i style="font-style:normal">收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i style="font-style:normal">部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <i style="font-style:normal">项目</i>
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <i style="font-style:normal">产品</i>
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <i style="font-style:normal">类型</i>
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    },
+    itemClickHandleer(e){
+        console.log(e)
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319172730.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button> -->
+    <!-- <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <!-- <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button :label="false">展开</el-radio-button>
+      <el-radio-button :label="true">收起</el-radio-button>
+    </el-radio-group> -->
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      @select="handleSelect"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i style="font-style:normal">成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i style="font-style:normal">收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i style="font-style:normal">部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <i style="font-style:normal">项目</i>
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <i style="font-style:normal">产品</i>
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <i style="font-style:normal">类型</i>
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    },
+    handleSelect(key, keyPath) {
+        console.log(key, keyPath);
+      }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319172845.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button> -->
+    <!-- <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <!-- <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button :label="false">展开</el-radio-button>
+      <el-radio-button :label="true">收起</el-radio-button>
+    </el-radio-group> -->
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      @select="handleSelect"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i style="font-style:normal">成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i style="font-style:normal">收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i style="font-style:normal">部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <i style="font-style:normal">项目</i>
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <i style="font-style:normal">产品</i>
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <i style="font-style:normal">类型</i>
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    },
+    handleSelect(key, keyPath) {
+        console.log(key, keyPath);
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319173158.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button> -->
+    <!-- <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <!-- <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button :label="false">展开</el-radio-button>
+      <el-radio-button :label="true">收起</el-radio-button>
+    </el-radio-group> -->
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      @select="handleSelect"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i style="font-style:normal">成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i style="font-style:normal">收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i style="font-style:normal">部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <i style="font-style:normal">项目</i>
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <i style="font-style:normal">产品</i>
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <i style="font-style:normal">类型</i>
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    },
+    handleSelect(key, keyPath) {
+        console.log(key, keyPath);
+        switch(key){
+            case '/manage/query':
+                Vue.prototype.$navTitle = '经营数据查询'
+            break;
+        }
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319173310.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button> -->
+    <!-- <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <!-- <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button :label="false">展开</el-radio-button>
+      <el-radio-button :label="true">收起</el-radio-button>
+    </el-radio-group> -->
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      @select="handleSelect"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i style="font-style:normal">成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i style="font-style:normal">收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i style="font-style:normal">部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <i style="font-style:normal">项目</i>
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <i style="font-style:normal">产品</i>
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <i style="font-style:normal">类型</i>
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    },
+    handleSelect(key, keyPath) {
+        console.log(key, keyPath);
+        switch(key){
+            case '/manage/query':
+                this.$navTitle = '经营数据查询'
+            break;
+        }
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319173325.vue

@@ -0,0 +1,96 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button> -->
+    <!-- <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <!-- <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button :label="false">展开</el-radio-button>
+      <el-radio-button :label="true">收起</el-radio-button>
+    </el-radio-group> -->
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+      @select="handleSelect"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i style="font-style:normal">成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i style="font-style:normal">收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i style="font-style:normal">部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <i style="font-style:normal">项目</i>
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <i style="font-style:normal">产品</i>
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <i style="font-style:normal">类型</i>
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    },
+    handleSelect(key, keyPath) {
+        console.log(key, keyPath);
+        switch(key){
+            case '/manage/query':
+                this.prototype.$navTitle = '经营数据查询'
+            break;
+        }
+    }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/nav/Nav_20190319173625.vue

@@ -0,0 +1,95 @@
+<template>
+  <div class="nav">
+    <!-- <el-button v-if="!isCollapse" icon="el-icon-arrow-left" circle @click="open"></el-button> -->
+    <!-- <el-button v-if="isCollapse" icon="el-icon-arrow-right" circle @click="open"></el-button> -->
+    <!-- <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button :label="false">展开</el-radio-button>
+      <el-radio-button :label="true">收起</el-radio-button>
+    </el-radio-group> -->
+    <el-menu
+      default-active="1-4-1"
+      :collapse="isCollapse"
+      class="el-menu-vertical-demo"
+      background-color="#545c64"
+      text-color="#fff"
+      active-text-color="#ffd04b"
+      :router="true"
+    >
+      <el-menu-item index="/manage/query">
+        <i class="el-icon-search"></i>
+        <span slot="title">经营数据查询</span>
+      </el-menu-item>
+
+      <el-menu-item index="/manage/cost">
+        <i style="font-style:normal">成本</i>
+        <span slot="title">经营数据成本</span>
+      </el-menu-item>
+      <el-menu-item index="/manage/index">
+        <i style="font-style:normal">收入</i>
+        <span slot="title">经营数据收入</span>
+      </el-menu-item>
+      <el-menu-item index="/team/index">
+        <i style="font-style:normal">部门</i>
+        <span slot="title">部门管理</span>
+      </el-menu-item>
+      <el-menu-item index="/project/index">
+        <i style="font-style:normal">项目</i>
+        <span slot="title">项目管理</span>
+      </el-menu-item>
+      <el-menu-item index="/product/index">
+        <i style="font-style:normal">产品</i>
+        <span slot="title">产品管理</span>
+      </el-menu-item>
+      <el-menu-item index="/costType/index">
+        <i style="font-style:normal">类型</i>
+        <span slot="title">成本类型管理</span>
+      </el-menu-item>
+      <!--
+        <el-menu-item index="/costTeam/index">
+            <span slot="title">成本部门/单位/人管理</span>
+        </el-menu-item>
+      -->
+    </el-menu>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      isCollapse: true
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    },
+    // handleSelect(key, keyPath) {
+    //     console.log(key, keyPath);
+    //     switch(key){
+    //         case '/manage/query':
+    //             this.prototype.$navTitle = '经营数据查询'
+    //         break;
+    //     }
+    // }
+  }
+};
+</script>
+<style>
+.nav {
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: fixed;
+  font-size: 0px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1001;
+  overflow: hidden;
+}
+.el-menu {
+  height: 100%;
+}
+</style>
+
+

.history/src/pages/layout/titleBar/TitleBar_20190314094846.vue

@@ -0,0 +1,18 @@
+<template>
+  <div class="titleBar"></div>
+</template>
+<script>
+  export default {
+      
+  }
+</script>
+<style>
+  .titleBar {
+    height: 70px;
+    width: 100%;
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  }
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319172143.vue

@@ -0,0 +1,18 @@
+<template>
+  <div class="titleBar"></div>
+</template>
+<script>
+  export default {
+      
+  }
+</script>
+<style>
+  .titleBar {
+    height: 20px;
+    width: 100%;
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  }
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319172151.vue

@@ -0,0 +1,18 @@
+<template>
+  <div class="titleBar"></div>
+</template>
+<script>
+  export default {
+      
+  }
+</script>
+<style>
+  .titleBar {
+    height: 50px;
+    width: 100%;
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  }
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319172242.vue

@@ -0,0 +1,19 @@
+<template>
+  <div class="titleBar">经营数据管理系统</div>
+</template>
+<script>
+  export default {
+      
+  }
+</script>
+<style>
+  .titleBar {
+    height: 50px;
+    width: 100%;
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+    text-align: center;
+  }
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319172318.vue

@@ -0,0 +1,22 @@
+<template>
+  <div class="titleBar">经营数据管理系统</div>
+</template>
+<script>
+  export default {
+      
+  }
+</script>
+<style>
+  .titleBar {
+    height: 50px;
+    width: 100%;
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+    text-align: center;
+    line-height: 50px;
+    font-size: 32px;
+    font-style: italic;
+  }
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319172327.vue

@@ -0,0 +1,22 @@
+<template>
+  <div class="titleBar">经营数据管理系统</div>
+</template>
+<script>
+  export default {
+      
+  }
+</script>
+<style>
+  .titleBar {
+    height: 50px;
+    width: 100%;
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+    text-align: center;
+    line-height: 50px;
+    font-size: 25px;
+    font-style: italic;
+  }
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319173158.vue

@@ -0,0 +1,29 @@
+<template>
+  <div class="titleBar">经营数据管理系统</div>
+</template>
+<script>
+export default {
+  data() {
+    return {};
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.titleBar {
+  height: 50px;
+  width: 100%;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  text-align: center;
+  line-height: 50px;
+  font-size: 25px;
+  font-style: italic;
+}
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319173240.vue

@@ -0,0 +1,31 @@
+<template>
+  <div class="titleBar">{{navTitle}}</div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      navTitle: this.$navTitle
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.titleBar {
+  height: 50px;
+  width: 100%;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  text-align: center;
+  line-height: 50px;
+  font-size: 25px;
+  font-style: italic;
+}
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319173646.vue

@@ -0,0 +1,31 @@
+<template>
+  <div class="titleBar">{{title}}</div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      title: this.$navTitle
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.titleBar {
+  height: 50px;
+  width: 100%;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  text-align: center;
+  line-height: 50px;
+  font-size: 25px;
+  font-style: italic;
+}
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319173833.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="titleBar">{{title}}</div>
+</template>
+<script>
+export default {
+  name:TitleBar,
+  data() {
+    return {
+      title: this.$navTitle
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.titleBar {
+  height: 50px;
+  width: 100%;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  text-align: center;
+  line-height: 50px;
+  font-size: 25px;
+  font-style: italic;
+}
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319173842.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="titleBar">{{title}}</div>
+</template>
+<script>
+export default {
+  name:'TitleBar',
+  data() {
+    return {
+      title: this.$navTitle
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.titleBar {
+  height: 50px;
+  width: 100%;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  text-align: center;
+  line-height: 50px;
+  font-size: 25px;
+  font-style: italic;
+}
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319173934.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="titleBar">123456</div>
+</template>
+<script>
+export default {
+  name:'TitleBar',
+  data() {
+    return {
+      
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.titleBar {
+  height: 50px;
+  width: 100%;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  text-align: center;
+  line-height: 50px;
+  font-size: 25px;
+  font-style: italic;
+}
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319174814.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="titleBar">{{title}}</div>
+</template>
+<script>
+export default {
+  name:'TitleBar',
+  data() {
+    return {
+      title: props.title
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.titleBar {
+  height: 50px;
+  width: 100%;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  text-align: center;
+  line-height: 50px;
+  font-size: 25px;
+  font-style: italic;
+}
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319174828.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="titleBar">{{title}}</div>
+</template>
+<script>
+export default {
+  name:'TitleBar',
+  data() {
+    return {
+      title: this.props.title
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.titleBar {
+  height: 50px;
+  width: 100%;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  text-align: center;
+  line-height: 50px;
+  font-size: 25px;
+  font-style: italic;
+}
+</style>
+
+
+

.history/src/pages/layout/titleBar/TitleBar_20190319175138.vue

@@ -0,0 +1,33 @@
+<template>
+  <div class="titleBar">{{title}}</div>
+</template>
+<script>
+export default {
+  name:'TitleBar',
+  props: ['propTitle'],
+  data() {
+    return {
+      title: this.propTitle
+    };
+  },
+  methods: {
+    open() {
+      this.isCollapse = !this.isCollapse;
+    }
+  }
+};
+</script>
+<style>
+.titleBar {
+  height: 50px;
+  width: 100%;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  text-align: center;
+  line-height: 50px;
+  font-size: 25px;
+  font-style: italic;
+}
+</style>
+
+
+

.history/src/pages/manage/cost_20190319175351.vue

@@ -0,0 +1,348 @@
+<template>
+  <div class="manage">
+    <TitleBar propTitle="成本管理" />
+    <div class="add-container">
+      <el-button type="primary" @click="append('COST')">增加成本</el-button>
+    </div>
+    <el-card class="right-card">
+      <el-table :data="manageData" style="width: 100%" :row-class-name="tableRowClassName">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="备注">
+                <span>{{ props.row.remark ? props.row.remark : '无' }}</span>
+              </el-form-item>
+              <el-form-item label="接收部门">
+                <span>{{ props.row.toDepartment.name ? props.row.toDepartment.name : '无'  }}</span>
+              </el-form-item>
+              <el-form-item label="接受项目">
+                <span>{{ props.row.toProject.name ? props.row.toProject.name : '无'  }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column>-->
+        <el-table-column label="成本类型" prop="costType.name"></el-table-column>
+        <el-table-column label="归属部门" prop="department.name"></el-table-column>
+        <el-table-column label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+        <el-table-column label="接受项目" prop="toProject.name"></el-table-column>
+        <el-table-column label="金额">
+          <template slot-scope="props">
+            <span>{{ props.row.type == 'COST' ? '-' + props.row.amount : '+' + props.row.amount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog :title="type == 'INCOME' ? '收入' : '成本'" :visible.sync="dialogFormVisible">
+      <el-form :model="form" ref="form">
+        <el-form-item
+          label="发生时间"
+          prop="happenTime"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '名称不能为空'}]"
+        >
+          <el-date-picker v-model="form.happenTime" type="date" placeholder="接收日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="金额"
+          prop="amount"
+          :label-width="formLabelWidth"
+          :rules="[
+        { required: true, message: '编码不能为空'}, 
+        // { type: 'number', message: '排序必须为数字值'}
+        ]"
+        >
+          <el-input style="width: 35% " v-model="form.amount" autocomplete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="成本类型"
+          prop="costTypeId"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '状态不能为空'}]"
+        >
+          <el-select v-model="form.costTypeId" placeholder="请选择类型">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in costTypeSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+          <el-select v-model="form.deptId" placeholder="请选择部门" @change="getName">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+          <el-select v-model="form.projectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="接收部门" prop="toDeptId" :label-width="formLabelWidth">
+          <el-select v-model="form.toDeptId" placeholder="请选择部门">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="接收项目" prop="toProjectId" :label-width="formLabelWidth">
+          <el-select v-model="form.toProjectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+          <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from '../layout/titleBar/TitleBar.vue';
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "COST"
+    }).then(res => {
+      this.manageData = res.data.data;
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      this.form.toDeptId = row.toDeptId;
+      this.form.toProjectId = row.toProjectId;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "COST"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "COST"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>
+

.history/src/pages/manage/cost_20190319175425.vue

@@ -0,0 +1,349 @@
+<template>
+  <div class="manage">
+    <TitleBar propTitle="成本管理" />
+    <div class="add-container">
+      <el-button type="primary" @click="append('COST')">增加成本</el-button>
+    </div>
+    <el-card class="right-card">
+      <el-table :data="manageData" style="width: 100%" :row-class-name="tableRowClassName">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="备注">
+                <span>{{ props.row.remark ? props.row.remark : '无' }}</span>
+              </el-form-item>
+              <el-form-item label="接收部门">
+                <span>{{ props.row.toDepartment.name ? props.row.toDepartment.name : '无'  }}</span>
+              </el-form-item>
+              <el-form-item label="接受项目">
+                <span>{{ props.row.toProject.name ? props.row.toProject.name : '无'  }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column>-->
+        <el-table-column label="成本类型" prop="costType.name"></el-table-column>
+        <el-table-column label="归属部门" prop="department.name"></el-table-column>
+        <el-table-column label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+        <el-table-column label="接受项目" prop="toProject.name"></el-table-column>
+        <el-table-column label="金额">
+          <template slot-scope="props">
+            <span>{{ props.row.type == 'COST' ? '-' + props.row.amount : '+' + props.row.amount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog :title="type == 'INCOME' ? '收入' : '成本'" :visible.sync="dialogFormVisible">
+      <el-form :model="form" ref="form">
+        <el-form-item
+          label="发生时间"
+          prop="happenTime"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '名称不能为空'}]"
+        >
+          <el-date-picker v-model="form.happenTime" type="date" placeholder="接收日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="金额"
+          prop="amount"
+          :label-width="formLabelWidth"
+          :rules="[
+        { required: true, message: '编码不能为空'}, 
+        // { type: 'number', message: '排序必须为数字值'}
+        ]"
+        >
+          <el-input style="width: 35% " v-model="form.amount" autocomplete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="成本类型"
+          prop="costTypeId"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '状态不能为空'}]"
+        >
+          <el-select v-model="form.costTypeId" placeholder="请选择类型">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in costTypeSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+          <el-select v-model="form.deptId" placeholder="请选择部门" @change="getName">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+          <el-select v-model="form.projectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="接收部门" prop="toDeptId" :label-width="formLabelWidth">
+          <el-select v-model="form.toDeptId" placeholder="请选择部门">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="接收项目" prop="toProjectId" :label-width="formLabelWidth">
+          <el-select v-model="form.toProjectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+          <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from '../layout/titleBar/TitleBar.vue';
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "COST"
+    }).then(res => {
+      this.manageData = res.data.data;
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      this.form.toDeptId = row.toDeptId;
+      this.form.toProjectId = row.toProjectId;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "COST"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "COST"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  padding-top: 0;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>
+

.history/src/pages/manage/cost_20190319175501.vue

@@ -0,0 +1,350 @@
+<template>
+<TitleBar propTitle="成本管理" />
+  <div class="manage">
+    
+    <div class="add-container">
+      <el-button type="primary" @click="append('COST')">增加成本</el-button>
+    </div>
+    <el-card class="right-card">
+      <el-table :data="manageData" style="width: 100%" :row-class-name="tableRowClassName">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="备注">
+                <span>{{ props.row.remark ? props.row.remark : '无' }}</span>
+              </el-form-item>
+              <el-form-item label="接收部门">
+                <span>{{ props.row.toDepartment.name ? props.row.toDepartment.name : '无'  }}</span>
+              </el-form-item>
+              <el-form-item label="接受项目">
+                <span>{{ props.row.toProject.name ? props.row.toProject.name : '无'  }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column>-->
+        <el-table-column label="成本类型" prop="costType.name"></el-table-column>
+        <el-table-column label="归属部门" prop="department.name"></el-table-column>
+        <el-table-column label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+        <el-table-column label="接受项目" prop="toProject.name"></el-table-column>
+        <el-table-column label="金额">
+          <template slot-scope="props">
+            <span>{{ props.row.type == 'COST' ? '-' + props.row.amount : '+' + props.row.amount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog :title="type == 'INCOME' ? '收入' : '成本'" :visible.sync="dialogFormVisible">
+      <el-form :model="form" ref="form">
+        <el-form-item
+          label="发生时间"
+          prop="happenTime"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '名称不能为空'}]"
+        >
+          <el-date-picker v-model="form.happenTime" type="date" placeholder="接收日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="金额"
+          prop="amount"
+          :label-width="formLabelWidth"
+          :rules="[
+        { required: true, message: '编码不能为空'}, 
+        // { type: 'number', message: '排序必须为数字值'}
+        ]"
+        >
+          <el-input style="width: 35% " v-model="form.amount" autocomplete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="成本类型"
+          prop="costTypeId"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '状态不能为空'}]"
+        >
+          <el-select v-model="form.costTypeId" placeholder="请选择类型">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in costTypeSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+          <el-select v-model="form.deptId" placeholder="请选择部门" @change="getName">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+          <el-select v-model="form.projectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="接收部门" prop="toDeptId" :label-width="formLabelWidth">
+          <el-select v-model="form.toDeptId" placeholder="请选择部门">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="接收项目" prop="toProjectId" :label-width="formLabelWidth">
+          <el-select v-model="form.toProjectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+          <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from '../layout/titleBar/TitleBar.vue';
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "COST"
+    }).then(res => {
+      this.manageData = res.data.data;
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      this.form.toDeptId = row.toDeptId;
+      this.form.toProjectId = row.toProjectId;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "COST"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "COST"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  padding-top: 0;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>
+

.history/src/pages/manage/cost_20190319175521.vue

@@ -0,0 +1,349 @@
+<template>
+  <div class="manage">
+    <TitleBar propTitle="成本管理" />
+    <div class="add-container">
+      <el-button type="primary" @click="append('COST')">增加成本</el-button>
+    </div>
+    <el-card class="right-card">
+      <el-table :data="manageData" style="width: 100%" :row-class-name="tableRowClassName">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="备注">
+                <span>{{ props.row.remark ? props.row.remark : '无' }}</span>
+              </el-form-item>
+              <el-form-item label="接收部门">
+                <span>{{ props.row.toDepartment.name ? props.row.toDepartment.name : '无'  }}</span>
+              </el-form-item>
+              <el-form-item label="接受项目">
+                <span>{{ props.row.toProject.name ? props.row.toProject.name : '无'  }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column>-->
+        <el-table-column label="成本类型" prop="costType.name"></el-table-column>
+        <el-table-column label="归属部门" prop="department.name"></el-table-column>
+        <el-table-column label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+        <el-table-column label="接受项目" prop="toProject.name"></el-table-column>
+        <el-table-column label="金额">
+          <template slot-scope="props">
+            <span>{{ props.row.type == 'COST' ? '-' + props.row.amount : '+' + props.row.amount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog :title="type == 'INCOME' ? '收入' : '成本'" :visible.sync="dialogFormVisible">
+      <el-form :model="form" ref="form">
+        <el-form-item
+          label="发生时间"
+          prop="happenTime"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '名称不能为空'}]"
+        >
+          <el-date-picker v-model="form.happenTime" type="date" placeholder="接收日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="金额"
+          prop="amount"
+          :label-width="formLabelWidth"
+          :rules="[
+        { required: true, message: '编码不能为空'}, 
+        // { type: 'number', message: '排序必须为数字值'}
+        ]"
+        >
+          <el-input style="width: 35% " v-model="form.amount" autocomplete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="成本类型"
+          prop="costTypeId"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '状态不能为空'}]"
+        >
+          <el-select v-model="form.costTypeId" placeholder="请选择类型">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in costTypeSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+          <el-select v-model="form.deptId" placeholder="请选择部门" @change="getName">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+          <el-select v-model="form.projectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="接收部门" prop="toDeptId" :label-width="formLabelWidth">
+          <el-select v-model="form.toDeptId" placeholder="请选择部门">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="接收项目" prop="toProjectId" :label-width="formLabelWidth">
+          <el-select v-model="form.toProjectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+          <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from '../layout/titleBar/TitleBar.vue';
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "COST"
+    }).then(res => {
+      this.manageData = res.data.data;
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      this.form.toDeptId = row.toDeptId;
+      this.form.toProjectId = row.toProjectId;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "COST"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "COST"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  padding-top: 0;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>
+

.history/src/pages/manage/cost_20190319175742.vue

@@ -0,0 +1,349 @@
+<template>
+  <div class="manage">
+    <!-- <TitleBar propTitle="成本管理" /> -->
+    <div class="add-container">
+      <el-button type="primary" @click="append('COST')">增加成本</el-button>
+    </div>
+    <el-card class="right-card">
+      <el-table :data="manageData" style="width: 100%" :row-class-name="tableRowClassName">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="备注">
+                <span>{{ props.row.remark ? props.row.remark : '无' }}</span>
+              </el-form-item>
+              <el-form-item label="接收部门">
+                <span>{{ props.row.toDepartment.name ? props.row.toDepartment.name : '无'  }}</span>
+              </el-form-item>
+              <el-form-item label="接受项目">
+                <span>{{ props.row.toProject.name ? props.row.toProject.name : '无'  }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column>-->
+        <el-table-column label="成本类型" prop="costType.name"></el-table-column>
+        <el-table-column label="归属部门" prop="department.name"></el-table-column>
+        <el-table-column label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+        <el-table-column label="接受项目" prop="toProject.name"></el-table-column>
+        <el-table-column label="金额">
+          <template slot-scope="props">
+            <span>{{ props.row.type == 'COST' ? '-' + props.row.amount : '+' + props.row.amount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog :title="type == 'INCOME' ? '收入' : '成本'" :visible.sync="dialogFormVisible">
+      <el-form :model="form" ref="form">
+        <el-form-item
+          label="发生时间"
+          prop="happenTime"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '名称不能为空'}]"
+        >
+          <el-date-picker v-model="form.happenTime" type="date" placeholder="接收日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="金额"
+          prop="amount"
+          :label-width="formLabelWidth"
+          :rules="[
+        { required: true, message: '编码不能为空'}, 
+        // { type: 'number', message: '排序必须为数字值'}
+        ]"
+        >
+          <el-input style="width: 35% " v-model="form.amount" autocomplete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="成本类型"
+          prop="costTypeId"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '状态不能为空'}]"
+        >
+          <el-select v-model="form.costTypeId" placeholder="请选择类型">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in costTypeSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+          <el-select v-model="form.deptId" placeholder="请选择部门" @change="getName">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+          <el-select v-model="form.projectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="接收部门" prop="toDeptId" :label-width="formLabelWidth">
+          <el-select v-model="form.toDeptId" placeholder="请选择部门">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="接收项目" prop="toProjectId" :label-width="formLabelWidth">
+          <el-select v-model="form.toProjectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+          <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from '../layout/titleBar/TitleBar.vue';
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "COST"
+    }).then(res => {
+      this.manageData = res.data.data;
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      this.form.toDeptId = row.toDeptId;
+      this.form.toProjectId = row.toProjectId;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "COST"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "COST"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  padding-top: 0;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>
+

.history/src/pages/manage/index_20190319175501.vue

@@ -0,0 +1,362 @@
+<template>
+  <div class="manage">
+    <div class="add-container">
+      <el-button type="primary" @click="append('INCOME')">增加收入</el-button>
+    </div>
+    <el-card class="right-card">
+      <el-table :data="manageData" style="width: 100%" :row-class-name="tableRowClassName">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="备注">
+                <span>{{ props.row.remark ? props.row.remark : '无' }}</span>
+              </el-form-item>
+              <el-form-item label="接收部门">
+                <span>{{ props.row.toDepartment.name ? props.row.toDepartment.name : '无' }}</span>
+              </el-form-item>
+              <el-form-item label="接受项目">
+                <span>{{ props.row.toProject.name ? props.row.toProject.name : '无' }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column> -->
+        <el-table-column label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="归属部门" prop="department.name"></el-table-column>
+        <el-table-column label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column label="产品" prop="product.name"></el-table-column>
+        <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+        <el-table-column label="接受项目" prop="toProject.name"></el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="金额">
+          <template slot-scope="props">
+            <span>{{ props.row.type == 'COST' ? '-' + props.row.amount : '+' + props.row.amount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog :title="type == 'INCOME' ? '收入' : '成本'" :visible.sync="dialogFormVisible">
+      <el-form :model="form" ref="form">
+        <el-form-item
+          label="发生时间"
+          prop="happenTime"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '名称不能为空'}]"
+        >
+          <!--<el-input v-model="form.happenTime" autocomplete="off" placeholder="请输入格式2019/00/00"></el-input>-->
+          <el-date-picker v-model="form.happenTime" type="date" placeholder="选择日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="金额"
+          prop="amount"
+          :label-width="formLabelWidth"
+          :rules="[
+          { required: true, message: '编码不能为空'}, 
+          // { type: 'float', message: '金额必须为数字值'}
+        ]"
+        >
+          <el-input style="width: 35%;" v-model="form.amount" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item
+          label="收入状态"
+          prop="incomeStatus"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '状态不能为空'}]"
+        >
+          <el-select v-model="form.incomeStatus" placeholder="请选择状态值">
+            <el-option key label="无" value></el-option>
+            <el-option label="开票/应收" value="INVOICE"></el-option>
+            <el-option label="到账" value="ARRIVAL"></el-option>
+            <el-option label="内部核算" value="INTERNAL"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+          <el-select v-model="form.productId" placeholder="请选择产品">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in productSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+          <el-select v-model="form.projectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+          <el-select v-model="form.toDeptId" placeholder="请选择部门">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+          <el-select v-model="form.toProjectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+          <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+          <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from '../layout/titleBar/TitleBar.vue';
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data)
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>
+

.history/src/pages/manage/index_20190319175552.vue

@@ -0,0 +1,364 @@
+<template>
+  <div class="manage">
+    <TitleBar propTitle="收入管理" />
+    <div class="add-container">
+      <el-button type="primary" @click="append('INCOME')">增加收入</el-button>
+    </div>
+    <el-card class="right-card">
+      <el-table :data="manageData" style="width: 100%" :row-class-name="tableRowClassName">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="备注">
+                <span>{{ props.row.remark ? props.row.remark : '无' }}</span>
+              </el-form-item>
+              <el-form-item label="接收部门">
+                <span>{{ props.row.toDepartment.name ? props.row.toDepartment.name : '无' }}</span>
+              </el-form-item>
+              <el-form-item label="接受项目">
+                <span>{{ props.row.toProject.name ? props.row.toProject.name : '无' }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column> -->
+        <el-table-column label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="归属部门" prop="department.name"></el-table-column>
+        <el-table-column label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column label="产品" prop="product.name"></el-table-column>
+        <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+        <el-table-column label="接受项目" prop="toProject.name"></el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="金额">
+          <template slot-scope="props">
+            <span>{{ props.row.type == 'COST' ? '-' + props.row.amount : '+' + props.row.amount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog :title="type == 'INCOME' ? '收入' : '成本'" :visible.sync="dialogFormVisible">
+      <el-form :model="form" ref="form">
+        <el-form-item
+          label="发生时间"
+          prop="happenTime"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '名称不能为空'}]"
+        >
+          <!--<el-input v-model="form.happenTime" autocomplete="off" placeholder="请输入格式2019/00/00"></el-input>-->
+          <el-date-picker v-model="form.happenTime" type="date" placeholder="选择日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="金额"
+          prop="amount"
+          :label-width="formLabelWidth"
+          :rules="[
+          { required: true, message: '编码不能为空'}, 
+          // { type: 'float', message: '金额必须为数字值'}
+        ]"
+        >
+          <el-input style="width: 35%;" v-model="form.amount" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item
+          label="收入状态"
+          prop="incomeStatus"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '状态不能为空'}]"
+        >
+          <el-select v-model="form.incomeStatus" placeholder="请选择状态值">
+            <el-option key label="无" value></el-option>
+            <el-option label="开票/应收" value="INVOICE"></el-option>
+            <el-option label="到账" value="ARRIVAL"></el-option>
+            <el-option label="内部核算" value="INTERNAL"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+          <el-select v-model="form.productId" placeholder="请选择产品">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in productSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+          <el-select v-model="form.projectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+          <el-select v-model="form.toDeptId" placeholder="请选择部门">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+          <el-select v-model="form.toProjectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+          <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+          <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from '../layout/titleBar/TitleBar.vue';
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data)
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+   padding-top: 0;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>
+

.history/src/pages/manage/index_20190319175742.vue

@@ -0,0 +1,364 @@
+<template>
+  <div class="manage">
+    <!-- <TitleBar propTitle="收入管理" /> -->
+    <div class="add-container">
+      <el-button type="primary" @click="append('INCOME')">增加收入</el-button>
+    </div>
+    <el-card class="right-card">
+      <el-table :data="manageData" style="width: 100%" :row-class-name="tableRowClassName">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="备注">
+                <span>{{ props.row.remark ? props.row.remark : '无' }}</span>
+              </el-form-item>
+              <el-form-item label="接收部门">
+                <span>{{ props.row.toDepartment.name ? props.row.toDepartment.name : '无' }}</span>
+              </el-form-item>
+              <el-form-item label="接受项目">
+                <span>{{ props.row.toProject.name ? props.row.toProject.name : '无' }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column> -->
+        <el-table-column label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="归属部门" prop="department.name"></el-table-column>
+        <el-table-column label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column label="产品" prop="product.name"></el-table-column>
+        <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+        <el-table-column label="接受项目" prop="toProject.name"></el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        <el-table-column label="金额">
+          <template slot-scope="props">
+            <span>{{ props.row.type == 'COST' ? '-' + props.row.amount : '+' + props.row.amount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog :title="type == 'INCOME' ? '收入' : '成本'" :visible.sync="dialogFormVisible">
+      <el-form :model="form" ref="form">
+        <el-form-item
+          label="发生时间"
+          prop="happenTime"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '名称不能为空'}]"
+        >
+          <!--<el-input v-model="form.happenTime" autocomplete="off" placeholder="请输入格式2019/00/00"></el-input>-->
+          <el-date-picker v-model="form.happenTime" type="date" placeholder="选择日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="金额"
+          prop="amount"
+          :label-width="formLabelWidth"
+          :rules="[
+          { required: true, message: '编码不能为空'}, 
+          // { type: 'float', message: '金额必须为数字值'}
+        ]"
+        >
+          <el-input style="width: 35%;" v-model="form.amount" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item
+          label="收入状态"
+          prop="incomeStatus"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '状态不能为空'}]"
+        >
+          <el-select v-model="form.incomeStatus" placeholder="请选择状态值">
+            <el-option key label="无" value></el-option>
+            <el-option label="开票/应收" value="INVOICE"></el-option>
+            <el-option label="到账" value="ARRIVAL"></el-option>
+            <el-option label="内部核算" value="INTERNAL"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+          <el-select v-model="form.productId" placeholder="请选择产品">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in productSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+          <el-select v-model="form.projectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+          <el-select v-model="form.toDeptId" placeholder="请选择部门">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+          <el-select v-model="form.toProjectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+          <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+          <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="resetForm('form')">取 消</el-button>
+        <el-button type="primary" @click="submitForm('form')">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from '../layout/titleBar/TitleBar.vue';
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data)
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+   padding-top: 0;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>
+

.history/src/pages/manage/query_20190318173111.vue

@@ -0,0 +1,3 @@
+<template>
+  <div>经营数据查询</div>
+</template>

.history/src/pages/manage/query_20190319151440.vue

@@ -0,0 +1,98 @@
+<template>
+  <el-form :model="form" ref="form">
+        <el-form-item
+          label="发生时间"
+          prop="happenTime"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '名称不能为空'}]"
+        >
+          <!--<el-input v-model="form.happenTime" autocomplete="off" placeholder="请输入格式2019/00/00"></el-input>-->
+          <el-date-picker v-model="form.happenTime" type="date" placeholder="选择日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="金额"
+          prop="amount"
+          :label-width="formLabelWidth"
+          :rules="[
+          { required: true, message: '编码不能为空'}, 
+          // { type: 'float', message: '金额必须为数字值'}
+        ]"
+        >
+          <el-input style="width: 35%;" v-model="form.amount" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item
+          label="收入状态"
+          prop="incomeStatus"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '状态不能为空'}]"
+        >
+          <el-select v-model="form.incomeStatus" placeholder="请选择状态值">
+            <el-option key label="无" value></el-option>
+            <el-option label="开票/应收" value="INVOICE"></el-option>
+            <el-option label="到账" value="ARRIVAL"></el-option>
+            <el-option label="内部核算" value="INTERNAL"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+          <el-select v-model="form.productId" placeholder="请选择产品">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in productSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+          <el-select v-model="form.projectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+          <el-select v-model="form.toDeptId" placeholder="请选择部门">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+          <el-select v-model="form.toProjectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+          <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+          <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+</template>

.history/src/pages/manage/query_20190319151525.vue

@@ -0,0 +1,299 @@
+<template>
+  <el-form :model="form" ref="form">
+        <el-form-item
+          label="发生时间"
+          prop="happenTime"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '名称不能为空'}]"
+        >
+          <!--<el-input v-model="form.happenTime" autocomplete="off" placeholder="请输入格式2019/00/00"></el-input>-->
+          <el-date-picker v-model="form.happenTime" type="date" placeholder="选择日期"></el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="金额"
+          prop="amount"
+          :label-width="formLabelWidth"
+          :rules="[
+          { required: true, message: '编码不能为空'}, 
+          // { type: 'float', message: '金额必须为数字值'}
+        ]"
+        >
+          <el-input style="width: 35%;" v-model="form.amount" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item
+          label="收入状态"
+          prop="incomeStatus"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '状态不能为空'}]"
+        >
+          <el-select v-model="form.incomeStatus" placeholder="请选择状态值">
+            <el-option key label="无" value></el-option>
+            <el-option label="开票/应收" value="INVOICE"></el-option>
+            <el-option label="到账" value="ARRIVAL"></el-option>
+            <el-option label="内部核算" value="INTERNAL"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+          <el-select v-model="form.productId" placeholder="请选择产品">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in productSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+          <el-select v-model="form.projectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+          <el-select v-model="form.toDeptId" placeholder="请选择部门">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+          <el-select v-model="form.toProjectId" placeholder="请选择项目">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in projectSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+          <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+            <el-option key label="无" value></el-option>
+            <el-option
+              v-for="item in teamSelectData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+          <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data)
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>

.history/src/pages/manage/query_20190319151958.vue

@@ -0,0 +1,278 @@
+<template>
+  <el-form :model="form" ref="form">
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+      :rules="[{ required: true, message: '状态不能为空'}]"
+    >
+      <el-select v-model="form.incomeStatus" placeholder="请选择状态值">
+        <el-checkbox label="开票/应收" name="INVOICE"></el-checkbox>
+        <el-checkbox label="到账" name="ARRIVAL"></el-checkbox>
+        <el-checkbox label="内部核算" name="INTERNAL"></el-checkbox>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+      <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>

.history/src/pages/manage/query_20190319152033.vue

@@ -0,0 +1,278 @@
+<template>
+  <el-form :model="form" ref="form">
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+      :rules="[{ required: true, message: '状态不能为空'}]"
+    >
+      <el-checkbox-group v-model="form.incomeStatus" placeholder="请选择状态值">
+        <el-checkbox label="开票/应收" name="INVOICE"></el-checkbox>
+        <el-checkbox label="到账" name="ARRIVAL"></el-checkbox>
+        <el-checkbox label="内部核算" name="INTERNAL"></el-checkbox>
+      </el-checkbox-group>
+    </el-form-item>
+
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+      <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>

.history/src/pages/manage/query_20190319152123.vue

@@ -0,0 +1,278 @@
+<template>
+  <el-form :model="form" ref="form">
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+      :rules="[{ required: true, message: '状态不能为空'}]"
+    >
+      <el-checkbox-group v-model="form.incomeStatus" placeholder="请选择状态值">
+        <el-checkbox label="开票/应收" name="INVOICE"  value="INVOICE"></el-checkbox>
+        <el-checkbox label="到账" name="ARRIVAL" value="ARRIVAL"></el-checkbox>
+        <el-checkbox label="内部核算" name="INTERNAL" value="INTERNAL"></el-checkbox>
+      </el-checkbox-group>
+    </el-form-item>
+
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+      <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>

.history/src/pages/manage/query_20190319152246.vue

@@ -0,0 +1,278 @@
+<template>
+  <el-form :model="form" ref="form">
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+      :rules="[{ required: true, message: '状态不能为空'}]"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值">
+        <el-radio label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+      <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>

.history/src/pages/manage/query_20190319153626.vue

@@ -0,0 +1,286 @@
+<template>
+  <el-form :model="form" ref="form">
+    <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别">
+        <el-radio label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值">
+        <el-radio label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+      <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>

.history/src/pages/manage/query_20190319153905.vue

@@ -0,0 +1,286 @@
+<template>
+  <el-form :model="form" ref="form">
+    <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+      <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>

.history/src/pages/manage/query_20190319153955.vue

@@ -0,0 +1,286 @@
+<template>
+  <el-form :model="form" ref="form">
+    <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
+      <el-input type="textarea" :rows="2" v-model="form.remark" autocomplete="off"></el-input>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>

.history/src/pages/manage/query_20190319154030.vue

@@ -0,0 +1,283 @@
+<template>
+  <el-form :model="form" ref="form">
+    <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>

.history/src/pages/manage/query_20190319154157.vue

@@ -0,0 +1,283 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form">
+    <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>

.history/src/pages/manage/query_20190319154230.vue

@@ -0,0 +1,283 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form">
+
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+.manage {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add-container {
+  float: right;
+  margin-bottom: 20px;
+}
+.right-card {
+  width: 100%;
+  margin: 0 auto;
+}
+.demo-table-expand {
+  font-size: 0;
+}
+.demo-table-expand label {
+  width: 90px;
+  color: #99a9bf;
+}
+.demo-table-expand .el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
+  width: 50%;
+}
+.el-table .cost-row {
+  color: green;
+}
+
+.el-table .income-row {
+  color: red;
+}
+</style>

.history/src/pages/manage/query_20190319154345.vue

@@ -0,0 +1,254 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319154433.vue

@@ -0,0 +1,257 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 编辑
+    handleEdit(index, row) {
+      console.log(row);
+      //回显赋值
+      this.type = row.type;
+      this.form.deptId = row.department.id;
+      this.form.projectId = row.project.id;
+      this.form.code = row.code;
+      this.form.happenTime = row.happenTime;
+      this.form.incomeStatus = row.incomeStatus;
+      this.form.productId = row.productId;
+      this.form.remark = row.remark;
+      this.form.amount = row.amount;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.form.costTypeId = row.costTypeId;
+      this.form.companyId = row.companyId;
+      this.form.companyType = row.companyType;
+      this.id = row.id;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          this.form.happenTime = new Date(this.form.happenTime) * 1;
+          this.form.type = this.type;
+          if (this.addFlag) {
+            addManage(this.form).then(res => {
+              console.log(res);
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319154739.vue

@@ -0,0 +1,173 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      console.log(this.form)
+    }
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319154823.vue

@@ -0,0 +1,194 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319154836.vue

@@ -0,0 +1,197 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      console.log(this.f)
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319154841.vue

@@ -0,0 +1,197 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "",
+        productId: "",
+        toProjectId: "",
+        remark: "",
+        amount: "",
+        toDeptId: "",
+        deptName: "",
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      console.log(this.form)
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319155142.vue

@@ -0,0 +1,189 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      prop="incomeStatus"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      console.log(this.form)
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319155415.vue

@@ -0,0 +1,188 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.type" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="开票/应收" name="INVOICE"  value="INVOICE"></el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      console.log(this.form)
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319155512.vue

@@ -0,0 +1,188 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="收入" name="ICOME"  value="ICOME"></el-radio>
+        <el-radio border  label="费用" name="COST" value="COST"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.type" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="INVOICE" name="INVOICE"  value="INVOICE">开票/应收</el-radio>
+        <el-radio border  label="到账" name="ARRIVAL" value="ARRIVAL"></el-radio>
+        <el-radio border  label="内部核算" name="INTERNAL" value="INTERNAL"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      console.log(this.form)
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319155628.vue

@@ -0,0 +1,188 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select" @change="getName">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="ICOME">收入</el-radio>
+        <el-radio border  label="COST" >费用</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.type" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="INVOICE" >开票/应收</el-radio>
+        <el-radio border  label="ARRIVAL" >到账</el-radio>
+        <el-radio border  label="INTERNAL">内部核算</el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      console.log(this.form)
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319155852.vue

@@ -0,0 +1,188 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="ICOME">收入</el-radio>
+        <el-radio border  label="COST" >费用</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.type" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="INVOICE" >开票/应收</el-radio>
+        <el-radio border  label="ARRIVAL" >到账</el-radio>
+        <el-radio border  label="INTERNAL">内部核算</el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      console.log(this.form)
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319160220.vue

@@ -0,0 +1,191 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="ICOME">收入</el-radio>
+        <el-radio border  label="COST" >费用</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.type" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="INVOICE" >开票/应收</el-radio>
+        <el-radio border  label="ARRIVAL" >到账</el-radio>
+        <el-radio border  label="INTERNAL">内部核算</el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      this.$fetch('manageBase/manage')
+    .then(response => {
+       console.log(response)
+    })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319160258.vue

@@ -0,0 +1,191 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="ICOME">收入</el-radio>
+        <el-radio border  label="COST" >费用</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.type" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="INVOICE" >开票/应收</el-radio>
+        <el-radio border  label="ARRIVAL" >到账</el-radio>
+        <el-radio border  label="INTERNAL">内部核算</el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      this.$fetch('manageBase/manage',this.form)
+    .then(response => {
+       console.log(response)
+    })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319160405.vue

@@ -0,0 +1,191 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="ICOME">收入</el-radio>
+        <el-radio border  label="COST" >费用</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.type" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="INVOICE" >开票/应收</el-radio>
+        <el-radio border  label="ARRIVAL" >到账</el-radio>
+        <el-radio border  label="INTERNAL">内部核算</el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      this.$patch('manageBase/manage',this.form)
+    .then(response => {
+       console.log(response)
+    })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319160518.vue

@@ -0,0 +1,191 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="ICOME">收入</el-radio>
+        <el-radio border  label="COST" >费用</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.type" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="INVOICE" >开票/应收</el-radio>
+        <el-radio border  label="ARRIVAL" >到账</el-radio>
+        <el-radio border  label="INTERNAL">内部核算</el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      this.$fetch('manageBase/manage',this.form)
+    .then(response => {
+       console.log(response)
+    })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319160814.vue

@@ -0,0 +1,191 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+        <el-option key label="无" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.type" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="ICOME">收入</el-radio>
+        <el-radio border  label="COST" >费用</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="INVOICE" >开票/应收</el-radio>
+        <el-radio border  label="ARRIVAL" >到账</el-radio>
+        <el-radio border  label="INTERNAL">内部核算</el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      this.$fetch('manageBase/manage',this.form)
+    .then(response => {
+       console.log(response)
+    })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319161144.vue

@@ -0,0 +1,191 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="不选" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="不选" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="不选" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="不选" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+        <el-option key label="不选" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+        <el-form-item
+      label="类别"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.type" placeholder="请选择类别"  size="medium">
+        <el-radio border  label="ICOME">收入</el-radio>
+        <el-radio border  label="COST" >费用</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item
+      label="状态"
+      :label-width="formLabelWidth"
+    >
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值"  size="medium">
+        <el-radio border  label="INVOICE" >开票/应收</el-radio>
+        <el-radio border  label="ARRIVAL" >到账</el-radio>
+        <el-radio border  label="INTERNAL">内部核算</el-radio>
+      </el-radio-group>
+    </el-form-item>
+      <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit(){
+      this.$fetch('manageBase/manage',this.form)
+    .then(response => {
+       console.log(response)
+    })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    
+  }
+};
+</script>
+
+<style scope>
+ .marginTop{
+   margin-top: 20px;
+ }
+</style>

.history/src/pages/manage/query_20190319161319.vue

@@ -0,0 +1,183 @@
+<template>
+  <el-form :inline="true" :model="form" ref="form" class="marginTop">
+    <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+      <el-select v-model="form.productId" placeholder="请选择产品">
+        <el-option key label="不选" value></el-option>
+        <el-option
+          v-for="item in productSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+      <el-select v-model="form.projectId" placeholder="请选择项目">
+        <el-option key label="不选" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+      <el-select v-model="form.toDeptId" placeholder="请选择部门">
+        <el-option key label="不选" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+      <el-select v-model="form.toProjectId" placeholder="请选择项目">
+        <el-option key label="不选" value></el-option>
+        <el-option
+          v-for="item in projectSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+      <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+        <el-option key label="不选" value></el-option>
+        <el-option
+          v-for="item in teamSelectData"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="类别" :label-width="formLabelWidth">
+      <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+        <el-radio border label="ICOME">收入</el-radio>
+        <el-radio border label="COST">费用</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item label="状态" :label-width="formLabelWidth">
+      <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+        <el-radio border label="INVOICE">开票/应收</el-radio>
+        <el-radio border label="ARRIVAL">到账</el-radio>
+        <el-radio border label="INTERNAL">内部核算</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="onSubmit">查询</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+</style>

.history/src/pages/manage/query_20190319161743.vue

@@ -0,0 +1,195 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="ICOME">收入</el-radio>
+          <el-radio border label="COST">费用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="状态" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="searchResult">
+      <el-table-column fixed prop="date" label="日期" width="150"></el-table-column>
+      <el-table-column prop="name" label="姓名" width="120"></el-table-column>
+      <el-table-column prop="province" label="省份" width="120"></el-table-column>
+      <el-table-column prop="city" label="市区" width="120"></el-table-column>
+      <el-table-column prop="address" label="地址" width="300"></el-table-column>
+      <el-table-column prop="zip" label="邮编" width="120"></el-table-column>
+    </el-table>
+  </div>
+
+  <!-- <el-table></el-table> -->
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+</style>

.history/src/pages/manage/query_20190319161746.vue

@@ -0,0 +1,193 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="ICOME">收入</el-radio>
+          <el-radio border label="COST">费用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="状态" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="searchResult">
+      <el-table-column fixed prop="date" label="日期" width="150"></el-table-column>
+      <el-table-column prop="name" label="姓名" width="120"></el-table-column>
+      <el-table-column prop="province" label="省份" width="120"></el-table-column>
+      <el-table-column prop="city" label="市区" width="120"></el-table-column>
+      <el-table-column prop="address" label="地址" width="300"></el-table-column>
+      <el-table-column prop="zip" label="邮编" width="120"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+</style>

.history/src/pages/manage/query_20190319161812.vue

@@ -0,0 +1,193 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="ICOME">收入</el-radio>
+          <el-radio border label="COST">费用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="状态" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="searchResult" style="width: 100%">
+      <el-table-column fixed prop="date" label="日期" width="150"></el-table-column>
+      <el-table-column prop="name" label="姓名" width="120"></el-table-column>
+      <el-table-column prop="province" label="省份" width="120"></el-table-column>
+      <el-table-column prop="city" label="市区" width="120"></el-table-column>
+      <el-table-column prop="address" label="地址" width="300"></el-table-column>
+      <el-table-column prop="zip" label="邮编" width="120"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+</style>

.history/src/pages/manage/query_20190319161929.vue

@@ -0,0 +1,193 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="ICOME">收入</el-radio>
+          <el-radio border label="COST">费用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="状态" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="searchResult" style="width: 100%">
+      <el-table-column fixed prop="date" label="日期" ></el-table-column>
+      <el-table-column prop="name" label="姓名" ></el-table-column>
+      <el-table-column prop="province" label="省份" ></el-table-column>
+      <el-table-column prop="city" label="市区" ></el-table-column>
+      <el-table-column prop="address" label="地址" ></el-table-column>
+      <el-table-column prop="zip" label="邮编" ></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+</style>

.history/src/pages/manage/query_20190319161954.vue

@@ -0,0 +1,193 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="ICOME">收入</el-radio>
+          <el-radio border label="COST">费用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="状态" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="searchResult" style="width: 100%;margin-top:50px;">
+      <el-table-column fixed prop="date" label="日期" ></el-table-column>
+      <el-table-column prop="name" label="姓名" ></el-table-column>
+      <el-table-column prop="province" label="省份" ></el-table-column>
+      <el-table-column prop="city" label="市区" ></el-table-column>
+      <el-table-column prop="address" label="地址" ></el-table-column>
+      <el-table-column prop="zip" label="邮编" ></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+</style>

.history/src/pages/manage/query_20190319162726.vue

@@ -0,0 +1,193 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="ICOME">收入</el-radio>
+          <el-radio border label="COST">费用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="状态" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="searchResult" style="width: 100%;margin-top:50px;">
+      <el-table-column fixed prop="deptName" label="部门" ></el-table-column>
+      <el-table-column prop="type" label="类型" ></el-table-column>
+      <el-table-column prop="product.name" label="产品" ></el-table-column>
+      <el-table-column prop="amount" label="金额" ></el-table-column>
+      <el-table-column prop="incomeStatus" label="状态" ></el-table-column>
+      <el-table-column prop="project.name" label="发生人/部门/单位" ></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+</style>

.history/src/pages/manage/query_20190319162817.vue

@@ -0,0 +1,194 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="ICOME">收入</el-radio>
+          <el-radio border label="COST">费用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="状态" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="searchResult" style="width: 100%;margin-top:50px;">
+      <el-table-column fixed prop="deptName" label="部门" ></el-table-column>
+      <el-table-column prop="type" label="类型" ></el-table-column>
+      <el-table-column prop="product.name" label="产品" ></el-table-column>
+      <el-table-column prop="amount" label="金额" ></el-table-column>
+      <el-table-column prop="incomeStatus" label="状态" ></el-table-column>
+      <el-table-column prop="project.name" label="发生人/部门/单位" ></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        this.searchResult = response.data;
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+</style>

.history/src/pages/manage/query_20190319162819.vue

@@ -0,0 +1,195 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="ICOME">收入</el-radio>
+          <el-radio border label="COST">费用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="状态" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="searchResult" style="width: 100%;margin-top:50px;">
+      <el-table-column fixed prop="deptName" label="部门" ></el-table-column>
+      <el-table-column prop="type" label="类型" ></el-table-column>
+      <el-table-column prop="product.name" label="产品" ></el-table-column>
+      <el-table-column prop="amount" label="金额" ></el-table-column>
+      <el-table-column prop="incomeStatus" label="状态" ></el-table-column>
+      <el-table-column prop="project.name" label="发生人/部门/单位" ></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+</style>

.history/src/pages/manage/query_20190319163121.vue

@@ -0,0 +1,195 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="ICOME">收入</el-radio>
+          <el-radio border label="COST">费用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="状态" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="searchResult" style="width: 100%;margin-top:50px;">
+      <el-table-column fixed prop="deptName" label="部门" ></el-table-column>
+      <el-table-column prop="type" label="类型" ></el-table-column>
+      <el-table-column prop="product.name" label="产品" ></el-table-column>
+      <el-table-column prop="amount" label="金额" ></el-table-column>
+      <el-table-column prop="incomeStatus" label="状态" :filters="[{ text: '开票/应收', value: 'INVOICE' }, { text: '到账', value: 'INVOICE' }, { text: '内部核算', value: 'INTERNAL' }]"></el-table-column>
+      <el-table-column prop="project.name" label="发生人/部门/单位" ></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+</style>

.history/src/pages/manage/query_20190319164008.vue

@@ -0,0 +1,199 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="ICOME">收入</el-radio>
+          <el-radio border label="COST">费用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="状态" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="searchResult" style="width: 100%;margin-top:50px;">
+      <el-table-column fixed prop="deptName" label="部门" ></el-table-column>
+      <el-table-column prop="type" label="类型" ></el-table-column>
+      <el-table-column prop="product.name" label="产品" ></el-table-column>
+      <el-table-column prop="amount" label="金额" ></el-table-column>
+      <el-table-column label="状态">
+         <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="发生人/部门/单位" ></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+</style>

.history/src/pages/manage/query_20190319164142.vue

@@ -0,0 +1,203 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="ICOME">收入</el-radio>
+          <el-radio border label="COST">费用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="状态" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="searchResult" style="width: 100%;margin-top:50px;">
+      <el-table-column fixed prop="deptName" label="部门" ></el-table-column>
+      <el-table-column label="类型" >
+         <template slot-scope="props">
+            <span>{{ props.row.type == 'INCOME' ? '收入' : 成本/费用 }}</span>
+          </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品" ></el-table-column>
+      <el-table-column prop="amount" label="金额" ></el-table-column>
+      <el-table-column label="状态">
+         <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="发生人/部门/单位" ></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+export default {
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data.data;
+      console.log(res.data.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.type === "COST") {
+        return "cost-row";
+      } else {
+        return "income-row";
+      }
+      return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+</style>