归属部门注释

.history/src/pages/manage/cost_20190325135951.vue

@@ -0,0 +1,387 @@
+<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" border 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="发生日期" sortable :formatter="dateFormat" prop="happenTime"></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="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="toProject.name"></el-table-column> -->
+        <!-- <el-table-column label="接收部门" prop="toDepartment.name"></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-pagination
+        background
+        @current-change="handlePageChange"
+        :page-size= "50"
+        layout="prev, pager, next"
+        :total="totalNumber"
+      ></el-pagination>
+    </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";
+import { formatTime } from "../../utils/common";
+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: ""
+      },
+      pageNo: 1,
+      pageSize: 50,
+      totalNumber: 0,
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "COST",
+      pageNo: 1,
+      pageSize: 50
+    }).then(res => {
+      this.manageData = res.data.content;
+      this.totalNumber = parseInt(res.data.totalElements);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    // 切换页码
+    handlePageChange(val) {
+      getManageList({
+        type: "COST",
+        pageNo: val,
+        pageSize: 50
+      }).then(res => {
+        this.manageData = res.data.content;
+        this.totalNumber = parseInt(res.data.totalElements);
+      });
+    },
+    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 ? row.department.id : "";
+      this.form.projectId = row.project ? 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",
+                pageNo: 1,
+                pageSize: 50
+              }).then(res => {
+                this.manageData = res.data.content;
+                this.totalSize = res.data.totalPages;
+              });
+              this.$refs[formName].resetFields();
+              this.$message({
+                message: "添加成功",
+                type: "success"
+              });
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "COST"
+              }).then(res => {
+                this.manageData = res.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    }
+  }
+};
+</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_20190325135951.vue

@@ -0,0 +1,403 @@
+<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" border 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="发生日期" sortable :formatter="dateFormat" prop="happenTime"></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="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="产品" prop="product.name"></el-table-column>
+        <el-table-column label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column label="归属部门" prop="department.name"></el-table-column>
+        <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
+
+        <!-- <el-table-column label="接收部门" prop="toDepartment.name"></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-pagination
+      background
+      @current-change="handlePageChange"
+      :page-size="50"
+      layout="prev, pager, next"
+      :total="totalNumber"
+    ></el-pagination>
+    <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";
+import { formatTime } from "../../utils/common";
+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: ""
+      },
+      pageNo: 1,
+      pageSize: 50,
+      totalNumber: 0,
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME",
+      pageNo: 1,
+      pageSize: 50
+    }).then(res => {
+      this.manageData = res.data.content;
+      this.totalNumber = parseInt(res.data.totalElements);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+     // 切换页码
+    handlePageChange(val) {
+      getManageList({
+        type: "INCOME",
+        pageNo: val,
+        pageSize: 50
+      }).then(res => {
+        this.manageData = res.data.content;
+        this.totalNumber = parseInt(res.data.totalElements);
+      });
+    },
+    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 ? row.department.id : "";
+      this.form.projectId = row.project ? 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",
+                pageNo: 1,
+                pageSize: 50
+              }).then(res => {
+                this.manageData = res.data.content;
+                this.totalSize = res.data.totalPages;
+              });
+              this.$refs[formName].resetFields();
+              this.$message({
+                message: "添加成功",
+                type: "success"
+              });
+            });
+          } else {
+            this.form.id = this.id;
+            setManage(this.form).then(res => {
+              //获取经营列表
+              getManageList({
+                type: "INCOME"
+              }).then(res => {
+                this.manageData = res.data;
+              });
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    }
+  }
+};
+</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_20190325140252.vue

