兼容搜索结果为空数组出现的bug

.history/src/pages/manage/index_20190327133419.vue

@@ -0,0 +1,415 @@
+<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.filter(data => !search || data.amount.toFixed(2).includes(search.toFixed(2)))" border style="width: 100%">
+        <el-table-column
+          width="120px"
+          align="right"
+          label="录入日期"
+          :formatter="recordTimeFormat"
+          prop="gmtModife"
+        ></el-table-column>
+        <el-table-column
+          width="120px"
+          align="right"
+          label="发生日期"
+          :formatter="dateFormat"
+          prop="happenTime"
+        ></el-table-column>
+        <el-table-column
+          width="110px"
+          align="right"
+          label="金额"
+          :formatter="moneyFormat"
+          prop="amount"
+        ></el-table-column>
+        <el-table-column width="170px" align="right" label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="180px" align="right" label="产品" prop="product.name"></el-table-column>
+        <el-table-column width="260px" align="right" label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column width="200px" align="right" 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 align="right" label="备注" prop="remark"></el-table-column>
+
+        <el-table-column align="right" 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" :rules="[{ required: true, message: '归属产品不能为空'}]" :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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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: "INVOICE",
+        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;
+      this.form.deptId = res.data[0].id;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+      this.form.productId = res.data[0].id;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME",
+      pageNo: 1,
+      pageSize: 50,
+      isEntry: true
+    }).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: {
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 切换页码
+    handlePageChange(val) {
+      getManageList({
+        type: "INCOME",
+        pageNo: val,
+        pageSize: 50,
+         isEntry: true,
+      }).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,
+                 isEntry: true,
+              }).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);
+    },
+    recordTimeFormat(row){
+      return formatTime(row.gmtModified);
+    }
+  }
+};
+</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_20190327133422.vue

@@ -0,0 +1,424 @@
+<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.filter(data => !search || data.amount.toFixed(2).includes(search.toFixed(2)))"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          width="120px"
+          align="right"
+          label="录入日期"
+          :formatter="recordTimeFormat"
+          prop="gmtModife"
+        ></el-table-column>
+        <el-table-column
+          width="120px"
+          align="right"
+          label="发生日期"
+          :formatter="dateFormat"
+          prop="happenTime"
+        ></el-table-column>
+        <el-table-column
+          width="110px"
+          align="right"
+          label="金额"
+          :formatter="moneyFormat"
+          prop="amount"
+        ></el-table-column>
+        <el-table-column width="170px" align="right" label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="180px" align="right" label="产品" prop="product.name"></el-table-column>
+        <el-table-column width="260px" align="right" label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column width="200px" align="right" 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 align="right" label="备注" prop="remark"></el-table-column>
+
+        <el-table-column align="right" 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"
+          :rules="[{ required: true, message: '归属产品不能为空'}]"
+          :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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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: "INVOICE",
+        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;
+      this.form.deptId = res.data[0].id;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+      this.form.productId = res.data[0].id;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME",
+      pageNo: 1,
+      pageSize: 50,
+      isEntry: true
+    }).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: {
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 切换页码
+    handlePageChange(val) {
+      getManageList({
+        type: "INCOME",
+        pageNo: val,
+        pageSize: 50,
+        isEntry: true
+      }).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,
+                isEntry: true
+              }).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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    }
+  }
+};
+</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_20190327133618.vue

@@ -0,0 +1,427 @@
+<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.filter(data => !search || data.amount.toFixed(2).includes(search.toFixed(2)))"
+        border
+        style="width: 100%"
+      >
+        <template slot="header" slot-scope="scope">
+          <el-input v-model="search" size="mini" placeholder="依据金额搜索"/>
+        </template>
+        <el-table-column
+          width="120px"
+          align="right"
+          label="录入日期"
+          :formatter="recordTimeFormat"
+          prop="gmtModife"
+        ></el-table-column>
+        <el-table-column
+          width="120px"
+          align="right"
+          label="发生日期"
+          :formatter="dateFormat"
+          prop="happenTime"
+        ></el-table-column>
+        <el-table-column
+          width="110px"
+          align="right"
+          label="金额"
+          :formatter="moneyFormat"
+          prop="amount"
+        ></el-table-column>
+        <el-table-column width="170px" align="right" label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="180px" align="right" label="产品" prop="product.name"></el-table-column>
+        <el-table-column width="260px" align="right" label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column width="200px" align="right" 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 align="right" label="备注" prop="remark"></el-table-column>
+
+        <el-table-column align="right" 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"
+          :rules="[{ required: true, message: '归属产品不能为空'}]"
+          :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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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: "INVOICE",
+        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;
+      this.form.deptId = res.data[0].id;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+      this.form.productId = res.data[0].id;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME",
+      pageNo: 1,
+      pageSize: 50,
+      isEntry: true
+    }).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: {
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 切换页码
+    handlePageChange(val) {
+      getManageList({
+        type: "INCOME",
+        pageNo: val,
+        pageSize: 50,
+        isEntry: true
+      }).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,
+                isEntry: true
+              }).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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    }
+  }
+};
+</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_20190327133858.vue

