网页端：修改预算有问题的地方

移动端：新增用车管理和借款管理

oa-ui-app/pages.json

@@ -133,7 +133,24 @@
 			"path" : "pages/oa/borrow/borrowList",
 			"style" : 
 			{
-				"navigationBarTitleText" : "借款管理"
+				"navigationBarTitleText" : "借款管理",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path" : "pages/oa/car/carList",
+			"style" : 
+			{
+				"navigationBarTitleText" : "用车管理",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path" : "pages/oa/car/useCarList",
+			"style" : 
+			{
+				"navigationBarTitleText" : "派出记录",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -142,6 +159,13 @@
 			{
 				"navigationBarTitleText" : "设备作业记录"
 			}
+		},
+		{
+			"path" : "pages/components/formInfo",
+			"style" : 
+			{
+				"navigationBarTitleText" : "表单信息"
+			}
 		}
 	],
 	"tabBar": {

oa-ui-app/pages/components/flowNote.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-03-17 10:04:51
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-28 14:29:11
+ * @LastEditTime: 2025-06-16 17:08:15
 -->
 <template>
   <view>
@@ -39,6 +39,9 @@ export default {
     }
   },
   created() {
+    if (!this.taskForm.procInsId) {
+      return
+    }
     this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
   },
   methods: {

oa-ui-app/pages/components/formInfo.vue

@@ -0,0 +1,34 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-06-16 16:26:24
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-06-16 17:09:31
+-->
+<template>
+  <view>
+    <borrow :taskForm="taskForm" :taskName="''" v-if="types == 'borrow'"></borrow>
+  </view>
+</template>
+
+<script>
+import borrow from '@/pages/form/borrow/borrow.vue'
+export default {
+  components: { borrow },
+  created() {
+    if (this.$route.query.formType == 'borrow') {
+      this.taskForm.formId = this.$route.query.formId
+      this.types = 'borrow'
+    }
+  },
+  data() {
+    return {
+      taskForm: {
+        formId: ''
+      },
+      types: ''
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui-app/pages/oa/borrow/borrowList.vue

@@ -1,15 +1,91 @@
 <template>
   <view class="container">
     <uv-tabs :list="tabList" @click="clickTab"></uv-tabs>
-    <view>
-      
-    </view>
+    <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+      :up="upOption" :fixed="false" :top="10" style="padding: 30rpx;">
+      <view>
+        <view v-for="(item, index) in borrowList" :key="index" class="modern-card">
+          <view class="modern-card-header" v-if="selectedTab === '项目借款'">
+            <view class="modern-card-title">
+              <text class="project-number">{{ item.projectNumber }}</text>
+              <text class="project-name">{{ item.project ? item.project.projectName : '' }}</text>
+            </view>
+          </view>
+          <view class="modern-card-header" v-else>
+            <view class="modern-card-title">
+              <text class="project-name">{{ item.applyReason }}</text>
+            </view>
+          </view>
+          <view class="modern-card-body">
+            <view class="avatar-section">
+              <view class="avatar">
+                <text>{{ item.applierUser.nickName ? item.applierUser.nickName[0] : '' }}</text>
+              </view>
+              <view>
+                <text class="applier-name">{{ item.applierUser.nickName }}</text>
+                <text class="dept-name">{{ item.dept.deptName }}</text>
+              </view>
+            </view>
+            <view class="info-row">
+              <text class="info-label">申请时间：</text>
+              <text class="info-value">{{ item.applyDate }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">申请说明：</text>
+              <text class="info-value">{{ item.remark }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">申请金额：</text>
+              <text class="amount-highlight-detail">￥{{ item.applyAmount }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">核准金额：</text>
+              <text class="manager-amount-highlight-detail">￥{{ item.managerAmount }}</text>
+            </view>
+          </view>
+          <view class="modern-card-footer">
+            <button class="footer-btn detail-btn" @click="openDetailPopup(item.borrowId)">查看明细</button>
+            <button class="footer-btn form-btn" @click="openFormInfo(item)">表单信息</button>
+          </view>
+        </view>
+      </view> 
+    </mescroll-uni>
+    <uv-popup ref="detailPopup" mode="bottom">
+      <view class="popup-detail-list" @touchmove.stop>
+        <view class="popup-close-btn" @click="$refs.detailPopup.close()">×</view>
+        <view class="popup-detail-title">借款明细</view>
+        <view v-for="(item, index) in detailList" :key="item.borrowDetailId" class="popup-detail-item">
+          <view class="popup-detail-index">{{ index + 1 }}</view>
+          <view class="popup-detail-main">
+            <view class="popup-detail-row">
+              <text class="popup-detail-label">开支项目：</text>
+              <text class="popup-detail-value">{{ item.borrowItem }}</text>
+            </view>
+            <view class="popup-detail-row">
+              <text class="popup-detail-label">单价×数量：</text>
+              <text class="popup-detail-value">￥{{ item.price }} × {{ item.quantity }}{{ item.unit }}</text>
+            </view>
+            <view class="popup-detail-row">
+              <text class="popup-detail-label">申请金额：</text>
+              <text class="popup-detail-amount">￥{{ item.applyAmount }}</text>
+            </view>
+            <view class="popup-detail-row" v-if="item.managerAmount">
+              <text class="popup-detail-label">核准金额：</text>
+              <text class="popup-detail-manager-amount">￥{{ item.managerAmount }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </uv-popup>
   </view>
 </template>
 
 <script>
-
+import { listBorrow } from '@/api/oa/borrow/borrow';
+import { listBorrowDetail, addBorrowDetail, updateBorrowDetail, delBorrowDetail, delBorrowDetailByDetailId } from "@/api/oa/borrow/borrowDetail";
+import MescrollMixin from '@/uni_modules/mescroll/components/mescroll-uni/mescroll-mixins.js'
 export default {
+  mixins: [MescrollMixin],
   data() {
     return {
       tabList: [{
@@ -24,59 +100,91 @@ export default {
         name: '团委借款'
       }],
       selectedTab: '项目借款',
-      isSearchExpanded: false,
+      mescroll: null, // mescroll实例
+      downOption: {
+        auto: true,
+        textOutOffset: '下拉刷新',
+        textLoading: '加载中...'
+      },
+      upOption: {
+        auto: false,
+        page: { num: 1, size: 10 },
+        noMoreSize: 5,
+        empty: { tip: '暂无借款数据' },
+        textNoMore: '~ 没有更多数据了 ~'
+      },
+      borrowList: [],
       queryParams: {
-        projectId: '',
-        applier: '',
-        borrowUsage: ''
+        pageNum: 1,
+        pageSize: 10,
+        borrowUsage: '0'
       },
-      borrowUsageList: [
-        {
-          value: '0',
-          text: '项目借款'
-        },
-        {
-          value: '1',
-          text: '非项目借款'
-        },
-        {
-          value: '2',
-          text: '工会借款'
-        },
-        {
-          value: '3',
-          text: '党委借款'
-        },
-        {
-          value: '4',
-          text: '团委借款'
-        }
-      ],
-      selectedBorrowUsage: '项目借款'
+      detailList: []
     }
   },
+  onLoad: function (options) {
+    uni.startPullDownRefresh();
+  },
   methods: {
-    toggleSearch() {
-      this.isSearchExpanded = !this.isSearchExpanded;
+    // 加载数据
+    async loadData() {
+      try {
+        const res = await listBorrow(this.queryParams)
+        return { data: res.rows, total: res.total }
+      } catch (e) {
+        return { data: [], error: true }
+      }
     },
-    handleQuery() {
-      console.log(this.queryParams);
+    mescrollInit(mescroll) {
+      this.mescroll = mescroll;
     },
-    resetQuery() {
-      this.queryParams = {
-        projectNumber: '',
-        projectName: '',
-        leader: '',
-        dept: ''
-      };
+    // mescroll下拉刷新回调
+    async downCallback() {
+      this.borrowList = []; // 清空列表
+      this.queryParams.pageNum = 1
+      const res = await this.loadData()
+      if (res.error) {
+        this.mescroll.endErr();
+      } else {
+        this.borrowList = res.data;
+        this.mescroll.endSuccess(res.data.length, res.total);
+      }
+      uni.stopPullDownRefresh();
     },
-    handleBorrowUsageChange(e) {
-      this.selectedBorrowUsage = this.borrowUsageList[e.target.value].text;
+    // mescroll上拉加载回调
+    async upCallback(page) {
+      this.queryParams.pageNum = page.num
+      const res = await this.loadData()
+      if (res.error) {
+        this.mescroll.endErr();
+      } else {
+        this.borrowList = this.borrowList.concat(res.data)
+        this.mescroll.endSuccess(res.data.length, res.total);
+      }
     },
     clickTab(obj) {
-      console.log(obj);
       let index = obj.index;
       this.selectedTab = this.tabList[index].name;
+      let param = [
+        { name: '项目借款', value: '0' },
+        { name: '非项目借款', value: '1' },
+        { name: '工会借款', value: '2' },
+        { name: '党委借款', value: '3' },
+        { name: '团委借款', value: '4' }
+      ]
+      this.queryParams.borrowUsage = param[index].value;
+      uni.startPullDownRefresh();
+    },
+    openDetailPopup(borrowId) {
+      listBorrowDetail({ borrowId: borrowId, pageNum: 1, pageSize: 200 }).then(res => {
+        this.detailList = res.rows;
+        this.$refs.detailPopup.open();
+      })
+    },
+    openFormInfo(item) {
+      uni.navigateTo({
+        url: `/pages/components/formInfo?formId=${item.borrowId}&formType=borrow`
+      });
     }
   }
 }
@@ -156,4 +264,241 @@ export default {
 .search-buttons button {
   flex: 1;
 }
+
+.modern-card {
+  background: #fff;
+  border-radius: 18rpx;
+  margin-bottom: 32rpx;
+  box-shadow: 0 6rpx 16rpx rgba(0, 0, 0, 0.08);
+  overflow: hidden;
+  transition: box-shadow 0.2s;
+  border: 1rpx solid #f0f0f0;
+}
+
+.modern-card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: linear-gradient(90deg, #e0e7ff 0%, #f8fafc 100%);
+  padding: 24rpx 28rpx 16rpx 28rpx;
+}
+
+.modern-card-title {
+  display: flex;
+  flex-direction: column;
+}
+
+.project-number {
+  font-size: 26rpx;
+  color: #6366f1;
+  font-weight: 600;
+}
+
+.project-name {
+  font-size: 28rpx;
+  color: #22223b;
+  font-weight: bold;
+  margin-top: 4rpx;
+}
+
+.amount-highlight {
+  background: #fef3c7;
+  color: #d97706;
+  font-size: 32rpx;
+  font-weight: bold;
+  border-radius: 10rpx;
+  padding: 8rpx 20rpx;
+  min-width: 120rpx;
+  text-align: center;
+}
+
+.amount-highlight-detail {
+  background: #fef3c7;
+  color: #d97706;
+  font-size: 28rpx;
+  font-weight: bold;
+  border-radius: 10rpx;
+  padding: 4rpx 18rpx;
+  margin-left: 8rpx;
+}
+
+.manager-amount-highlight-detail {
+  background: #d4f3e9;
+  color: #10b981;
+  font-size: 28rpx;
+  font-weight: bold;
+  border-radius: 10rpx;
+  padding: 4rpx 18rpx;
+  margin-left: 8rpx;
+}
+
+.modern-card-body {
+  padding: 20rpx 28rpx 24rpx 28rpx;
+}
+
+.avatar-section {
+  display: flex;
+  align-items: center;
+  margin-bottom: 18rpx;
+}
+
+.avatar {
+  width: 56rpx;
+  height: 56rpx;
+  border-radius: 50%;
+  background: #a5b4fc;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  font-weight: bold;
+  margin-right: 18rpx;
+}
+
+.applier-name {
+  font-size: 28rpx;
+  color: #22223b;
+  font-weight: 500;
+}
+
+.dept-name {
+  font-size: 24rpx;
+  color: #64748b;
+  margin-left: 8rpx;
+}
+
+.info-row {
+  display: flex;
+  margin-bottom: 10rpx;
+}
+
+.info-label {
+  color: #64748b;
+  font-size: 24rpx;
+  min-width: 120rpx;
+}
+
+.info-value {
+  color: #22223b;
+  font-size: 24rpx;
+  flex: 1;
+  word-break: break-all;
+}
+
+.modern-card-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 20rpx;
+  padding: 16rpx 28rpx 20rpx 28rpx;
+  border-top: 1px solid #f0f0f0;
+  background: #fafbfc;
+}
+
+.footer-btn {
+  font-size: 26rpx;
+  border-radius: 8rpx;
+  border: none;
+  outline: none;
+  background: #e0e7ff;
+  color: #3b3b4f;
+}
+
+.detail-btn {
+  background: #6366f1;
+  color: #fff;
+}
+
+.form-btn {
+  background: #f4c542;
+  color: #fff;
+}
+
+.popup-detail-list {
+  padding: 32rpx 24rpx 48rpx 24rpx;
+  background: #fff;
+  border-radius: 24rpx 24rpx 0 0;
+  min-height: 300rpx;
+  max-height: 70vh;
+  overflow-y: auto;
+  position: relative;
+}
+
+.popup-detail-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #22223b;
+  margin-bottom: 24rpx;
+  text-align: center;
+}
+
+.popup-detail-item {
+  display: flex;
+  align-items: flex-start;
+  background: #f7f8fa;
+  border-radius: 12rpx;
+  margin-bottom: 18rpx;
+  padding: 18rpx 16rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+}
+
+.popup-detail-index {
+  width: 44rpx;
+  height: 44rpx;
+  background: #6366f1;
+  color: #fff;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 24rpx;
+  font-weight: bold;
+  margin-right: 18rpx;
+}
+
+.popup-detail-main {
+  flex: 1;
+}
+
+.popup-detail-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8rpx;
+}
+
+.popup-detail-label {
+  color: #64748b;
+  font-size: 24rpx;
+  min-width: 120rpx;
+}
+
+.popup-detail-value {
+  color: #22223b;
+  font-size: 24rpx;
+}
+
+.popup-detail-amount {
+  color: #d97706;
+  font-size: 28rpx;
+  font-weight: bold;
+  margin-left: 8rpx;
+}
+
+.popup-detail-manager-amount {
+  color: #10b981;
+  font-size: 28rpx;
+  font-weight: bold;
+  margin-left: 8rpx;
+}
+
+.popup-close-btn {
+  position: absolute;
+  right: 24rpx;
+  top: 18rpx;
+  font-size: 40rpx;
+  color: #999;
+  z-index: 10;
+  cursor: pointer;
+  line-height: 1;
+}
 </style>

oa-ui-app/pages/oa/car/carList.vue

@@ -0,0 +1,483 @@
+<template>
+  <view class="container">
+    <uv-tabs :list="tabList" @click="clickTab"></uv-tabs>
+    <view style="padding-top: 20rpx;">
+      <uv-input placeholder="请输入车牌号" shape="circle" prefixIcon="search" prefixIconStyle="font-size: 22px;color: #909399"
+        @confirm="handleSearchCar"></uv-input>
+    </view>
+    <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+      :up="upOption" :fixed="false" :top="10" style="padding: 30rpx;">
+      <view>
+        <view v-for="item, index in carList" :key="'car' + index" class="modern-card">
+          <view class="modern-card-header">
+            <view class="modern-card-title">
+              <text class="car-plate">{{ item.licensePlate }}</text>
+            </view>
+            <view class="car-status" :class="'status-' + item.status">{{ getStatusText(item.status) }}</view>
+          </view>
+          <view class="modern-card-body">
+            <view class="avatar-section">
+              <view class="avatar">
+                <text>{{ item.driverUser ? item.driverUser.nickName[0] : '无' }}</text>
+              </view>
+              <view>
+                <text class="applier-name">{{ item.driverUser ? item.driverUser.nickName : '无' }}</text>
+                <text class="dept-name">驾驶员</text>
+              </view>
+            </view>
+            <view class="info-row">
+              <text class="info-label">品牌：</text>
+              <text class="info-value">{{ item.brand }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">购置时间：</text>
+              <text class="info-value">{{ item.acquisitionTime }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">是否为租车：</text>
+              <text class="info-value">{{ item.isRent == "0" ? '否' : '是' }}</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">油耗（km）：</text>
+              <text>{{ item.fuel }}元</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">保险（天）：</text>
+              <text>{{ item.insurance }}元</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">维修（天）：</text>
+              <text>{{ item.maintenance }}元</text>
+            </view>
+            <view class="info-row">
+              <text class="info-label">单日成本：</text>
+              <text class="manager-amount-highlight-detail">￥{{ item.dayCost }}</text>
+            </view>
+          </view>
+          <view class="modern-card-footer">
+            <button class="footer-btn detail-btn" @click="showExpenseList(item)">维保记录</button>
+            <button class="footer-btn detail-btn2" @click="showUseCarList(item)">派出记录</button>
+          </view>
+        </view>
+      </view>
+    </mescroll-uni>
+    <uv-popup ref="expensePopup" mode="bottom">
+      <view class="popup-detail-list" @touchmove.stop>
+        <view class="popup-close-btn" @click="$refs.expensePopup.close()">×</view>
+        <view class="popup-detail-title">维保记录</view>
+        <view v-for="item, index in expenseList" :key="'c' + index" class="popup-detail-item"
+          v-if="expenseList.length > 0">
+          <view class="popup-detail-main">
+            <view class="popup-detail-row">
+              <text class="popup-detail-label">负责人：</text>
+              <text class="popup-detail-value">{{ item.user ? item.user.nickName : '' }}</text>
+            </view>
+            <view class="popup-detail-row">
+              <text class="popup-detail-label">费用类型：</text>
+              <text class="popup-detail-value">{{ item.expenseType }}</text>
+            </view>
+            <view class="popup-detail-row">
+              <text class="popup-detail-label">费用金额：</text>
+              <text class="popup-detail-value">{{ item.expense }}</text>
+            </view>
+            <view class="popup-detail-row">
+              <text class="popup-detail-label">发生日期：</text>
+              <text class="popup-detail-value">{{ item.occurDate }}</text>
+            </view>
+            <view class="popup-detail-row">
+              <text class="popup-detail-label">备注：</text>
+              <text class="popup-detail-value">{{ item.remark }}</text>
+            </view>
+          </view>
+        </view>
+        <view v-else>
+          <view class="popup-detail-empty">暂无维保记录</view>
+        </view>
+      </view>
+    </uv-popup>
+  </view>
+</template>
+
+<script>
+import { listCar, getCar, delCar, addCar, updateCar } from "@/api/oa/car/car";
+import { listDeviceExpense, getDeviceExpense, delDeviceExpense, addDeviceExpense, updateDeviceExpense } from "@/api/oa/device/deviceExpense";
+import MescrollMixin from '@/uni_modules/mescroll/components/mescroll-uni/mescroll-mixins.js';
+export default {
+  mixins: [MescrollMixin],
+  data() {
+    return {
+      tabList: [{
+        name: '可使用',
+        value: '1'
+      }, {
+        name: '已派出',
+        value: '0'
+      }, {
+        name: '已还车',
+        value: '3'
+      }, {
+        name: '已报废',
+        value: '4'
+      }],
+      selectedTab: '可使用',
+      carList: [],
+      expenseList: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50,
+        licensePlate: null,
+        driver: null,
+        status: '1'
+      },
+      mescroll: null,
+      downOption: {
+        auto: true,
+        textOutOffset: '下拉刷新',
+        textLoading: '加载中...'
+      },
+      upOption: {
+        auto: false,
+        page: { num: 1, size: 50 },
+        noMoreSize: 5,
+        empty: { tip: '暂无借款数据' },
+        textNoMore: '~ 没有更多数据了 ~'
+      },
+    }
+  },
+  onLoad: function (options) {
+    uni.startPullDownRefresh();
+  },
+  methods: {
+    handleSearchCar(e) {
+      this.queryParams.licensePlate = e;
+      uni.startPullDownRefresh();
+    },
+    clickTab(obj) {
+      let index = obj.index;
+      this.selectedTab = this.tabList[index].name;
+      this.queryParams.status = this.tabList[index].value;
+      uni.startPullDownRefresh();
+    },
+    // 加载数据
+    async loadData() {
+      try {
+        let res = null;
+        res = await listCar(this.queryParams)
+        return { data: res.rows, total: res.total }
+      } catch (error) {
+        console.error(error);
+        return { data: [] };
+      }
+    },
+    mescrollInit(mescroll) {
+      this.mescroll = mescroll;
+    },
+    async downCallback() {
+      this.carList = []; // 清空列表
+      this.queryParams.pageNum = 1
+      const res = await this.loadData()
+      if (res.error) {
+        this.mescroll.endErr();
+      } else {
+        this.carList = res.data;
+        this.mescroll.endSuccess(res.data.length, res.total);
+      }
+      uni.stopPullDownRefresh();
+    },
+    async upCallback(page) {
+      this.queryParams.pageNum = page.num
+      const res = await this.loadData()
+      if (res.error) {
+        this.mescroll.endErr();
+      } else {
+        this.carList = this.carList.concat(res.data);
+        this.mescroll.endSuccess(res.data.length, res.total);
+      }
+    },
+    getStatusText(status) {
+      switch (status) {
+        case '0': return '已派出';
+        case '1': return '可使用';
+        case '4': return '已报废';
+        case '3': return '已还车';
+        default: return '未知';
+      }
+    },
+    showExpenseList(item) {
+      listDeviceExpense({ carId: item.carId, pageNum: 1, pageSize: 100 }).then(res => {
+        this.expenseList = res.rows;
+        this.$refs.expensePopup.open();
+      })
+    },
+    showUseCarList(item) {
+      uni.navigateTo({
+        url: `/pages/oa/car/useCarList?carId=${item.carId}&licensePlate=${item.licensePlate}`
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  padding: 20rpx;
+  background-color: #f5f5f5;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.modern-card {
+  background: #fff;
+  border-radius: 18rpx;
+  margin-bottom: 32rpx;
+  box-shadow: 0 6rpx 16rpx rgba(0, 0, 0, 0.08);
+  overflow: hidden;
+  transition: box-shadow 0.2s;
+  border: 1rpx solid #f0f0f0;
+}
+
+.modern-card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: linear-gradient(90deg, #e0e7ff 0%, #f8fafc 100%);
+  padding: 24rpx 28rpx 16rpx 28rpx;
+}
+
+.modern-card-title {
+  display: flex;
+  flex-direction: column;
+}
+
+.car-plate {
+  font-size: 32rpx;
+  color: #22223b;
+  font-weight: bold;
+  margin-bottom: 8rpx;
+}
+
+.car-status {
+  font-size: 24rpx;
+  font-weight: 500;
+  padding: 4rpx 16rpx;
+  border-radius: 8rpx;
+  display: inline-block;
+  width: fit-content;
+}
+
+.status-0 {
+  background: #fef3c7;
+  color: #d97706;
+}
+
+/* 已派出 */
+.status-1 {
+  background: #d4f3e9;
+  color: #10b981;
+}
+
+/* 可使用 */
+.status-4 {
+  background: #fee2e2;
+  color: #ef4444;
+}
+
+/* 已报废 */
+.status-3 {
+  background: #dbeafe;
+  color: #3b82f6;
+}
+
+/* 已还车 */
+
+.modern-card-body {
+  padding: 20rpx 28rpx 24rpx 28rpx;
+}
+
+.avatar-section {
+  display: flex;
+  align-items: center;
+  margin-bottom: 18rpx;
+}
+
+.avatar {
+  width: 56rpx;
+  height: 56rpx;
+  border-radius: 50%;
+  background: #a5b4fc;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  font-weight: bold;
+  margin-right: 18rpx;
+}
+
+.applier-name {
+  font-size: 28rpx;
+  color: #22223b;
+  font-weight: 500;
+}
+
+.dept-name {
+  font-size: 24rpx;
+  color: #64748b;
+  margin-left: 8rpx;
+}
+
+.info-row {
+  display: flex;
+  margin-bottom: 10rpx;
+}
+
+.info-label {
+  color: #64748b;
+  font-size: 24rpx;
+  min-width: 120rpx;
+}
+
+.info-value {
+  color: #22223b;
+  font-size: 24rpx;
+  flex: 1;
+  word-break: break-all;
+}
+
+.amount-highlight-detail {
+  background: #fef3c7;
+  color: #d97706;
+  font-size: 28rpx;
+  font-weight: bold;
+  border-radius: 10rpx;
+  padding: 4rpx 18rpx;
+  margin-left: 8rpx;
+}
+
+.manager-amount-highlight-detail {
+  background: #d4f3e9;
+  color: #10b981;
+  font-size: 28rpx;
+  font-weight: bold;
+  border-radius: 10rpx;
+  padding: 4rpx 18rpx;
+  margin-left: 8rpx;
+}
+
+.modern-card-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 20rpx;
+  padding: 16rpx 28rpx 20rpx 28rpx;
+  border-top: 1px solid #f0f0f0;
+  background: #fafbfc;
+}
+
+.footer-btn {
+  font-size: 26rpx;
+  border-radius: 8rpx;
+  border: none;
+  outline: none;
+  background: #e0e7ff;
+  color: #3b3b4f;
+}
+
+.detail-btn {
+  background: #6366f1;
+  color: #fff;
+}
+
+.detail-btn2 {
+  background: #f4c542;
+  color: #fff;
+}
+
+.popup-detail-list {
+  padding: 32rpx 24rpx 48rpx 24rpx;
+  background: #fff;
+  border-radius: 24rpx 24rpx 0 0;
+  min-height: 300rpx;
+  max-height: 70vh;
+  overflow-y: auto;
+  position: relative;
+}
+
+.popup-detail-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #22223b;
+  margin-bottom: 24rpx;
+  text-align: center;
+}
+
+.popup-detail-item {
+  display: flex;
+  align-items: flex-start;
+  background: #f7f8fa;
+  border-radius: 12rpx;
+  margin-bottom: 18rpx;
+  padding: 18rpx 16rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+}
+
+.popup-detail-index {
+  width: 44rpx;
+  height: 44rpx;
+  background: #6366f1;
+  color: #fff;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 24rpx;
+  font-weight: bold;
+  margin-right: 18rpx;
+}
+
+.popup-detail-main {
+  flex: 1;
+}
+
+.popup-detail-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 8rpx;
+}
+
+.popup-detail-label {
+  color: #64748b;
+  font-size: 24rpx;
+  min-width: 120rpx;
+}
+
+.popup-detail-value {
+  color: #22223b;
+  font-size: 24rpx;
+}
+
+.popup-detail-amount {
+  color: #d97706;
+  font-size: 28rpx;
+  font-weight: bold;
+  margin-left: 8rpx;
+}
+
+.popup-detail-manager-amount {
+  color: #10b981;
+  font-size: 28rpx;
+  font-weight: bold;
+  margin-left: 8rpx;
+}
+
+.popup-close-btn {
+  position: absolute;
+  right: 24rpx;
+  top: 18rpx;
+  font-size: 40rpx;
+  color: #999;
+  z-index: 10;
+  cursor: pointer;
+  line-height: 1;
+}
+</style>

oa-ui-app/pages/oa/car/useCarList.vue

@@ -0,0 +1,313 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-06-18 15:39:56
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-06-19 11:26:48
+-->
+<template>
+  <view class="container">
+    <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+      :up="upOption" :fixed="false" :top="10" style="padding: 30rpx;">
+      <view v-for="item, index in useCarList" :key="'car' + index" class="modern-card">
+        <view class="modern-card-header">
+          <view class="modern-card-title">
+            <view class="car-status" :class="'status-' + item.carUsage">{{ getStatusText(item.carUsage) }}</view>
+          </view>
+        </view>
+        <view class="modern-card-body">
+          <view class="avatar-section">
+            <view class="avatar">
+              <text>{{ item.applierUser ? item.applierUser.nickName[0] : '无' }}</text>
+            </view>
+            <view>
+              <text class="applier-name">{{ item.applierUser ? item.applierUser.nickName : '无' }}</text>
+              <text class="dept-name">{{ item.dept ? item.dept.deptName : '无' }}</text>
+            </view>
+          </view>
+          <view class="info-row">
+            <text class="info-label">用车时间：</text>
+            <text class="info-value">{{ item.beginDate + ' 至 ' + item.endDate }}</text>
+          </view>
+          <view class="info-row">
+            <text class="info-label">用车事由：</text>
+            <text class="info-value">{{ item.applyReason }}</text>
+          </view>
+          <view class="info-row" v-if="item.carUsage == '0'">
+            <text class="info-label">项目编号：</text>
+            <text class="info-value">{{ item.project ? item.project.projectNumber : '无' }}</text>
+          </view>
+          <view class="info-row" v-if="item.carUsage == '0'">
+            <text class="info-label">项目名称：</text>
+            <text class="info-value">{{ item.project ? item.project.projectName : '无' }}</text>
+          </view>
+        </view>
+      </view>
+    </mescroll-uni>
+  </view>
+</template>
+
+<script>
+import { listCarApproval } from "@/api/oa/car/carApproval";
+export default {
+  data() {
+    return {
+      carId: '',
+      licensePlate: '',
+      useCarList: [],
+      mescroll: null,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20
+      },
+      downOption: {
+        auto: true,
+        textOutOffset: '下拉刷新',
+        textLoading: '加载中...'
+      },
+      upOption: {
+        auto: false,
+        page: { num: 1, size: 20 },
+        noMoreSize: 5,
+        empty: { tip: '暂无借款数据' },
+        textNoMore: '~ 没有更多数据了 ~'
+      },
+    }
+  },
+  onLoad(options) {
+    this.carId = options.carId;
+    this.licensePlate = options.licensePlate;
+    uni.setNavigationBarTitle({
+      title: this.licensePlate + '派车记录'
+    })
+    uni.startPullDownRefresh();
+  },
+  methods: {
+    // 加载数据
+    async loadData() {
+      try {
+        let res = null;
+        res = await listCarApproval({ carId: this.carId, cars: this.carId, ...this.queryParams })
+        return { data: res.rows, total: res.total }
+      } catch (error) {
+        console.error(error);
+        return { data: [] };
+      }
+    },
+    mescrollInit(mescroll) {
+      this.mescroll = mescroll;
+    },
+    async downCallback() {
+      this.useCarList = []; // 清空列表
+      this.queryParams.pageNum = 1
+      const res = await this.loadData()
+      if (res.error) {
+        this.mescroll.endErr();
+      } else {
+        this.useCarList = res.data;
+        this.mescroll.endSuccess(res.data.length, res.total);
+      }
+      uni.stopPullDownRefresh();
+    },
+    async upCallback(page) {
+      this.queryParams.pageNum = page.num
+      const res = await this.loadData()
+      if (res.error) {
+        this.mescroll.endErr();
+      } else {
+        this.useCarList = this.useCarList.concat(res.data);
+        this.mescroll.endSuccess(res.data.length, res.total);
+      }
+    },
+    getStatusText(status) {
+      switch (status) {
+        case '0':
+          return '项目用车';
+        case '1':
+          return '非项目用车';
+        case '2':
+          return '工会用车';
+        case '3':
+          return '党委用车';
+        case '4':
+          return '团委用车';
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  padding: 20rpx;
+  background-color: #f5f5f5;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.modern-card {
+  background: #fff;
+  border-radius: 18rpx;
+  margin-bottom: 32rpx;
+  box-shadow: 0 6rpx 16rpx rgba(0, 0, 0, 0.08);
+  overflow: hidden;
+  transition: box-shadow 0.2s;
+  border: 1rpx solid #f0f0f0;
+}
+
+.modern-card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: linear-gradient(90deg, #e0e7ff 0%, #f8fafc 100%);
+  padding: 24rpx 28rpx 16rpx 28rpx;
+}
+
+.modern-card-title {
+  display: flex;
+  flex-direction: column;
+}
+
+.car-plate {
+  font-size: 32rpx;
+  color: #22223b;
+  font-weight: bold;
+  margin-bottom: 8rpx;
+}
+
+.car-status {
+  font-size: 24rpx;
+  font-weight: 500;
+  padding: 4rpx 16rpx;
+  border-radius: 8rpx;
+  display: inline-block;
+  width: fit-content;
+}
+
+.status-0 {
+  background: #fef3c7;
+  color: #d97706;
+}
+
+/* 已派出 */
+.status-1 {
+  background: #d4f3e9;
+  color: #10b981;
+}
+
+/* 可使用 */
+.status-4 {
+  background: #fee2e2;
+  color: #ef4444;
+}
+
+/* 已报废 */
+.status-3 {
+  background: #dbeafe;
+  color: #3b82f6;
+}
+
+/* 已还车 */
+
+.modern-card-body {
+  padding: 20rpx 28rpx 24rpx 28rpx;
+}
+
+.avatar-section {
+  display: flex;
+  align-items: center;
+  margin-bottom: 18rpx;
+}
+
+.avatar {
+  width: 56rpx;
+  height: 56rpx;
+  border-radius: 50%;
+  background: #a5b4fc;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  font-weight: bold;
+  margin-right: 18rpx;
+}
+
+.applier-name {
+  font-size: 28rpx;
+  color: #22223b;
+  font-weight: 500;
+}
+
+.dept-name {
+  font-size: 24rpx;
+  color: #64748b;
+  margin-left: 8rpx;
+}
+
+.info-row {
+  display: flex;
+  margin-bottom: 10rpx;
+}
+
+.info-label {
+  color: #64748b;
+  font-size: 24rpx;
+  min-width: 120rpx;
+}
+
+.info-value {
+  color: #22223b;
+  font-size: 24rpx;
+  flex: 1;
+  word-break: break-all;
+}
+
+.amount-highlight-detail {
+  background: #fef3c7;
+  color: #d97706;
+  font-size: 28rpx;
+  font-weight: bold;
+  border-radius: 10rpx;
+  padding: 4rpx 18rpx;
+  margin-left: 8rpx;
+}
+
+.manager-amount-highlight-detail {
+  background: #d4f3e9;
+  color: #10b981;
+  font-size: 28rpx;
+  font-weight: bold;
+  border-radius: 10rpx;
+  padding: 4rpx 18rpx;
+  margin-left: 8rpx;
+}
+
+.modern-card-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 20rpx;
+  padding: 16rpx 28rpx 20rpx 28rpx;
+  border-top: 1px solid #f0f0f0;
+  background: #fafbfc;
+}
+
+.footer-btn {
+  font-size: 26rpx;
+  border-radius: 8rpx;
+  border: none;
+  outline: none;
+  background: #e0e7ff;
+  color: #3b3b4f;
+}
+
+.detail-btn {
+  background: #6366f1;
+  color: #fff;
+}
+
+.detail-btn2 {
+  background: #f4c542;
+  color: #fff;
+}
+</style>

oa-ui-app/pages/work/index.vue

@@ -2,7 +2,13 @@
  * @Author: ysh
  * @Date: 2025-01-16 11:17:08
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-06-10 11:02:19
+ * @LastEditTime: 2025-06-17 15:18:44
+-->
+<!--
+ * @Author: ysh
+ * @Date: 2025-01-16 11:17:08
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-06-17 14:54:35
 -->
 <template>
   <view class="work-container">
@@ -21,81 +27,13 @@
     <uni-section title="常用操作" type="line"></uni-section>
     <view class="grid-body">
       <uni-grid :column="4" :showBorder="false">
-        <uni-grid-item>
-          <view class="grid-item-box" @click="openSendFlow">
-            <u-image :fade="false" src="@/static/images/work/sendFlow.png" width="40px" height="40px"></u-image>
-            <text class="text">发起流程</text>
-          </view>
-        </uni-grid-item>
-        <!-- <uni-grid-item>
-          <view class="grid-item-box" @click="toUrlFn('borrow)">
-            <u-image :fade="false" src="@/static/images/work/borrow.png" width="40px" height="40px"></u-image>
-            <text class="text">借款管理</text>
-          </view>
-        </uni-grid-item> -->
-        <uni-grid-item>
-          <view class="grid-item-box" @click="toUrlFn('deviceLog')">
-            <u-image :fade="false" src="@/static/images/work/workDay.png" width="40px" height="40px"></u-image>
-            <text class="text">设备作业记录</text>
+        <uni-grid-item v-for="item in gridList" :key="item.url" v-if="item.hasPermi">
+          <view class="grid-item-box" @click="toUrlFn(item.url)">
+            <u-image :fade="false" :src="item.icon" width="40px" height="40px"></u-image>
+            <text class="text">{{ item.name }}</text>
           </view>
         </uni-grid-item>
       </uni-grid>
-      <!-- <uni-grid :column="4" :showBorder="false" @change="changeGrid">
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="person-filled" size="30"></uni-icons>
-            <text class="text">用户管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="staff-filled" size="30"></uni-icons>
-            <text class="text">角色管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="color" size="30"></uni-icons>
-            <text class="text">菜单管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="settings-filled" size="30"></uni-icons>
-            <text class="text">部门管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="heart-filled" size="30"></uni-icons>
-            <text class="text">岗位管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="bars" size="30"></uni-icons>
-            <text class="text">字典管理</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="gear-filled" size="30"></uni-icons>
-            <text class="text">参数设置</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="chat-filled" size="30"></uni-icons>
-            <text class="text">通知公告</text>
-          </view>
-        </uni-grid-item>
-        <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="wallet-filled" size="30"></uni-icons>
-            <text class="text">日志管理</text>
-          </view>
-        </uni-grid-item>
-      </uni-grid> -->
     </view>
 
     <uv-popup ref="popup" mode="bottom">
@@ -113,6 +51,7 @@ import { listDefinition } from "@/api/flowable/definition";
 import { Snowflake } from '@/utils/snowFlake.js';
 import { getNextFlowNodeByStart, todoList } from "@/api/flowable/todo";
 import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
+import { checkPermi, checkRole } from "@/utils/permission";
 export default {
   data() {
     return {
@@ -126,7 +65,38 @@ export default {
       },
       {
         image: '/static/images/banner/banner03.jpg'
-      }
+      }],
+      gridList: [
+        {
+          name: '发起流程',
+          icon: '/static/images/work/sendFlow.png',
+          url: 'sendFlow',
+          hasPermi: true
+        },
+        {
+          name: '借款管理',
+          icon: '/static/images/work/borrow.png',
+          url: 'borrow',
+          hasPermi: checkPermi(['oa:borrow:list'])
+        },
+        {
+          name: '用车管理',
+          icon: '/static/images/work/car.png',
+          url: 'car',
+          hasPermi: checkPermi(['oa:car:list'])
+        },
+        {
+          name: '设备管理',
+          icon: '/static/images/work/device.png',
+          url: 'device',
+          hasPermi: checkPermi(['oa:device:list'])
+        },
+        {
+          name: '设备作业记录',
+          icon: '/static/images/work/workDay.png',
+          url: 'deviceLog',
+          hasPermi: checkPermi(['oa:deviceLog:list'])
+        }
       ],
       flowList: ['借款审批', '用车审批', '设备审批', '工作填报'],
       sendFlowList: [],
@@ -153,18 +123,14 @@ export default {
     this.getDefinitionList();
   },
   methods: {
+    checkPermi,
+    checkRole,
     clickBannerItem(item) {
       console.info(item)
     },
     changeSwiper(e) {
       this.current = e.detail.current
     },
-    changeGrid(e) {
-      this.$modal.showToast('模块建设中~')
-    },
-    openSendFlow() {
-      this.$refs.popup.open();
-    },
     toUrlFn(type) {
       if (type == 'borrow') {
         uni.navigateTo({
@@ -174,6 +140,13 @@ export default {
         uni.navigateTo({
           url: '/pages/oa/device/deviceLog'
         })
+      } else if (type == 'car') {
+        uni.navigateTo({
+          url: '/pages/oa/car/carList'
+        })
+      }
+      else {
+        this.$modal.showToast('模块建设中~')
       }
     },
     sendFlow(row) {

oa-ui/src/views/flowable/form/budget/adjust/budgetAdjust.vue

@@ -2,10 +2,10 @@
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-21 17:06:38
+ * @LastEditTime: 2025-06-19 16:25:11
 -->
 <template>
-  <div class="main" v-loading="loading">
+  <div class="main">
     <h2 class="text-center">项目直接生产成本预算—核算表</h2>
     <p style="text-align: center">
       编制人：{{ budgetForm.compilerUser ? budgetForm.compilerUser.nickName : '' }}
@@ -17,7 +17,7 @@
       </el-alert>
     </div>
     <el-divider></el-divider>
-    <el-descriptions :column="3" border class="descriptions">
+    <el-descriptions :column="3" border class="descriptions" v-loading="loading" :element-loading-text="loadingText">
       <el-descriptions-item label="项目编号">
         {{ project.projectNumber }}
       </el-descriptions-item>
@@ -156,7 +156,8 @@
           @update:deviceList="handleDeviceChange"></device-cost>
       </el-descriptions-item>
       <el-descriptions-item label="现场开支" :span="3">
-        <site-cost :siteList.sync="siteList" :taskName="taskName" @update:siteList="handleSiteChange"></site-cost>
+        <site-cost :siteList.sync="siteList" :taskName="taskName" @update:siteList="handleSiteChange"
+          @updateList="updateSiteList"></site-cost>
       </el-descriptions-item>
       <el-descriptions-item label="合同总价" :span="3" v-hasRole="['leader', 'finance', 'nfinance', 'admin']">
         <table border="1" style="width:100%;" v-if="contractList.length > 0">
@@ -458,6 +459,8 @@ export default {
       },
       contractList: [],
       subContractList: [],
+      budgetId: '',
+      loadingText: '加载中...'
     }
   },
   async created() {
@@ -477,7 +480,28 @@ export default {
         this.budgetForm = res.rows[0];
         if (this.budgetForm) {
           const budgetId = this.budgetForm.budgetId;
-          // 经营相关
+          this.budgetId = budgetId;
+          
+          // 并发获取所有数据
+          const [
+            deviceRes,
+            carRes,
+            innerStaffRes,
+            outerStaffRes,
+            settleRes,
+            siteRes,
+            otherRes
+          ] = await Promise.all([
+            listBudgetDevice({ pageSize: 100, budgetId }),
+            listBudgetCar({ pageSize: 100, budgetId }),
+            listBudgetStaff({ pageSize: 100, budgetId, type: '内业' }),
+            listBudgetStaff({ pageSize: 100, budgetId, type: '外业' }),
+            listBudgetSettle({ pageSize: 100, budgetId }),
+            listSite({ pageSize: 100, budgetId }),
+            listOther({ pageSize: 100, budgetId })
+          ]);
+
+          // 经营相关数据处理
           this.budgetForm.outExpense = Number(this.budgetForm.outExpense).toFixed(2);
           this.budgetForm.letterExpense = Number(this.budgetForm.letterExpense).toFixed(2);
           this.budgetForm.winExpense = Number(this.budgetForm.winExpense).toFixed(2);
@@ -501,70 +525,52 @@ export default {
             Number(this.budgetForm.taxAdjust || 0) +
             Number(this.budgetForm.travelAdjust || 0);
 
-
-          // 获取设备数据
-          let deviceRes = await listBudgetDevice({ pageSize: 100, budgetId });
-          this.deviceList = deviceRes.rows;
-          this.deviceList = this.deviceList.map(device => {
-            return {
-              ...device,
-              depreciation: Number(device.depreciation).toFixed(2),
-              amount: Number(device.amount).toFixed(2),
-              amountAdjust: device.amountAdjust ? Number(device.amountAdjust).toFixed(2) : 0
-            };
-          });
+          // 处理设备数据
+          this.deviceList = deviceRes.rows.map(device => ({
+            ...device,
+            depreciation: Number(device.depreciation).toFixed(2),
+            amount: Number(device.amount).toFixed(2),
+            amountAdjust: device.amountAdjust ? Number(device.amountAdjust).toFixed(2) : 0
+          }));
           this.checkDeviceCost = this.deviceList.reduce((sum, device) => sum + Number(device.amountAdjust || 0), 0).toFixed(2);
 
-          // 获取车辆数据
-          let carRes = await listBudgetCar({ pageSize: 100, budgetId });
-          this.carList = carRes.rows;
-          this.carList = this.carList.map(car => {
-            return {
-              ...car,
-              depreciation: Number(car.depreciation).toFixed(2),
-              amount: Number(car.amount).toFixed(2),
-              amountAdjust: car.amountAdjust ? Number(car.amountAdjust).toFixed(2) : 0
-            };
-          });
+          // 处理车辆数据
+          this.carList = carRes.rows.map(car => ({
+            ...car,
+            depreciation: Number(car.depreciation).toFixed(2),
+            amount: Number(car.amount).toFixed(2),
+            amountAdjust: car.amountAdjust ? Number(car.amountAdjust).toFixed(2) : 0
+          }));
           this.checkCarCost = this.carList.reduce((sum, car) => sum + Number(car.amountAdjust || 0), 0).toFixed(2);
 
-          // 获取内业人员数据
-          let innerStaffRes = await listBudgetStaff({ pageSize: 100, budgetId, type: '内业' });
-          this.innerStaffList = innerStaffRes.rows;
-          this.innerStaffList = this.innerStaffList.map(staff => {
-            return {
-              ...staff,
-              dayCost: Number(staff.dayCost).toFixed(2),
-              performance: Number(staff.performance).toFixed(2),
-              amount: Number(staff.amount).toFixed(2),
-              staffCost: Number(staff.staffCost).toFixed(2),
-              daysAdjust: staff.daysAdjust ? Number(staff.daysAdjust).toFixed(2) : 0,
-              performanceAdjust: staff.performanceAdjust ? Number(staff.performanceAdjust).toFixed(2) : 0,
-              amountAdjust: staff.amountAdjust ? Number(staff.amountAdjust).toFixed(2) : 0
-            };
-          });
+          // 处理内业人员数据
+          this.innerStaffList = innerStaffRes.rows.map(staff => ({
+            ...staff,
+            dayCost: Number(staff.dayCost).toFixed(2),
+            performance: Number(staff.performance).toFixed(2),
+            amount: Number(staff.amount).toFixed(2),
+            staffCost: Number(staff.staffCost).toFixed(2),
+            daysAdjust: staff.daysAdjust ? Number(staff.daysAdjust).toFixed(2) : 0,
+            performanceAdjust: staff.performanceAdjust ? Number(staff.performanceAdjust).toFixed(2) : 0,
+            amountAdjust: staff.amountAdjust ? Number(staff.amountAdjust).toFixed(2) : 0
+          }));
           let innerCheckCost = this.innerStaffList.reduce((sum, staff) => sum + Number(staff.amountAdjust || 0), 0);
 
-          // 获取外业人员数据
-          let outerStaffRes = await listBudgetStaff({ pageSize: 100, budgetId, type: '外业' });
-          this.outerStaffList = outerStaffRes.rows;
-          this.outerStaffList = this.outerStaffList.map(staff => {
-            return {
-              ...staff,
-              dayCost: Number(staff.dayCost).toFixed(2),
-              performance: Number(staff.performance).toFixed(2),
-              amount: Number(staff.amount).toFixed(2),
-              staffCost: Number(staff.staffCost).toFixed(2),
-              daysAdjust: staff.daysAdjust ? Number(staff.daysAdjust).toFixed(2) : 0,
-              performanceAdjust: staff.performanceAdjust ? Number(staff.performanceAdjust).toFixed(2) : 0,
-              amountAdjust: staff.amountAdjust ? Number(staff.amountAdjust).toFixed(2) : 0
-            };
-          });
+          // 处理外业人员数据
+          this.outerStaffList = outerStaffRes.rows.map(staff => ({
+            ...staff,
+            dayCost: Number(staff.dayCost).toFixed(2),
+            performance: Number(staff.performance).toFixed(2),
+            amount: Number(staff.amount).toFixed(2),
+            staffCost: Number(staff.staffCost).toFixed(2),
+            daysAdjust: staff.daysAdjust ? Number(staff.daysAdjust).toFixed(2) : 0,
+            performanceAdjust: staff.performanceAdjust ? Number(staff.performanceAdjust).toFixed(2) : 0,
+            amountAdjust: staff.amountAdjust ? Number(staff.amountAdjust).toFixed(2) : 0
+          }));
           let outerCheckCost = this.outerStaffList.reduce((sum, staff) => sum + Number(staff.amountAdjust || 0), 0);
           this.checkStaffCost = (innerCheckCost + outerCheckCost).toFixed(2);
 
-          // 获取内业绩效额数据
-          let settleRes = await listBudgetSettle({ pageSize: 100, budgetId });
+          // 处理内业绩效额数据
           this.workList = settleRes.rows;
           for (let work of this.workList) {
             if (work.checkPriceId) {
@@ -592,37 +598,21 @@ export default {
             }
           }
 
-          // 获取现场开支
-          let siteRes = await listSite({ pageSize: 100, budgetId });
-          this.siteList = siteRes.rows;
-          this.siteList = this.siteList.map(site => {
-            return {
-              ...site,
-              amount: Number(site.amount).toFixed(2),
-              amountAdjust: site.amountAdjust ? Number(site.amountAdjust).toFixed(2) : 0
-            };
-          });
+          // 处理现场开支
+          this.siteList = siteRes.rows.map(site => ({
+            ...site,
+            amount: Number(site.amount).toFixed(2),
+            amountAdjust: site.amountAdjust ? Number(site.amountAdjust).toFixed(2) : 0
+          }));
           this.budgetForm.siteSum = this.siteList.reduce((sum, site) => sum + Number(site.amount || 0), 0).toFixed(2);
           this.checkSiteCost = this.siteList.reduce((sum, site) => sum + Number(site.amountAdjust || 0), 0).toFixed(2);
 
-          this.siteList = this.siteList.map(site => {
-            return {
-              ...site,
-              amount: Number(site.amount).toFixed(2),
-              amountAdjust: site.amountAdjust ? Number(site.amountAdjust).toFixed(2) : 0
-            };
-          });
-
-          // 获取预算外开销
-          let otherRes = await listOther({ pageSize: 100, budgetId });
-          this.otherList = otherRes.rows;
-          this.otherList = this.otherList.map(other => {
-            return {
-              ...other,
-              amount: Number(other.amount).toFixed(2),
-              amountAdjust: other.amountAdjust ? Number(other.amountAdjust).toFixed(2) : 0
-            };
-          });
+          // 处理预算外开销
+          this.otherList = otherRes.rows.map(other => ({
+            ...other,
+            amount: Number(other.amount).toFixed(2),
+            amountAdjust: other.amountAdjust ? Number(other.amountAdjust).toFixed(2) : 0
+          }));
           this.checkOtherCost = this.otherList.reduce((sum, other) => sum + Number(other.amountAdjust || 0), 0).toFixed(2);
           this.totalBudgetAdjust = (Number(this.checkStaffCost) + Number(this.checkCarCost) + Number(this.checkDeviceCost)
             + Number(this.checkSiteCost) + Number(this.checkJYAmount) + Number(this.checkOtherCost)).toFixed(2);
@@ -764,6 +754,18 @@ export default {
       this.checkSiteCost = this.siteList.reduce((sum, site) => sum + (Number(site.amountAdjust) || 0), 0).toFixed(2);
       this.getTotalBudgetAdjust();
     },
+    async updateSiteList() {
+      // 获取现场开支
+      let siteRes = await listSite({ pageSize: 100, budgetId: this.budgetId });
+      this.siteList = siteRes.rows.map(site => ({
+        ...site,
+        amount: Number(site.amount).toFixed(2),
+        amountAdjust: site.amountAdjust ? Number(site.amountAdjust).toFixed(2) : 0
+      }));
+      
+      this.budgetForm.siteSum = this.siteList.reduce((sum, site) => sum + Number(site.amount || 0), 0).toFixed(2);
+      this.checkSiteCost = this.siteList.reduce((sum, site) => sum + Number(site.amountAdjust || 0), 0).toFixed(2);
+    },
     // 处理经营相关数据变化
     handleBusinessChange(newData) {
       this.budgetForm.outAdjust = newData.outAdjust;
@@ -794,56 +796,86 @@ export default {
     },
     // 保存
     async preserve() {
-      let obj = {
-        budgetId: this.row.budgetId,
-        projectId: this.row.projectId,
-        checkId: this.taskForm.formId
-      }
-      if (!this.checkForm.checkId) {
-        await addCheck(obj);
-        this.$emit('preserve');
-      } else {
-        await updateCheck(this.checkForm);
-      }
-      await updateBudget(this.budgetForm);
+      this.loading = true;
+      this.loadingText = '保存中...';
+      this.$message.warning('保存中...');
+      try {
+        let obj = {
+          budgetId: this.row.budgetId,
+          projectId: this.row.projectId,
+          checkId: this.taskForm.formId
+        }
+        
+        // 并发处理基础数据保存
+        const savePromises = [];
+        
+        if (!this.checkForm.checkId) {
+          savePromises.push(addCheck(obj));
+          this.$emit('preserve');
+        } else {
+          savePromises.push(updateCheck(this.checkForm));
+        }
+        savePromises.push(updateBudget(this.budgetForm));
 
-      if (this.taskName == '核算编制') {
-        // 更新人员
-        let staffList = this.innerStaffList.concat(this.outerStaffList);
-        delBudgetStaff(this.row.budgetId).then(async res => {
-          for (let staff of staffList) {
+        if (this.taskName == '核算编制') {
+          // 并发处理所有删除操作
+          const deletePromises = [
+            delBudgetStaff(this.row.budgetId),
+            delBudgetCar(this.row.budgetId),
+            delBudgetDevice(this.row.budgetId),
+            delOther(this.row.budgetId)
+          ];
+          
+          await Promise.all(deletePromises);
+          
+          // 并发处理所有新增操作
+          const addPromises = [];
+          
+          // 人员数据（保持顺序）
+          const staffList = this.innerStaffList.concat(this.outerStaffList);
+          staffList.forEach(staff => {
             staff.budgetId = this.row.budgetId;
-            await addBudgetStaff(staff);
-          }
-        })
-        // 更新车辆
-        delBudgetCar(this.row.budgetId).then(async res => {
-          for (let car of this.carList) {
+            addPromises.push(addBudgetStaff(staff));
+          });
+          
+          // 车辆数据（保持顺序）
+          this.carList.forEach(car => {
             car.budgetId = this.row.budgetId;
-            await addBudgetCar(car);
-          }
-        })
-        // 更新设备
-        delBudgetDevice(this.row.budgetId).then(async res => {
-          for (let device of this.deviceList) {
+            addPromises.push(addBudgetCar(car));
+          });
+          
+          // 设备数据（保持顺序）
+          this.deviceList.forEach(device => {
             device.budgetId = this.row.budgetId;
-            await addBudgetDevice(device);
-          }
-        })
-        // 更新现场开支
-        for (let site of this.siteList) {
-          await updateSite(site);
-        }
-        // 更新预算外开销
-        delOther(this.row.budgetId).then(async res => {
-          for (let other of this.otherList) {
+            addPromises.push(addBudgetDevice(device));
+          });
+          
+          // 预算外开销数据（保持顺序）
+          this.otherList.forEach(other => {
             other.budgetId = this.row.budgetId;
-            await addOther(other);
-          }
-        })
+            addPromises.push(addOther(other));
+          });
+          
+          // 现场开支更新（保持顺序）
+          this.siteList.forEach(site => {
+            addPromises.push(updateSite(site));
+          });
+          
+          // 并发执行所有新增操作
+          await Promise.all(addPromises);
+        }
+        
+        // 等待基础数据保存完成
+        await Promise.all(savePromises);
+        
+        this.$message.success('保存成功');
+      } catch (error) {
+        console.error('保存失败:', error);
+        this.$message.error('保存失败，请重试');
+      } finally {
+        this.loading = false;
+        this.loadingText = '加载中...';
       }
-
-      this.$message.success('保存成功');
     },
     confirmSucess() {
       this.preserve();

oa-ui/src/views/flowable/form/budget/adjust/components/SiteCost.vue

@@ -2,25 +2,25 @@
  * @Author: ysh
  * @Date: 2025-05-15 15:30:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-19 11:24:43
+ * @LastEditTime: 2025-06-19 16:13:39
 -->
 <template>
   <div class="site-cost">
     <table border="1" style="width:100%;">
       <tr style="background-color:#f8f8f9">
         <td style="width: 50px;">序号</td>
-        <td>开支项</td>
-        <td>金额</td>
+        <td style="min-width: 100px;">开支项</td>
+        <td style="min-width: 100px;">金额</td>
         <td class="adjust">核算金额</td>
         <td>备注</td>
       </tr>
       <tr v-for="site, index in siteList" :key="site.id">
         <td>{{ index + 1 }}</td>
         <td>{{ site.name }}</td>
-        <td style="text-align: right;">{{ site.amount }}</td>
+        <td style="text-align: right;">{{ Number(site.amount).toFixed(2) }}</td>
         <td style="text-align: right;">
-          <el-input-number v-if="taskName === '核算编制'" :controls="false" v-model="site.amountAdjust" placeholder="请输入核算金额"
-            @change="handleSiteChange(site)" />
+          <el-input-number v-if="taskName === '核算编制'" :controls="false" v-model="site.amountAdjust"
+            placeholder="请输入核算金额" @change="handleSiteChange(site)" />
           <span v-else>{{ site.amountAdjust }}</span>
         </td>
         <td style="text-align: left;">{{ site.remark }}</td>
@@ -33,10 +33,35 @@
           || 0), 0).toFixed(2)}}</td>
       </tr>
     </table>
+    <div class="mt10">
+      <el-button type="success" plain icon="el-icon-plus" @click="isOpenSite = true" size="mini">新增开支项</el-button>
+    </div>
+    <!-- 添加现场开支对话框 -->
+    <el-dialog title="添加现场开支" :visible.sync="isOpenSite" width="700px" append-to-body>
+      <el-form :model="siteForm" label-width="120px">
+        <el-form-item label="开支项">
+          <el-input v-model="siteForm.name" placeholder="请输入开支项" />
+        </el-form-item>
+        <el-form-item label="金额">
+          {{ siteForm.amount }}
+        </el-form-item>
+        <el-form-item label="核算金额">
+          <el-input-number v-model="siteForm.amountAdjust" placeholder="请输入核算金额" :controls="false" />
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" :rows="3" v-model="siteForm.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="isOpenSite = false">取 消</el-button>
+        <el-button type="primary" @click="addSiteConfirm">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import { addSite } from "@/api/oa/budget/budgetSite";
 export default {
   props: {
     siteList: {
@@ -48,9 +73,27 @@ export default {
       default: ''
     }
   },
+  data() {
+    return {
+      isOpenSite: false,
+      siteForm: {
+        name: '',
+        amount: 0,
+        amountAdjust: 0,
+        remark: ''
+      }
+    }
+  },
   methods: {
     handleSiteChange(site) {
       this.$emit('update:siteList', this.siteList);
+    },
+    async addSiteConfirm() {
+      const budgetId = this.siteList[0].budgetId;
+      this.siteForm.budgetId = budgetId;
+      await addSite(this.siteForm)
+      this.isOpenSite = false;
+      this.$emit('updateList');
     }
   },
 }

oa-ui/src/views/flowable/form/budget/adjust/components/otherCost.vue

@@ -36,7 +36,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="3" class="amount">预算外开支合计</td>
+        <td colspan="3" class="amount">现场外开支合计</td>
         <td class="amount" style="text-align: right;">{{otherList.reduce((sum, other) => sum +
           (Number(other.amountAdjust) || 0), 0).toFixed(2)}}</td>
       </tr>

oa-ui/src/views/flowable/form/budget/moneyTable.vue

@@ -428,9 +428,6 @@ export default {
     },
     deletWorkItem(index) {
       let arr = this.contentList;
-      if (arr.length == 1) {
-        return;
-      }
       if (index >= 0 && index < arr.length) {
         arr.splice(index, 1);
       }