@@ -0,0 +1,418 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group
+          v-model="form.type"
+          placeholder="请选择类别"
+          size="medium"
+          
+          :rules="[{ required: true, message: '必选'}]"
+          style="width:100%"
+        >
+          <el-row :gutter="10">
+            <el-col :span="4">
+              <el-radio border style="width:100%;" label="INCOME">收入</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio border style="width:100%;" label="COST">成本</el-radio>
+            </el-col>
+          </el-row>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-date-picker placeholder="起始时间" style="width:100%" v-model="form.startTime"></el-date-picker>
+          </el-col>
+          <el-col :span="4">
+            <el-date-picker placeholder="结束时间" style="width:100%" v-model="form.endTime"></el-date-picker>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item label="金额范围" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-input placeholder="起始金额" style="width:100%" v-model="form.minAmount" clearable></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-input placeholder="结束金额" style="width:100%" v-model="form.maxAmount" clearable></el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item
+        label="成本类型"
+        v-if="form.type==='COST'"
+        prop="costTypeId"
+        style="display:inline-block;"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.costTypeId" placeholder="请选择支出类型" ref="select">
+          <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="收入状态" v-if="form.type==='INCOME'" :label-width="formLabelWidth">
+        <el-radio-group
+          style="width:100%"
+          v-model="form.incomeStatus"
+          placeholder="请选择状态值"
+          size="medium"
+        >
+          <el-row :gutter="10">
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="INVOICE">开票/应收</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="ARRIVAL">到账</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="INTERNAL">内部核算</el-radio>
+            </el-col>
+          </el-row>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        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="归属产品"
+        v-if="form.type==='INCOME'"
+        prop="productId"
+        style="display:inline-block;"
+        :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="来源项目"
+        style="display:inline-block;"
+        prop="toProjectId"
+        v-if="form.type!==''"
+        :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="toDeptId"
+        style="display:inline-block;"
+        v-if="form.type!==''"
+        :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="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :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
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></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="toProject.name"></el-table-column> -->
+      <!-- <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column> -->
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      background
+      @current-change="handlePageChange"
+      :page-size="50"
+      :current-page.sync="pageNo"
+      layout="prev, pager, next"
+      :total="totalNumber"
+    ></el-pagination>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: "",
+        minAmount: "",
+        maxAmount: "",
+        pageNo: 1,
+        pageSize: 50
+      },
+      pageNo: 1,
+      pageSize: 50,
+      totalNumber: 0,
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    // getManageList({
+    //   type: "INCOME"
+    // }).then(res => {
+    //   this.manageData = res.data;
+    //   console.log(res.data);
+    // });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    handlePageChange(val) {
+      this.form.pageNo = val;
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        if (response.data && response.data.content.length == 0) {
+          this.$message("未找到相应数据");
+        }
+      });
+    },
+    onSubmit() {
+      // this.totalNumber = 0;
+      this.searchResult = [];
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.form.productId = "";
+        this.tableType = "COST";
+      }
+      this.form.pageNo = 1;
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        if (response.data && response.data.content.length == 0) {
+          this.$message("未找到相应数据");
+        }
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // 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;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  /* background: #f0f9eb; */
+  color: green;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  /* background: rgba(248, 181, 172, 0.267); */
+  color: red;
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190325140344.vue

@@ -0,0 +1,418 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group
+          v-model="form.type"
+          placeholder="请选择类别"
+          size="medium"
+          
+          :rules="[{ required: true, message: '必选'}]"
+          style="width:100%"
+        >
+          <el-row :gutter="10">
+            <el-col :span="4">
+              <el-radio border style="width:100%;" label="INCOME">收入</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio border style="width:100%;" label="COST">成本</el-radio>
+            </el-col>
+          </el-row>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-date-picker placeholder="起始时间" style="width:100%" v-model="form.startTime"></el-date-picker>
+          </el-col>
+          <el-col :span="4">
+            <el-date-picker placeholder="结束时间" style="width:100%" v-model="form.endTime"></el-date-picker>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item label="金额范围" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-input placeholder="起始金额" style="width:100%" v-model="form.minAmount" clearable></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-input placeholder="结束金额" style="width:100%" v-model="form.maxAmount" clearable></el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item
+        label="成本类型"
+        v-if="form.type==='COST'"
+        prop="costTypeId"
+        style="display:inline-block;"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.costTypeId" placeholder="请选择支出类型" ref="select">
+          <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="收入状态" v-if="form.type==='INCOME'" :label-width="formLabelWidth">
+        <el-radio-group
+          style="width:100%"
+          v-model="form.incomeStatus"
+          placeholder="请选择状态值"
+          size="medium"
+        >
+          <el-row :gutter="10">
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="INVOICE">开票/应收</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="ARRIVAL">到账</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="INTERNAL">内部核算</el-radio>
+            </el-col>
+          </el-row>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        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="归属产品"
+        v-if="form.type==='INCOME'"
+        prop="productId"
+        style="display:inline-block;"
+        :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="来源项目"
+        style="display:inline-block;"
+        prop="toProjectId"
+        v-if="form.type!==''"
+        :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="toDeptId"
+        style="display:inline-block;"
+        v-if="form.type!==''"
+        :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="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :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
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></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="toProject.name"></el-table-column> -->
+      <!-- <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column> -->
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      background
+      @current-change="handlePageChange"
+      :page-size="50"
+      :current-page.sync="pageNo"
+      layout="prev, pager, next"
+      :total="totalNumber"
+    ></el-pagination>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: "",
+        minAmount: "",
+        maxAmount: "",
+        pageNo: 1,
+        pageSize: 50
+      },
+      pageNo: 1,
+      pageSize: 50,
+      totalNumber: 0,
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    // getManageList({
+    //   type: "INCOME"
+    // }).then(res => {
+    //   this.manageData = res.data;
+    //   console.log(res.data);
+    // });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    handlePageChange(val) {
+      this.form.pageNo = val;
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        if (response.data && response.data.content.length == 0) {
+          this.$message("未找到相应数据");
+        }
+      });
+    },
+    onSubmit() {
+      // this.totalNumber = 0;
+      this.searchResult = [];
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.form.productId = "";
+        this.tableType = "COST";
+      }
+      this.form.pageNo = 1;
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        if (response.data && response.data.content.length == 0) {
+          this.$message("未找到相应数据");
+        }
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // 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;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  /* background: #f0f9eb; */
+  color: green;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  /* background: rgba(248, 181, 172, 0.267); */
+  color: red;
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190325141325.vue

