孙志雷 6 anos atrás
pai
commit
0cdca8f9ac

+ 3 - 3
src/pages/costTeam/index.vue

@@ -5,7 +5,7 @@
       <el-table
       :data="costTeamData"
       style="width: 100%">
-        <el-table-column type="expand">
+        <!-- <el-table-column type="expand">
           <template slot-scope="props">
             <el-form label-position="left" inline class="demo-table-expand">
               <el-form-item label="收入部门名称">
@@ -16,7 +16,7 @@
               </el-form-item>
             </el-form>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           label="收入部门 ID"
           prop="id">
@@ -25,7 +25,7 @@
           label="收入部门名称"
           prop="name">
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="80">
           <template slot-scope="scope">
             <el-button
               size="mini"

+ 3 - 3
src/pages/costType/index.vue

@@ -5,7 +5,7 @@
       <el-table
       :data="costTypeData"
       style="width: 100%">
-        <el-table-column type="expand">
+        <!-- <el-table-column type="expand">
           <template slot-scope="props">
             <el-form label-position="left" inline class="demo-table-expand">
               <el-form-item label="类型名称">
@@ -16,7 +16,7 @@
               </el-form-item>
             </el-form>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           label="类型 ID"
           prop="id">
@@ -25,7 +25,7 @@
           label="类型名称"
           prop="name">
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="80">
           <template slot-scope="scope">
             <el-button
               size="mini"

+ 11 - 8
src/pages/layout/nav/Nav.vue

@@ -1,23 +1,26 @@
 <template>
     <div class="nav">
       <el-menu default-active="1-4-1" class="el-menu-vertical-demo" background-color="#545c64" text-color="#fff" active-text-color="#ffd04b" :router=true :default-active="$route.path">
+        <el-menu-item index="/manage/query">
+            <span slot="title">经营数据查询</span>
+        </el-menu-item>
+        <el-menu-item index="/manage/index">
+            <span slot="title">经营数据管理</span>
+        </el-menu-item>
         <el-menu-item index="/team/index">
-            <span slot="title">部门</span>
+            <span slot="title">部门管理</span>
         </el-menu-item>
         <el-menu-item index="/project/index">
-            <span slot="title">项目</span>
+            <span slot="title">项目管理</span>
         </el-menu-item>
         <el-menu-item index="/product/index">
-            <span slot="title">产品</span>
+            <span slot="title">产品管理</span>
         </el-menu-item>
         <el-menu-item index="/costType/index">
-            <span slot="title">成本/收入类型</span>
+            <span slot="title">成本类型管理</span>
         </el-menu-item>
         <el-menu-item index="/costTeam/index">
-            <span slot="title">成本/收入部门</span>
-        </el-menu-item>
-        <el-menu-item index="/manage/index">
-            <span slot="title">经营数据</span>
+            <span slot="title">成本部门/单位/人管理</span>
         </el-menu-item>
       </el-menu>
     </div>

+ 31 - 15
src/pages/manage/index.vue

@@ -2,21 +2,16 @@
   <div class="manage">
     <div class="add-container">    
       <el-button type="primary" @click="append('INCOME')">增加收入</el-button>
-      <el-button type="primary" @click="append('COST')">增加支出</el-button>
+      <el-button type="primary" @click="append('COST')">增加成本</el-button>
     </div>
     <el-card class="right-card">
       <el-table
       :data="manageData"
-      style="width: 100%">
+      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.department.name }}</span>
-              </el-form-item>
-              <el-form-item label="ID">
-                <span>{{ props.row.id }}</span>
-              </el-form-item>
               <el-form-item label="备注">
                 <span>{{ props.row.remark }}</span>
               </el-form-item>
@@ -30,7 +25,7 @@
         <el-table-column
           label="类型">
             <template slot-scope="props">
-              <span>{{ props.row.type == 'COST' ? '支出' : '收入' }}</span>
+              <span>{{ props.row.type == 'COST' ? '成本' : '收入' }}</span>
             </template>
         </el-table-column>  
         <el-table-column
@@ -42,10 +37,16 @@
           prop="project.name">
         </el-table-column>
         <el-table-column
-          label="明细"
-          prop="amount">
+          label="产品"
+          prop="product.name">
+        </el-table-column>
+        <el-table-column
+          label="金额">
+            <template slot-scope="props">
+              <span>{{ props.row.type == 'COST' ? '-' + props.row.amount : '+' + props.row.amount }}</span>
+            </template>
         </el-table-column>              
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="80">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -60,7 +61,7 @@
         </el-table-column>
       </el-table>
     </el-card>    
-    <el-dialog :title="type" :visible.sync="dialogFormVisible">     
+    <el-dialog :title="type == 'INCOME' ? '收入' : '成本'" :visible.sync="dialogFormVisible">     
       <el-form :model="form" ref="form">
         <el-form-item label="选择部门" prop="deptId" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
           <el-select v-model="form.deptId" placeholder="请选择部门">
@@ -92,7 +93,7 @@
               </el-option>        
             </el-select> 
         </el-form-item> 
-        <el-form-item v-else label="支出类型" prop="costTypeId" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
+        <el-form-item v-else label="成本类型" prop="costTypeId" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
           <el-select v-model="form.costTypeId" placeholder="请选择类型">
             <el-option
               v-for="item in costTypeSelectData"
@@ -109,7 +110,7 @@
             <el-option label="内部核算" value="INTERNAL"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item v-else label="支出人" prop="companyType" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
+        <el-form-item v-else label="成本部门/单位/人" prop="companyType" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
           <el-select v-model="form.companyType" placeholder="请选择状态值" @change="selectChange">
             <el-option label="外部" value="COMPANY"></el-option>
             <el-option label="部门" value="DEPARTMENT"></el-option>
@@ -224,6 +225,14 @@ export default {
     })
   },
   methods: {
+    tableRowClassName({row, rowIndex}) {
+      if (row.type === 'COST') {
+        return 'cost-row';
+      } else {
+        return 'income-row';
+      }
+      return '';
+    },
     //选项框联动
     selectChange(val) {
       switch (val) {
@@ -328,5 +337,12 @@ export default {
     margin-bottom: 0;
     width: 50%;
   }
+  .el-table .cost-row {
+    color: green;
+  }
+
+  .el-table .income-row {
+    color: red;
+  }
 </style>
 

+ 1 - 1
src/pages/product/index.vue

@@ -27,7 +27,7 @@
           label="产品名称"
           prop="name">
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="80">
           <template slot-scope="scope">
             <el-button
               size="mini"

+ 1 - 1
src/pages/project/index.vue

@@ -27,7 +27,7 @@
           label="项目名称"
           prop="name">
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="80">
           <template slot-scope="scope">
             <el-button
               size="mini"

+ 1 - 1
src/pages/team/index.vue

@@ -63,7 +63,7 @@
           label="上级部门"
           prop="desc">
         </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="80">
           <template slot-scope="scope">
             <el-button
               size="mini"