2545307760@qq.com 8 månader sedan
förälder
incheckning
cbeb0f1145

+ 2 - 2
web/.env.development

@@ -4,12 +4,12 @@ VITE_CLI_PORT = 8080
 VITE_SERVER_PORT = 8220
 VITE_BASE_API = /api
 VITE_FILE_API = /api
-VITE_BASE_PATH = http://192.168.110.116
+//VITE_BASE_PATH = http://192.168.110.116
 VITE_POSITION = close
 VITE_EDITOR = webstorm
 
 
 // VITE_EDITOR = webstorm 如果使用webstorm开发且要使用dom定位到代码行功能 请先自定添加 webstorm到环境变量 再将VITE_EDITOR值修改为webstorm
 // 如果使用docker-compose开发模式,设置为下面的地址或本机主机IP
-//VITE_BASE_PATH = http://106.52.134.22
+VITE_BASE_PATH = http://106.52.134.22
 

+ 13 - 3
web/src/view/finance/borrowing/borrowing.vue

@@ -153,7 +153,7 @@
               </el-form-item>
               <el-form-item label="总金额">
                 <el-input-number
-                  v-model="dailyExpensesData.totalAmount"
+                  v-model="accountSum"
                   style="width: 300px"
                   :precision="2"
                   disabled
@@ -459,7 +459,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref, reactive } from 'vue'
+import { onMounted, ref, reactive, computed } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import {
   createBorrowing,
@@ -471,6 +471,16 @@ import {
 } from '@/api/finance'
 import { getAllUsers } from '@/api/user'
 
+// 计算属性
+const accountSum = computed(() => {
+  const data = dailyExpensesData.value.dailyFeeDetails
+  console.log('计算data:', data)
+  let middle = 0
+  data.forEach(item => {
+    middle += item.feePrice
+  })
+  return middle
+})
 // 数据初始化
 const feeGenre = ref()
 const users = ref()
@@ -535,6 +545,7 @@ const queryData = async() => {
   // 日常费用列表
   await queryDailyExpensesList(searchDailyExpenses).then(res => {
     console.log('查询3:', res.data)
+    dailyExpensesTable.length = 0
     dailyExpensesTable.push(...res.data.list)
     searchDailyExpenses.pageInfo.page = res.data.page
     searchDailyExpenses.pageInfo.pageSize = res.data.pageSize
@@ -542,7 +553,6 @@ const queryData = async() => {
   })
   // 支借列表
   await queryBorrowingList(searchBorrowing.value).then(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

+ 1 - 1
web/src/view/finance/workingHours/workingHours.vue

@@ -221,7 +221,7 @@
       <!--      修改-->
       <el-dialog
         v-model="workingDialog"
-        title="Warning"
+        title="修改工时"
         width="500"
         align-center
       >