收入分析

web/src/view/finance/financeAnalysis/components/charts.vue

@@ -131,6 +131,9 @@ const tap = (e) => {
   uChartsInstance[e.target.id].touchLegend(getH5Offset(e))
   uChartsInstance[e.target.id].showToolTip(getH5Offset(e))
 }
+defineExpose({
+  getServerData
+})
 </script>
 
 <style scoped>

web/src/view/finance/financeAnalysis/components/costSum.vue

@@ -80,7 +80,7 @@
         :span="10"
         :offset="1"
       >
-        <charts />
+        <charts ref="chartOut"/>
       </el-col>
     </el-row>
   </div>
@@ -103,6 +103,7 @@ const chartsStorage = chartsList()
 onMounted(() => {
   querySum()
 })
+const chartOut = ref()
 const querySum = () => {
   queryProjectMonthFee(monthData.value, yearData.value, id.currentCode).then(res => {
     if (res.code === 0) {
@@ -110,10 +111,13 @@ const querySum = () => {
       const list = res.data
       const sumData = []
       list.forEach(item => {
-        const temporary = { name: item.projectFeeGenre.name, value: item.totalExpenditure }
-        sumData.push(temporary)
+        if (item.totalExpenditure !== 0) {
+          const temporary = { name: item.projectFeeGenre.name, value: item.totalExpenditure }
+          sumData.push(temporary)
+        }
       })
       chartsStorage.changeCharts(sumData)
+      chartOut.value.getServerData()
     }
   })
 }

web/src/view/finance/financeAnalysis/financeAnalysis.vue

@@ -211,7 +211,7 @@
                     style="font-size: 12px;"
                     type="info"
                   >
-                    负责人：{{ item.principal }}
+                    负责人：{{ item.secondPrincipalName }}
                   </el-text>
                 </el-row>
               </el-col>
@@ -347,6 +347,7 @@ const projectList = (condition) => {
     if (res.code === 0) {
       const list = res.data.list
       projectTotal.value = res.data.total
+      console.log(list)
       listData.push(...list)
       symbol.changeCode(list[0].code)
       getMainMessage(list[0].code)

web/src/view/finance/firmPay/components/departmentList.vue

@@ -0,0 +1,139 @@
+<template>
+  <div>
+    <el-row>
+      <el-col :span="3">
+        <el-date-picker
+          v-model="monthData"
+          type="month"
+          placeholder="选择月份"
+          value-format="YYYY-MM"
+          value-on-clear=""
+          @change="choiceMonth"
+        />
+      </el-col>
+      <el-col
+        :span="3"
+        :offset="1"
+      >
+        <el-date-picker
+          v-model="yearData"
+          type="year"
+          placeholder="选择年份"
+          value-format="YYYY"
+          value-on-clear=""
+          @change="choiceYear"
+        />
+      </el-col>
+      <el-col
+        :span="3"
+        :offset="1"
+      >
+        <el-select
+          v-model="feeGenre"
+          clearable
+          filterable
+          value-on-clear=""
+          placeholder="请选择公司费用类型"
+          @change="changeFeeGenre"
+        >
+          <el-option
+            v-for="item in feeGenreData"
+            :key="item.ID"
+            :label="item.name"
+            :value="item.ID"
+          />
+        </el-select>
+      </el-col>
+      <el-col
+        :span="2"
+        :offset="1"
+      >
+        <el-button
+          type="primary"
+          icon="Refresh"
+          @click="costListReset"
+        >重置</el-button>
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 20px">
+      <el-col :span="12">
+        <el-table
+          :data="monthFee"
+          max-height="400px"
+          height="400px"
+          table-layout="auto"
+          show-summary
+        >
+          <el-table-column
+            prop="department.name"
+            label="部门"
+            width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="totalExpenditure"
+            label="支出金额"
+            align="center"
+          />
+          <el-table-column
+            prop="totalDeposit"
+            label="支入金额"
+            align="center"
+          />
+        </el-table>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue'
+import { queryMonthExpenses } from '@/api/cost'
+import { queryExpensesGenre } from '@/api/finance'
+defineOptions({
+  name: 'DepartmentList'
+})
+onMounted(() => {
+  queryData()
+})
+const feeGenre = ref('')
+const feeGenreData = reactive([])
+const monthFee = reactive([])
+const monthData = ref('')
+const yearData = ref('')
+const changeFeeGenre = () => {
+  queryData()
+}
+
+const choiceMonth = () => {
+  queryData()
+}
+
+const choiceYear = () => {
+  queryData()
+}
+const costListReset = () => {
+  feeGenre.value = ''
+  monthData.value = ''
+  yearData.value = ''
+  queryData()
+}
+const queryData = () => {
+  queryMonthExpenses(monthData.value, yearData.value, feeGenre.value).then(res => {
+    if (res.code === 0) {
+      monthFee.length = 0
+      monthFee.push(...res.data)
+    }
+  })
+  queryExpensesGenre().then(res => {
+    if (res.code === 0) {
+      feeGenreData.length = 0
+      feeGenreData.push(...res.data)
+    }
+  })
+}
+</script>
+
+<style scoped>
+
+</style>

web/src/view/finance/firmPay/firmPay.vue

@@ -17,14 +17,21 @@
       >
         <PeopleList />
       </el-tab-pane>
+      <el-tab-pane
+        label="部门费用列表"
+        name="department"
+      >
+        <DepartmentList />
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script setup>
 import { ref } from 'vue'
-import DetailList from '@/view/finance/firmPay/components/detailList.vue'
-import PeopleList from '@/view/finance/firmPay/components/peopleList.vue'
+import DetailList from './components/detailList.vue'
+import PeopleList from './components/peopleList.vue'
+import DepartmentList from './components/departmentList.vue'
 defineOptions({
   name: 'CostManage'
 })