展示接受部门等

src/pages/manage/cost.vue

@@ -24,8 +24,8 @@
         <el-table-column width="260px" align="right" label="发生项目/人" prop="project.name"></el-table-column>
         <el-table-column width="260px" align="right" label="发生部门" prop="department.name"></el-table-column>
 
-        <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
-        <!-- <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column> -->
+        <el-table-column label="接收项目" width="260px" align="right" prop="toProject.name"></el-table-column>
+        <el-table-column label="接收部门" width="260px" align="right" prop="toDepartment.name"></el-table-column>
 
         <el-table-column label="备注" align="right" prop="remark"></el-table-column>
         <el-table-column label="操作" align="center" width="160">
@@ -247,7 +247,6 @@ export default {
     }).then(res => {
       this.manageData = res.data.content;
       this.totalNumber = parseInt(res.data.totalElements);
-      
     });
     //获取单位下拉
     getCostTeamSelect().then(res => {

src/pages/manage/index.vue

@@ -33,7 +33,7 @@
         <el-table-column width="160px" align="right" label="产品" prop="product.name"></el-table-column>
         <el-table-column width="260px" align="right" label="归属项目" prop="project.name"></el-table-column>
         <el-table-column width="200px" align="right" label="归属部门" prop="department.name"></el-table-column>
-        <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
+        <el-table-column label="接收项目" width="260px" align="right" prop="toProject.name"></el-table-column>
 
         <!-- <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column> -->
         <el-table-column label="来源部门" width="200px" align="right" prop="toDepartment.name"></el-table-column>

src/pages/manage/query.vue

@@ -56,7 +56,16 @@
         </el-select>
       </el-form-item>
       <el-form-item label="收入状态" v-if="form.type==='INCOME'" :label-width="formLabelWidth">
-        <el-row :gutter="10">
+        <el-select v-model="form.incomeStatus" multiple placeholder="全选">
+          <el-option
+            v-for="item in incomeStatus"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+
+        <!-- <el-row :gutter="10">
           <el-col :span="1">
             <el-checkbox
               :indeterminate="isIndeterminate"
@@ -83,7 +92,7 @@
               <el-checkbox style="width:100%;" border label="INTERNAL">内部核算</el-checkbox>
             </el-col>
           </el-checkbox-group>
-        </el-row>
+        </el-row>-->
       </el-form-item>
       <el-form-item
         label="归属产品"
@@ -115,20 +124,33 @@
           ></el-option>
         </el-select>
       </el-form-item>
-
-      <!-- <el-form-item
+      <el-form-item
+        label="归属部门"
+        prop="deptId"
+        multiple
+        v-if="form.type!==''"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.deptId" multiple placeholder="全选" ref="select">
+          <el-option
+            v-for="item in teamSelectData"
+            :key="item.id"
+            :label="item.code +'--'+ item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
         label="来源项目"
-        style="display:inline-block;"
         prop="toProjectId"
-        v-if="form.type!==''"
+        v-if="form.type==='INCOME'"
         :label-width="formLabelWidth"
       >
-        <el-select v-model="form.toProjectId" placeholder="请选择项目">
-          <el-option key label="不选" value></el-option>
+        <el-select v-model="form.toProjectId" multiple placeholder="全选">
           <el-option
             v-for="item in projectSelectData"
             :key="item.id"
-            :label="item.name"
+            :label="item.code +'--'+ item.name"
             :value="item.id"
           ></el-option>
         </el-select>
@@ -136,28 +158,41 @@
       <el-form-item
         label="来源部门"
         prop="toDeptId"
-        style="display:inline-block;"
-        v-if="form.type!==''"
+        v-if="form.type==='INCOME'"
         :label-width="formLabelWidth"
       >
-        <el-select v-model="form.toDeptId" placeholder="请选择部门">
-          <el-option key label="不选" value></el-option>
+        <el-select v-model="form.toDeptId" multiple placeholder="全选" ref="select">
           <el-option
             v-for="item in teamSelectData"
             :key="item.id"
-            :label="item.name"
+            :label="item.code +'--'+ item.name"
             :value="item.id"
           ></el-option>
         </el-select>
-      </el-form-item>-->
+      </el-form-item>
+
       <el-form-item
-        label="归属部门"
-        prop="deptId"
-        multiple
-        v-if="form.type!==''"
+        label="接收项目"
+        prop="toProjectId"
+        v-if="form.type==='COST'"
         :label-width="formLabelWidth"
       >
-        <el-select v-model="form.deptId" multiple placeholder="全选" ref="select">
+        <el-select v-model="form.toProjectId" multiple placeholder="全选">
+          <el-option
+            v-for="item in projectSelectData"
+            :key="item.id"
+            :label="item.code +'--'+ item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="接收部门"
+        prop="toDeptId"
+        v-if="form.type==='COST'"
+        :label-width="formLabelWidth"
+      >
+        <el-select v-model="form.toDeptId" multiple placeholder="全选" ref="select">
           <el-option
             v-for="item in teamSelectData"
             :key="item.id"
@@ -166,7 +201,6 @@
           ></el-option>
         </el-select>
       </el-form-item>
-
       <el-form-item style="position: absolute; width:23%; left:300px;">
         <el-button type="primary" @click="onSubmit">查询</el-button>
         <!-- <el-button type="info" @click="onReset">重置</el-button> -->
@@ -176,9 +210,10 @@
       </el-form-item>-->
     </el-form>
     <!-- 查询结果收入表 -->
+    <div class="totalSumDiv" >全部金额合计：{{totalSum}}</div>
     <el-table
       :data="searchResult"
-      style="width: 95%;margin-top:80px; margin-left:20px;"
+      style="margin-top:30px; margin-left:20px;"
       :summary-method="tableSummary"
       show-summary
       v-if="tableType === 'INCOME'"
@@ -208,8 +243,9 @@
       <el-table-column label="产品" width="200px" align="right" prop="product.name"></el-table-column>
       <el-table-column label="归属项目" width="290px" align="right" prop="project.name"></el-table-column>
       <el-table-column label="归属部门" width="250px" align="right" prop="department.name"></el-table-column>
-      <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
-      <el-table-column prop="remark" align="right"  label="备注"></el-table-column>
+      <el-table-column label="来源项目" width="290px" align="right" prop="toProject.name"></el-table-column>
+        <el-table-column label="来源部门" width="220px"  align="right" prop="toDepartment.name"></el-table-column>
+      <el-table-column prop="remark" align="right" width="330px" label="备注"></el-table-column>
       <el-table-column
         width="120px"
         align="right"
@@ -222,7 +258,7 @@
     <!-- 查询结果成本表 -->
     <el-table
       :data="searchResult"
-      style="width: 95%;margin-top:80px; margin-left:20px;"
+      style=";margin-top:30px; margin-left:20px;"
       show-summary
       :summary-method="tableSummary"
       v-if="tableType === 'COST'"
@@ -245,9 +281,9 @@
       <el-table-column label="成本类别" width="130px" align="right" prop="costType.name"></el-table-column>
       <el-table-column label="发生部门" width="220px" align="right" prop="department.name"></el-table-column>
       <el-table-column label="发生项目/人" width="300px" align="right" prop="project.name"></el-table-column>
-      <!-- <el-table-column label="接收项目" prop="toProject.name"></el-table-column> -->
-      <!-- <el-table-column label="接收部门" prop="toDepartment.name"></el-table-column> -->
-      <el-table-column label="备注" align="right" prop="remark"></el-table-column>
+      <el-table-column label="接收项目" width="300px"  align="right" prop="toProject.name"></el-table-column>
+      <el-table-column label="接收部门" width="220px"  align="right" prop="toDepartment.name"></el-table-column>
+      <el-table-column label="备注" width="320px" align="right" prop="remark"></el-table-column>
       <el-table-column
         width="120px"
         align="right"
@@ -325,7 +361,12 @@ export default {
       tableType: "",
       isIndeterminate: true,
       checkAll: false,
-      totalSum: 0 // 后台返回的合计
+      totalSum: 0, // 后台返回的合计
+      incomeStatus: [
+        { name: "开票/应收", id: "INVOICE" },
+        { name: "到账", id: "ARRIVAL" },
+        { name: "内部核算", id: "INTERNAL" }
+      ]
     };
   },
   created() {
@@ -500,4 +541,11 @@ export default {
   color: red;
   /* color: #f0f9eb; */
 }
+.totalSumDiv{
+  width: 100%;
+  /* text-align: right; */
+  padding-left: 120px;
+  display: block;
+  margin-top: 80px;
+}
 </style>