搜索优化，添加时间与金额范围筛选

.history/src/pages/costTeam/index_20190322152543.vue

@@ -0,0 +1,188 @@
+<template>
+  <div class="cost-team">
+    <el-button type="primary" class="add" @click="append">增加收入部门</el-button>
+    <el-card class="right-card">
+      <el-table
+      :data="costTeamData"
+      style="width: 100%">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="收入部门名称">
+                <span>{{ props.row.name }}</span>
+              </el-form-item>
+              <el-form-item label="收入部门 ID">
+                <span>{{ props.row.id }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          label="收入部门编号"
+          prop="code">
+        </el-table-column>
+        <el-table-column
+          label="收入部门名称"
+          prop="name">
+        </el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+              <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog title="新增收入部门" :visible.sync="dialogFormVisible">     
+      <el-form :model="form" ref="form">
+        <el-form-item label="收入部门编码" prop="code" :label-width="formLabelWidth" :rules="[{ required: true, message: '编码不能为空'}]">
+          <el-input v-model="form.code" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="收入部门名称" prop="name" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <!--
+        <el-form-item label="收入部门状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
+          <el-select v-model="form.status" placeholder="请选择状态值">
+            <el-option label="正常" value="NORMAL"></el-option>
+            <el-option label="已删除" value="DEL"></el-option>
+          </el-select>
+        </el-form-item>
+        -->
+        <el-form-item label="收入部门排序" prop="sort" :label-width="formLabelWidth" >
+          <el-input v-model.number="form.sort" 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 scoped>
+import { getCostTeamList, addCostTeam, setCostTeam } from '@/api/costTeamApi'
+export default {
+  data () {
+    return {
+      costTeamData: [],
+      dialogFormVisible: false,
+      addFlag: false,
+      id: '',
+      form: {
+        code: '',
+        name: '',
+        status: 'NORMAL',
+        sort: ''
+      },
+      formLabelWidth: '120px',
+      index: ''      
+    }
+  },
+  created () {
+    getCostTeamList().then(res => {
+      this.costTeamData = res.data
+    });
+  },
+  methods: {
+    // 新增收入部门
+    append() {
+      this.addFlag = true;
+      this.dialogFormVisible = true;
+    },
+    // 编辑收入部门
+    handleEdit(index, row) {
+      this.form.code = row.code;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.id = row.id;
+      this.index = index;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    //删除收入部门
+    handleDelete(index, row) {
+      console.log(index, row);
+      setCostTeam({
+        id: row.id,
+        status: 'DEL'
+      }).then(res => {
+        console.log(res);
+      })
+    },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          console.log(this.form);
+          if(this.addFlag) {
+            addCostTeam(this.form).then(res => {
+              this.costTeamData.unshift(res.data)
+              this.$refs[formName].resetFields();
+              this.$message({
+                message: "添加成功",
+                type: "success"
+              });
+            })
+          } else {
+            this.form.id = this.id;
+            setCostTeam(this.form).then(res => {
+              console.log(res);
+              console.log(this.index)
+              this.costTeamData.splice(this.index, 1, res.data)
+              this.$refs[formName].resetFields();
+            })
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm (formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }    
+  }, 
+}
+</script>
+<style scope>
+  .cost-team {
+    padding: 20px;
+    box-sizing: border-box;
+  }
+  .add {
+    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%;
+  }
+</style>
+
+
+
+

.history/src/pages/costType/index_20190322151421.vue

@@ -0,0 +1,186 @@
+<template>
+  <div class="cost-type">
+    <el-button type="primary" class="add" @click="append">增加类型</el-button>
+    <el-card class="right-card">
+      <el-table
+      :data="costTypeData"
+      border
+      :default-sort = "{prop: 'code', order: 'ascending'}"
+      style="width: 100%">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="类型名称">
+                <span>{{ props.row.name }}</span>
+              </el-form-item>
+              <el-form-item label="类型 ID">
+                <span>{{ props.row.id }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          label="类型编号"
+          sortable
+          prop="code">
+        </el-table-column>
+        <el-table-column
+          label="类型名称"
+          prop="name">
+        </el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+              <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog title="新增类型" :visible.sync="dialogFormVisible">     
+      <el-form :model="form" ref="form">
+        <el-form-item label="类型编码" prop="code" :label-width="formLabelWidth" :rules="[{ required: true, message: '编码不能为空'}]">
+          <el-input v-model="form.code" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="类型名称" prop="name" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <!--
+        <el-form-item label="类型状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
+          <el-select v-model="form.status" placeholder="请选择状态值">
+            <el-option label="正常" value="NORMAL"></el-option>
+            <el-option label="已删除" value="DEL"></el-option>
+          </el-select>
+        </el-form-item>
+        -->
+        <el-form-item label="类型排序" prop="sort" :label-width="formLabelWidth">
+          <el-input v-model.number="form.sort" 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 scoped>
+import { getCostTypeList, addCostType, setCostType } from '@/api/costTypeApi'
+export default {
+  data () {
+    return {
+      costTypeData: [],
+      dialogFormVisible: false,
+      addFlag: false,
+      id: '',
+      form: {
+        code: '',
+        name: '',
+        status: 'NORMAL',
+        sort: ''
+      },
+      formLabelWidth: '120px',
+      index: ''      
+    }
+  },
+  created () {
+    getCostTypeList().then(res => {
+      this.costTypeData = res.data
+    });
+  },
+  methods: {
+    // 新增类型
+    append() {
+      this.addFlag = true;
+      this.dialogFormVisible = true;
+    },
+    // 编辑类型
+    handleEdit(index, row) {
+      this.form.code = row.code;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.id = row.id;
+      this.index = index;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    //删除类型
+    // handleDelete(index, row) {
+    //   console.log(index, row);
+    //   setCostType({
+    //     id: row.id,
+    //     status: 'DEL'
+    //   }).then(res => {
+    //     console.log(res);
+    //   })
+    // },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          console.log(this.form);
+          if(this.addFlag) {
+            addCostType(this.form).then(res => {
+              this.costTypeData.unshift(res.data)
+              this.$refs[formName].resetFields();
+            })
+          } else {
+            this.form.id = this.id;
+            setCostType(this.form).then(res => {
+              console.log(res);
+              console.log(this.index)
+              this.costTypeData.splice(this.index, 1, res.data)
+              this.$refs[formName].resetFields();
+            })
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm (formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }  
+  }, 
+}
+</script>
+<style scope>
+  .cost-type {
+    padding: 20px;
+    box-sizing: border-box;
+  }
+  .add {
+    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%;
+  }
+</style>
+
+
+

.history/src/pages/costType/index_20190322152226.vue

@@ -0,0 +1,190 @@
+<template>
+  <div class="cost-type">
+    <el-button type="primary" class="add" @click="append">增加类型</el-button>
+    <el-card class="right-card">
+      <el-table
+      :data="costTypeData"
+      border
+      :default-sort = "{prop: 'code', order: 'ascending'}"
+      style="width: 100%">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="类型名称">
+                <span>{{ props.row.name }}</span>
+              </el-form-item>
+              <el-form-item label="类型 ID">
+                <span>{{ props.row.id }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          label="类型编号"
+          sortable
+          prop="code">
+        </el-table-column>
+        <el-table-column
+          label="类型名称"
+          prop="name">
+        </el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+              <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog title="新增类型" :visible.sync="dialogFormVisible">     
+      <el-form :model="form" ref="form">
+        <el-form-item label="类型编码" prop="code" :label-width="formLabelWidth" :rules="[{ required: true, message: '编码不能为空'}]">
+          <el-input v-model="form.code" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="类型名称" prop="name" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <!--
+        <el-form-item label="类型状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
+          <el-select v-model="form.status" placeholder="请选择状态值">
+            <el-option label="正常" value="NORMAL"></el-option>
+            <el-option label="已删除" value="DEL"></el-option>
+          </el-select>
+        </el-form-item>
+        -->
+        <el-form-item label="类型排序" prop="sort" :label-width="formLabelWidth">
+          <el-input v-model.number="form.sort" 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 scoped>
+import { getCostTypeList, addCostType, setCostType } from '@/api/costTypeApi'
+export default {
+  data () {
+    return {
+      costTypeData: [],
+      dialogFormVisible: false,
+      addFlag: false,
+      id: '',
+      form: {
+        code: '',
+        name: '',
+        status: 'NORMAL',
+        sort: ''
+      },
+      formLabelWidth: '120px',
+      index: ''      
+    }
+  },
+  created () {
+    getCostTypeList().then(res => {
+      this.costTypeData = res.data
+    });
+  },
+  methods: {
+    // 新增类型
+    append() {
+      this.addFlag = true;
+      this.dialogFormVisible = true;
+    },
+    // 编辑类型
+    handleEdit(index, row) {
+      this.form.code = row.code;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.id = row.id;
+      this.index = index;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    //删除类型
+    // handleDelete(index, row) {
+    //   console.log(index, row);
+    //   setCostType({
+    //     id: row.id,
+    //     status: 'DEL'
+    //   }).then(res => {
+    //     console.log(res);
+    //   })
+    // },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          console.log(this.form);
+          if(this.addFlag) {
+            addCostType(this.form).then(res => {
+              if (res.code === 703) {
+                this.$alert("添加失败，该类型名已存在");
+                return;
+              }
+              this.costTypeData.unshift(res.data)
+              this.$refs[formName].resetFields();
+            })
+          } else {
+            this.form.id = this.id;
+            setCostType(this.form).then(res => {
+              console.log(res);
+              console.log(this.index)
+              this.costTypeData.splice(this.index, 1, res.data)
+              this.$refs[formName].resetFields();
+            })
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm (formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }  
+  }, 
+}
+</script>
+<style scope>
+  .cost-type {
+    padding: 20px;
+    box-sizing: border-box;
+  }
+  .add {
+    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%;
+  }
+</style>
+
+
+

.history/src/pages/costType/index_20190322152322.vue

@@ -0,0 +1,190 @@
+<template>
+  <div class="cost-type">
+    <el-button type="primary" class="add" @click="append">增加类型</el-button>
+    <el-card class="right-card">
+      <el-table
+      :data="costTypeData"
+      border
+      :default-sort = "{prop: 'code', order: 'ascending'}"
+      style="width: 100%">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="类型名称">
+                <span>{{ props.row.name }}</span>
+              </el-form-item>
+              <el-form-item label="类型 ID">
+                <span>{{ props.row.id }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          label="类型编号"
+          sortable
+          prop="code">
+        </el-table-column>
+        <el-table-column
+          label="类型名称"
+          prop="name">
+        </el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+              <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog title="新增类型" :visible.sync="dialogFormVisible">     
+      <el-form :model="form" ref="form">
+        <el-form-item label="类型编码" prop="code" :label-width="formLabelWidth" :rules="[{ required: true, message: '编码不能为空'}]">
+          <el-input v-model="form.code" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="类型名称" prop="name" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <!--
+        <el-form-item label="类型状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
+          <el-select v-model="form.status" placeholder="请选择状态值">
+            <el-option label="正常" value="NORMAL"></el-option>
+            <el-option label="已删除" value="DEL"></el-option>
+          </el-select>
+        </el-form-item>
+        -->
+        <el-form-item label="类型排序" prop="sort" :label-width="formLabelWidth">
+          <el-input v-model.number="form.sort" 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 scoped>
+import { getCostTypeList, addCostType, setCostType } from '@/api/costTypeApi'
+export default {
+  data () {
+    return {
+      costTypeData: [],
+      dialogFormVisible: false,
+      addFlag: false,
+      id: '',
+      form: {
+        code: '',
+        name: '',
+        status: 'NORMAL',
+        sort: ''
+      },
+      formLabelWidth: '120px',
+      index: ''      
+    }
+  },
+  created () {
+    getCostTypeList().then(res => {
+      this.costTypeData = res.data
+    });
+  },
+  methods: {
+    // 新增类型
+    append() {
+      this.addFlag = true;
+      this.dialogFormVisible = true;
+    },
+    // 编辑类型
+    handleEdit(index, row) {
+      this.form.code = row.code;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.id = row.id;
+      this.index = index;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    //删除类型
+    // handleDelete(index, row) {
+    //   console.log(index, row);
+    //   setCostType({
+    //     id: row.id,
+    //     status: 'DEL'
+    //   }).then(res => {
+    //     console.log(res);
+    //   })
+    // },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          console.log(this.form);
+          if(this.addFlag) {
+            addCostType(this.form).then(res => {
+              if (res.code === 703) {
+                this.$alert("添加失败，该类型名已存在");
+                return;
+              }
+              this.costTypeData.unshift(res.data)
+              this.$refs[formName].resetFields();
+            })
+          } else {
+            this.form.id = this.id;
+            setCostType(this.form).then(res => {
+              console.log(res);
+              console.log(this.index)
+              this.costTypeData.splice(this.index, 1, res.data)
+              this.$refs[formName].resetFields();
+            })
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm (formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }  
+  }, 
+}
+</script>
+<style scope>
+  .cost-type {
+    padding: 20px;
+    box-sizing: border-box;
+  }
+  .add {
+    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%;
+  }
+</style>
+
+
+

.history/src/pages/costType/index_20190322152345.vue

@@ -0,0 +1,191 @@
+<template>
+  <div class="cost-type">
+    <el-button type="primary" class="add" @click="append">增加类型</el-button>
+    <el-card class="right-card">
+      <el-table
+      :data="costTypeData"
+      border
+      :default-sort = "{prop: 'code', order: 'ascending'}"
+      style="width: 100%">
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="类型名称">
+                <span>{{ props.row.name }}</span>
+              </el-form-item>
+              <el-form-item label="类型 ID">
+                <span>{{ props.row.id }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          label="类型编号"
+          sortable
+          prop="code">
+        </el-table-column>
+        <el-table-column
+          label="类型名称"
+          prop="name">
+        </el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+              <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog title="新增类型" :visible.sync="dialogFormVisible">     
+      <el-form :model="form" ref="form">
+        <el-form-item label="类型编码" prop="code" :label-width="formLabelWidth" :rules="[{ required: true, message: '编码不能为空'}]">
+          <el-input v-model="form.code" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="类型名称" prop="name" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <!--
+        <el-form-item label="类型状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
+          <el-select v-model="form.status" placeholder="请选择状态值">
+            <el-option label="正常" value="NORMAL"></el-option>
+            <el-option label="已删除" value="DEL"></el-option>
+          </el-select>
+        </el-form-item>
+        -->
+        <el-form-item label="类型排序" prop="sort" :label-width="formLabelWidth">
+          <el-input v-model.number="form.sort" 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 scoped>
+import { getCostTypeList, addCostType, setCostType } from '@/api/costTypeApi'
+export default {
+  data () {
+    return {
+      costTypeData: [],
+      dialogFormVisible: false,
+      addFlag: false,
+      id: '',
+      form: {
+        code: '',
+        name: '',
+        status: 'NORMAL',
+        sort: ''
+      },
+      formLabelWidth: '120px',
+      index: ''      
+    }
+  },
+  created () {
+    getCostTypeList().then(res => {
+      this.costTypeData = res.data
+    });
+  },
+  methods: {
+    // 新增类型
+    append() {
+      this.addFlag = true;
+      this.dialogFormVisible = true;
+    },
+    // 编辑类型
+    handleEdit(index, row) {
+      this.form.code = row.code;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.id = row.id;
+      this.index = index;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    //删除类型
+    // handleDelete(index, row) {
+    //   console.log(index, row);
+    //   setCostType({
+    //     id: row.id,
+    //     status: 'DEL'
+    //   }).then(res => {
+    //     console.log(res);
+    //   })
+    // },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          console.log(this.form);
+          if(this.addFlag) {
+            addCostType(this.form).then(res => {
+              if (res.code === 703) {
+                this.$alert("添加失败，该类型名已存在");
+                return;
+              }
+              this.costTypeData.unshift(res.data)
+              this.$refs[formName].resetFields();
+              this.$message("添加成功");
+            })
+          } else {
+            this.form.id = this.id;
+            setCostType(this.form).then(res => {
+              console.log(res);
+              console.log(this.index)
+              this.costTypeData.splice(this.index, 1, res.data)
+              this.$refs[formName].resetFields();
+            })
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm (formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }  
+  }, 
+}
+</script>
+<style scope>
+  .cost-type {
+    padding: 20px;
+    box-sizing: border-box;
+  }
+  .add {
+    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%;
+  }
+</style>
+
+
+

.history/src/pages/costType/index_20190322152454.vue

@@ -0,0 +1,196 @@
+<template>
+  <div class="cost-type">
+    <el-button type="primary" class="add" @click="append">增加类型</el-button>
+    <el-card class="right-card">
+      <el-table
+        :data="costTypeData"
+        border
+        :default-sort="{prop: 'code', order: 'ascending'}"
+        style="width: 100%"
+      >
+        <!-- <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form label-position="left" inline class="demo-table-expand">
+              <el-form-item label="类型名称">
+                <span>{{ props.row.name }}</span>
+              </el-form-item>
+              <el-form-item label="类型 ID">
+                <span>{{ props.row.id }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column>-->
+        <el-table-column label="类型编号" sortable prop="code"></el-table-column>
+        <el-table-column label="类型名称" prop="name"></el-table-column>
+        <el-table-column label="操作" width="80">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <!--
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog title="新增类型" :visible.sync="dialogFormVisible">
+      <el-form :model="form" ref="form">
+        <el-form-item
+          label="类型编码"
+          prop="code"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '编码不能为空'}]"
+        >
+          <el-input v-model="form.code" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item
+          label="类型名称"
+          prop="name"
+          :label-width="formLabelWidth"
+          :rules="[{ required: true, message: '名称不能为空'}]"
+        >
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <!--
+        <el-form-item label="类型状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
+          <el-select v-model="form.status" placeholder="请选择状态值">
+            <el-option label="正常" value="NORMAL"></el-option>
+            <el-option label="已删除" value="DEL"></el-option>
+          </el-select>
+        </el-form-item>
+        -->
+        <el-form-item label="类型排序" prop="sort" :label-width="formLabelWidth">
+          <el-input v-model.number="form.sort" 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 scoped>
+import { getCostTypeList, addCostType, setCostType } from "@/api/costTypeApi";
+export default {
+  data() {
+    return {
+      costTypeData: [],
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      form: {
+        code: "",
+        name: "",
+        status: "NORMAL",
+        sort: ""
+      },
+      formLabelWidth: "120px",
+      index: ""
+    };
+  },
+  created() {
+    getCostTypeList().then(res => {
+      this.costTypeData = res.data;
+    });
+  },
+  methods: {
+    // 新增类型
+    append() {
+      this.addFlag = true;
+      this.dialogFormVisible = true;
+    },
+    // 编辑类型
+    handleEdit(index, row) {
+      this.form.code = row.code;
+      this.form.name = row.name;
+      // this.form.status = row.status;
+      this.form.sort = row.sort;
+      this.id = row.id;
+      this.index = index;
+      this.dialogFormVisible = true;
+      this.addFlag = false;
+    },
+    //删除类型
+    // handleDelete(index, row) {
+    //   console.log(index, row);
+    //   setCostType({
+    //     id: row.id,
+    //     status: 'DEL'
+    //   }).then(res => {
+    //     console.log(res);
+    //   })
+    // },
+    // 提交新增
+    submitForm(formName) {
+      //验证表单
+      this.$refs[formName].validate((valid, value) => {
+        if (valid) {
+          console.log(this.form);
+          if (this.addFlag) {
+            addCostType(this.form).then(res => {
+              if (res.code === 703) {
+                this.$alert("添加失败，该类型名已存在");
+                return;
+              }
+              this.costTypeData.unshift(res.data);
+              this.$refs[formName].resetFields();
+              this.$message({
+                message: "添加成功",
+                type: "success"
+              });
+            });
+          } else {
+            this.form.id = this.id;
+            setCostType(this.form).then(res => {
+              console.log(res);
+              console.log(this.index);
+              this.costTypeData.splice(this.index, 1, res.data);
+              this.$refs[formName].resetFields();
+            });
+          }
+          this.dialogFormVisible = false;
+        } else {
+          return false;
+        }
+      });
+    },
+    // 取消
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }
+  }
+};
+</script>
+<style scope>
+.cost-type {
+  padding: 20px;
+  box-sizing: border-box;
+}
+.add {
+  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%;
+}
+</style>
+
+
+

.history/src/pages/manage/cost_20190321181851.vue

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

.history/src/pages/manage/cost_20190322101656.vue

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

.history/src/pages/manage/cost_20190322151319.vue

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

.history/src/pages/manage/cost_20190322152851.vue

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

.history/src/pages/manage/cost_20190322152854.vue

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

.history/src/pages/manage/index_20190321181557.vue

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

.history/src/pages/manage/index_20190321184959.vue

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

.history/src/pages/manage/index_20190321185218.vue

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

.history/src/pages/manage/index_20190321185307.vue

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

.history/src/pages/manage/index_20190322101656.vue

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

.history/src/pages/manage/index_20190322151303.vue

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

.history/src/pages/manage/index_20190322152851.vue

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

.history/src/pages/manage/query_20190321180612.vue

@@ -0,0 +1,268 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">费用</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item 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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column fixed prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column fixed prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : '费用' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="amount" sortable  label="金额"></el-table-column>
+      <el-table-column label="状态">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import {formatTime} from '../../utils/common';
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: []
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).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: {
+    onSubmit() {
+      if(this.form.type === 'INCOME') this.form.costTypeId = '';
+      if(this.form.type === 'COST') this.form.incomeStatus = '';
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = '';
+      this.form.costTypeId = '';
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime)
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row){
+      if(row.type == 'COST'){
+        return '-'+ row.amount
+      } else {
+        return row.amount
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190321181040.vue

@@ -0,0 +1,269 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item 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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column fixed prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column fixed prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : '成本' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="amount" sortable  label="金额"></el-table-column>
+      <el-table-column label="状态" v-if="tableType === 'COST'">
+        <template slot-scope="props" >
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import {formatTime} from '../../utils/common';
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType:''
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if(this.form.type === 'INCOME') this.form.costTypeId = '';
+      if(this.form.type === 'COST') this.form.incomeStatus = '';
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = '';
+      this.form.costTypeId = '';
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime)
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row){
+      if(row.type == 'COST'){
+        return '-'+ row.amount
+      } else {
+        return row.amount
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190321181150.vue

@@ -0,0 +1,282 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column fixed prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column fixed prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : '成本' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="状态" v-if="tableType === 'COST'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.form.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.form.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190321183514.vue

@@ -0,0 +1,282 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column fixed prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column fixed prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : '成本' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.form.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.form.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190321183601.vue

@@ -0,0 +1,282 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column fixed prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column fixed prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : '成本' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190321183831.vue

@@ -0,0 +1,282 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column fixed prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column fixed prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.type }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190321183923.vue

@@ -0,0 +1,282 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column fixed prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column fixed prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190321184026.vue

@@ -0,0 +1,283 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column fixed prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column fixed prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column prop="project.remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190321184050.vue

@@ -0,0 +1,284 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column fixed prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column fixed prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column prop="project.remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190321184149.vue

@@ -0,0 +1,284 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column  prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column  prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column prop="project.remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322095458.vue

@@ -0,0 +1,285 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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"
+      height="250"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column  prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column  prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column prop="project.remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322095522.vue

@@ -0,0 +1,284 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column  prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column  prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column prop="project.remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322100633.vue

@@ -0,0 +1,284 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column  prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column  prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322102059.vue

@@ -0,0 +1,287 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column  prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+       <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column  prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      
+      
+     
+      
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322105010.vue

@@ -0,0 +1,283 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属产品" prop="productId" :label-width="formLabelWidth">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column  prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+       <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column  prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322105120.vue

@@ -0,0 +1,283 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+        <el-select v-model="form.productId" placeholder="请选择产品">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in productSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+       <el-form-item label="归属产品" v-if="form.type==='INCOME'" prop="productId" :label-width="formLabelWidth">
+      <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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column  prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+       <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column  prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322105211.vue

@@ -0,0 +1,284 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column  prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+       <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column  prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST"){
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      } 
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322105319.vue

@@ -0,0 +1,287 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="归属项目" prop="projectId" :label-width="formLabelWidth">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属部门" prop="deptId" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="来源项目" prop="toProjectId" :label-width="formLabelWidth">
+        <el-select v-model="form.toProjectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源部门" prop="toDeptId" :label-width="formLabelWidth">
+        <el-select v-model="form.toDeptId" placeholder="请选择部门">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      }
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322105549.vue

@@ -0,0 +1,304 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      }
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322105708.vue

@@ -0,0 +1,305 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      }
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322105750.vue

@@ -0,0 +1,306 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      }
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = '';
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322110000.vue

@@ -0,0 +1,329 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+<!-- 查询结果成本表 -->
+    <el-table :data="searchResult" style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border>
+        <el-table-column label="发生日期" sortable :formatter="dateFormat" prop="happenTime"></el-table-column>
+        <el-table-column label="金额">
+          <template slot-scope="props">
+            <span>{{ props.row.type == 'COST' ? '-' + props.row.amount : '+' + props.row.amount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+        <el-table-column label="发生部门" prop="department.name"></el-table-column>
+        <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+        <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+        <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+        
+        
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        
+      </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      }
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = '';
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322110138.vue

@@ -0,0 +1,325 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="状态" :v-if="tableType === 'INCOME'">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="product.name" label="产品"></el-table-column>
+      <el-table-column prop="project.name" label="项目名称"></el-table-column>
+      <el-table-column prop="deptName" label="归属部门"></el-table-column>
+      <el-table-column label="类型">
+        <template slot-scope="props">
+          <span>{{ props.row.type == 'INCOME' ? '收入' : props.row.costType.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+<!-- 查询结果成本表 -->
+    <el-table :data="searchResult" style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border>
+        <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+        <el-table-column prop="amount" sortable label="金额"></el-table-column>
+        <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+        <el-table-column label="发生部门" prop="department.name"></el-table-column>
+        <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+        <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+        <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+        
+        
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        
+      </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      }
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = '';
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322110703.vue

@@ -0,0 +1,321 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+              <el-table-column label="产品" prop="product.name"></el-table-column>
+        <el-table-column label="归属项目" prop="project.name"></el-table-column>
+        <el-table-column label="归属部门" prop="department.name"></el-table-column>
+        <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+<!-- 查询结果成本表 -->
+    <el-table :data="searchResult" style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border>
+        <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+        <el-table-column prop="amount" sortable label="金额"></el-table-column>
+        <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+        <el-table-column label="发生部门" prop="department.name"></el-table-column>
+        <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+        <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+        <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+        
+        
+        <el-table-column label="备注" prop="remark"></el-table-column>
+        
+      </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      }
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = '';
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322110900.vue

@@ -0,0 +1,344 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      }
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322110950.vue

@@ -0,0 +1,321 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      if (this.form.type === "INCOME") {
+        this.form.costTypeId = "";
+        this.tableType = "INCOME";
+      }
+      if (this.form.type === "COST") {
+        this.form.incomeStatus = "";
+        this.tableType = "COST";
+      }
+      this.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322111056.vue

@@ -0,0 +1,322 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322111347.vue

@@ -0,0 +1,323 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322111349.vue

@@ -0,0 +1,323 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态">
+        <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+      // let date = new Date(row.happenTime);
+      // let Y = date.getFullYear() + "-";
+      // let M =
+      //   (date.getMonth() + 1 < 10
+      //     ? "0" + (date.getMonth() + 1)
+      //     : date.getMonth() + 1) + "-";
+      // let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      // return Y + M + D;
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322111948.vue

@@ -0,0 +1,318 @@
+<template>
+  <div>
+    <!-- <TitleBar propTitle="经营数据查询" /> -->
+    <el-form :inline="true" :model="form" ref="form" class="marginTop">
+      <el-form-item label="类别" :label-width="formLabelWidth">
+        <el-radio-group v-model="form.type" placeholder="请选择类别" size="medium">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == 'INVOICE' ? '开票/应收' : row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' 
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322112133.vue

@@ -0,0 +1,319 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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.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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == 'INVOICE' ? '开票/应收' : row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' 
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322112220.vue

@@ -0,0 +1,319 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属部门" style="display:inline" prop="deptId" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        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"
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == 'INVOICE' ? '开票/应收' : row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' 
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322112357.vue

@@ -0,0 +1,320 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属部门" style="display:inline" prop="deptId" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        label="来源项目"
+        style="display:inline"
+        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"
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == 'INVOICE' ? '开票/应收' : row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' 
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322112950.vue

@@ -0,0 +1,320 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属部门" style="display:inline-block;" prop="deptId" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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"
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == 'INVOICE' ? '开票/应收' : row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' 
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322113031.vue

@@ -0,0 +1,322 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属部门" style="display:inline-block;" prop="deptId" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == 'INVOICE' ? '开票/应收' : row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' 
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322114059.vue

@@ -0,0 +1,325 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围">
+        <el-time-picker placeholder="起始时间" v-model="form.startTime" style="width: 100%;"></el-time-picker>
+        <el-time-picker placeholder="结束时间" v-model="form.endTime" style="width: 100%;"></el-time-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属部门" style="display:inline-block;" prop="deptId" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == 'INVOICE' ? '开票/应收' : row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' 
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322114401.vue

@@ -0,0 +1,325 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" v-model="form.startTime" style="width: 100%;"></el-date-picker>
+        <el-date-picker placeholder="结束时间" v-model="form.endTime" style="width: 100%;"></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属部门" style="display:inline-block;" prop="deptId" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == 'INVOICE' ? '开票/应收' : row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' 
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322114425.vue

@@ -0,0 +1,325 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间" v-model="form.endTime" ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属部门" style="display:inline-block;" prop="deptId" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == 'INVOICE' ? '开票/应收' : row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' 
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322114612.vue

@@ -0,0 +1,325 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间" v-model="form.endTime" ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属部门" style="display:inline-block;" prop="deptId" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.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:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:50px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == 'INVOICE' ? '开票/应收' : row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' 
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322114714.vue

@@ -0,0 +1,325 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间" v-model="form.endTime" ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属部门" style="display:inline-block;" prop="deptId" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == 'INVOICE' ? '开票/应收' : row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' 
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322114738.vue

@@ -0,0 +1,325 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间" v-model="form.endTime" ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="归属部门" style="display:inline-block;" prop="deptId" v-if="form.type!==''" :label-width="formLabelWidth">
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template> -->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == 'INVOICE' ? '开票/应收' : row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' 
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322115111.vue

@@ -0,0 +1,344 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <!-- <el-date-picker placeholder="起始时间" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间" v-model="form.endTime" ></el-date-picker>-->
+        <el-date-picker
+          v-model="form.startTime"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322135025.vue

@@ -0,0 +1,337 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间" v-model="form.endTime" ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322135127.vue

@@ -0,0 +1,337 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间"  :value-format="timestamp"  v-model="form.endTime" ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322135142.vue

@@ -0,0 +1,337 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间"  value-format="timestamp"  v-model="form.endTime" ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322135200.vue

@@ -0,0 +1,337 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" value-format="timestamp" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间"  value-format="timestamp"  v-model="form.endTime" ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322135240.vue

@@ -0,0 +1,336 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" value-format="timestamp" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间"  value-format="timestamp"  v-model="form.endTime" ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322135325.vue

@@ -0,0 +1,338 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" value-format="timestamp" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间"  value-format="timestamp"  v-model="form.endTime" ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    }).then(err => {
+      console.log(err)
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322135908.vue

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

.history/src/pages/manage/query_20190322140009.vue

@@ -0,0 +1,341 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" value-format="timestamp" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间"  value-format="timestamp"  v-model="form.endTime" ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    })
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+         if(response.data && response.data.length == 0){
+           this.$message('123123123')
+      }
+      }).reject(error => {
+          alert('错误')
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322140056.vue

@@ -0,0 +1,341 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" value-format="timestamp" v-model="form.startTime" ></el-date-picker>
+        <el-date-picker placeholder="结束时间"  value-format="timestamp"  v-model="form.endTime" ></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    })
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form).then(response => {
+        console.log(response);
+        this.searchResult = response.data;
+         if(response.data && response.data.length == 0){
+           this.$message('123123123')
+      }
+      }).then(error => {
+          alert('错误')
+      });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322140121.vue

@@ -0,0 +1,343 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" value-format="timestamp" v-model="form.startTime"></el-date-picker>
+        <el-date-picker placeholder="结束时间" value-format="timestamp" v-model="form.endTime"></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form)
+        .then(response => {
+          console.log(response);
+          this.searchResult = response.data;
+          // if (response.data && response.data.length == 0) {
+          //   this.$message("123123123");
+          // }
+        })
+        .then(error => {
+          alert("错误");
+        });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322145830.vue

@@ -0,0 +1,343 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" value-format="yyyy" v-model="form.startTime"></el-date-picker>
+        <el-date-picker placeholder="结束时间" value-format="yyyy" v-model="form.endTime"></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form)
+        .then(response => {
+          console.log(response);
+          this.searchResult = response.data;
+          // if (response.data && response.data.length == 0) {
+          //   this.$message("123123123");
+          // }
+        })
+        .then(error => {
+          alert("错误");
+        });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322145916.vue

@@ -0,0 +1,343 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" value-format="yyyy-mm-dd" v-model="form.startTime"></el-date-picker>
+        <el-date-picker placeholder="结束时间" value-format="yyyy-mm-dd" v-model="form.endTime"></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form)
+        .then(response => {
+          console.log(response);
+          this.searchResult = response.data;
+          // if (response.data && response.data.length == 0) {
+          //   this.$message("123123123");
+          // }
+        })
+        .then(error => {
+          alert("错误");
+        });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322145955.vue

