收入分析

web/src/api/cost.js

@@ -112,8 +112,8 @@ export const projectCostTypeList = () => {
 // 新增项目费用类型
 export const postProjectCostType = (data) => {
   return service({
-    url: '/finance/queryProjectFeeGenre',
-    method: 'get',
+    url: '/finance/createProjectFeeGenre',
+    method: 'post',
     data
   })
 }

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

@@ -0,0 +1,115 @@
+<template>
+  <div>
+    <el-row
+      :gutter="10"
+      style="height: 40px"
+      align="middle"
+    >
+      <el-col
+        :span="1"
+      >
+        <el-text>数据统计</el-text>
+      </el-col>
+      <el-col
+        :xs="24"
+        :sm="4"
+      >
+        <el-date-picker
+          v-model="monthData"
+          type="month"
+          placeholder="选择月份"
+          value-format="YYYY-MM"
+          clearable
+          @clear="choiceMonth"
+        />
+      </el-col>
+      <el-col
+        :xs="24"
+        :sm="4"
+      >
+        <el-date-picker
+          v-model="yearData"
+          type="year"
+          placeholder="选择年份"
+          value-format="YYYY"
+          @clear="choiceYear"
+        />
+      </el-col>
+      <el-col
+        :xs="24"
+        :sm="6"
+      >
+        <el-button
+          icon="Search"
+          type="primary"
+          @click="querySum"
+        >查询</el-button>
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 20px">
+      <el-col
+        :xs="24"
+        :sm="11"
+      >
+        <el-table
+          :data="projectMonthFee"
+          max-height="400px"
+          height="400px"
+          show-summary
+          table-layout="auto"
+        >
+          <el-table-column
+            prop="projectFeeGenre.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 { codeOperate } from '@/pinia/code/code'
+import { queryProjectMonthFee } from '@/api/cost'
+import { ref, defineExpose } from 'vue'
+defineOptions({
+  name: 'CostSum'
+})
+const monthData = ref('')
+const yearData = ref('')
+const id = codeOperate()
+const projectMonthFee = ref()
+const querySum = () => {
+  queryProjectMonthFee(monthData.value, yearData.value, id.currentCode).then(res => {
+    if (res.code === 0) {
+      projectMonthFee.value = res.data
+    }
+  })
+}
+const choiceMonth = () => {
+  monthData.value = ''
+}
+const choiceYear = () => {
+  yearData.value = ''
+}
+
+defineExpose({
+  querySum
+})
+</script>
+
+<style scoped>
+
+</style>

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

@@ -1,11 +1,12 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="4">
+      <el-col :span="3">
         <el-select
           v-model="peopleId"
           placeholder="请选择工作人员"
           clearable
+          filterable
           @clear="changePeopleId"
         >
           <el-option
@@ -17,7 +18,7 @@
         </el-select>
       </el-col>
       <el-col
-        :span="5"
+        :span="4"
         :offset="1"
       >
         <el-date-picker
@@ -31,8 +32,7 @@
         />
       </el-col>
       <el-col
-        :span="5"
-        :offset="1"
+        :span="4"
       >
         <el-date-picker
           v-model="condition.time"
@@ -46,7 +46,6 @@
       </el-col>
       <el-col
         :span="2"
-        :offset="1"
       >
         <el-button
           type="primary"
@@ -56,7 +55,6 @@
       </el-col>
       <el-col
         :span="2"
-        style="margin-left: 20px"
       >
         <el-button
           type="primary"
@@ -66,7 +64,7 @@
       </el-col>
     </el-row>
     <el-row style="margin-top: 20px">
-      <el-col :span="23">
+      <el-col :span="16">
         <el-table
           :data="hour.timeList"
           stripe
@@ -88,7 +86,7 @@
     </el-row>
     <el-row>
       <el-col
-        :span="23"
+        :span="16"
         style="display: flex;justify-content: end"
       >
         <el-pagination
@@ -112,6 +110,7 @@
             v-model="addCondition.people"
             placeholder="请选择工作人员"
             clearable
+            filterable
             @change="changeWorkPeople"
             @clear="addCondition.people = ''"
           >
@@ -253,6 +252,7 @@ const changePeopleId = () => {
 const changeWorkPeople = (id) => {
   peopleList.forEach(item => {
     if (item.ID === id) {
+      console.log('工作人员信息', item.onePrice)
       addCondition.price = parseFloat(item.onePrice)
     }
   })

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="8">
+      <el-col :span="5">
         <el-form-item
           label="收款日期："
         >
@@ -14,7 +14,10 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="2">
+      <el-col
+        :span="1"
+        style="margin-left: 20px"
+      >
         <el-button
           type="primary"
           :icon="Search"
@@ -23,7 +26,7 @@
       </el-col>
       <el-col
         :span="2"
-        style="margin-left: 30px"
+        style="margin-left: 50px"
       >
         <el-button
           type="primary"
@@ -35,7 +38,7 @@
       </el-col>
     </el-row>
     <el-row>
-      <el-col :span="23">
+      <el-col :span="16">
         <el-row>
           <el-table
             :data="pay.paymentList"

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

@@ -84,6 +84,7 @@
               v-model="peopleSelect"
               placeholder="请选择人员名称"
               clearable
+              filterable
               @clear="clearPeopleSelect"
             >
               <el-option
@@ -410,18 +411,18 @@
 </template>
 
 <script setup>
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted, defineExpose } from 'vue'
 import { payData } from '@/pinia/cost/cost'
 import { getDepByStart } from '@/api/department'
-import { projectCostTypeList, delProjectCostType, createProjectCost, deleteProjectCost, updateProjectCost } from '@/api/cost'
+import { projectCostTypeList, delProjectCostType, createProjectCost,
+  deleteProjectCost, updateProjectCost, postProjectCostType, putProjectCostType } from '@/api/cost'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getAllUsers } from '@/api/user'
 import { getAllProject } from '@/api/project'
 import { codeOperate } from '@/pinia/code/code'
-import { createFeeGenre, updateFeeGenre } from '@/api/finance'
 
 defineOptions({
-  name: 'ProjectPay'
+  name: 'ProjectCost'
 })
 onMounted(() => {
   // 查询部门
@@ -499,7 +500,7 @@ const editCostType = () => {
     const createCost = {
       name: changeTypeValue.value
     }
-    createFeeGenre(createCost).then(res => {
+    postProjectCostType(createCost).then(res => {
       if (res.code === 0) {
         ElMessage.success('新增类型成功')
         queryProjectCostType()
@@ -512,7 +513,7 @@ const editCostType = () => {
       id: changeTypeSelect.value,
       name: changeTypeValue.value
     }
-    updateFeeGenre(updateCost).then(res => {
+    putProjectCostType(updateCost).then(res => {
       if (res.code === 0) {
         ElMessage.success('修改类型成功')
         queryProjectCostType()
@@ -573,6 +574,8 @@ const changeCostList = () => {
       }
     })
   }
+  // 刷新汇总
+  say()
 }
 
 // 费用数据存储
@@ -696,7 +699,6 @@ const addDetailRecord = () => {
 }
 
 const costEdit = (val) => {
-  console.log(val)
   drawerTitle.value = '编辑项目费用项'
   drawerDataType.value = 'edit'
   const editData = {
@@ -751,6 +753,21 @@ const changeCostPage = (val) => {
   condition.pageInfo.page = val
   consultPayList()
 }
+// 重置页码
+const outsideChangePage = () => {
+  condition.pageInfo.page = 1
+}
+
+defineExpose({
+  outsideChangePage
+})
+
+// 项目费用改变后刷新项目费用汇总
+const emit = defineEmits(['refresh'])
+
+const say = () => {
+  emit('refresh')
+}
 </script>
 
 <style scoped>

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

@@ -7,7 +7,7 @@
       justify="space-around"
     >
       <el-col
-        :span="4"
+        :span="3"
         class="flex align-center justify-around"
       >
         <el-image
@@ -16,9 +16,9 @@
         />
         <el-text style="font-size: 20px;font-weight: 550;color: #409eff">项目收支</el-text>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="21">
         <el-row align="middle">
-          <el-col :span="6">
+          <el-col :span="5">
             <el-row
               justify="center"
               align="middle"
@@ -81,9 +81,30 @@
               <el-text>项目收款</el-text>
             </el-row>
           </el-col>
+          <el-col :span="4">
+            <el-row
+              justify="center"
+              align="middle"
+            >
+              <el-text
+                style="font-size: 20px;color: #409eff;"
+                tag="b"
+                :line-clamp="1"
+              >
+                {{ projectPaySum }}
+              </el-text>
+            </el-row>
+            <el-row
+              justify="center"
+              align="middle"
+              style="margin-top: 8px"
+            >
+              <el-text>项目支出</el-text>
+            </el-row>
+          </el-col>
           <el-col
-            :span="4"
-            :offset="5"
+            :span="3"
+            :offset="2"
           >
             <el-button
               text
@@ -120,11 +141,20 @@
             label="项目费用"
             :name="2"
           >
-            <project-pay />
+            <project-cost
+              ref="costOut"
+              @refresh="refreshSummary"
+            />
           </el-tab-pane>
           <el-tab-pane
-            label="项目收款"
+            label="项目费用汇总"
             :name="3"
+          >
+            <CostSum ref="sumOut" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="项目收款"
+            :name="4"
           >
             <payment ref="paymentOut" />
           </el-tab-pane>
@@ -226,6 +256,7 @@ import { Search } from '@element-plus/icons-vue'
 import { computed, onMounted, reactive, ref } from 'vue'
 import { getProjectList, getProjectMessage, queryProjectExpense } from '@/api/project'
 import Hour from './components/hour.vue'
+import CostSum from './components/costSum.vue'
 // import Reimburse from './components/reimburse.vue'
 // 引入pinia
 import { collectionOperate } from '@/pinia/collection/Collection'
@@ -236,11 +267,11 @@ import { payData } from '@/pinia/cost/cost'
 // eslint-disable-next-line no-unused-vars
 import Payment from '@/view/finance/financeAnalysis/components/payment.vue'
 import expense from '@/assets/expenses.png'
-import ProjectPay from '@/view/finance/financeAnalysis/components/projectPay.vue'
+import { queryProjectMonthFee } from '@/api/cost'
+import ProjectCost from './components/projectCost.vue'
 defineOptions({
   name: 'FinanceAnalysis'
 })
-
 // 项目列表
 const listDisplay = ref(false)
 const openProjectList = () => {
@@ -266,7 +297,7 @@ const projectTotal = ref(0)
 const projectMessage = reactive({})
 const listSort = ref(1)
 const projectSum = ref(0)
-
+const paySum = ref(0)
 // 计算属性
 const buttonType = computed(() => (state) => {
   const obj = {
@@ -279,8 +310,16 @@ const buttonType = computed(() => (state) => {
   return obj[state]
 })
 const projectAmount = computed(() => {
-  const price = ref(parseInt(projectMessage.price))
-  // const price = ref(4892703)
+  const price = ref(parseInt(projectMessage.projectPrice))
+  if (price.value < 10000) {
+    return price.value + '元'
+  } else {
+    const tenThousand = (price.value / 10000).toFixed(4)
+    return parseFloat(tenThousand) + '万元'
+  }
+})
+const projectPaySum = computed(() => {
+  const price = ref(parseInt(paySum.value))
   if (price.value < 10000) {
     return price.value + '元'
   } else {
@@ -343,6 +382,9 @@ const paymentOut = ref()
 // const reimburseOut = ref()
 const hourOut = ref()
 
+const sumOut = ref()
+
+const costOut = ref()
 const getMainMessage = (code) => {
   queryProjectExpense(code).then(res => {
     if (res.code === 0) {
@@ -372,6 +414,8 @@ const getMainMessage = (code) => {
       hourOut.value.outsideChangePage()
       pay.changeCostList(summaryData.projectFee)
       pay.changeCostTotal(summaryData.projectFeeTotal)
+      sumOut.value.querySum()
+      costOut.value.outsideChangePage()
     }
   })
   getProjectMessage(code).then(res => {
@@ -379,6 +423,22 @@ const getMainMessage = (code) => {
       Object.assign(projectMessage, res.data)
     }
   })
+  queryProjectMonthFee('', '', code).then(res => {
+    if (res.code === 0) {
+      const payList = res.data
+      let sum = 0
+      payList.forEach(item => {
+        sum += item.totalExpenditure
+      })
+      paySum.value = sum
+    }
+  })
+}
+
+// 刷新项目费用汇总
+const refreshSummary = () => {
+  console.log('刷新汇总')
+  sumOut.value.querySum()
 }
 
 </script>

web/src/view/projectManage/projectDetails/projectDetails.vue

@@ -171,12 +171,16 @@
         >
           <template #header>
             <el-row align="middle">
-              <el-col :span="6">
+              <el-col :span="10">
                 <el-text size="large">项目文件列表</el-text>
+                <el-button
+                  style="margin-left: 40px"
+                  @click="changeFilePrompt"
+                >所需文件提示</el-button>
               </el-col>
               <el-col
                 :span="6"
-                :offset="12"
+                :offset="8"
               >
                 <el-button
                   type="primary"
@@ -569,6 +573,29 @@
         </div>
       </template>
     </el-drawer>
+    <el-dialog v-model="filePrompt">
+      <el-row style="margin-top: 20px">
+        <el-alert
+          title="项目前期文件：报价单、施工图、合同、项目立项书、工程清单、财评中心审计后清单表、图审报告"
+          type="info"
+          show-icon
+        />
+      </el-row>
+      <el-row style="margin-top: 20px">
+        <el-alert
+          title="项目前期文件：报价单、施工图、合同、项目立项书、工程清单、财评中心审计后清单表、图审报告"
+          type="info"
+          show-icon
+        />
+      </el-row>
+      <el-row style="margin-top: 20px">
+        <el-alert
+          title="项目前期文件：报价单、施工图、合同、项目立项书、工程清单、财评中心审计后清单表、图审报告"
+          type="info"
+          show-icon
+        />
+      </el-row>
+    </el-dialog>
   </div>
 </template>
 
@@ -590,6 +617,11 @@ const route = useRoute()
 defineOptions({
   name: 'ProjectDetails'
 })
+// 文件提示显示
+const filePrompt = ref(false)
+const changeFilePrompt = () => {
+  filePrompt.value = true
+}
 // ......................................
 // 基本信息编辑
 const activeName = ref('first')