@@ -0,0 +1,419 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group
+          v-model="form.type"
+          placeholder="请选择类别"
+          size="medium"
+          
+          :rules="[{ required: true, message: '必选'}]"
+          style="width:100%"
+        >
+          <el-row :gutter="10">
+            <el-col :span="4">
+              <el-radio border style="width:100%;" label="INCOME">收入</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio border style="width:100%;" label="COST">成本</el-radio>
+            </el-col>
+          </el-row>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-date-picker placeholder="起始时间" style="width:100%" v-model="form.startTime"></el-date-picker>
+          </el-col>
+          <el-col :span="4">
+            <el-date-picker placeholder="结束时间" style="width:100%" v-model="form.endTime"></el-date-picker>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item label="金额范围" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-input placeholder="起始金额" style="width:100%" v-model="form.minAmount" clearable></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-input placeholder="结束金额" style="width:100%" v-model="form.maxAmount" clearable></el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item
+        label="成本类型"
+        v-if="form.type==='COST'"
+        prop="costTypeId"
+        style="display:inline-block;"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.costTypeId" placeholder="请选择支出类型" ref="select">
+          <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="收入状态" v-if="form.type==='INCOME'" :label-width="formLabelWidth">
+        <el-radio-group
+          style="width:100%"
+          v-model="form.incomeStatus"
+          placeholder="请选择状态值"
+          size="medium"
+        >
+          <el-row :gutter="10">
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="INVOICE">开票/应收</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="ARRIVAL">到账</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="INTERNAL">内部核算</el-radio>
+            </el-col>
+          </el-row>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        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="归属产品"
+        v-if="form.type==='INCOME'"
+        prop="productId"
+        style="display:inline-block;"
+        :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="来源项目"
+        style="display:inline-block;"
+        prop="toProjectId"
+        v-if="form.type!==''"
+        :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="toDeptId"
+        style="display:inline-block;"
+        v-if="form.type!==''"
+        :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="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :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
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></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="toProject.name"></el-table-column> -->
+      <!-- <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column> -->
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      background
+      @current-change="handlePageChange"
+      :page-size="50"
+      :current-page.sync="pageNo"
+      layout="prev, pager, next"
+      v-if="searchResult.length===0"
+      :total="totalNumber"
+    ></el-pagination>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: "",
+        minAmount: "",
+        maxAmount: "",
+        pageNo: 1,
+        pageSize: 50
+      },
+      pageNo: 1,
+      pageSize: 50,
+      totalNumber: 0,
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    // getManageList({
+    //   type: "INCOME"
+    // }).then(res => {
+    //   this.manageData = res.data;
+    //   console.log(res.data);
+    // });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    handlePageChange(val) {
+      this.form.pageNo = val;
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        if (response.data && response.data.content.length == 0) {
+          this.$message("未找到相应数据");
+        }
+      });
+    },
+    onSubmit() {
+      // this.totalNumber = 0;
+      this.searchResult = [];
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.form.productId = "";
+        this.tableType = "COST";
+      }
+      this.form.pageNo = 1;
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        if (response.data && response.data.content.length == 0) {
+          this.$message("未找到相应数据");
+        }
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // 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;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  /* background: #f0f9eb; */
+  color: green;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  /* background: rgba(248, 181, 172, 0.267); */
+  color: red;
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190325141328.vue