@@ -0,0 +1,427 @@
+<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.filter(data => !search || data.amount.toFixed(2).includes(search.toFixed(2)))"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          width="120px"
+          align="right"
+          label="录入日期"
+          :formatter="recordTimeFormat"
+          prop="gmtModife"
+        ></el-table-column>
+        <el-table-column
+          width="120px"
+          align="right"
+          label="发生日期"
+          :formatter="dateFormat"
+          prop="happenTime"
+        ></el-table-column>
+        <el-table-column
+          width="110px"
+          align="right"
+          label="金额"
+          :formatter="moneyFormat"
+          prop="amount"
+        ></el-table-column>
+        <el-table-column width="170px" align="right" label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="180px" align="right" label="产品" prop="product.name"></el-table-column>
+        <el-table-column width="260px" align="right" label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column width="200px" align="right" 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 align="right" label="备注" prop="remark"></el-table-column>
+
+        <el-table-column align="right" label="操作" width="80">
+          <template slot="header" slot-scope="scope">
+            <el-input v-model="search" size="mini" placeholder="依据金额搜索"/>
+          </template>
+          <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"
+          :rules="[{ required: true, message: '归属产品不能为空'}]"
+          :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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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: "INVOICE",
+        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;
+      this.form.deptId = res.data[0].id;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+      this.form.productId = res.data[0].id;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME",
+      pageNo: 1,
+      pageSize: 50,
+      isEntry: true
+    }).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: {
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 切换页码
+    handlePageChange(val) {
+      getManageList({
+        type: "INCOME",
+        pageNo: val,
+        pageSize: 50,
+        isEntry: true
+      }).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,
+                isEntry: true
+              }).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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    }
+  }
+};
+</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_20190327133944.vue

@@ -0,0 +1,428 @@
+<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.filter(data => !search || data.amount.toFixed(2).includes(search.toFixed(2)))"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          width="120px"
+          align="right"
+          label="录入日期"
+          :formatter="recordTimeFormat"
+          prop="gmtModife"
+        ></el-table-column>
+        <el-table-column
+          width="120px"
+          align="right"
+          label="发生日期"
+          :formatter="dateFormat"
+          prop="happenTime"
+        ></el-table-column>
+        <el-table-column
+          width="110px"
+          align="right"
+          label="金额"
+          :formatter="moneyFormat"
+          prop="amount"
+        ></el-table-column>
+        <el-table-column width="170px" align="right" label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="180px" align="right" label="产品" prop="product.name"></el-table-column>
+        <el-table-column width="260px" align="right" label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column width="200px" align="right" 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 align="right" label="备注" prop="remark">
+          <template slot="header" slot-scope="scope">
+            <el-input v-model="search" size="mini" placeholder="依据金额搜索"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column align="right" 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"
+          :rules="[{ required: true, message: '归属产品不能为空'}]"
+          :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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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: "INVOICE",
+        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;
+      this.form.deptId = res.data[0].id;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+      this.form.productId = res.data[0].id;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME",
+      pageNo: 1,
+      pageSize: 50,
+      isEntry: true
+    }).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: {
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 切换页码
+    handlePageChange(val) {
+      getManageList({
+        type: "INCOME",
+        pageNo: val,
+        pageSize: 50,
+        isEntry: true
+      }).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,
+                isEntry: true
+              }).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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    }
+  }
+};
+</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_20190327134022.vue

@@ -0,0 +1,429 @@
+<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.filter(data => !search || data.amount.toFixed(2).includes(search.toFixed(2)))"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          width="120px"
+          align="right"
+          label="录入日期"
+          :formatter="recordTimeFormat"
+          prop="gmtModife"
+        ></el-table-column>
+        <el-table-column
+          width="120px"
+          align="right"
+          label="发生日期"
+          :formatter="dateFormat"
+          prop="happenTime"
+        ></el-table-column>
+        <el-table-column
+          width="110px"
+          align="right"
+          label="金额"
+          :formatter="moneyFormat"
+          prop="amount"
+        ></el-table-column>
+        <el-table-column width="170px" align="right" label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="180px" align="right" label="产品" prop="product.name"></el-table-column>
+        <el-table-column width="260px" align="right" label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column width="200px" align="right" 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 align="right" label="备注" prop="remark">
+          <template slot="header" slot-scope="scope">
+            <el-input v-model="search" size="mini" placeholder="依据金额搜索"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column align="right" 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"
+          :rules="[{ required: true, message: '归属产品不能为空'}]"
+          :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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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: "",
+      search:'',
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "INVOICE",
+        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;
+      this.form.deptId = res.data[0].id;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+      this.form.productId = res.data[0].id;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME",
+      pageNo: 1,
+      pageSize: 50,
+      isEntry: true
+    }).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: {
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 切换页码
+    handlePageChange(val) {
+      getManageList({
+        type: "INCOME",
+        pageNo: val,
+        pageSize: 50,
+        isEntry: true
+      }).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,
+                isEntry: true
+              }).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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    }
+  }
+};
+</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_20190327134210.vue

@@ -0,0 +1,429 @@
+<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.filter(data => !search || data.amount.toString().includes(search)"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          width="120px"
+          align="right"
+          label="录入日期"
+          :formatter="recordTimeFormat"
+          prop="gmtModife"
+        ></el-table-column>
+        <el-table-column
+          width="120px"
+          align="right"
+          label="发生日期"
+          :formatter="dateFormat"
+          prop="happenTime"
+        ></el-table-column>
+        <el-table-column
+          width="110px"
+          align="right"
+          label="金额"
+          :formatter="moneyFormat"
+          prop="amount"
+        ></el-table-column>
+        <el-table-column width="170px" align="right" label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="180px" align="right" label="产品" prop="product.name"></el-table-column>
+        <el-table-column width="260px" align="right" label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column width="200px" align="right" 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 align="right" label="备注" prop="remark">
+          <template slot="header" slot-scope="scope">
+            <el-input v-model="search" size="mini" placeholder="依据金额搜索"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column align="right" 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"
+          :rules="[{ required: true, message: '归属产品不能为空'}]"
+          :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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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: "",
+      search:'',
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "INVOICE",
+        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;
+      this.form.deptId = res.data[0].id;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+      this.form.productId = res.data[0].id;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME",
+      pageNo: 1,
+      pageSize: 50,
+      isEntry: true
+    }).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: {
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 切换页码
+    handlePageChange(val) {
+      getManageList({
+        type: "INCOME",
+        pageNo: val,
+        pageSize: 50,
+        isEntry: true
+      }).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,
+                isEntry: true
+              }).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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    }
+  }
+};
+</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_20190327134329.vue

