修改网页端预算显示的问题；

新增移动端项目首页。

oa-ui-app/api/qywx/index.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 发送企业微信消息
+export function sendQyMessage(data) {
+  return request({
+    url: '/qywx/message/send',
+    method: 'post',
+    data: data
+  })
+} 

oa-ui-app/pages.json

@@ -1,9 +1,3 @@
-/*
- * @Author: ysh
- * @Date: 2025-01-15 14:42:34
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-20 10:20:46
- */
 {
 	"pages": [{
 			"path": "pages/login",
@@ -96,7 +90,8 @@
 		{
 			"path": "pages/message/myProcess/index",
 			"style": {
-				"navigationBarTitleText": "我的流程"
+				"navigationBarTitleText": "我的流程",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -119,6 +114,13 @@
 			{
 				"navigationBarTitleText" : "借款审批"
 			}
+		},
+		{
+			"path" : "pages/project/projectInfo",
+			"style" : 
+			{
+				"navigationBarTitleText" : "项目详情"
+			}
 		}
 	],
 	"tabBar": {

oa-ui-app/pages/index.vue

@@ -6,7 +6,7 @@
         <text class="search-title">搜索条件</text>
         <text class="search-icon">{{ isSearchExpanded ? '收起' : '展开' }}</text>
       </view>
-      
+
       <view class="search-content" v-if="isSearchExpanded">
         <view class="search-item">
           <text>项目编号</text>
@@ -47,21 +47,17 @@
     <view class="list-box">
       <view class="list-header">
         <text class="title">测绘项目列表</text>
-        <view class="header-btns">
+        <!-- <view class="header-btns">
           <button type="primary" size="mini" @tap="handleRegister">登记项目</button>
           <button type="default" size="mini" @tap="handleExport">导出项目</button>
-        </view>
+        </view> -->
       </view>
 
-      <scroll-view 
-        scroll-y 
-        class="list-scroll"
-        @scrolltolower="loadMore"
-        :refresher-enabled="true"
-        :refresher-triggered="isRefreshing"
-        @refresherrefresh="onRefresh"
-      >
+      <scroll-view scroll-y class="list-scroll" id="projectList" :scroll-into-view="scrollToId" 
+        :scroll-with-animation="true" @scrolltolower="loadMore" :refresher-enabled="true"
+        :refresher-triggered="isRefreshing" @refresherrefresh="onRefresh" @scroll="onScroll">
         <view class="list-content">
+          <view id="top"></view>
           <view class="project-card" v-for="(item, index) in projectList" :key="index">
             <!-- 卡片头部 -->
             <view class="card-header">
@@ -110,8 +106,6 @@
             <!-- 卡片底部 -->
             <view class="card-footer">
               <button type="primary" size="mini" @tap="handleView(item)">查看</button>
-              <button type="warn" size="mini" @tap="handleDelete(item)">删除</button>
-              <button type="default" size="mini" @tap="handleRelate(item)">关联合同</button>
             </view>
           </view>
         </view>
@@ -122,6 +116,13 @@
         <text v-if="hasMore">上拉加载更多</text>
         <text v-else>没有更多数据了</text>
       </view>
+
+      <!-- 回到顶部按钮 -->
+      <view class="back-to-top" v-if="showBackToTop" @tap="scrollToTop">
+        <text class="iconfont">
+          <uv-icon size="28" name="arrow-upward" color="#fcfcfc"></uv-icon>
+        </text>
+      </view>
     </view>
   </view>
 </template>
@@ -131,6 +132,7 @@ import { listProject, listProjectFuzzy, delProject } from "@/api/oa/project/proj
 import { getProjectProgress } from "@/api/oa/project/projectProgress";
 import { listDept } from '@/api/system/dept';
 import { listUser } from '@/api/system/user';
+import { checkPermi } from '@/utils/permission';
 
 export default {
   data() {
@@ -153,7 +155,10 @@ export default {
       selectedLeader: '',
       selectedDept: '',
       hasMore: true,
-      isRefreshing: false
+      isRefreshing: false,
+      showBackToTop: false,
+      scrollTop: 0,
+      scrollToId: ''
     }
   },
   onLoad() {
@@ -165,7 +170,7 @@ export default {
     toggleSearch() {
       this.isSearchExpanded = !this.isSearchExpanded;
     },
-    
+
     resetQuery() {
       this.queryParams = {
         pageNum: 1,
@@ -180,32 +185,39 @@ export default {
       this.selectedDept = '';
       this.handleQuery();
     },
-    
+
     async getList() {
       this.loading = true;
       try {
-        const response = this.queryParams.queryString ? 
-          await listProjectFuzzy(this.queryParams) : 
+        const deptId = this.$store.getters.deptId;
+        if (deptId > 106 && deptId != 109) {
+          let response = await checkPermi(['oa:allproject:query'])
+          if (response == false) {
+            this.queryParams.undertakingDept = deptId
+          }
+        }
+        const response = this.queryParams.queryString ?
+          await listProjectFuzzy(this.queryParams) :
           await listProject(this.queryParams);
-        
+
         if (this.queryParams.pageNum === 1) {
           this.projectList = response.rows;
         } else {
           this.projectList = [...this.projectList, ...response.rows];
         }
-        
+
         this.total = response.total;
         this.hasMore = this.projectList.length < this.total;
-        
+
         for (let project of this.projectList) {
           const res = await getProjectProgress(project.projectId);
           if (res.data && res.data.length > 0) {
-            project.percentage = Number(res.data[res.data.length - 1].percentage);
+            this.$set(project, 'percentage', Number(res.data[res.data.length - 1].percentage));
           } else {
-            project.percentage = 0;
+            this.$set(project, 'percentage', 0);
           }
           if (project.isFinished === '1') {
-            project.percentage = 100;
+            this.$set(project, 'percentage', 100);
           }
         }
       } catch (error) {
@@ -218,7 +230,7 @@ export default {
         this.isRefreshing = false;
       }
     },
-    
+
     async getDeptList() {
       try {
         const res = await listDept({});
@@ -233,7 +245,7 @@ export default {
         });
       }
     },
-    
+
     async getUserList() {
       try {
         const res = await listUser({ pageNum: 1, pageSize: 9999 });
@@ -248,95 +260,76 @@ export default {
         });
       }
     },
-    
+
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-    
+
     handleLeaderChange(e) {
       const index = e.detail.value;
       this.queryParams.projectLeader = this.userList[index].value;
       this.selectedLeader = this.userList[index].text;
       this.handleQuery();
     },
-    
+
     handleDeptChange(e) {
       const index = e.detail.value;
       this.queryParams.undertakingDept = this.deptList[index].value;
       this.selectedDept = this.deptList[index].text;
       this.handleQuery();
     },
-    
+
     handleView(row) {
       uni.navigateTo({
-        url: `/pages/project/info?id=${row.projectId}&projectName=${encodeURIComponent(row.projectName)}`
+        url: `/pages/project/projectInfo?projectId=${row.projectId}`
       });
     },
-    
-    handleDelete(row) {
-      uni.showModal({
-        title: '提示',
-        content: `是否确认删除项目编号为"${row.projectNumber}"的数据项？`,
-        success: async (res) => {
-          if (res.confirm) {
-            try {
-              await delProject(row.projectId);
-              this.getList();
-              uni.showToast({
-                title: '删除成功',
-                icon: 'success'
-              });
-            } catch (error) {
-              uni.showToast({
-                title: '删除失败',
-                icon: 'none'
-              });
-            }
-          }
-        }
-      });
-    },
-    
+
     handleRegister() {
       uni.navigateTo({
         url: '/pages/project/register'
       });
     },
-    
+
     handleExport() {
       uni.showToast({
         title: '导出功能开发中',
         icon: 'none'
       });
     },
-    
-    handleRelate(row) {
-      uni.showToast({
-        title: '关联合同功能开发中',
-        icon: 'none'
-      });
-    },
-    
+
     loadMore() {
       if (this.hasMore) {
         this.queryParams.pageNum++;
         this.getList();
       }
     },
-    
+
     onRefresh() {
       this.isRefreshing = true;
       this.queryParams.pageNum = 1;
       this.getList();
     },
-    
+
     getProgressColor(percentage) {
       if (!percentage) return '#ff4d4f';
       if (percentage <= 20) return '#ff4d4f';
       if (percentage <= 50) return '#faad14';
       if (percentage <= 80) return '#1890ff';
       return '#52c41a';
+    },
+
+    onScroll(e) {
+      this.scrollTop = e.detail.scrollTop;
+      this.showBackToTop = this.scrollTop > 300;
+    },
+
+    scrollToTop() {
+      this.scrollToId = 'top';
+      setTimeout(() => {
+        this.scrollToId = '';
+      }, 300);
     }
   }
 }
@@ -524,7 +517,7 @@ export default {
 }
 
 .info-row .label {
-  width: 160rpx;
+  width: 170rpx;
   color: #909399;
   font-size: 28rpx;
 }
@@ -573,4 +566,27 @@ export default {
   color: #909399;
   font-size: 28rpx;
 }
+
+.back-to-top {
+  position: fixed;
+  right: 30rpx;
+  bottom: 100rpx;
+  width: 80rpx;
+  height: 80rpx;
+  background-color: rgba(0, 0, 0, 0.5);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 999;
+}
+
+.back-to-top .iconfont {
+  color: #fff;
+  font-size: 40rpx;
+}
+
+.icon-top:before {
+  content: "↑";
+}
 </style>

oa-ui-app/pages/login.vue

@@ -3,7 +3,7 @@
     <view class="logo-content align-center justify-center flex">
       <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
       </image>
-      <text class="title">CMC综合办公系统</text>
+      <text class="title">CMC智联云枢办公系统</text>
     </view>
     <view class="login-form-content">
       <view class="input-item flex align-center">
@@ -31,6 +31,7 @@
       <text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
       <text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
     </view> -->
+    <view class="copyright-info">©2025 CMC智联云枢办公系统 版权所有</view>
   </view>
 </template>
 
@@ -114,43 +115,109 @@
 
 <style lang="scss">
   page {
-    background-color: #ffffff;
+    background: linear-gradient(135deg, #f5f7fa 0%, #e4e8eb 100%);
+    min-height: 100vh;
+    position: relative;
+    overflow: hidden;
+
+    &::before,
+    &::after {
+      content: '';
+      position: absolute;
+      width: 300px;
+      height: 300px;
+      border-radius: 50%;
+      z-index: 0;
+    }
+
+    &::before {
+      background: linear-gradient(45deg, rgba(33, 150, 243, 0.1), rgba(25, 118, 210, 0.1));
+      top: -100px;
+      right: -100px;
+      animation: float 6s ease-in-out infinite;
+    }
+
+    &::after {
+      background: linear-gradient(45deg, rgba(33, 150, 243, 0.08), rgba(25, 118, 210, 0.08));
+      bottom: -150px;
+      left: -150px;
+      animation: float 8s ease-in-out infinite reverse;
+    }
   }
 
   .normal-login-container {
     width: 100%;
+    padding: 0 30rpx;
+    box-sizing: border-box;
+    position: relative;
+    z-index: 1;
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+
+    &::before {
+      content: '';
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      width: 600px;
+      height: 600px;
+      background: radial-gradient(circle, rgba(33, 150, 243, 0.03) 0%, rgba(33, 150, 243, 0) 70%);
+      z-index: -1;
+    }
 
     .logo-content {
       width: 100%;
       font-size: 21px;
       text-align: center;
-      padding-top: 15%;
+      padding-top: 25%;
+      animation: fadeInDown 0.8s ease-out;
 
       image {
-        border-radius: 4px;
+        border-radius: 12px;
+        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+        transition: transform 0.3s ease;
+        
+        &:hover {
+          transform: scale(1.05);
+        }
       }
 
       .title {
         margin-left: 10px;
+        background: linear-gradient(45deg, #2196F3, #1976D2);
+        -webkit-background-clip: text;
+        color: transparent;
+        font-weight: 600;
       }
     }
 
     .login-form-content {
       text-align: center;
       margin: 20px auto;
-      margin-top: 15%;
-      width: 80%;
+      margin-top: 10%;
+      width: 90%;
+      animation: fadeInUp 0.8s ease-out;
 
       .input-item {
         margin: 20px auto;
-        background-color: #f5f6f7;
+        background-color: rgba(255, 255, 255, 0.9);
         height: 45px;
-        border-radius: 20px;
+        border-radius: 25px;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+        transition: all 0.3s ease;
+        border: 1px solid transparent;
+
+        &:focus-within {
+          border-color: #2196F3;
+          box-shadow: 0 2px 12px rgba(33, 150, 243, 0.1);
+        }
 
         .icon {
           font-size: 38rpx;
-          margin-left: 10px;
-          color: #999;
+          margin-left: 20px;
+          color: #2196F3;
         }
 
         .input {
@@ -159,32 +226,73 @@
           line-height: 20px;
           text-align: left;
           padding-left: 15px;
+          color: #333;
+          
+          &::placeholder {
+            color: #999;
+          }
         }
-
       }
 
       .login-btn {
         margin-top: 40px;
         height: 45px;
-      }
+        background: linear-gradient(45deg, #2196F3, #1976D2);
+        border: none;
+        font-weight: 600;
+        letter-spacing: 1px;
+        transition: all 0.3s ease;
+        box-shadow: 0 4px 12px rgba(33, 150, 243, 0.2);
 
-      .xieyi {
-        color: #333;
-        margin-top: 20px;
-      }
-      
-      .login-code {
-        height: 38px;
-        float: right;
-      
-        .login-code-img {
-          height: 38px;
-          position: absolute;
-          margin-left: 10px;
-          width: 200rpx;
+        &:active {
+          transform: translateY(2px);
+          box-shadow: 0 2px 6px rgba(33, 150, 243, 0.2);
         }
       }
     }
   }
 
+  .copyright-info {
+    width: 100%;
+    text-align: center;
+    position: fixed;
+    left: 0;
+    bottom: 30rpx;
+    color: #666;
+    font-size: 22rpx;
+    letter-spacing: 1rpx;
+    z-index: 1;
+    opacity: 0.8;
+  }
+
+  @keyframes float {
+    0%, 100% {
+      transform: translateY(0) rotate(0deg);
+    }
+    50% {
+      transform: translateY(-20px) rotate(5deg);
+    }
+  }
+
+  @keyframes fadeInDown {
+    from {
+      opacity: 0;
+      transform: translateY(-20px);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0);
+    }
+  }
+
+  @keyframes fadeInUp {
+    from {
+      opacity: 0;
+      transform: translateY(20px);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0);
+    }
+  }
 </style>

oa-ui-app/pages/message/myProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-02-19 15:36:34
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-23 15:42:14
+ * @LastEditTime: 2025-05-26 10:46:52
 -->
 <template>
   <view class="page-container">
@@ -158,6 +158,7 @@ export default {
       this.myProcessList = res.data.list;
       this.mescroll.endSuccess(res.data.length)
       this.mescroll.endErr()
+      uni.stopPullDownRefresh();
     },
     // mescroll上拉加载回调
     async upCallback(page) {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-07 11:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-21 14:16:47
+ * @LastEditTime: 2025-05-27 16:27:15
 -->
 <template>
   <div class="main" v-loading="loading">
@@ -33,6 +33,15 @@
       <el-descriptions-item label="预算表单备注" :span="5">
         {{ budgetForm.remark }}
       </el-descriptions-item>
+      <el-descriptions-item label="预算附件" :span="5" v-if="budgetForm.document">
+        <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + budgetForm.document}`)">
+          {{ getFileName(budgetForm.document) }}
+        </el-link>
+        <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + budgetForm.document}`"
+          :underline="false" target="_blank">
+          <span class="el-icon-download">下载文件</span>
+        </el-link>
+      </el-descriptions-item>
       <el-descriptions-item label="项目计划工作量" :span="3">
         <div>
           <table border="1" style="width: 100%;">
@@ -118,7 +127,7 @@
             <td style="width:120px">金额</td>
             <td style="width:120px">备注</td>
           </tr>
-          <tr v-for="staff, index in innerStaffList" :key="'user' + staff.userId">
+          <tr v-for="staff, index in innerStaffList" :key="'innerUser' + staff.userId">
             <td>{{ index + 1 }}</td>
             <td>{{ staff.user ? staff.user.nickName : '' }}</td>
             <td>{{ staff.dayCost }}</td>
@@ -165,7 +174,7 @@
             <td style="width:120px">金额</td>
             <td style="width:120px">备注</td>
           </tr>
-          <tr v-for="staff, index in outerStaffList" :key="'user' + staff.userId">
+          <tr v-for="staff, index in outerStaffList" :key="'outUser' + staff.userId">
             <td>{{ index + 1 }}</td>
             <td>{{ staff.user ? staff.user.nickName : '' }}</td>
             <td>{{ staff.dayCost }}</td>
@@ -523,6 +532,7 @@ export default {
   },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       loading: true,
       budgetForm: {},
       project: {},
@@ -844,7 +854,7 @@ export default {
 }
 
 .main {
-  width: 85%;
+  width: 90%;
   margin: 0 auto;
   text-align: center;
 }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-19 17:08:57
+ * @LastEditTime: 2025-05-27 15:11:17
 -->
 <template>
   <div class="main">
@@ -123,7 +123,7 @@
               <td></td>
               <td style="min-width:80px">金额</td>
             </tr>
-            <tr v-for="user in chooseUser" :key="'user' + user.userId">
+            <tr v-for="user, index in chooseUser" :key="'user' + user.userId + index">
               <td>{{ user.user ? user.user.nickName : '' }}</td>
               <td>1780</td>
               <td>
@@ -463,13 +463,17 @@ export default {
 
             for (let work of this.workList) {
               if (work.groundType == '0') {
-                work.price = work.cmcPrice.commonPrice
-                work.scaleGrade = work.cmcPrice.scaleGrade
-                work.unit = work.cmcPrice.unit
+                if (work.cmcPrice) {
+                  work.price = work.cmcPrice.commonPrice
+                  work.scaleGrade = work.cmcPrice.scaleGrade
+                  work.unit = work.cmcPrice.unit
+                }
               } else {
-                work.price = work.cmcPrice.complexPrice
-                work.scaleGrade = work.cmcPrice.scaleGrade
-                work.unit = work.cmcPrice.unit
+                if (work.cmcPrice) {
+                  work.price = work.cmcPrice.complexPrice
+                  work.scaleGrade = work.cmcPrice.scaleGrade
+                  work.unit = work.cmcPrice.unit
+                }
               }
             }
             this.loading = false;

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

@@ -2,15 +2,15 @@
   <div>
     <el-form ref="form" :model="form" style="padding: 20px 100px 0">
       <el-form-item label="选择设备：">
-        <span v-if="chooseDevice.length != 0">
-          <el-tag effect="plain" type="success" v-for="item in chooseDevice" style="margin: 5px; font-size: 14px"
+        <span v-if="chooseDeviceList.length != 0">
+          <el-tag effect="plain" type="success" v-for="item in chooseDeviceList" style="margin: 5px; font-size: 14px"
             :key="item.code">
             {{ item.name + "-" + item.series + "-" + item.brand }}
           </el-tag>
         </span>
         <el-button type="success" plain icon="el-icon-plus" @click="openDevice = true" size="mini">选择</el-button>
       </el-form-item>
-      <el-form-item v-if="chooseDevice.length != 0">
+      <el-form-item v-if="chooseDeviceList.length != 0">
         <table border="1">
           <tr>
             <td :colspan="6" class="head">设备成本预算</td>
@@ -23,7 +23,7 @@
             <td style="width: 100px">预算天数</td>
             <td style="width: 100px">总额</td>
           </tr>
-          <tr v-for="device in chooseDevice" :key="device.deviceId">
+          <tr v-for="device in chooseDeviceList" :key="device.deviceId">
             <td>{{ device.name }}</td>
             <td>{{ device.series }}</td>
             <td>{{ device.brand }}</td>
@@ -68,7 +68,7 @@ export default {
       form: {
         deviceCost: 0
       },
-      chooseDevice: [],
+      chooseDeviceList: [],
       openDevice: false,
     }
   },
@@ -81,7 +81,7 @@ export default {
     budgetId() {
       this.initForm()
     },
-    chooseDevice: {
+    chooseDeviceList: {
       handler(newVal) {
         this.$emit('chooseDevice', newVal)
       },
@@ -96,8 +96,8 @@ export default {
     initForm() {
       if (this.budgetId != '') {
         listBudgetDevice({ pageSize: 100, budgetId: this.budgetId }).then((res) => {
-          this.chooseDevice = res.rows;
-          for (let device of this.chooseDevice) {
+          this.chooseDeviceList = res.rows;
+          for (let device of this.chooseDeviceList) {
             device.brand = device.device.brand
             device.depreciation = device.device.dayCost
             device.name = device.device.name
@@ -109,22 +109,24 @@ export default {
     },
     initDeviceCost() {
       let deviceCost = 0;
-      for (let device of this.chooseDevice) {
+      for (let device of this.chooseDeviceList) {
         deviceCost = deviceCost + Number(device.amount);
       }
       this.form.deviceCost = deviceCost.toFixed(2)
     },
     getChooseDevice(val) {
-      this.chooseDevice = val;
+      this.chooseDeviceList = val;
       this.openDevice = false;
-      this.chooseDevice.depreciation = val.device.dayCost;
+      for (let v of val) {
+        v.depreciation = v.dayCost;
+      }
       this.recalculateCost(val, 'amount', 'deviceCost');
     },
     calculateDeviceTotal(device) {
       let total = Number(device.depreciation) * Number(device.days);
       total = isNaN(total) ? 0 : total
       this.$set(device, "amount", total.toFixed(2));
-      this.getCost("amount", "deviceCost", this.chooseDevice);
+      this.getCost("amount", "deviceCost", this.chooseDeviceList);
     },
     recalculateCost(arr, name, formName) {
       let sum = arr.reduce((accumulator, item) => {

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

@@ -314,7 +314,7 @@ export default {
       let total = 0;
       if (user.type === '外业') {
         // 外业人员计算方式
-        user.performance = 200 * Number(user.days) * Number(user.coefficient);
+        user.performance = (200 * Number(user.days) * Number(user.coefficient)).toFixed(2);
       }
       if (!user.dayCost) {
         user.dayCost = (parseFloat(((user.salary.salary + 1780) * 12) / 365) + user.socialSecurityUnit + user.houseFund).toFixed(2);

oa-ui/src/views/flowable/form/components/conditionDisplay.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-23 17:08:16
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-19 16:30:37
+ * @LastEditTime: 2025-05-27 16:07:26
 -->
 <template>
   <div>
@@ -31,7 +31,6 @@
       v-else-if="taskForm.procDefName == '项目结算'"></settle-form>
     <settle-other :key="'so' + taskForm.taskId" :taskForm="taskForm" :taskName="''" :disabled="true"
       v-else-if="taskForm.procDefName == '其他结算'"></settle-other>
-    <!-- <budget-in :key="'budget'+taskForm.taskId" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"></budget-in> -->
     <budget-tab :key="'budget' + taskForm.taskId" :taskForm="taskForm"
       v-else-if="taskForm.procDefName == '项目预算'"></budget-tab>
     <contract-form :key="'cj' + taskForm.taskId" :taskForm="taskForm" :taskName="''" :formDisabled="true"

oa-ui/src/views/flowable/form/projectProcess/budgetTab.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: wrh
  * @Date: 2024-04-26 17:52:02
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-29 14:32:50
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-05-27 16:06:46
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -10,7 +10,8 @@
     <div v-if="haveBudget">
       <!-- <h3 class="text-center">{{ title }}</h3> -->
       <div>
-        <budget-info :taskForm="taskForm"></budget-info>
+        <budget-info :taskForm="taskForm" v-if="isOld"></budget-info>
+        <new-budget-info :taskForm="taskForm" v-else></new-budget-info>
       </div>
     </div>
   </div>
@@ -24,9 +25,11 @@ import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
 import { listBudgetStaff } from "@/api/oa/budget/budgetStaff";
 import { listProjectWork } from "@/api/oa/project/projectWork";
 import BudgetInfo from "../budget/budgetInfo.vue";
+import NewBudgetInfo from "../budget/adjust/newBudgetInfo.vue";
 export default {
   components: {
     BudgetInfo,
+    NewBudgetInfo,
   },
   props: {
     taskForm: Object,
@@ -46,8 +49,8 @@ export default {
       title: "",
       form: {},
       loading: true,
-      workList: [],
-      budgetId:''
+      budgetId: '',
+      isOld: false,
     };
   },
   mounted() {
@@ -64,13 +67,11 @@ export default {
         if (res.total != 0) {
           this.haveBudget = true;
           this.budgetId = res.rows[0].budgetId;
-          listProjectWork({projectId: projectId}).then(res => {
-            if (res.rows) {
-              this.workList = res.rows;
-            }
-            listBudgetSettle({budgetId: this.budgetId}).then(res => {
-            });
-          });
+          if (res.rows[0].project.projectNumber.substring(0, 4) >= 2025) {
+            this.isOld = false;
+          } else {
+            this.isOld = true;
+          }
         }
       });
     },

oa-ui/src/views/oa/budget/index.vue

@@ -26,23 +26,10 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['oa:budget:add']">新增</el-button>
-      </el-col> -->
-      <!-- <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['oa:budget:edit']">修改</el-button>
-      </el-col> -->
-      <!-- <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['oa:budget:remove']">删除</el-button>
-      </el-col> -->
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:budget:export']">导出</el-button>
       </el-col>
-      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table v-loading="loading" :data="budgetList" @selection-change="handleSelectionChange">
@@ -63,14 +50,20 @@
           {{ getUserName(scope.row.auditor) }}
         </template>
       </el-table-column>
+      <el-table-column label="是否核算" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.isAdjust" type="success">是</el-tag>
+          <el-tag v-else type="danger">否</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-            v-hasPermi="['oa:budget:query']">查看</el-button>
-          <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:budget:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:budget:remove']">删除</el-button> -->
+          <el-button size="mini" type="text" icon="el-icon-tickets" @click="handleNewView(scope.row)"
+            v-hasPermi="['oa:budget:query']">新版预算</el-button>
+          <el-button size="mini" type="text" icon="el-icon-document-remove" @click="handleView(scope.row)"
+            v-hasPermi="['oa:budget:query']">旧版预算</el-button>
+          <el-button size="mini" type="text" icon="el-icon-document-checked" @click="handleAdjust(scope.row)"
+            v-hasRole="['leader']" v-if="scope.row.isAdjust">查看核算</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -83,12 +76,14 @@
       <form-data :form="form" @close="open = false"></form-data>
     </el-dialog>
 
-    <el-dialog :title="title" :visible.sync="infoOpen" width="70%" append-to-body>
-      <budget-adjust :taskForm="taskForm" :taskName="''" :row="clickRow" v-show="isAdjust"></budget-adjust>
-      <div v-show="!isAdjust">
-        <budget-info :taskForm="taskForm" :taskName="''" v-show="isOld"></budget-info>
-        <new-budget-info :taskForm="taskForm" :taskName="''" v-show="!isOld"></new-budget-info>
-      </div>
+    <el-dialog title="新版预算" :visible.sync="newInfoOpen" width="70%" append-to-body>
+      <new-budget-info :taskForm="taskForm" :taskName="''"></new-budget-info>
+    </el-dialog>
+    <el-dialog title="旧版预算" :visible.sync="infoOpen" width="70%" append-to-body>
+      <budget-info :taskForm="taskForm" :taskName="''"></budget-info>
+    </el-dialog>
+    <el-dialog title="项目核算" :visible.sync="adjustOpen" width="70%" append-to-body>
+      <budget-adjust :taskForm="taskForm" :taskName="''" :row="clickRow"></budget-adjust>
     </el-dialog>
   </div>
 </template>
@@ -162,7 +157,9 @@ export default {
       queryType: '1',
       isOld: false,
       clickRow: {},
-      isAdjust: false
+      isAdjust: false,
+      adjustOpen: false,
+      newInfoOpen: false,
     };
   },
   created() {
@@ -172,8 +169,16 @@ export default {
     /** 查询cmc预算管理列表 */
     getList() {
       this.loading = true;
-      listBudget(this.queryParams).then(response => {
+      listBudget(this.queryParams).then(async response => {
         this.budgetList = response.rows;
+        for (let i of this.budgetList) {
+          let res = await listCheck({ budgetId: i.budgetId });
+          if (res.rows.length > 0) {
+            this.$set(i, 'isAdjust', true);
+          } else {
+            this.$set(i, 'isAdjust', false);
+          }
+        }
         this.total = response.total;
         this.loading = false;
       });
@@ -255,28 +260,23 @@ export default {
       this.title = "添加预算";
     },
     async handleView(row) {
-      this.isAdjust = this.$store.getters.roles.includes('leader') || this.$store.getters.roles.includes('finance')
-        || this.$store.getters.roles.includes('nfinance') || this.$store.getters.roles.includes('admin');
-      if (this.isAdjust) {
-        let res = await listCheck({ budgetId: row.budgetId });
-        if (res.rows.length > 0) {
-          this.taskForm.formId = res.rows[0].checkId;
-        } else {
-          this.taskForm.formId = row.projectId;
-          this.isAdjust = false;
-        }
-      } else {
-        this.taskForm.formId = row.projectId;
-      }
       this.clickRow = row;
-      let old = Number(row.project.projectNumber.substring(0, 4));
-      if (old >= 2025) {
-        this.isOld = false;
-      } else {
-        this.isOld = true;
-      }
+      this.taskForm.formId = row.projectId;
       this.infoOpen = true;
     },
+    handleNewView(row) {
+      this.taskForm.formId = row.projectId;
+      this.clickRow = row;
+      this.newInfoOpen = true;
+    },
+    async handleAdjust(row) {
+      let res = await listCheck({ budgetId: row.budgetId });
+      if (res.rows.length > 0) {
+        this.taskForm.formId = res.rows[0].checkId;
+      }
+      this.clickRow = row;
+      this.adjustOpen = true;
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();