@@ -0,0 +1,419 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group
+          v-model="form.type"
+          placeholder="请选择类别"
+          size="medium"
+          
+          :rules="[{ required: true, message: '必选'}]"
+          style="width:100%"
+        >
+          <el-row :gutter="10">
+            <el-col :span="4">
+              <el-radio border style="width:100%;" label="INCOME">收入</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio border style="width:100%;" label="COST">成本</el-radio>
+            </el-col>
+          </el-row>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-date-picker placeholder="起始时间" style="width:100%" v-model="form.startTime"></el-date-picker>
+          </el-col>
+          <el-col :span="4">
+            <el-date-picker placeholder="结束时间" style="width:100%" v-model="form.endTime"></el-date-picker>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item label="金额范围" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-input placeholder="起始金额" style="width:100%" v-model="form.minAmount" clearable></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-input placeholder="结束金额" style="width:100%" v-model="form.maxAmount" clearable></el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item
+        label="成本类型"
+        v-if="form.type==='COST'"
+        prop="costTypeId"
+        style="display:inline-block;"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.costTypeId" placeholder="请选择支出类型" ref="select">
+          <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="收入状态" v-if="form.type==='INCOME'" :label-width="formLabelWidth">
+        <el-radio-group
+          style="width:100%"
+          v-model="form.incomeStatus"
+          placeholder="请选择状态值"
+          size="medium"
+        >
+          <el-row :gutter="10">
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="INVOICE">开票/应收</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="ARRIVAL">到账</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="INTERNAL">内部核算</el-radio>
+            </el-col>
+          </el-row>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        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="归属产品"
+        v-if="form.type==='INCOME'"
+        prop="productId"
+        style="display:inline-block;"
+        :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="来源项目"
+        style="display:inline-block;"
+        prop="toProjectId"
+        v-if="form.type!==''"
+        :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="toDeptId"
+        style="display:inline-block;"
+        v-if="form.type!==''"
+        :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="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :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
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></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="toProject.name"></el-table-column> -->
+      <!-- <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column> -->
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      background
+      @current-change="handlePageChange"
+      :page-size="50"
+      :current-page.sync="pageNo"
+      layout="prev, pager, next"
+      v-if="searchResult.length!==0"
+      :total="totalNumber"
+    ></el-pagination>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: "",
+        minAmount: "",
+        maxAmount: "",
+        pageNo: 1,
+        pageSize: 50
+      },
+      pageNo: 1,
+      pageSize: 50,
+      totalNumber: 0,
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    // getManageList({
+    //   type: "INCOME"
+    // }).then(res => {
+    //   this.manageData = res.data;
+    //   console.log(res.data);
+    // });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    handlePageChange(val) {
+      this.form.pageNo = val;
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        if (response.data && response.data.content.length == 0) {
+          this.$message("未找到相应数据");
+        }
+      });
+    },
+    onSubmit() {
+      // this.totalNumber = 0;
+      this.searchResult = [];
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.form.productId = "";
+        this.tableType = "COST";
+      }
+      this.form.pageNo = 1;
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        if (response.data && response.data.content.length == 0) {
+          this.$message("未找到相应数据");
+        }
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // 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;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  /* background: #f0f9eb; */
+  color: green;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  /* background: rgba(248, 181, 172, 0.267); */
+  color: red;
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190325141414.vue