@@ -0,0 +1,343 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间" value-format="yyyy-m-d" v-model="form.startTime"></el-date-picker>
+        <el-date-picker placeholder="结束时间" value-format="yyyy-m-d" v-model="form.endTime"></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form)
+        .then(response => {
+          console.log(response);
+          this.searchResult = response.data;
+          // if (response.data && response.data.length == 0) {
+          //   this.$message("123123123");
+          // }
+        })
+        .then(error => {
+          alert("错误");
+        });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322150507.vue

@@ -0,0 +1,343 @@
+<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">
+          <el-radio border label="INCOME">收入</el-radio>
+          <el-radio border label="COST">成本</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="时间范围" :label-width="formLabelWidth">
+        <el-date-picker placeholder="起始时间"  v-model="form.startTime"></el-date-picker>
+        <el-date-picker placeholder="结束时间" v-model="form.endTime"></el-date-picker>
+      </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-radio-group v-model="form.incomeStatus" placeholder="请选择状态值" size="medium">
+          <el-radio border label="INVOICE">开票/应收</el-radio>
+          <el-radio border label="ARRIVAL">到账</el-radio>
+          <el-radio border label="INTERNAL">内部核算</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="归属项目"
+        v-if="form.type!==''"
+        style="display:inline-block;"
+        prop="projectId"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="归属部门"
+        style="display:inline-block;"
+        prop="deptId"
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" placeholder="请选择部门" ref="select">
+          <el-option key label="不选" value></el-option>
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item
+        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="归属产品"
+        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.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        style="position: absolute; width:23%; display:block; margin:0 auto; left: 0; right: 0;"
+      >
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button type="info" @click="onReset">重置</el-button>
+      </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="info" @click="reset">重置</el-button>
+      </el-form-item>-->
+    </el-form>
+    <!-- 查询结果收入表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'INCOME'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="发生日期"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="收入状态" prop="incomeStatus" :formatter="incomeTypeFormat">
+        <!-- <template slot-scope="props">
+          <span>{{ props.row.incomeStatus == 'INVOICE' ? '开票/应收' : props.row.incomeStatus == 'ARRIVAL' ? '到账' : '内部核算' }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column label="产品" prop="product.name"></el-table-column>
+      <el-table-column label="归属项目" prop="project.name"></el-table-column>
+      <el-table-column label="归属部门" prop="department.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column prop="remark" label="备注"></el-table-column>
+    </el-table>
+    <!-- 查询结果成本表 -->
+    <el-table
+      :data="searchResult"
+      style="width: 100%;margin-top:80px;"
+      :row-class-name="tableRowClassName"
+      show-summary
+      v-if="tableType === 'COST'"
+      border
+    >
+      <el-table-column prop="happenTime" sortable :formatter="dateFormat" label="时间"></el-table-column>
+      <el-table-column prop="amount" sortable label="金额"></el-table-column>
+      <el-table-column label="成本类别" prop="costType.name"></el-table-column>
+      <el-table-column label="发生部门" prop="department.name"></el-table-column>
+      <el-table-column label="发生项目/人" prop="project.name"></el-table-column>
+      <el-table-column label="接收项目" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column>
+      <el-table-column label="备注" prop="remark"></el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import {
+  getTeamSelect,
+  getProjectSelect,
+  getProductSelect,
+  getCostTeamSelect,
+  getCostTypeSelect,
+  addManage,
+  getManageList,
+  setManage
+} from "@/api/manageApi";
+import TitleBar from "../layout/titleBar/TitleBar.vue";
+import { formatTime } from "../../utils/common";
+export default {
+  components: {
+    TitleBar
+  },
+  data() {
+    return {
+      type: "",
+      dialogFormVisible: false,
+      addFlag: false,
+      id: "",
+      searchResult: [],
+      form: {
+        type: "",
+        productId: "",
+        projectId: "",
+        toDeptId: "",
+        toProjectId: "",
+        deptId: "",
+        incomeStatus: "",
+        status: "NORMAL",
+        costTypeId: "",
+        startTime: "",
+        endTime: ""
+      },
+      formLabelWidth: "120px",
+      teamSelectData: [],
+      projectSelectData: [],
+      productSelectData: [],
+      costTeamSelectData: [],
+      costTypeSelectData: [],
+      manageData: [],
+      companyData: [],
+      tableType: ""
+    };
+  },
+  created() {
+    // 获取部门下拉框
+    getTeamSelect().then(res => {
+      this.teamSelectData = res.data;
+    });
+    // 获取项目下拉框
+    getProjectSelect().then(res => {
+      this.projectSelectData = res.data;
+    });
+    //获取产品下拉框
+    getProductSelect().then(res => {
+      this.productSelectData = res.data;
+    });
+    //获取经营列表
+    getManageList({
+      type: "INCOME"
+    }).then(res => {
+      this.manageData = res.data;
+      console.log(res.data);
+    });
+    //获取单位下拉
+    getCostTeamSelect().then(res => {
+      this.costTeamSelectData = res.data;
+    });
+    //获取成本类型下拉
+    getCostTypeSelect().then(res => {
+      this.costTypeSelectData = res.data;
+    });
+  },
+  methods: {
+    onSubmit() {
+      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.$fetch("manageBase/manage", this.form)
+        .then(response => {
+          console.log(response);
+          this.searchResult = response.data;
+          // if (response.data && response.data.length == 0) {
+          //   this.$message("123123123");
+          // }
+        })
+        .then(error => {
+          alert("错误");
+        });
+    },
+    onReset() {
+      this.form.type = "";
+      this.form.costTypeId = "";
+      this.tableType = "";
+      this.$refs.form.resetFields();
+    },
+    tableRowClassName({ row, rowIndex }) {
+      console.log(row.type);
+      if (row.type === "COST") {
+        return "cost-row-search";
+      } else {
+        return "income-row-search";
+      }
+      // return "";
+    },
+    //获取部门名称
+    getName(val) {
+      let obj = {};
+      obj = this.teamSelectData.find(item => {
+        return item.id === val;
+      });
+      let getName = "";
+      this.form.deptName = obj.name;
+    },
+    // 添加
+    append(type) {
+      this.type = type;
+      this.dialogFormVisible = true;
+      this.addFlag = true;
+    },
+    // 格式化时间
+    dateFormat(row, column) {
+      return formatTime(row.happenTime);
+    },
+    incomeTypeFormat(row) {
+      return row.incomeStatus == "INVOICE"
+        ? "开票/应收"
+        : row.incomeStatus == "ARRIVAL"
+        ? "到账"
+        : "内部核算";
+    },
+    moneyFormat(row) {
+      if (row.type == "COST") {
+        return "-" + row.amount;
+      } else {
+        return row.amount;
+      }
+    }
+  }
+};
+</script>
+
+<style scope>
+.marginTop {
+  margin-top: 20px;
+}
+.el-table .cost-row-search {
+  /* color: green; */
+  background: #f0f9eb;
+}
+
+.el-table .income-row-search {
+  /* color: red; */
+  background: rgba(248, 181, 172, 0.267);
+  /* color: #f0f9eb; */
+}
+</style>

.history/src/pages/manage/query_20190322150918.vue

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

.history/src/pages/manage/query_20190322151036.vue

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

.history/src/pages/manage/query_20190322151214.vue

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

.history/src/pages/manage/query_20190322151235.vue

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

.history/src/pages/manage/query_20190322153058.vue

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

.history/src/pages/manage/query_20190322153100.vue

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

.history/src/pages/manage/query_20190322153255.vue

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

.history/src/pages/manage/query_20190322153325.vue

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

.history/src/pages/manage/query_20190322153350.vue

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

.history/src/pages/manage/query_20190322153402.vue

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

.history/src/pages/manage/query_20190322153421.vue

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

.history/src/pages/manage/query_20190322153438.vue

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

.history/src/pages/manage/query_20190322153537.vue

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

.history/src/pages/manage/query_20190322153554.vue

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

.history/src/pages/manage/query_20190322153718.vue

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

.history/src/pages/manage/query_20190322153740.vue

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

.history/src/pages/manage/query_20190322153800.vue

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

.history/src/pages/manage/query_20190322153813.vue

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

.history/src/pages/manage/query_20190322153838.vue

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

.history/src/pages/manage/query_20190322153918.vue

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

.history/src/pages/manage/query_20190322154020.vue

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

.history/src/pages/manage/query_20190322154305.vue

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

.history/src/pages/manage/query_20190322154355.vue

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

.history/src/pages/manage/query_20190322154406.vue

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

.history/src/pages/manage/query_20190322154448.vue

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