@@ -0,0 +1,429 @@
+<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.filter(data => !search || data.amount.toString().includes(search.toString()))"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          width="120px"
+          align="right"
+          label="录入日期"
+          :formatter="recordTimeFormat"
+          prop="gmtModife"
+        ></el-table-column>
+        <el-table-column
+          width="120px"
+          align="right"
+          label="发生日期"
+          :formatter="dateFormat"
+          prop="happenTime"
+        ></el-table-column>
+        <el-table-column
+          width="110px"
+          align="right"
+          label="金额"
+          :formatter="moneyFormat"
+          prop="amount"
+        ></el-table-column>
+        <el-table-column width="170px" align="right" label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="180px" align="right" label="产品" prop="product.name"></el-table-column>
+        <el-table-column width="260px" align="right" label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column width="200px" align="right" 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 align="right" label="备注" prop="remark">
+          <template slot="header" slot-scope="scope">
+            <el-input v-model="search" size="mini" placeholder="依据金额搜索"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column align="right" 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"
+          :rules="[{ required: true, message: '归属产品不能为空'}]"
+          :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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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: "",
+      search:'',
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "INVOICE",
+        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;
+      this.form.deptId = res.data[0].id;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+      this.form.productId = res.data[0].id;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME",
+      pageNo: 1,
+      pageSize: 50,
+      isEntry: true
+    }).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: {
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 切换页码
+    handlePageChange(val) {
+      getManageList({
+        type: "INCOME",
+        pageNo: val,
+        pageSize: 50,
+        isEntry: true
+      }).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,
+                isEntry: true
+              }).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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    }
+  }
+};
+</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_20190327134435.vue

@@ -0,0 +1,429 @@
+<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.filter(data => !search || data.amount.toString().includes(search.toString()))"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          width="120px"
+          align="right"
+          label="录入日期"
+          :formatter="recordTimeFormat"
+          prop="gmtModife"
+        ></el-table-column>
+        <el-table-column
+          width="120px"
+          align="right"
+          label="发生日期"
+          :formatter="dateFormat"
+          prop="happenTime"
+        ></el-table-column>
+        <el-table-column
+          width="110px"
+          align="right"
+          label="金额"
+          :formatter="moneyFormat"
+          prop="amount"
+        ></el-table-column>
+        <el-table-column width="170px" align="right" label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="180px" align="right" label="产品" prop="product.name"></el-table-column>
+        <el-table-column width="260px" align="right" label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column width="200px" align="right" 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 align="right" label="备注" prop="remark">
+          <template slot="header" slot-scope="scope">
+            <el-input v-model="search" size="medium" placeholder="依据金额搜索"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column align="right" 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"
+          :rules="[{ required: true, message: '归属产品不能为空'}]"
+          :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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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: "",
+      search:'',
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "INVOICE",
+        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;
+      this.form.deptId = res.data[0].id;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+      this.form.productId = res.data[0].id;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME",
+      pageNo: 1,
+      pageSize: 50,
+      isEntry: true
+    }).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: {
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 切换页码
+    handlePageChange(val) {
+      getManageList({
+        type: "INCOME",
+        pageNo: val,
+        pageSize: 50,
+        isEntry: true
+      }).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,
+                isEntry: true
+              }).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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    }
+  }
+};
+</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_20190327134446.vue

@@ -0,0 +1,429 @@
+<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.filter(data => !search || data.amount.toString().includes(search.toString()))"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          width="120px"
+          align="right"
+          label="录入日期"
+          :formatter="recordTimeFormat"
+          prop="gmtModife"
+        ></el-table-column>
+        <el-table-column
+          width="120px"
+          align="right"
+          label="发生日期"
+          :formatter="dateFormat"
+          prop="happenTime"
+        ></el-table-column>
+        <el-table-column
+          width="110px"
+          align="right"
+          label="金额"
+          :formatter="moneyFormat"
+          prop="amount"
+        ></el-table-column>
+        <el-table-column width="170px" align="right" label="收入状态">
+          <template slot-scope="props">
+            <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="180px" align="right" label="产品" prop="product.name"></el-table-column>
+        <el-table-column width="260px" align="right" label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column width="200px" align="right" 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 align="right" label="备注" prop="remark">
+          <!-- <template slot="header" slot-scope="scope">
+            <el-input v-model="search" size="medium" placeholder="依据金额搜索"/>
+          </template> -->
+        </el-table-column>
+
+        <el-table-column align="right" 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"
+          :rules="[{ required: true, message: '归属产品不能为空'}]"
+          :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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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.code +'--'+ 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: "",
+      search:'',
+      form: {
+        deptId: "",
+        projectId: "",
+        costTypeId: "",
+        companyId: "",
+        companyType: "",
+        happenTime: "",
+        incomeStatus: "INVOICE",
+        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;
+      this.form.deptId = res.data[0].id;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+      this.form.productId = res.data[0].id;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME",
+      pageNo: 1,
+      pageSize: 50,
+      isEntry: true
+    }).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: {
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 切换页码
+    handlePageChange(val) {
+      getManageList({
+        type: "INCOME",
+        pageNo: val,
+        pageSize: 50,
+        isEntry: true
+      }).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,
+                isEntry: true
+              }).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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    }
+  }
+};
+</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_20190327173011.vue