@@ -0,0 +1,420 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group
+          v-model="form.type"
+          placeholder="请选择类别"
+          size="medium"
+          
+          :rules="[{ required: true, message: '必选'}]"
+          style="width:100%"
+        >
+          <el-row :gutter="10">
+            <el-col :span="4">
+              <el-radio border style="width:100%;" label="INCOME">收入</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio border style="width:100%;" label="COST">成本</el-radio>
+            </el-col>
+          </el-row>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-date-picker placeholder="起始时间" style="width:100%" v-model="form.startTime"></el-date-picker>
+          </el-col>
+          <el-col :span="4">
+            <el-date-picker placeholder="结束时间" style="width:100%" v-model="form.endTime"></el-date-picker>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item label="金额范围" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-row :gutter="10">
+          <el-col :span="4">
+            <el-input placeholder="起始金额" style="width:100%" v-model="form.minAmount" clearable></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-input placeholder="结束金额" style="width:100%" v-model="form.maxAmount" clearable></el-input>
+          </el-col>
+        </el-row>
+      </el-form-item>
+      <el-form-item
+        label="成本类型"
+        v-if="form.type==='COST'"
+        prop="costTypeId"
+        style="display:inline-block;"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.costTypeId" placeholder="请选择支出类型" ref="select">
+          <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="收入状态" v-if="form.type==='INCOME'" :label-width="formLabelWidth">
+        <el-radio-group
+          style="width:100%"
+          v-model="form.incomeStatus"
+          placeholder="请选择状态值"
+          size="medium"
+        >
+          <el-row :gutter="10">
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="INVOICE">开票/应收</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="ARRIVAL">到账</el-radio>
+            </el-col>
+            <el-col :span="4">
+              <el-radio style="width:100%;" border label="INTERNAL">内部核算</el-radio>
+            </el-col>
+          </el-row>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        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="归属产品"
+        v-if="form.type==='INCOME'"
+        prop="productId"
+        style="display:inline-block;"
+        :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="来源项目"
+        style="display:inline-block;"
+        prop="toProjectId"
+        v-if="form.type!==''"
+        :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="toDeptId"
+        style="display:inline-block;"
+        v-if="form.type!==''"
+        :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="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :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
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></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="toProject.name"></el-table-column> -->
+      <!-- <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column> -->
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      background
+      @current-change="handlePageChange"
+      :page-size="50"
+      :current-page.sync="pageNo"
+      layout="prev, pager, next"
+      v-if="searchResult.length!==0"
+      :total="totalNumber"
+    ></el-pagination>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: "",
+        minAmount: "",
+        maxAmount: "",
+        pageNo: 1,
+        pageSize: 50
+      },
+      pageNo: 1,
+      pageSize: 50,
+      totalNumber: 0,
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    // getManageList({
+    //   type: "INCOME"
+    // }).then(res => {
+    //   this.manageData = res.data;
+    //   console.log(res.data);
+    // });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    handlePageChange(val) {
+      this.form.pageNo = val;
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        if (response.data && response.data.content.length == 0) {
+          this.$message("未找到相应数据");
+        }
+      });
+    },
+    onSubmit() {
+      // this.totalNumber = 0;
+      this.searchResult = [];
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.form.productId = "";
+        this.tableType = "COST";
+      }
+      this.form.pageNo = 1;
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        if (response.data && response.data.content.length == 0) {
+          this.$message("未找到相应数据");
+        }
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.searchResult = '';
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // 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;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  /* background: #f0f9eb; */
+  color: green;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  /* background: rgba(248, 181, 172, 0.267); */
+  color: red;
+  /* color: #f0f9eb; */
+}
+</style>

src/pages/manage/cost.vue

@@ -30,8 +30,8 @@
         <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="toProject.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="toDepartment.name"></el-table-column> -->
 
         <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="操作" width="80">

src/pages/manage/index.vue

@@ -35,9 +35,9 @@
         <el-table-column label="产品" prop="product.name"></el-table-column>
         <el-table-column label="归属项目" prop="project.name"></el-table-column>
         <el-table-column label="归属部门" prop="department.name"></el-table-column>
-        <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+        <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
 
-        <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+        <!-- <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column> -->
 
         <el-table-column label="备注" prop="remark"></el-table-column>
 

src/pages/manage/query.vue

@@ -113,7 +113,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item
+      <!-- <el-form-item
         label="来源项目"
         style="display:inline-block;"
         prop="toProjectId"
@@ -146,7 +146,7 @@
             :value="item.id"
           ></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item
         label="归属部门"
         style="display:inline-block;"
@@ -194,7 +194,7 @@
       <el-table-column label="产品" prop="product.name"></el-table-column>
       <el-table-column label="归属项目" prop="project.name"></el-table-column>
       <el-table-column label="归属部门" prop="department.name"></el-table-column>
-      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
       <el-table-column prop="remark" label="备注"></el-table-column>
     </el-table>
     
@@ -212,8 +212,8 @@
       <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="toProject.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="toDepartment.name"></el-table-column> -->
       <el-table-column label="备注" prop="remark"></el-table-column>
     </el-table>
     <!-- 分页 -->
@@ -223,6 +223,7 @@
       :page-size="50"
       :current-page.sync="pageNo"
       layout="prev, pager, next"
+      v-if="searchResult.length!==0"
       :total="totalNumber"
     ></el-pagination>
   </div>
@@ -351,6 +352,7 @@ export default {
       this.form.type = "";
       this.form.costTypeId = "";
       this.tableType = "";
+      this.searchResult = '';
       this.$refs.form.resetFields();
     },
     tableRowClassName({ row, rowIndex }) {