收支分析

web/src/view/finance/borrowing/borrowing.vue

@@ -459,7 +459,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, reactive } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import {
   createBorrowing, createConstructor,
@@ -475,9 +475,9 @@ import { getAllUsers } from '@/api/user'
 const feeGenre = ref()
 const users = ref()
 
-const dailyExpensesTable = ref()
+const dailyExpensesTable = reactive([])
 const dailyExpensesTotal = ref(0)
-const searchDailyExpenses = ref({
+const searchDailyExpenses = reactive({
   pageInfo: {
     page: 1,
     pageSize: 10
@@ -488,12 +488,12 @@ const searchDailyExpenses = ref({
 })
 // 分页
 const dailyExpensesSizeChange = (val) => {
-  searchDailyExpenses.value.pageInfo.pageSize = val
+  searchDailyExpenses.pageInfo.pageSize = val
   queryData()
 }
 
 const dailyExpensesCurrentChange = (val) => {
-  searchDailyExpenses.value.pageInfo.page = val
+  searchDailyExpenses.pageInfo.page = val
   queryData()
 }
 
@@ -519,24 +519,30 @@ const borrowingCurrentChange = (val) => {
 }
 
 const queryData = async() => {
-  if (searchDailyExpenses.value.state === '') {
-    searchDailyExpenses.value.state = null
+  if (searchDailyExpenses.state === '') {
+    searchDailyExpenses.state = null
   }
+  // 查询类型
   await queryExpensesGenre().then(res => {
-    console.log(res.data)
+    // console.log('查询1：', res.data)
     feeGenre.value = res.data
   })
+  // 查询用户列表
   await getAllUsers().then(res => {
+    // console.log('查询2：', res.data)
     users.value = res.data
   })
-  await queryDailyExpensesList(searchDailyExpenses.value).then(res => {
-    dailyExpensesTable.value = res.data.list
-    searchDailyExpenses.value.pageInfo.page = res.data.page
-    searchDailyExpenses.value.pageInfo.pageSize = res.data.pageSize
+  // 日常费用列表
+  await queryDailyExpensesList(searchDailyExpenses).then(res => {
+    console.log('查询3：', res.data)
+    dailyExpensesTable.push(...res.data.list)
+    searchDailyExpenses.pageInfo.page = res.data.page
+    searchDailyExpenses.pageInfo.pageSize = res.data.pageSize
     dailyExpensesTotal.value = res.data.total
   })
+  // 支借列表
   await queryBorrowingList(searchBorrowing.value).then(res => {
-    console.log(res)
+    console.log('查询4：', res.data)
     borrowingTable.value = res.data.list
     searchBorrowing.value.pageInfo.page = res.data.page
     searchBorrowing.value.pageInfo.pageSize = res.data.pageSize

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

@@ -112,6 +112,7 @@
             v-model="addCondition.people"
             placeholder="请选择工作人员"
             clearable
+            @change="changeWorkPeople"
             @clear="addCondition.people = ''"
           >
             <el-option
@@ -126,7 +127,7 @@
           <el-input-number v-model="addCondition.days" />
         </el-form-item>
         <el-form-item label="人天单价：">
-          <el-input-number v-model="addCondition.price" />
+          <el-input-number v-model="addCondition.price" :disabled="true"/>
         </el-form-item>
         <el-form-item label="报工时间：">
           <el-date-picker
@@ -244,6 +245,14 @@ const changeAddTimeShow = () => {
 const changePeopleId = () => {
   peopleId.value = ''
 }
+
+const changeWorkPeople = (id) => {
+  peopleList.forEach(item => {
+    if (item.ID === id) {
+      addCondition.price = parseFloat(item.onePrice)
+    }
+  })
+}
 </script>
 
 <style scoped>