@@ -0,0 +1,495 @@
+<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"
+        :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-row :gutter="10">
+          <el-col :span="1">
+            <el-checkbox
+              :indeterminate="isIndeterminate"
+              v-model="checkAll"
+              @change="handleCheckAllChange"
+              size="medium"
+            >全选</el-checkbox>
+          </el-col>
+
+          <el-checkbox-group
+            style="width:100%"
+            v-model="form.incomeStatus"
+            placeholder="请选择状态值"
+            size="medium"
+            :indeterminate="isIndeterminate"
+          >
+            <el-col :span="4">
+              <el-checkbox style="width:100%;" border label="INVOICE">开票/应收</el-checkbox>
+            </el-col>
+            <el-col :span="4">
+              <el-checkbox style="width:100%;" border label="ARRIVAL">到账</el-checkbox>
+            </el-col>
+            <el-col :span="4">
+              <el-checkbox style="width:100%;" border label="INTERNAL">内部核算</el-checkbox>
+            </el-col>
+          </el-checkbox-group>
+        </el-row>
+      </el-form-item>
+      <el-form-item
+        label="归属产品"
+        v-if="form.type==='INCOME'"
+        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.code +'--'+ item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        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.code +'--'+ 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="归属部门" 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.code +'--'+ 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;"
+      :summary-method="tableSummary"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column
+        width="120px"
+        align="right"
+        label="录入日期"
+        :formatter="recordTimeFormat"
+        prop="gmtModife"
+      ></el-table-column>
+      <el-table-column
+        prop="happenTime"
+        width="120px"
+        align="right"
+        :formatter="dateFormat"
+        label="发生日期"
+      ></el-table-column>
+      <el-table-column
+        :formatter="moneyFormat"
+        prop="amount"
+        width="110px"
+        align="right"
+        label="金额"
+      ></el-table-column>
+      <el-table-column
+        label="收入状态"
+        width="130px"
+        align="right"
+        prop="incomeStatus"
+        :formatter="incomeTypeFormat"
+      ></el-table-column>
+      <el-table-column label="产品" width="200px" align="right" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" width="290px" align="right" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" width="250px" align="right" prop="department.name"></el-table-column>
+      <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
+      <el-table-column prop="remark" align="right" label="备注"></el-table-column>
+    </el-table>
+
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      show-summary
+      :summary-method="tableSummary"
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column
+        width="120px"
+        align="right"
+        label="录入日期"
+        :formatter="recordTimeFormat"
+        prop="gmtModife"
+      ></el-table-column>
+      <el-table-column
+        prop="happenTime"
+        width="120px"
+        align="right"
+        :formatter="dateFormat"
+        label="发生日期"
+      ></el-table-column>
+      <el-table-column
+        :formatter="moneyFormat"
+        prop="amount"
+        width="110px"
+        align="right"
+        label="金额"
+      ></el-table-column>
+      <el-table-column label="成本类别" width="130px" align="right" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" width="220px" align="right" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" width="300px" align="right" 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="备注" align="right" 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 && 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";
+const statusOptions = ["INVOICE", "ARRIVAL", "INTERNAL"];
+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: null,
+        endTime: null,
+        minAmount: "",
+        maxAmount: "",
+        isEntry: false,
+        pageNo: 1,
+        pageSize: 50
+      },
+      pageNo: 1,
+      pageSize: 50,
+      totalNumber: 0,
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: "",
+      isIndeterminate: true,
+      checkAll: false
+    };
+  },
+  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: {
+    // 自定义合计
+    tableSummary(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        switch (column.property) {
+          case 'gmtModife':
+           sums[index] = '合计';
+           break;
+          case "happenTime":
+            sums[index] = "";
+            break;
+            case 'amount':
+            const amountNum = data.map(item => Number(item['amount']));
+            console.log(amountNum)
+            sums[index] = amountNum.reduce((prev,cur) => {
+              console.log('prev',prev)
+              console.log('cur',cur)
+              // const sum = prev.toFixed(2) + cur.toFixed(2);
+                return (parseFloat(prev) + parseFloat(cur)).toFixed(2);
+            },0)
+          default:
+            break;
+        }
+      });
+      return sums;
+    },
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 全选
+    handleCheckAllChange(val) {
+      this.form.incomeStatus = val ? statusOptions : [];
+      this.isIndeterminate = false;
+      this.checkAll = val;
+    },
+    handlePageChange(val) {
+      this.form.pageNo = val;
+      this.$post("manageBase/manage/search", this.form).then(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.$post("manageBase/manage/search", this.form).then(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 }) {
+      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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    }
+  }
+};
+</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_20190327173116.vue

