移动端完善项目页面、完善借款、用车、设备、工作填报

oa-ui-app/api/oa/budget/budgetSite.js

@@ -0,0 +1,50 @@
+/*
+ * @Author: ysh
+ * @Date: 2025-05-12 11:03:30
+ * @LastEditors: 
+ * @LastEditTime: 2025-05-12 11:03:36
+ */
+import request from '@/utils/request'
+
+// 查询cmc现场开支列表
+export function listSite(query) {
+  return request({
+    url: '/oa/site/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc现场开支详细
+export function getSite(expenseId) {
+  return request({
+    url: '/oa/site/' + expenseId,
+    method: 'get'
+  })
+}
+
+// 新增cmc现场开支
+export function addSite(data) {
+  return request({
+    url: '/oa/site',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc现场开支
+export function updateSite(data) {
+  return request({
+    url: '/oa/site',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc现场开支
+export function delSite(expenseId) {
+  return request({
+    url: '/oa/site/' + expenseId,
+    method: 'delete'
+  })
+}

oa-ui-app/api/oa/budget/check.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc项目核算列表
+export function listCheck(query) {
+  return request({
+    url: '/oa/check/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc项目核算详细
+export function getCheck(checkId) {
+  return request({
+    url: '/oa/check/' + checkId,
+    method: 'get'
+  })
+}
+
+// 新增cmc项目核算
+export function addCheck(data) {
+  return request({
+    url: '/oa/check',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc项目核算
+export function updateCheck(data) {
+  return request({
+    url: '/oa/check',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc项目核算
+export function delCheck(checkId) {
+  return request({
+    url: '/oa/check/' + checkId,
+    method: 'delete'
+  })
+}

oa-ui-app/api/system/dict/data.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询字典数据列表
+export function listData(query) {
+  return request({
+    url: '/system/dict/data/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典数据详细
+export function getData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'get'
+  })
+}
+
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType) {
+  return request({
+    url: '/system/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
+
+// 新增字典数据
+export function addData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典数据
+export function updateData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典数据
+export function delData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'delete'
+  })
+}

oa-ui-app/api/system/dict/type.js

@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 查询字典类型列表
+export function listType(query) {
+  return request({
+    url: '/system/dict/type/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典类型详细
+export function getType(dictId) {
+  return request({
+    url: '/system/dict/type/' + dictId,
+    method: 'get'
+  })
+}
+
+// 新增字典类型
+export function addType(data) {
+  return request({
+    url: '/system/dict/type',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典类型
+export function updateType(data) {
+  return request({
+    url: '/system/dict/type',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典类型
+export function delType(dictId) {
+  return request({
+    url: '/system/dict/type/' + dictId,
+    method: 'delete'
+  })
+}
+
+// 刷新字典缓存
+export function refreshCache() {
+  return request({
+    url: '/system/dict/type/refreshCache',
+    method: 'delete'
+  })
+}
+
+// 获取字典选择框列表
+export function optionselect() {
+  return request({
+    url: '/system/dict/type/optionselect',
+    method: 'get'
+  })
+}

oa-ui-app/main.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-01-16 11:17:07
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-18 17:11:37
+ * @LastEditTime: 2025-05-28 10:20:17
  */
 import Vue from 'vue'
 import App from './App'

oa-ui-app/pages.json

@@ -121,6 +121,20 @@
 			{
 				"navigationBarTitleText" : "项目详情"
 			}
+		},
+		{
+			"path" : "pages/oa/budget/budgetInfo",
+			"style" : 
+			{
+				"navigationBarTitleText" : "项目预算表"
+			}
+		},
+		{
+			"path" : "pages/oa/borrow/borrowList",
+			"style" : 
+			{
+				"navigationBarTitleText" : "借款管理"
+			}
 		}
 	],
 	"tabBar": {

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

@@ -3,18 +3,21 @@
     <view class="modal-container">
       <!-- 搜索表单 -->
       <view class="search-box">
-        <!-- <uni-data-select v-model="queryParams.status" :localdata="statusOptions" style="width: 200rpx;"
-          :clearable="false" @change="handleSearch" disabled>
-        </uni-data-select> -->
-
-        <uni-easyinput v-model="queryParams.code" placeholder="出厂编号" @change="handleSearch" clearable>
-        </uni-easyinput>
-
-        <uni-easyinput v-model="queryParams.name" placeholder="设备名称" @change="handleSearch" clearable>
-        </uni-easyinput>
-
-        <uni-easyinput v-model="queryParams.brand" placeholder="设备品牌" @change="handleSearch" clearable>
-        </uni-easyinput>
+        <view class="search-type">
+          <uni-data-select v-model="searchType" :localdata="searchTypeOptions" @change="handleSearchTypeChange">
+          </uni-data-select>
+        </view>
+        <view class="search-item">
+          <uni-easyinput v-show="searchType === 'code'" v-model="queryParams.code" placeholder="出厂编号"
+            @blur="handleSearch" clearable>
+          </uni-easyinput>
+          <uni-data-select v-show="searchType === 'name'" v-model="queryParams.name" :localdata="nameList"
+            @change="handleSearch" clearable>
+          </uni-data-select>
+          <uni-easyinput v-show="searchType === 'brand'" v-model="queryParams.brand" placeholder="设备品牌"
+            @blur="handleSearch" clearable>
+          </uni-easyinput>
+        </view>
       </view>
 
       <!-- 设备列表 -->
@@ -76,13 +79,20 @@ export default {
 
   data() {
     return {
+      searchType: 'code',
+      searchTypeOptions: [
+        { value: 'code', text: '出厂编号' },
+        { value: 'name', text: '设备名称' },
+        { value: 'brand', text: '设备品牌' }
+      ],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         status: '1',
         type: '仪器设备',
         code: '',
-        name: ''
+        name: '',
+        brand: ''
       },
       statusOptions: [
         { value: '0', text: '被领用' },
@@ -95,7 +105,8 @@ export default {
       selectedList: [],
       hasMore: true,
       loading: false,
-      scrollTop: 0
+      scrollTop: 0,
+      nameList: []
     }
   },
 
@@ -119,6 +130,7 @@ export default {
 
   created() {
     this.debouncedSearch = debounce(this.loadData, 300);
+    this.getNameList();
   },
 
   methods: {
@@ -137,7 +149,7 @@ export default {
       this.loading = true;
       try {
         const res = await listDevice(this.queryParams);
-        
+
         // 如果是第一页，直接替换列表
         if (this.queryParams.pageNum === 1) {
           this.list = res.rows;
@@ -163,7 +175,23 @@ export default {
         this.loading = false;
       }
     },
-
+    getNameList() {
+      listDeviceName().then(res => {
+        this.nameList = res.data.filter(function (item) {
+          return item !== null;
+        }).map(function (item) {
+          return { value: item.name, text: item.name };
+        });
+      })
+    },
+    // 搜索类型改变处理
+    handleSearchTypeChange() {
+      // 清空其他搜索字段
+      this.queryParams.code = '';
+      this.queryParams.name = '';
+      this.queryParams.brand = '';
+      this.handleSearch();
+    },
     // 搜索处理
     handleSearch() {
       // 重置分页参数
@@ -231,10 +259,32 @@ export default {
 
 .search-box {
   display: flex;
-  flex-wrap: wrap;
+  flex-direction: row;
+  align-items: center;
   gap: 16rpx;
   margin-bottom: 32rpx;
 
+  .search-type {
+    width: 30%;
+
+    ::v-deep .uni-data-select {
+      width: 100%;
+    }
+  }
+
+  .search-item {
+    width: 70%;
+    position: relative;
+    height: 72rpx;
+    /* 设置固定高度，与输入框高度一致 */
+
+    ::v-deep .uni-easyinput__content,
+    ::v-deep .uni-data-select {
+      height: 72rpx;
+      line-height: 72rpx;
+    }
+  }
+
   ::v-deep .uni-easyinput__content {
     border-radius: 16rpx;
   }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-02-20 10:20:22
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-28 14:27:15
+ * @LastEditTime: 2025-05-29 10:15:51
 -->
 <template>
   <view class="form-container">
@@ -55,13 +55,13 @@
 
       <!-- 最大借款金额限制 -->
       <uni-forms-item label="最大借款金额" class="form-item" v-if="form.borrowUsage == '0'">
-        <view class="amount-text">¥ {{ totalBudget.toFixed(2) }}</view>
+        <view class="amount-text">¥ {{ siteExpenses.toFixed(2) }}</view>
       </uni-forms-item>
       <uni-forms-item label="已申请借款" class="form-item" v-if="form.borrowUsage == '0'">
         <view class="amount-text">¥ {{ hasBorrow.toFixed(2) }}</view>
       </uni-forms-item>
       <uni-forms-item label="可用借款" class="form-item" v-if="form.borrowUsage == '0'">
-        <view class="amount-text">¥ {{ (totalBudget - hasBorrow).toFixed(2) }}</view>
+        <view class="amount-text">¥ {{ (siteExpenses - hasBorrow).toFixed(2) }}</view>
       </uni-forms-item>
       <uni-forms-item label="申请金额" required class="form-item">
         <view class="amount-text">¥ {{ (this.form.applyAmount ? this.form.applyAmount : 0).toFixed(2) }}</view>
@@ -151,6 +151,7 @@ import ProjectInfo from '@/pages/components/ProjectInfo.vue';
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import ProjectPicker from '@/pages/components/ProjectPicker.vue';
 import { listProject, getProject } from "@/api/oa/project/project";
+import { listSite, delSite } from "@/api/oa/budget/budgetSite.js";
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
 import { getUserByPost, getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
 import BorrowDetail from './borrowDetail.vue';
@@ -229,7 +230,7 @@ export default {
       selectedProject: null, //选中的项目
       projectObj: {}, //项目信息的项目
       formTotal: 0,
-      totalBudget: 0, //预结算额
+      siteExpenses: 0, //预结算额
       exceed: false, //是否超预算
       hasBorrow: 0, //已申请借款
       deptId: undefined,
@@ -313,37 +314,8 @@ export default {
                 this.projectObj = res.data;
               }
             })
-            let budgetData = await listBudget({ projectId: this.form.projectId })
-            if (budgetData.total == 1) {
-              let budget = budgetData.rows[0];
-              this.totalBudget = budget.settleExpense
-            } else if (budgetData.total == 0) {
-              this.totalBudget = 0
-            }
-            if (this.form.borrowUsage == '0') {
-              if ((this.totalBudget - this.form.applyAmount) < 0) {
-                this.exceed = true;
-              } else {
-                this.exceed = false;
-              }
-            } else {
-              this.exceed = false;
-            }
-            let borrow = await listBorrow({ projectId: this.form.projectId })
-            if (borrow.total != 0) {
-              let borrowList = borrow.rows;
-              let hasBorrow = 0;
-              borrowList = borrowList.filter(item => item.borrowId != this.taskForm.formId)
-              borrowList.forEach(element => {
-                if (element.managerAmount) {
-                  hasBorrow = hasBorrow + element.managerAmount
-                }
-                if (!element.managerAmount && element.applyAmount) {
-                  hasBorrow = hasBorrow + element.applyAmount
-                }
-              });
-              this.hasBorrow = hasBorrow
-            }
+            await this.getMaxExpense();
+
           }
         } else {
           this.formTotal = 0;
@@ -353,6 +325,42 @@ export default {
       })
 
     },
+    async getMaxExpense() {
+      let budgetData = await listBudget({ projectId: this.form.projectId })
+      if (budgetData.total == 1) {
+        let budget = budgetData.rows[0];
+        let siteRes = await listSite({ budgetId: budget.budgetId });
+        let maxExpense = siteRes.rows.reduce((sum, site) => sum + (Number(site.amount) || 0), 0);
+        this.siteExpenses = maxExpense
+      } else {
+        this.siteExpenses = 0
+      }
+      if (this.form.borrowUsage == '0') {
+        if ((this.siteExpenses - this.form.applyAmount) < 0) {
+          this.exceed = true;
+        } else {
+          this.exceed = false;
+        }
+      } else {
+        this.exceed = false;
+      }
+      let borrow = await listBorrow({ projectId: this.form.projectId })
+      if (borrow.total != 0) {
+        let borrowList = borrow.rows;
+        let hasBorrow = 0;
+        borrowList = borrowList.filter(item => item.borrowId != this.taskForm.formId)
+        borrowList.forEach(element => {
+          if (element.managerAmount) {
+            hasBorrow = hasBorrow + element.managerAmount
+          }
+          if (!element.managerAmount && element.applyAmount) {
+            hasBorrow = hasBorrow + element.applyAmount
+          }
+        });
+        this.hasBorrow = hasBorrow
+      }
+      this.getMoreAmount();
+    },
     hanldeChangeType() {
       if (this.form.borrowUsage == '2') {
         this.dgtLabel = '工会审核意见'
@@ -366,9 +374,9 @@ export default {
     getMoreAmount(type) {
       let result;
       if (type == '0') {
-        result = this.form.applyAmount - (this.totalBudget - this.hasBorrow);
+        result = this.form.applyAmount - (this.siteExpenses - this.hasBorrow);
       } else {
-        result = this.form.managerAmount - (this.totalBudget - this.hasBorrow);
+        result = this.form.managerAmount - (this.siteExpenses - this.hasBorrow);
       }
       return result.toFixed(2)
     },
@@ -382,6 +390,7 @@ export default {
       this.selectedProject = project;
       this.projectObj = project;
       this.form.projectId = project.projectId;
+      this.getMaxExpense();
     },
     // 保存
     async saves() {
@@ -591,7 +600,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 .amount-text {
   font-size: 16px;
   font-weight: bold;

oa-ui-app/pages/form/borrow/borrowDetail.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-02-27 10:43:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-19 10:34:18
+ * @LastEditTime: 2025-05-28 11:05:53
 -->
 <template>
   <view class="container">
@@ -51,7 +51,8 @@
         <text class="popup-title">新增借款项</text>
         <uni-forms ref="form" :modelValue="newItem" :rules="rules" label-position="top" label-width="150">
           <uni-forms-item label="开支项目" name="borrowItem" required class="form-item">
-            <uni-easyinput v-model="newItem.borrowItem" placeholder="请输入开支项目" />
+            <uni-data-select v-model="newItem.borrowItem" :localdata="dictsList" placeholder="请选择开支项目"
+              @change="handleExpenseChange" />
           </uni-forms-item>
           <uni-forms-item label="单位" name="unit" required class="form-item">
             <uni-easyinput v-model="newItem.unit" placeholder="请输入单位" />
@@ -73,12 +74,24 @@
         </uni-forms>
       </view>
     </view>
+    <!-- 新增开支项字典弹窗 -->
+    <view class="new-expense-popup" v-if="openNewExpense">
+      <view class="popup-content">
+        <text class="popup-title">新增开支项</text>
+        <uni-easyinput v-model="newExpenseName" placeholder="请输入开支名称" />
+        <view class="popup-buttons">
+          <u-button style="margin-right: 10px;" @click="openNewExpense = false">取消</u-button>
+          <u-button type="primary" class="confirm" @click="addNewExpense">确认添加</u-button>
+        </view>
+      </view>
+    </view>
   </view>
 </template>
 
 <script>
 import { listBorrowDetail, addBorrowDetail, updateBorrowDetail, delBorrowDetail, delBorrowDetailByDetailId } from "@/api/oa/borrow/borrowDetail";
 import uButton from '../../../uni_modules/uview-ui/components/u-button/u-button.vue';
+import { addData, getDicts } from "@/api/system/dict/data";
 export default {
   components: { uButton },
   props: {
@@ -124,10 +137,14 @@ export default {
       },
       errorMessage: '',
       isModify: false,
+      dictsList: [], //开支项字典
+      openNewExpense: false, //新增开支项字典弹窗
+      newExpenseName: '', //新增开支项名称
     }
   },
   created() {
     this.initList();
+    this.initDict();
   },
   watch: {
     borrowId() {
@@ -151,6 +168,45 @@ export default {
         }
       });
     },
+    initDict() {
+      getDicts('cmc_borrow_expense').then(res => {
+        this.dictsList = res.data.map(item => ({
+          value: item.dictValue,
+          text: item.dictLabel
+        }))
+        this.dictsList.push({
+          value: 'newExpense',
+          text: '+新增更多开支项...'
+        })
+      })
+    },
+    handleExpenseChange(value) {
+      console.log(value);
+      if (value == 'newExpense') {
+        this.openNewExpense = true;
+      }
+    },
+    addNewExpense() {
+      if (this.newExpenseName == '') {
+        this.$modal.msgError('请输入开支名称');
+        return;
+      }
+      let length = this.dictsList.length;
+      let newExpenseForm = {
+        dictType: 'cmc_borrow_expense',
+        dictLabel: this.newExpenseName,
+        dictValue: this.newExpenseName,
+        listClass: 'default',
+        dictSort: length
+      }
+      addData(newExpenseForm).then(res => {
+        this.$modal.msgSuccess('新增成功');
+        this.openNewExpense = false;
+        this.newItem.borrowItem = this.newExpenseName;
+        this.newExpenseName = '';
+        this.initDict();
+      })
+    },
     // 确认添加
     confirmAdd() {
       const borrowId = this.borrowId
@@ -363,4 +419,17 @@ export default {
 .popup-buttons {
   display: flex;
 }
+
+.new-expense-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 1000;
+}
 </style>

oa-ui-app/pages/form/device/device.vue

@@ -24,18 +24,26 @@
       </uni-forms-item>
 
       <!-- 选择项目 -->
-      <uni-forms-item label="选择项目" required class="form-item" name="projectId">
+      <uni-forms-item label="选择项目" class="form-item" name="projectId">
+        <view v-if="taskName == '设备申请'" style="display: flex; align-items: center; margin-bottom: 10px;">
+          <uni-icons type="info" size="16" color="#666"></uni-icons>
+          <text style="font-size: 24rpx; color: #666;">项目非必选，非项目设备申请时，可不选项目</text>
+        </view>
         <uv-button type="primary" @click="openProject = true" v-if="taskName == '设备申请'">+ 选择项目</uv-button>
         <ProjectPicker :visible.sync="openProject" :selected.sync="selectedProject" @confirm="handleConfirm" />
-        <ProjectInfo :project="projectObj"></ProjectInfo>
+        <ProjectInfo :project="projectObj" v-if="form.projectId != '0'"></ProjectInfo>
+        <view v-if="form.projectId == '0' && taskName != '设备申请'">
+          <uni-tag type="primary" text="非项目设备申请"></uni-tag>
+        </view>
       </uni-forms-item>
+      <!-- 设备选择器 -->
+      <device-picker :visible.sync="openDevice" :selected.sync="selectDevice" :multiple="!isReplaceMode"
+        @confirm="handleDeviceConfirm"></device-picker>
 
       <!-- 设备选择 -->
       <uni-forms-item label="申请设备" required class="form-item" name="devices"
         v-if="taskName != '安排设备' && taskName != '归还确认'">
         <uv-button type="primary" @click="openDevice = true" v-if="taskName == '设备申请'">+ 选择设备</uv-button>
-        <device-picker :visible.sync="openDevice" :selected.sync="selectDevice" :multiple="!isReplaceMode"
-          @confirm="handleDeviceConfirm"></device-picker>
         <view class="device-cards" v-if="deviceList.length > 0">
           <view class="device-card" v-for="(item, index) in deviceList" :key="index">
             <view class="card-header">
@@ -147,7 +155,7 @@
 
       <!-- 归还确认 -->
       <uni-forms-item label="已归还设备" required class="form-item" v-if="taskName == '' || taskName == '归还确认'">
-        <text style="color: #a69494;" v-if="taskName == '归还确认'">Tips：请点击卡片，切换归还状态</text>
+        <text style="color: #3c9cff;" v-if="taskName == '归还确认'">Tips：请点击卡片，切换归还状态</text>
         <view class="device-cards" v-if="returnDevicesList.length > 0">
           <view class="device-card" v-for="(item, index) in returnDevicesList" :key="index"
             :class="{ 'selected': isDeviceSelected(item.deviceId) }" @click="toggleDeviceSelection(item)">
@@ -224,7 +232,7 @@
             </view>
           </view>
         </view>
-        <view v-else>
+        <view v-if="repairDevicesList.length == 0 && taskName != '归还确认'" style="margin-top: 10rpx;">
           <uni-tag type="success" text="没有需维修的设备" size="small"></uni-tag>
         </view>
       </uni-forms-item>
@@ -311,9 +319,9 @@ export default {
         returnDate: ''
       },
       rules: {
-        projectId: {
-          rules: [{ required: true, errorMessage: '请选择项目' }]
-        },
+        // projectId: {
+        //   rules: [{ required: true, errorMessage: '请选择项目' }]
+        // },
         devices: {
           rules: [{ required: true, errorMessage: '请选择设备' }]
         },
@@ -405,12 +413,14 @@ export default {
           this.formTotal = 1;
           this.form = res.data;
           this.applierUserName = res.data.applierUser.nickName;
-          const project = await getProject(res.data.projectId);
-          this.projectObj = project.data;
+          if (res.data.projectId != '0') {
+            const project = await getProject(res.data.projectId);
+            this.projectObj = project.data;
+          }
           // 初始化申请设备
           if (res.data.devices) {
             const deviceIds = res.data.devices.split(',').map(id => parseInt(id));
-            this.form.devices = res.data.devices.split(',');
+            this.form.devices = res.data.devices.split(',').map(id => parseInt(id));
             this.deviceList = [];
             this.selectDevice = [];
 
@@ -432,7 +442,7 @@ export default {
               : Array.isArray(res.data.modifyDevices)
                 ? res.data.modifyDevices.map(id => parseInt(id))
                 : [];
-            this.form.modifyDevices = res.data.modifyDevices.split(',');
+            this.form.modifyDevices = res.data.modifyDevices.split(',').map(id => parseInt(id));
             this.modifyDeviceList = [];
 
             for (const id of modifyDeviceIds) {
@@ -494,8 +504,10 @@ export default {
           }
 
           if (this.form.beginDate && this.form.endDate) {
-            this.form.dateRange = [this.form.beginDate, this.form.endDate];
+            let dateRange = [this.form.beginDate, this.form.endDate];
+            this.$set(this.form, 'dateRange', dateRange);
           }
+
         } else {
           this.form.applier = this.$store.getters.userId;
           this.form.applyDate = parseTime(new Date(), "{y}-{m}-{d}");
@@ -532,7 +544,7 @@ export default {
         this.isReplaceMode = false;
       } else {
         this.deviceList = Array.isArray(devices) ? devices : [devices];
-        this.form.devices = this.deviceList.map(item => item.deviceId);
+        this.form.devices = this.deviceList.map(item => Number(item.deviceId));
       }
     },
     handleDateRangeChange(e) {
@@ -584,26 +596,45 @@ export default {
     },
     submit() {
       this.$refs.form.validate().then(() => {
-        let submitData = {
-          ...this.form,
-          ...(this.form.formId ? {} : { formId: this.taskForm.formId }),
-          ...(this.form.deviceApplyId ? {} : { deviceApplyId: this.taskForm.formId })
-        };
-        let jsonForm = JSON.stringify(submitData);
-        submitDeviceApproval(jsonForm).then(res => {
-          // 获取下一个流程节点
-          this.getNextFlowNodeApproval().then(() => {
-            uni.showToast({
-              title: '提交成功',
-              icon: 'success'
+        this.$modal.confirm('是否提交设备申请？').then(() => {
+          let submitData = {
+            ...this.form,
+            ...(this.form.formId ? {} : { formId: this.taskForm.formId }),
+            ...(this.form.deviceApplyId ? {} : { deviceApplyId: this.taskForm.formId })
+          };
+          let jsonForm = JSON.stringify(submitData);
+          if (!this.form.deviceApplyId) {
+            submitDeviceApproval(jsonForm).then(res => {
+              // 获取下一个流程节点
+              this.getNextFlowNodeApproval().then(() => {
+                uni.showToast({
+                  title: '提交成功',
+                  icon: 'success'
+                });
+                setTimeout(() => {
+                  uni.switchTab({
+                    url: '/pages/message/index'
+                  })
+                }, 500);
+              })
             });
-            setTimeout(() => {
-              uni.switchTab({
-                url: '/pages/message/index'
+          } else {
+            modifyDeviceApproval(jsonForm).then(res => {
+              // 获取下一个流程节点
+              this.getNextFlowNodeApproval().then(() => {
+                uni.showToast({
+                  title: '提交成功',
+                  icon: 'success'
+                });
+                setTimeout(() => {
+                  uni.switchTab({
+                    url: '/pages/message/index'
+                  })
+                }, 500);
               })
-            }, 500);
-          })
-        });
+            })
+          }
+        })
       });
     },
     saves() {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-02-19 15:30:13
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-23 16:00:38
+ * @LastEditTime: 2025-06-03 10:19:28
 -->
 <template>
   <view class="page-container">
@@ -203,7 +203,7 @@ export default {
             }
             revokeProcess(params).then(res => {
               this.$modal.msgSuccess(res.msg);
-              this.upCallback();
+              this.downCallback();
             });
           }
         }

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-26 10:46:52
+ * @LastEditTime: 2025-05-29 10:29:10
 -->
 <template>
   <view class="page-container">
@@ -245,7 +245,7 @@ export default {
             }
             return delDeployment(ids);
           }).then(() => {
-            this.upCallback();
+            this.downCallback();
             this.$modal.msgSuccess("流程取消成功");
             this.$refs.actionPopup.close()
           })

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

@@ -1,5 +1,11 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-01-16 11:17:08
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-06-03 14:51:33
+-->
 <template>
-  <view class="mine-container" :style="{height: `${windowHeight}px`}">
+  <view class="mine-container" :style="{ height: `${windowHeight}px` }">
     <!--顶部个人信息栏-->
     <view class="header-section">
       <view class="flex padding justify-between">
@@ -70,6 +76,12 @@
             <view>应用设置</view>
           </view>
         </view>
+        <view class="list-cell list-cell-arrow" @click="handleLogout">
+          <view class="menu-item-box" style="color:#f56c6c">
+            <view class="iconfont icon-logout menu-icon" style="color:#f56c6c"></view>
+            <view>退出登录</view>
+          </view>
+        </view>
       </view>
 
     </view>
@@ -77,122 +89,122 @@
 </template>
 
 <script>
-  import storage from '@/utils/storage'
-  
-  export default {
-    data() {
-      return {
-        name: this.$store.state.user.name,
-        version: getApp().globalData.config.appInfo.version
-      }
+import storage from '@/utils/storage'
+
+export default {
+  data() {
+    return {
+      name: this.$store.state.user.name,
+      version: getApp().globalData.config.appInfo.version
+    }
+  },
+  computed: {
+    avatar() {
+      return this.$store.state.user.avatar
     },
-    computed: {
-      avatar() {
-        return this.$store.state.user.avatar
-      },
-      windowHeight() {
-        return uni.getSystemInfoSync().windowHeight - 50
-      }
+    windowHeight() {
+      return uni.getSystemInfoSync().windowHeight - 50
+    }
+  },
+  methods: {
+    handleToInfo() {
+      this.$tab.navigateTo('/pages/mine/info/index')
+    },
+    handleToEditInfo() {
+      this.$tab.navigateTo('/pages/mine/info/edit')
     },
-    methods: {
-      handleToInfo() {
-        this.$tab.navigateTo('/pages/mine/info/index')
-      },
-      handleToEditInfo() {
-        this.$tab.navigateTo('/pages/mine/info/edit')
-      },
-      handleToSetting() {
-        this.$tab.navigateTo('/pages/mine/setting/index')
-      },
-      handleToLogin() {
-        this.$tab.reLaunch('/pages/login')
-      },
-      handleToAvatar() {
-        this.$tab.navigateTo('/pages/mine/avatar/index')
-      },
-      handleLogout() {
-        this.$modal.confirm('确定注销并退出系统吗？').then(() => {
-          this.$store.dispatch('LogOut').then(() => {
-            this.$tab.reLaunch('/pages/index')
-          })
+    handleToSetting() {
+      this.$tab.navigateTo('/pages/mine/setting/index')
+    },
+    handleToLogin() {
+      this.$tab.reLaunch('/pages/login')
+    },
+    handleToAvatar() {
+      this.$tab.navigateTo('/pages/mine/avatar/index')
+    },
+    handleLogout() {
+      this.$modal.confirm('确定注销并退出系统吗？').then(() => {
+        this.$store.dispatch('LogOut').then(() => {
+          this.$tab.reLaunch('/pages/index')
         })
-      },
-      handleHelp() {
-        this.$tab.navigateTo('/pages/mine/help/index')
-      },
-      handleAbout() {
-        this.$tab.navigateTo('/pages/mine/about/index')
-      },
-      handleJiaoLiuQun() {
-        this.$modal.showToast('QQ群：133713780')
-      },
-      handleBuilding() {
-        this.$modal.showToast('模块建设中~')
-      }
+      })
+    },
+    handleHelp() {
+      this.$tab.navigateTo('/pages/mine/help/index')
+    },
+    handleAbout() {
+      this.$tab.navigateTo('/pages/mine/about/index')
+    },
+    handleJiaoLiuQun() {
+      this.$modal.showToast('QQ群：133713780')
+    },
+    handleBuilding() {
+      this.$modal.showToast('模块建设中~')
     }
   }
+}
 </script>
 
 <style lang="scss">
-  page {
-    background-color: #f5f6f7;
-  }
+page {
+  background-color: #f5f6f7;
+}
 
-  .mine-container {
-    width: 100%;
-    height: 100%;
+.mine-container {
+  width: 100%;
+  height: 100%;
 
 
-    .header-section {
-      padding: 15px 15px 45px 15px;
-      background-color: #3c96f3;
-      color: white;
+  .header-section {
+    padding: 15px 15px 45px 15px;
+    background-color: #3c96f3;
+    color: white;
 
-      .login-tip {
-        font-size: 18px;
-        margin-left: 10px;
-      }
+    .login-tip {
+      font-size: 18px;
+      margin-left: 10px;
+    }
 
-      .cu-avatar {
-        border: 2px solid #eaeaea;
+    .cu-avatar {
+      border: 2px solid #eaeaea;
 
-        .icon {
-          font-size: 40px;
-        }
+      .icon {
+        font-size: 40px;
       }
+    }
 
-      .user-info {
-        margin-left: 15px;
+    .user-info {
+      margin-left: 15px;
 
-        .u_title {
-          font-size: 18px;
-          line-height: 30px;
-        }
+      .u_title {
+        font-size: 18px;
+        line-height: 30px;
       }
     }
+  }
+
+  .content-section {
+    position: relative;
+    top: -50px;
+
+    .mine-actions {
+      margin: 15px 15px;
+      padding: 20px 0px;
+      border-radius: 8px;
+      background-color: white;
+
+      .action-item {
+        .icon {
+          font-size: 28px;
+        }
 
-    .content-section {
-      position: relative;
-      top: -50px;
-
-      .mine-actions {
-        margin: 15px 15px;
-        padding: 20px 0px;
-        border-radius: 8px;
-        background-color: white;
-
-        .action-item {
-          .icon {
-            font-size: 28px;
-          }
-
-          .text {
-            display: block;
-            font-size: 13px;
-            margin: 8px 0px;
-          }
+        .text {
+          display: block;
+          font-size: 13px;
+          margin: 8px 0px;
         }
       }
     }
   }
+}
 </style>

oa-ui-app/pages/mine/setting/index.vue

@@ -20,13 +20,13 @@
         </view>
       </view>
     </view>
-    <view class="cu-list menu">
+    <!-- <view class="cu-list menu">
       <view class="cu-item item-box">
         <view class="content text-center" @click="handleLogout">
           <text class="text-black">退出登录</text>
         </view>
       </view>
-    </view>
+    </view> -->
   </view>
 </template>
 

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

@@ -0,0 +1,159 @@
+<template>
+  <view class="container">
+    <uv-tabs :list="tabList" @click="clickTab"></uv-tabs>
+    <view>
+      
+    </view>
+  </view>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      tabList: [{
+        name: '项目借款',
+      }, {
+        name: '非项目借款',
+      }, {
+        name: '工会借款'
+      }, {
+        name: '党委借款'
+      }, {
+        name: '团委借款'
+      }],
+      selectedTab: '项目借款',
+      isSearchExpanded: false,
+      queryParams: {
+        projectId: '',
+        applier: '',
+        borrowUsage: ''
+      },
+      borrowUsageList: [
+        {
+          value: '0',
+          text: '项目借款'
+        },
+        {
+          value: '1',
+          text: '非项目借款'
+        },
+        {
+          value: '2',
+          text: '工会借款'
+        },
+        {
+          value: '3',
+          text: '党委借款'
+        },
+        {
+          value: '4',
+          text: '团委借款'
+        }
+      ],
+      selectedBorrowUsage: '项目借款'
+    }
+  },
+  methods: {
+    toggleSearch() {
+      this.isSearchExpanded = !this.isSearchExpanded;
+    },
+    handleQuery() {
+      console.log(this.queryParams);
+    },
+    resetQuery() {
+      this.queryParams = {
+        projectNumber: '',
+        projectName: '',
+        leader: '',
+        dept: ''
+      };
+    },
+    handleBorrowUsageChange(e) {
+      this.selectedBorrowUsage = this.borrowUsageList[e.target.value].text;
+    },
+    clickTab(obj) {
+      console.log(obj);
+      let index = obj.index;
+      this.selectedTab = this.tabList[index].name;
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  padding: 20rpx;
+  background-color: #f5f5f5;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.search-box {
+  background-color: #fff;
+  border-radius: 8rpx;
+  margin-bottom: 20rpx;
+  overflow: hidden;
+}
+
+.search-header {
+  padding: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.search-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+}
+
+.search-icon {
+  font-size: 28rpx;
+  color: #909399;
+}
+
+.search-content {
+  padding: 20rpx;
+}
+
+.search-item {
+  margin-bottom: 20rpx;
+}
+
+.search-item text {
+  display: block;
+  margin-bottom: 10rpx;
+  font-size: 28rpx;
+  color: #333;
+}
+
+.search-item input,
+.search-item .picker {
+  width: 100%;
+  height: 80rpx;
+  padding: 0 20rpx;
+  border: 1px solid #dcdfe6;
+  border-radius: 4rpx;
+  box-sizing: border-box;
+}
+
+.search-item .picker {
+  line-height: 80rpx;
+  color: #606266;
+}
+
+.search-buttons {
+  display: flex;
+  gap: 20rpx;
+  margin-top: 20rpx;
+}
+
+.search-buttons button {
+  flex: 1;
+}
+</style>

oa-ui-app/pages/oa/budget/budgetInfo.vue

@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <view class="section">
+      <view class="section-title">
+        <view class="line"></view>
+        <text>项目预算表</text>
+      </view>
+    </view>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        budgetList: [],
+        budgetTotal: 0,
+        budgetPage: 1,
+        budgetLimit: 10
+      }
+    },
+    created() {
+      this.getBudgetList()
+    },
+    methods: {
+      getBudgetList() {
+        
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

oa-ui-app/pages/project/projectInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-05-26 10:44:29
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-27 10:10:16
+ * @LastEditTime: 2025-05-30 15:05:07
 -->
 <template>
   <view class="container">
@@ -153,8 +153,7 @@
           <view class="info-item full-width">
             <text class="label">项目预算编制</text>
             <view class="value">
-              <text class="link" @click="openBudget = true" v-if="isProjectLeader">项目预算表</text>
-              <text class="link" @click="openBudget = true" v-else-if="hasPermi(['oa:allproject:query'])">项目预算表</text>
+              <text class="link" @click="openBudgetFn" v-if="isProjectLeader">项目预算表</text>
             </view>
           </view>
         </view>
@@ -179,10 +178,10 @@
             <text class="label">质量检查员</text>
             <text class="value">{{ project.qualityInspectorName }}</text>
           </view>
-          <view class="info-item">
+          <!-- <view class="info-item">
             <text class="label">技术方案设计</text>
             <text class="value link" @click="openPlan = true">技术方案审批表</text>
-          </view>
+          </view> -->
         </view>
       </view>
 
@@ -231,7 +230,7 @@
           <text>项目生产情况</text>
         </view>
         <view class="info-list">
-          <view class="info-item full-width">
+          <!-- <view class="info-item full-width">
             <text class="label" style="width:200rpx">安全交底记录表</text>
             <view class="value">
               <text class="link" @click="openSafe = true">安全交底记录表</text>
@@ -244,7 +243,7 @@
               <text class="link" @click="openTech = true">技术交底记录表</text>
               <button class="btn-small" @click="handleUrge('2')" v-if="isSend">发送企业微信消息提醒相关人员</button>
             </view>
-          </view>
+          </view> -->
           <view class="info-item full-width">
             <text class="label">申请设备</text>
             <view class="value">
@@ -399,7 +398,6 @@ export default {
       actualList: [],
       contractCode: "",
       contractNumber: "",
-      openBudget: false,
       openPlan: false,
       openSafe: false,
       openTech: false,
@@ -464,7 +462,7 @@ export default {
       const res = await getProject(projectId)
       if (res.data) {
         this.project = res.data;
-        if (this.project.projectLeader == this.$store.state.user.id) {
+        if (this.project.projectLeader == this.$store.getters.userId) {
           this.isProjectLeader = true;
         }
         let deptArr = [];
@@ -503,7 +501,6 @@ export default {
             return res.data.nickName
           }))
         }
-        console.log(this.devices, this.cars, this.drivers, this.participates)
         this.getManagerList();
       }
     },
@@ -685,30 +682,6 @@ export default {
       uni.navigateBack();
     },
 
-    // 预览文档
-    reviewWord(url) {
-      uni.navigateTo({
-        url: '/pages/preview/preview?url=' + encodeURIComponent(url)
-      });
-    },
-
-    // 下载文件
-    downloadFile(url) {
-      uni.downloadFile({
-        url: url,
-        success: (res) => {
-          if (res.statusCode === 200) {
-            uni.openDocument({
-              filePath: res.tempFilePath,
-              success: function () {
-                console.log('打开文档成功');
-              }
-            });
-          }
-        }
-      });
-    },
-
     // 处理设备选择变化
     onDeviceChange(e) {
       this.devices = e.detail.value;
@@ -798,6 +771,11 @@ export default {
       return pattern.replace('{y}', year)
         .replace('{m}', month.toString().padStart(2, '0'))
         .replace('{d}', day.toString().padStart(2, '0'));
+    },
+    openBudgetFn() {
+      uni.navigateTo({
+        url: '/pages/form/budget/budgetInfo?projectId=' + this.project.projectId
+      })
     }
   }
 }
@@ -1027,7 +1005,8 @@ export default {
   word-break: break-all;
   padding-left: 10rpx;
 }
-.device-item{
+
+.device-item {
   border-bottom: 1px solid #e2e2e2;
   padding: 10rpx;
 }

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

@@ -14,13 +14,19 @@
     <!-- 宫格组件 -->
     <uni-section title="常用操作" type="line"></uni-section>
     <view class="grid-body">
-      <uni-grid :column="4" :showBorder="false" @change="openSendFlow">
+      <uni-grid :column="4" :showBorder="false">
         <uni-grid-item>
-          <view class="grid-item-box">
-            <uni-icons type="paperplane-filled" size="30" color="#2979ff"></uni-icons>
+          <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="openBorrow">
+            <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>
       <!-- <uni-grid :column="4" :showBorder="false" @change="changeGrid">
         <uni-grid-item>
@@ -82,7 +88,7 @@
 
     <uv-popup ref="popup" mode="bottom">
       <view class="bottom-popup">
-        <view v-for="item,index in sendFlowList" :key="index">
+        <view v-for="item, index in sendFlowList" :key="index">
           <u-button @click="sendFlow(item)">{{ item.name }}</u-button>
         </view>
       </view>
@@ -147,6 +153,11 @@ export default {
     openSendFlow() {
       this.$refs.popup.open();
     },
+    openBorrow() {
+      uni.navigateTo({
+        url: '/pages/oa/borrow/borrowList'
+      })
+    },
     sendFlow(row) {
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
@@ -287,7 +298,5 @@ view {
   margin-bottom: 65px;
   padding: 10px;
   text-align: center;
-
-  .popup-item {}
 }
 </style>

oa-ui-app/static/scss/colorui.css

@@ -11,7 +11,7 @@
         初始化
  ==================== */
 body {
-	background-color: #f1f1f1;
+	background-color: #ffffff;
 	font-size: 28upx;
 	color: #333333;
 	font-family: Helvetica Neue, Helvetica, sans-serif;

oa-ui-app/utils/deleteResource.js

@@ -169,7 +169,6 @@ export async function deleteResources(procDefName, id) {
     // 替换URL中的:id占位符  
     const url = apiUrl.replace(':id', id);
     // 发送DELETE请求并返回Promise  
-    console.log(request.delete);
     return request({
       url: url,
       method: 'delete'