@@ -0,0 +1,495 @@
+<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"
+        :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-row :gutter="10">
+          <el-col :span="1">
+            <el-checkbox
+              :indeterminate="isIndeterminate"
+              v-model="checkAll"
+              @change="handleCheckAllChange"
+              size="medium"
+            >全选</el-checkbox>
+          </el-col>
+
+          <el-checkbox-group
+            style="width:100%"
+            v-model="form.incomeStatus"
+            placeholder="请选择状态值"
+            size="medium"
+            :indeterminate="isIndeterminate"
+          >
+            <el-col :span="4">
+              <el-checkbox style="width:100%;" border label="INVOICE">开票/应收</el-checkbox>
+            </el-col>
+            <el-col :span="4">
+              <el-checkbox style="width:100%;" border label="ARRIVAL">到账</el-checkbox>
+            </el-col>
+            <el-col :span="4">
+              <el-checkbox style="width:100%;" border label="INTERNAL">内部核算</el-checkbox>
+            </el-col>
+          </el-checkbox-group>
+        </el-row>
+      </el-form-item>
+      <el-form-item
+        label="归属产品"
+        v-if="form.type==='INCOME'"
+        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.code +'--'+ item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        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.code +'--'+ 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="归属部门" 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.code +'--'+ 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;"
+      :summary-method="tableSummary"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column
+        width="120px"
+        align="right"
+        label="录入日期"
+        :formatter="recordTimeFormat"
+        prop="gmtModife"
+      ></el-table-column>
+      <el-table-column
+        prop="happenTime"
+        width="120px"
+        align="right"
+        :formatter="dateFormat"
+        label="发生日期"
+      ></el-table-column>
+      <el-table-column
+        :formatter="moneyFormat"
+        prop="amount"
+        width="110px"
+        align="right"
+        label="金额"
+      ></el-table-column>
+      <el-table-column
+        label="收入状态"
+        width="130px"
+        align="right"
+        prop="incomeStatus"
+        :formatter="incomeTypeFormat"
+      ></el-table-column>
+      <el-table-column label="产品" width="200px" align="right" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" width="290px" align="right" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" width="250px" align="right" prop="department.name"></el-table-column>
+      <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
+      <el-table-column prop="remark" align="right" label="备注"></el-table-column>
+    </el-table>
+
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      show-summary
+      :summary-method="tableSummary"
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column
+        width="120px"
+        align="right"
+        label="录入日期"
+        :formatter="recordTimeFormat"
+        prop="gmtModife"
+      ></el-table-column>
+      <el-table-column
+        prop="happenTime"
+        width="120px"
+        align="right"
+        :formatter="dateFormat"
+        label="发生日期"
+      ></el-table-column>
+      <el-table-column
+        :formatter="moneyFormat"
+        prop="amount"
+        width="110px"
+        align="right"
+        label="金额"
+      ></el-table-column>
+      <el-table-column label="成本类别" width="130px" align="right" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" width="220px" align="right" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" width="300px" align="right" 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="备注" align="right" 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 && 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";
+const statusOptions = ["INVOICE", "ARRIVAL", "INTERNAL"];
+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: null,
+        endTime: null,
+        minAmount: "",
+        maxAmount: "",
+        isEntry: false,
+        pageNo: 1,
+        pageSize: 50
+      },
+      pageNo: 1,
+      pageSize: 50,
+      totalNumber: 0,
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: "",
+      isIndeterminate: true,
+      checkAll: false
+    };
+  },
+  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: {
+    // 自定义合计
+    tableSummary(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        switch (column.property) {
+          case 'gmtModife':
+           sums[index] = '合计';
+           break;
+          case "happenTime":
+            sums[index] = "";
+            break;
+            case 'amount':
+            const amountNum = data.map(item => Number(item['amount']));
+            console.log(amountNum)
+            sums[index] = amountNum.reduce((prev,cur) => {
+              console.log('prev',prev)
+              console.log('cur',cur)
+              // const sum = prev.toFixed(2) + cur.toFixed(2);
+                return (parseFloat(prev) + parseFloat(cur)).toFixed(2);
+            },0)
+          default:
+            break;
+        }
+      });
+      return sums;
+    },
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 全选
+    handleCheckAllChange(val) {
+      this.form.incomeStatus = val ? statusOptions : [];
+      this.isIndeterminate = false;
+      this.checkAll = val;
+    },
+    handlePageChange(val) {
+      this.form.pageNo = val;
+      this.$post("manageBase/manage/search", this.form).then(response => {
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        if (response.data && response.data.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.$post("manageBase/manage/search", this.form).then(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 }) {
+      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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    }
+  }
+};
+</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_20190327173151.vue

@@ -0,0 +1,496 @@
+<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"
+        :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-row :gutter="10">
+          <el-col :span="1">
+            <el-checkbox
+              :indeterminate="isIndeterminate"
+              v-model="checkAll"
+              @change="handleCheckAllChange"
+              size="medium"
+            >全选</el-checkbox>
+          </el-col>
+
+          <el-checkbox-group
+            style="width:100%"
+            v-model="form.incomeStatus"
+            placeholder="请选择状态值"
+            size="medium"
+            :indeterminate="isIndeterminate"
+          >
+            <el-col :span="4">
+              <el-checkbox style="width:100%;" border label="INVOICE">开票/应收</el-checkbox>
+            </el-col>
+            <el-col :span="4">
+              <el-checkbox style="width:100%;" border label="ARRIVAL">到账</el-checkbox>
+            </el-col>
+            <el-col :span="4">
+              <el-checkbox style="width:100%;" border label="INTERNAL">内部核算</el-checkbox>
+            </el-col>
+          </el-checkbox-group>
+        </el-row>
+      </el-form-item>
+      <el-form-item
+        label="归属产品"
+        v-if="form.type==='INCOME'"
+        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.code +'--'+ item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        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.code +'--'+ 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="归属部门" 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.code +'--'+ 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;"
+      :summary-method="tableSummary"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column
+        width="120px"
+        align="right"
+        label="录入日期"
+        :formatter="recordTimeFormat"
+        prop="gmtModife"
+      ></el-table-column>
+      <el-table-column
+        prop="happenTime"
+        width="120px"
+        align="right"
+        :formatter="dateFormat"
+        label="发生日期"
+      ></el-table-column>
+      <el-table-column
+        :formatter="moneyFormat"
+        prop="amount"
+        width="110px"
+        align="right"
+        label="金额"
+      ></el-table-column>
+      <el-table-column
+        label="收入状态"
+        width="130px"
+        align="right"
+        prop="incomeStatus"
+        :formatter="incomeTypeFormat"
+      ></el-table-column>
+      <el-table-column label="产品" width="200px" align="right" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" width="290px" align="right" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" width="250px" align="right" prop="department.name"></el-table-column>
+      <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
+      <el-table-column prop="remark" align="right" label="备注"></el-table-column>
+    </el-table>
+
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      show-summary
+      :summary-method="tableSummary"
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column
+        width="120px"
+        align="right"
+        label="录入日期"
+        :formatter="recordTimeFormat"
+        prop="gmtModife"
+      ></el-table-column>
+      <el-table-column
+        prop="happenTime"
+        width="120px"
+        align="right"
+        :formatter="dateFormat"
+        label="发生日期"
+      ></el-table-column>
+      <el-table-column
+        :formatter="moneyFormat"
+        prop="amount"
+        width="110px"
+        align="right"
+        label="金额"
+      ></el-table-column>
+      <el-table-column label="成本类别" width="130px" align="right" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" width="220px" align="right" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" width="300px" align="right" 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="备注" align="right" 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 && 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";
+const statusOptions = ["INVOICE", "ARRIVAL", "INTERNAL"];
+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: null,
+        endTime: null,
+        minAmount: "",
+        maxAmount: "",
+        isEntry: false,
+        pageNo: 1,
+        pageSize: 50
+      },
+      pageNo: 1,
+      pageSize: 50,
+      totalNumber: 0,
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: "",
+      isIndeterminate: true,
+      checkAll: false
+    };
+  },
+  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: {
+    // 自定义合计
+    tableSummary(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        switch (column.property) {
+          case 'gmtModife':
+           sums[index] = '合计';
+           break;
+          case "happenTime":
+            sums[index] = "";
+            break;
+            case 'amount':
+            const amountNum = data.map(item => Number(item['amount']));
+            console.log(amountNum)
+            sums[index] = amountNum.reduce((prev,cur) => {
+              console.log('prev',prev)
+              console.log('cur',cur)
+              // const sum = prev.toFixed(2) + cur.toFixed(2);
+                return (parseFloat(prev) + parseFloat(cur)).toFixed(2);
+            },0)
+          default:
+            break;
+        }
+      });
+      return sums;
+    },
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 全选
+    handleCheckAllChange(val) {
+      this.form.incomeStatus = val ? statusOptions : [];
+      this.isIndeterminate = false;
+      this.checkAll = val;
+    },
+    handlePageChange(val) {
+      this.form.pageNo = val;
+      this.$post("manageBase/manage/search", this.form).then(response => {
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        console.log('回复内容',response.data.length)
+        if (response.data && response.data.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.$post("manageBase/manage/search", this.form).then(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 }) {
+      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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    }
+  }
+};
+</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_20190327173223.vue

@@ -0,0 +1,497 @@
+<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"
+        :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-row :gutter="10">
+          <el-col :span="1">
+            <el-checkbox
+              :indeterminate="isIndeterminate"
+              v-model="checkAll"
+              @change="handleCheckAllChange"
+              size="medium"
+            >全选</el-checkbox>
+          </el-col>
+
+          <el-checkbox-group
+            style="width:100%"
+            v-model="form.incomeStatus"
+            placeholder="请选择状态值"
+            size="medium"
+            :indeterminate="isIndeterminate"
+          >
+            <el-col :span="4">
+              <el-checkbox style="width:100%;" border label="INVOICE">开票/应收</el-checkbox>
+            </el-col>
+            <el-col :span="4">
+              <el-checkbox style="width:100%;" border label="ARRIVAL">到账</el-checkbox>
+            </el-col>
+            <el-col :span="4">
+              <el-checkbox style="width:100%;" border label="INTERNAL">内部核算</el-checkbox>
+            </el-col>
+          </el-checkbox-group>
+        </el-row>
+      </el-form-item>
+      <el-form-item
+        label="归属产品"
+        v-if="form.type==='INCOME'"
+        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.code +'--'+ item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        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.code +'--'+ 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="归属部门" 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.code +'--'+ 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;"
+      :summary-method="tableSummary"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column
+        width="120px"
+        align="right"
+        label="录入日期"
+        :formatter="recordTimeFormat"
+        prop="gmtModife"
+      ></el-table-column>
+      <el-table-column
+        prop="happenTime"
+        width="120px"
+        align="right"
+        :formatter="dateFormat"
+        label="发生日期"
+      ></el-table-column>
+      <el-table-column
+        :formatter="moneyFormat"
+        prop="amount"
+        width="110px"
+        align="right"
+        label="金额"
+      ></el-table-column>
+      <el-table-column
+        label="收入状态"
+        width="130px"
+        align="right"
+        prop="incomeStatus"
+        :formatter="incomeTypeFormat"
+      ></el-table-column>
+      <el-table-column label="产品" width="200px" align="right" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" width="290px" align="right" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" width="250px" align="right" prop="department.name"></el-table-column>
+      <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
+      <el-table-column prop="remark" align="right" label="备注"></el-table-column>
+    </el-table>
+
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      show-summary
+      :summary-method="tableSummary"
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column
+        width="120px"
+        align="right"
+        label="录入日期"
+        :formatter="recordTimeFormat"
+        prop="gmtModife"
+      ></el-table-column>
+      <el-table-column
+        prop="happenTime"
+        width="120px"
+        align="right"
+        :formatter="dateFormat"
+        label="发生日期"
+      ></el-table-column>
+      <el-table-column
+        :formatter="moneyFormat"
+        prop="amount"
+        width="110px"
+        align="right"
+        label="金额"
+      ></el-table-column>
+      <el-table-column label="成本类别" width="130px" align="right" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" width="220px" align="right" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" width="300px" align="right" 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="备注" align="right" 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 && 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";
+const statusOptions = ["INVOICE", "ARRIVAL", "INTERNAL"];
+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: null,
+        endTime: null,
+        minAmount: "",
+        maxAmount: "",
+        isEntry: false,
+        pageNo: 1,
+        pageSize: 50
+      },
+      pageNo: 1,
+      pageSize: 50,
+      totalNumber: 0,
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: "",
+      isIndeterminate: true,
+      checkAll: false
+    };
+  },
+  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: {
+    // 自定义合计
+    tableSummary(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        switch (column.property) {
+          case 'gmtModife':
+           sums[index] = '合计';
+           break;
+          case "happenTime":
+            sums[index] = "";
+            break;
+            case 'amount':
+            const amountNum = data.map(item => Number(item['amount']));
+            console.log(amountNum)
+            sums[index] = amountNum.reduce((prev,cur) => {
+              console.log('prev',prev)
+              console.log('cur',cur)
+              // const sum = prev.toFixed(2) + cur.toFixed(2);
+                return (parseFloat(prev) + parseFloat(cur)).toFixed(2);
+            },0)
+          default:
+            break;
+        }
+      });
+      return sums;
+    },
+    // 金额格式化
+    moneyFormat(row) {
+      return row.amount.toFixed(2);
+    },
+    // 全选
+    handleCheckAllChange(val) {
+      this.form.incomeStatus = val ? statusOptions : [];
+      this.isIndeterminate = false;
+      this.checkAll = val;
+    },
+    handlePageChange(val) {
+      this.form.pageNo = val;
+      this.$post("manageBase/manage/search", this.form).then(response => {
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        console.log('回复内容',response.data.length)
+        if (response.data && response.data.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.$post("manageBase/manage/search", this.form).then(response => {
+        this.searchResult = response.data.content;
+        this.totalNumber = parseInt(response.data.totalElements);
+        this.pageNo = parseInt(response.data.number) + 1;
+        console.log('回复内容11',response.data.length)
+        if (response.data && response.data.length == 0) {
+          this.$message("未找到相应数据");
+        }
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.searchResult = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      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);
+    },
+    recordTimeFormat(row) {
+      return formatTime(row.gmtModified);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    }
+  }
+};
+</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/utils/http_20190327172732.js

@@ -0,0 +1,132 @@
+import axios from 'axios';
+// import Cookies from "js-cookie";
+import {
+    Message
+} from 'element-ui';
+
+axios.defaults.timeout = 5000;
+axios.defaults.baseURL = 'http://whiteboardtest.ai160.com/';
+
+/*** 
+ * 
+ * 复制于 https://www.cnblogs.com/ldlx-mars/p/7908950.html
+ * 
+*/
+
+//http request 拦截器
+axios.interceptors.request.use(
+    config => {
+        // const token = Cookies('token'); //注意使用的时候需要引入cookie方法，推荐js-cookie
+        config.data = JSON.stringify(config.data);
+        const uid = sessionStorage.getItem('uid') ? sessionStorage.getItem('uid') : '';
+        config.headers = {
+            'Content-Type': 'application/json',
+            'uid': uid,
+        }
+        // if(token){
+        //   config.params = {'X-Token':token}
+        // }
+        return config;
+    },
+    error => {
+        return Promise.reject(err);
+    }
+);
+
+//http response 拦截器 暂时不用
+axios.interceptors.response.use(
+    response => {
+        if (response.data.code == 402) {
+            // router.push({
+            //     path: "/login",
+            //     // querry: {
+            //     //     redirect: Router.currentRoute.fullPath
+            //     // } //从哪个页面跳转
+            // })
+            Message.warning({
+                message: '请登录',
+                type: 'warning'
+              });
+            window.location.href = '/manageWeb/'
+        }
+        return response;
+    },
+    error => {
+        return Promise.reject(error)
+    }
+)
+
+/**
+ * 封装get方法
+ * @param url
+ * @param data
+ * @returns {Promise}
+ */
+
+export function fetch(url, params = {}) {
+    return new Promise((resolve, reject) => {
+        axios.get(url, {
+                params: params
+            })
+            .then(response => {
+                resolve(response.data);
+            })
+            .catch(err => {
+                reject(err)
+            })
+    })
+}
+
+/**
+ * 封装post请求
+ * @param url
+ * @param data
+ * @returns {Promise}
+ */
+
+export function post(url, data = {}) {
+    return new Promise((resolve, reject) => {
+        axios.post(url, data)
+            .then(response => {
+                resolve(response.data);
+            }, err => {
+                reject(err)
+            })
+    })
+}
+
+/**
+ * 封装patch请求
+ * @param url
+ * @param data
+ * @returns {Promise}
+ */
+
+export function patch(url, data = {}) {
+    return new Promise((resolve, reject) => {
+        axios.patch(url, data)
+            .then(response => {
+                resolve(response.data);
+            }, err => {
+                reject(err)
+            })
+    })
+}
+
+/**
+ * 封装put请求
+ * @param url
+ * @param data
+ * @returns {Promise}
+ */
+
+export function put(url, data = {}) {
+    return new Promise((resolve, reject) => {
+        axios.put(url, data)
+            .then(response => {
+                resolve(response.data);
+            }, err => {
+                reject(err)
+            })
+    })
+}

.history/src/utils/http_20190327173306.js

@@ -0,0 +1,132 @@
+import axios from 'axios';
+// import Cookies from "js-cookie";
+import {
+    Message
+} from 'element-ui';
+
+axios.defaults.timeout = 5000;
+axios.defaults.baseURL = 'http://manage.ai160.com/';
+
+/*** 
+ * 
+ * 复制于 https://www.cnblogs.com/ldlx-mars/p/7908950.html
+ * 
+*/
+
+//http request 拦截器
+axios.interceptors.request.use(
+    config => {
+        // const token = Cookies('token'); //注意使用的时候需要引入cookie方法，推荐js-cookie
+        config.data = JSON.stringify(config.data);
+        const uid = sessionStorage.getItem('uid') ? sessionStorage.getItem('uid') : '';
+        config.headers = {
+            'Content-Type': 'application/json',
+            'uid': uid,
+        }
+        // if(token){
+        //   config.params = {'X-Token':token}
+        // }
+        return config;
+    },
+    error => {
+        return Promise.reject(err);
+    }
+);
+
+//http response 拦截器 暂时不用
+axios.interceptors.response.use(
+    response => {
+        if (response.data.code == 402) {
+            // router.push({
+            //     path: "/login",
+            //     // querry: {
+            //     //     redirect: Router.currentRoute.fullPath
+            //     // } //从哪个页面跳转
+            // })
+            Message.warning({
+                message: '请登录',
+                type: 'warning'
+              });
+            window.location.href = '/manageWeb/'
+        }
+        return response;
+    },
+    error => {
+        return Promise.reject(error)
+    }
+)
+
+/**
+ * 封装get方法
+ * @param url
+ * @param data
+ * @returns {Promise}
+ */
+
+export function fetch(url, params = {}) {
+    return new Promise((resolve, reject) => {
+        axios.get(url, {
+                params: params
+            })
+            .then(response => {
+                resolve(response.data);
+            })
+            .catch(err => {
+                reject(err)
+            })
+    })
+}
+
+/**
+ * 封装post请求
+ * @param url
+ * @param data
+ * @returns {Promise}
+ */
+
+export function post(url, data = {}) {
+    return new Promise((resolve, reject) => {
+        axios.post(url, data)
+            .then(response => {
+                resolve(response.data);
+            }, err => {
+                reject(err)
+            })
+    })
+}
+
+/**
+ * 封装patch请求
+ * @param url
+ * @param data
+ * @returns {Promise}
+ */
+
+export function patch(url, data = {}) {
+    return new Promise((resolve, reject) => {
+        axios.patch(url, data)
+            .then(response => {
+                resolve(response.data);
+            }, err => {
+                reject(err)
+            })
+    })
+}
+
+/**
+ * 封装put请求
+ * @param url
+ * @param data
+ * @returns {Promise}
+ */
+
+export function put(url, data = {}) {
+    return new Promise((resolve, reject) => {
+        axios.put(url, data)
+            .then(response => {
+                resolve(response.data);
+            }, err => {
+                reject(err)
+            })
+    })
+}

src/pages/manage/index.vue

@@ -5,7 +5,11 @@
       <el-button type="primary" @click="append('INCOME')">增加收入</el-button>
     </div>
     <el-card class="right-card">
-      <el-table :data="manageData" border style="width: 100%">
+      <el-table
+        :data="manageData.filter(data => !search || data.amount.toString().includes(search.toString()))"
+        border
+        style="width: 100%"
+      >
         <el-table-column
           width="120px"
           align="right"
@@ -39,7 +43,11 @@
 
         <!-- <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column> -->
 
-        <el-table-column align="right" label="备注" prop="remark"></el-table-column>
+        <el-table-column align="right" label="备注" prop="remark">
+          <!-- <template slot="header" slot-scope="scope">
+            <el-input v-model="search" size="medium" placeholder="依据金额搜索"/>
+          </template> -->
+        </el-table-column>
 
         <el-table-column align="right" label="操作" width="80">
           <template slot-scope="scope">
@@ -97,7 +105,12 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="归属产品" prop="productId" :rules="[{ required: true, message: '归属产品不能为空'}]" :label-width="formLabelWidth">
+        <el-form-item
+          label="归属产品"
+          prop="productId"
+          :rules="[{ required: true, message: '归属产品不能为空'}]"
+          :label-width="formLabelWidth"
+        >
           <el-select v-model="form.productId" placeholder="请选择产品">
             <!-- <el-option key label="无" value></el-option> -->
             <el-option
@@ -189,6 +202,7 @@ export default {
       dialogFormVisible: false,
       addFlag: false,
       id: "",
+      search:'',
       form: {
         deptId: "",
         projectId: "",
@@ -266,7 +280,7 @@ export default {
         type: "INCOME",
         pageNo: val,
         pageSize: 50,
-         isEntry: true,
+        isEntry: true
       }).then(res => {
         this.manageData = res.data.content;
         this.totalNumber = parseInt(res.data.totalElements);
@@ -333,7 +347,7 @@ export default {
                 type: "INCOME",
                 pageNo: 1,
                 pageSize: 50,
-                 isEntry: true,
+                isEntry: true
               }).then(res => {
                 this.manageData = res.data.content;
                 this.totalSize = res.data.totalPages;
@@ -371,7 +385,7 @@ export default {
     dateFormat(row, column) {
       return formatTime(row.happenTime);
     },
-    recordTimeFormat(row){
+    recordTimeFormat(row) {
       return formatTime(row.gmtModified);
     }
   }

src/pages/manage/query.vue

@@ -263,7 +263,7 @@
       :page-size="50"
       :current-page.sync="pageNo"
       layout="prev, pager, next"
-      v-if="searchResult.length!==0"
+      v-if="searchResult && searchResult.length!==0"
       :total="totalNumber"
     ></el-pagination>
   </div>
@@ -401,7 +401,8 @@ export default {
         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) {
+        console.log('回复内容',response.data.length)
+        if (response.data && response.data.length == 0) {
           this.$message("未找到相应数据");
         }
       });
@@ -423,7 +424,8 @@ export default {
         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) {
+        console.log('回复内容11',response.data.length)
+        if (response.data && response.data.length == 0) {
           this.$message("未找到相应数据");
         }
       });