更新移动端，新增设备审批页面

oa-ui-app/config.js

@@ -1,13 +1,14 @@
 /*
  * @Author: ysh
  * @Date: 2025-01-16 11:17:07
- * @LastEditors: 
- * @LastEditTime: 2025-02-27 10:25:33
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-04-11 09:21:58
  */
 // 应用全局配置
 module.exports = {
   // baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  baseUrl: 'http://192.168.28.107:8080',
+  baseUrl: 'http://192.168.28.108:8080',
+  // baseUrl: '/prod-api',
   // 应用信息
   appInfo: {
     // 应用名称

oa-ui-app/manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "CMC综合办公系统移动端",
-    "appid" : "__UNI__25A9D80",
+    "name" : "CMC智联云枢办公系统移动端",
+    "appid" : "__UNI__9ED53E4",
     "description" : "",
     "versionName" : "1.1.0",
     "versionCode" : "100",

oa-ui-app/pages.json

@@ -96,8 +96,7 @@
 		{
 			"path": "pages/message/myProcess/index",
 			"style": {
-				"navigationBarTitleText": "我的流程",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "我的流程"
 			}
 		},
 		{

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

@@ -0,0 +1,302 @@
+<template>
+  <uni-popup ref="devicePopup" type="bottom" @maskClick="close">
+    <view class="modal-container">
+      <!-- 搜索表单 -->
+      <view class="search-box">
+        <uni-data-select v-model="queryParams.status" :localdata="statusOptions" style="width: 200rpx;"
+          :clearable="false" @change="handleSearch">
+        </uni-data-select>
+
+        <uni-easyinput v-model="queryParams.code" placeholder="出厂编号" @confirm="handleSearch" clearable>
+        </uni-easyinput>
+
+        <uni-easyinput v-model="queryParams.name" placeholder="设备名称" @confirm="handleSearch" clearable>
+        </uni-easyinput>
+      </view>
+
+      <!-- 设备列表 -->
+      <scroll-view scroll-y class="list-container" @scrolltolower="loadMore" :scroll-top="scrollTop">
+        <view v-for="(item, index) in list" :key="index" class="list-item" :class="{ selected: isSelected(item) }"
+          @click="handleSelect(item)">
+          <view class="item-content">
+            <view class="item-header">
+              <uni-tag :text="statusText(item.status)" :type="statusType(item.status)" size="small">
+              </uni-tag>
+              <text class="device-code">{{ item.code }}</text>
+            </view>
+            <view class="item-body">
+              <text class="device-name">{{ item.name }}</text>
+              <text class="device-info">{{ item.brand }} {{ item.series }}</text>
+              <text class="device-place">📍 {{ item.place }}</text>
+            </view>
+          </view>
+
+          <uni-icons v-if="isSelected(item)" type="checkmarkempty" color="#007AFF" size="18" />
+        </view>
+
+        <!-- 加载状态 -->
+        <view class="loading-status">
+          <uni-load-more :status="loading ? 'loading' : (hasMore ? 'more' : 'noMore')" :contentText="{
+            contentdown: '上拉加载更多',
+            contentrefresh: '正在加载',
+            contentnomore: '没有更多设备'
+          }">
+          </uni-load-more>
+        </view>
+      </scroll-view>
+
+      <!-- 底部操作栏 -->
+      <view class="footer-actions">
+        <button class="action-btn cancel" @click="close">取消</button>
+        <button class="action-btn confirm" @click="confirm" :disabled="!selectedList.length">确定选择</button>
+      </view>
+    </view>
+  </uni-popup>
+</template>
+
+<script>
+import { listDevice, listDeviceName } from "@/api/oa/device/device";
+import { debounce } from 'lodash-es';
+
+export default {
+  props: {
+    visible: Boolean,
+    selected: {
+      type: [Array, Object],
+      default: () => ([])
+    },
+    multiple: {
+      type: Boolean,
+      default: true
+    }
+  },
+
+  data() {
+    return {
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        status: '1',
+        type: '仪器设备',
+        code: '',
+        name: ''
+      },
+      statusOptions: [
+        { value: '0', text: '被领用' },
+        { value: '1', text: '可领用' },
+        { value: '2', text: '维修中' },
+        { value: '3', text: '已停用' },
+        { value: '4', text: '已报废' }
+      ],
+      list: [],
+      selectedList: [],
+      hasMore: true,
+      loading: false,
+      scrollTop: 0
+    }
+  },
+
+  watch: {
+    visible(val) {
+      val ? this.$refs.devicePopup.open() : this.$refs.devicePopup.close();
+      if (val) this.initData();
+    },
+    selected: {
+      immediate: true,
+      handler(val) {
+        this.selectedList = Array.isArray(val) ? [...val] : [val];
+      }
+    }
+  },
+
+  created() {
+    this.debouncedSearch = debounce(this.loadData, 300);
+  },
+
+  methods: {
+    // 初始化数据
+    initData() {
+      this.queryParams.pageNum = 1;
+      this.hasMore = true;
+      this.list = [];
+      this.loadData();
+    },
+
+    // 加载设备数据
+    async loadData() {
+      if (this.loading || !this.hasMore) return;
+
+      this.loading = true;
+      try {
+        const res = await listDevice(this.queryParams);
+        this.list = this.queryParams.pageNum === 1
+          ? res.rows
+          : [...this.list, ...res.rows];
+
+        this.hasMore = res.total > this.queryParams.pageNum * this.queryParams.pageSize;
+        this.queryParams.pageNum++;
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    // 搜索处理
+    handleSearch() {
+      this.queryParams.pageNum = 1;
+      this.hasMore = true;
+      this.list = [];
+      this.loadData();
+    },
+
+    // 选择设备
+    handleSelect(item) {
+      if (this.multiple) {
+        const index = this.selectedList.findIndex(d => d.deviceId === item.deviceId);
+        index === -1
+          ? this.selectedList.push(item)
+          : this.selectedList.splice(index, 1);
+      } else {
+        this.selectedList = [item];
+      }
+    },
+
+    // 确认选择
+    confirm() {
+      const result = this.multiple ? this.selectedList : this.selectedList[0];
+      this.$emit('update:selected', result);
+      this.$emit('confirm', result);
+      this.close();
+    },
+
+    // 状态显示逻辑
+    statusText(status) {
+      const map = { '0': '被领用', '1': '可领用', '2': '维修中', '3': '已停用', '4': '已报废' };
+      return map[status] || '未知状态';
+    },
+
+    statusType(status) {
+      const typeMap = { '0': 'warning', '1': 'success', '2': 'info', '3': 'error', '4': 'default' };
+      return typeMap[status] || 'default';
+    },
+
+    isSelected(item) {
+      return this.selectedList.some(d => d.deviceId === item.deviceId);
+    },
+
+    // 加载更多
+    loadMore() {
+      this.loadData();
+    },
+
+    close() {
+      this.$emit('update:visible', false);
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.modal-container {
+  background: #fff;
+  border-radius: 24rpx 24rpx 0 0;
+  padding: 32rpx;
+  max-height: 80vh;
+}
+
+.search-box {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16rpx;
+  margin-bottom: 32rpx;
+
+  ::v-deep .uni-easyinput__content {
+    border-radius: 16rpx;
+  }
+}
+
+.list-container {
+  max-height: 60vh;
+  margin-bottom: 32rpx;
+
+  .list-item {
+    display: flex;
+    align-items: center;
+    padding: 24rpx;
+    border-bottom: 1rpx solid #eee;
+
+    &.selected {
+      background-color: #f5f7fa;
+    }
+
+    .item-content {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      gap: 8rpx;
+
+      .item-header {
+        display: flex;
+        align-items: center;
+        gap: 16rpx;
+
+        .device-code {
+          color: #666;
+          font-size: 24rpx;
+        }
+      }
+
+      .item-body {
+        display: flex;
+        flex-direction: column;
+        gap: 4rpx;
+
+        .device-name {
+          color: #333;
+          font-size: 28rpx;
+          font-weight: 500;
+        }
+
+        .device-info {
+          color: #666;
+          font-size: 24rpx;
+        }
+
+        .device-place {
+          color: #999;
+          font-size: 24rpx;
+        }
+      }
+    }
+  }
+}
+
+.footer-actions {
+  display: flex;
+  gap: 32rpx;
+
+  .action-btn {
+    flex: 1;
+    border-radius: 12rpx;
+    font-size: 28rpx;
+
+    &.confirm {
+      background: #007AFF;
+      color: #fff;
+
+      &:disabled {
+        background: #ccc;
+      }
+    }
+
+    &.cancel {
+      background: #f5f5f5;
+      color: #666;
+    }
+  }
+}
+
+.loading-status {
+  padding: 32rpx 0;
+  text-align: center;
+}
+</style>

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-18 10:45:52
+ * @LastEditTime: 2025-03-28 14:29:11
 -->
 <template>
   <view>
@@ -42,6 +42,7 @@ export default {
   methods: {
     /** 流程流转记录 */
     getFlowRecordList(procInsId, deployId) {
+      this.currentNum = 0;
       const params = { procInsId: procInsId, deployId: deployId }
       flowRecordFull(params).then(res => {
         if (res.data.flowList.length > 1 && res.data.flowList[1].comment && res.data.flowList[1].comment.type == '退回意见') {
@@ -52,7 +53,14 @@ export default {
           this.isRetrun = false
         }
         this.flowRecordList = res.data.flowList.reverse();
-        this.currentNum = this.flowRecordList.length - 1;
+        for (let i = 0; i < this.flowRecordList.length; i++) {
+          if (!this.flowRecordList[i].finishTime) {
+            this.currentNum = i
+          }
+        }
+        if (this.currentNum == 0) {
+          this.currentNum = this.flowRecordList.length
+        }
       })
     },
   },

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-26 16:08:38
+ * @LastEditTime: 2025-03-28 14:27:15
 -->
 <template>
   <view class="form-container">
@@ -13,7 +13,7 @@
     </view>
     <!-- 表单内容 -->
     <uni-forms ref="form" :modelValue="form" :rules="rules" label-position="top" label-width="150" class="custom-form">
-      <flow-note :taskForm="taskForm" v-if="taskName"></flow-note>
+      <flow-note :taskForm="taskForm"></flow-note>
       <!-- 当前节点 -->
       <uni-forms-item label="当前节点" class="form-item" v-if="taskName">
         <uni-tag :inverted="true" type="primary" :text="taskName"></uni-tag>
@@ -21,7 +21,7 @@
 
       <!-- 流程发起人 -->
       <uni-forms-item label="填报人" class="form-item">
-        <b style="font-size:35rpx;">{{ applierUserName }}</b>
+        <b style="font-size:30rpx;">{{ applierUserName }}</b>
       </uni-forms-item>
 
       <!-- 填报日期 -->
@@ -193,7 +193,7 @@ export default {
   },
   data() {
     return {
-      applierUserName:'',
+      applierUserName: '',
       form: {
         submitTime: '',
         borrowUsage: '0',
@@ -591,6 +591,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
 .amount-text {
   font-size: 16px;
   font-weight: bold;

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

@@ -10,13 +10,13 @@
 			class="custom-form">
 			<flow-note :taskForm="taskForm"></flow-note>
 			<!-- 当前节点 -->
-			<uni-forms-item label="当前节点" class="form-item">
+			<uni-forms-item label="当前节点" class="form-item" v-if="taskName">
 				<uni-tag :inverted="true" type="primary" :text="taskName"></uni-tag>
 			</uni-forms-item>
 
 			<!-- 流程发起人 -->
 			<uni-forms-item label="填报人" class="form-item">
-				<b style="font-size:35rpx;">{{ startUserName }}</b>
+				<b style="font-size:30rpx;">{{ applierUserName }}</b>
 			</uni-forms-item>
 
 			<!-- 填报日期 -->
@@ -72,7 +72,7 @@
 
 			<uni-forms-item label="系数" required class="form-item" name="coefficient" v-if="taskName != '工作填报'">
 				<uni-easyinput type="number" v-model="formData.coefficient" placeholder="请输入系数" :styles="inputStyle"
-					@blur="countMoney" @clear="countMoney" :disabled="taskName == '填报人确认'">
+					@blur="countMoney" @clear="countMoney" :disabled="!taskName || taskName == '填报人确认'">
 				</uni-easyinput>
 			</uni-forms-item>
 
@@ -84,9 +84,12 @@
 				<u-tag :text="'¥' + money" type="primary" plain></u-tag>
 			</uni-forms-item>
 			<!-- 提交按钮 -->
-			<button class="save-btn" @click="save">保存</button>
-			<button class="submit-btn margin-top-xs" type="primary" @click="submitForm" v-if="taskName == '工作填报'">提交</button>
-			<button class="submit-btn margin-top-xs" type="primary" @click="submitForm" v-else>确认审核</button>
+			<view v-if="taskName">
+				<button class="save-btn" @click="save">保存</button>
+				<button class="submit-btn margin-top-xs" type="primary" @click="submitForm"
+					v-if="taskName == '工作填报'">提交</button>
+				<button class="submit-btn margin-top-xs" type="primary" @click="submitForm" v-else>确认审核</button>
+			</view>
 		</uni-forms>
 
 		<uv-modal ref="popModal" title="提示" content='是否提交表单？' :showCancelButton="true" @confirm="confirmSubmit"></uv-modal>
@@ -115,6 +118,7 @@ export default {
 		startUserName: String, // 流程发起人
 	},
 	created() {
+    this.applierUserName = this.startUserName;
 		this.getProjectList();
 		this.initForm();
 		if (this.taskName != '工作填报') {
@@ -126,6 +130,7 @@ export default {
 	},
 	data() {
 		return {
+			applierUserName: '',
 			openProject: false,
 			selectedProject: null,
 			isScattered: 0,
@@ -230,6 +235,11 @@ export default {
 				if (res.data) {
 					this.hasForm = true;
 					this.formData = res.data;
+					console.log(this.formData);
+
+					if (!this.applierUserName) {
+						this.applierUserName = this.formData.user.nickName;
+					}
 					if (res.data.projectId) {
 						this.isScattered = 0;
 					} else {
@@ -394,7 +404,9 @@ export default {
 						icon: 'success'
 					});
 					setTimeout(() => {
-						this.$emit('goBack')
+						uni.switchTab({
+							url: '/pages/message/index'
+						})
 					}, 500);
 				})
 			})

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

@@ -0,0 +1,338 @@
+<template>
+  <view class="form-container">
+    <!-- 表单标题 -->
+    <view class="form-title">
+      <text class="title-text">设备申请表</text>
+      <view class="title-line"></view>
+    </view>
+    <!-- 表单内容 -->
+    <uni-forms ref="form" :modelValue="form" :rules="rules" label-position="top" label-width="150" class="custom-form">
+      <flow-note :taskForm="taskForm"></flow-note>
+      <!-- 当前节点 -->
+      <uni-forms-item label="当前节点" class="form-item" v-if="taskName">
+        <uni-tag :inverted="true" type="primary" :text="taskName"></uni-tag>
+      </uni-forms-item>
+
+      <!-- 流程发起人 -->
+      <uni-forms-item label="填报人" class="form-item">
+        <b style="font-size:30rpx;">{{ applierUserName }}</b>
+      </uni-forms-item>
+
+      <!-- 填报日期 -->
+      <uni-forms-item label="填报日期" class="form-item">
+        <uni-datetime-picker v-model="form.applyDate" type="date" :disabled="taskName != '设备申请'" />
+      </uni-forms-item>
+
+      <!-- 选择项目 -->
+      <uni-forms-item label="选择项目" required class="form-item" name="projectId">
+        <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>
+      </uni-forms-item>
+
+      <!-- 设备选择 -->
+      <uni-forms-item label="选择设备" required class="form-item" name="devices">
+        <uv-button type="primary" @click="openDevice = true" v-if="taskName == '设备申请'">+ 选择设备</uv-button>
+        <device-picker :visible.sync="openDevice" :selected.sync="selectDevice" @confirm="handleDeviceConfirm"></device-picker>
+        <uni-table v-if="deviceList.length > 0">
+          <uni-tr>
+            <uni-th>序号</uni-th>
+            <uni-th>出厂编号</uni-th>
+            <uni-th>设备品牌</uni-th>
+            <uni-th>设备名称</uni-th>
+            <uni-th>规格型号</uni-th>
+            <uni-th>存放地址</uni-th>
+          </uni-tr>
+          <uni-tr v-for="(item, index) in deviceList" :key="index">
+            <uni-td>{{ index + 1 }}</uni-td>
+            <uni-td>{{ item.code }}</uni-td>
+            <uni-td>{{ item.brand }}</uni-td>
+            <uni-td>{{ item.name }}</uni-td>
+            <uni-td>{{ item.series }}</uni-td>
+            <uni-td>{{ item.place }}</uni-td>
+          </uni-tr>
+        </uni-table>
+      </uni-forms-item>
+
+      <!-- 申领事由 -->
+      <uni-forms-item label="申领事由" required class="form-item" name="applyReason">
+        <uni-easyinput type="textarea" v-model="form.applyReason" placeholder="请输入申领事由" :disabled="taskName != '设备申请'" />
+      </uni-forms-item>
+
+      <!-- 日期选择 -->
+      <view class="date-range">
+        <uni-forms-item label="开始日期" required class="form-item" name="beginDate">
+          <uni-datetime-picker v-model="form.beginDate" type="date" :disabled="taskName != '设备申请'" @change="calculateDay" />
+        </uni-forms-item>
+        <uni-forms-item label="结束日期" required class="form-item" name="endDate">
+          <uni-datetime-picker v-model="form.endDate" type="date" :disabled="taskName != '设备申请'" @change="calculateDay" />
+        </uni-forms-item>
+        <uni-forms-item label="共计" class="form-item">
+          <text>{{ form.days + '天' }}</text>
+        </uni-forms-item>
+      </view>
+
+      <!-- 安排设备意见 -->
+      <uni-forms-item label="拟发放设备" class="form-item" v-if="taskName == '安排设备'">
+        <uni-table v-if="modifyDeviceList.length > 0">
+          <uni-tr>
+            <uni-th>序号</uni-th>
+            <uni-th>出厂编号</uni-th>
+            <uni-th>设备品牌</uni-th>
+            <uni-th>设备名称</uni-th>
+            <uni-th>规格型号</uni-th>
+            <uni-th>存放地址</uni-th>
+            <uni-th>操作</uni-th>
+          </uni-tr>
+          <uni-tr v-for="(item, index) in modifyDeviceList" :key="index">
+            <uni-td>{{ index + 1 }}</uni-td>
+            <uni-td>{{ item.code }}</uni-td>
+            <uni-td>{{ item.brand }}</uni-td>
+            <uni-td>{{ item.name }}</uni-td>
+            <uni-td>{{ item.series }}</uni-td>
+            <uni-td>{{ item.place }}</uni-td>
+            <uni-td>
+              <uv-button type="primary" size="mini" @click="replaceRowData(item, index)">重新选择</uv-button>
+              <uv-button type="error" size="mini" @click="deleteRowData(item, index)">删除</uv-button>
+            </uni-td>
+          </uni-tr>
+        </uni-table>
+        <uv-button type="primary" @click="addRowdata()" v-if="taskName == '安排设备'">新增设备</uv-button>
+      </uni-forms-item>
+
+      <!-- 安排设备意见 -->
+      <uni-forms-item label="安排设备意见" class="form-item" v-if="taskName == '安排设备'">
+        <uni-easyinput type="textarea" v-model="form.dispatchComment" placeholder="请输入安排设备意见" :disabled="taskName != '安排设备'" />
+      </uni-forms-item>
+
+      <!-- 分管审核意见 -->
+      <uni-forms-item label="分管审核意见" class="form-item" v-if="taskName == '分管审核'">
+        <uni-easyinput type="textarea" v-model="form.managerComment" placeholder="请输入分管审核意见" :disabled="taskName != '分管审核'" />
+      </uni-forms-item>
+
+      <!-- 归还确认 -->
+      <uni-forms-item label="已归还设备" class="form-item" v-if="taskName == '归还确认'">
+        <uni-table v-if="returnDevicesList.length > 0">
+          <uni-tr>
+            <uni-th>序号</uni-th>
+            <uni-th>出厂编号</uni-th>
+            <uni-th>设备品牌</uni-th>
+            <uni-th>设备名称</uni-th>
+            <uni-th>规格型号</uni-th>
+            <uni-th>存放地址</uni-th>
+          </uni-tr>
+          <uni-tr v-for="(item, index) in returnDevicesList" :key="index">
+            <uni-td>{{ index + 1 }}</uni-td>
+            <uni-td>{{ item.code }}</uni-td>
+            <uni-td>{{ item.brand }}</uni-td>
+            <uni-td>{{ item.name }}</uni-td>
+            <uni-td>{{ item.series }}</uni-td>
+            <uni-td>{{ item.place }}</uni-td>
+          </uni-tr>
+        </uni-table>
+      </uni-forms-item>
+
+      <!-- 需维修设备 -->
+      <uni-forms-item label="需维修设备" class="form-item" v-if="taskName == '归还确认'">
+        <uni-data-select v-model="form.repairDevices" :localdata="modifyDeviceList" multiple :disabled="taskName != '归还确认'" />
+      </uni-forms-item>
+
+      <!-- 备注 -->
+      <uni-forms-item label="备注" class="form-item" v-if="taskName == '归还确认'">
+        <uni-easyinput type="textarea" v-model="form.remark" placeholder="请输入备注" :disabled="taskName != '归还确认'" />
+      </uni-forms-item>
+
+      <!-- 归还日期 -->
+      <uni-forms-item label="归还日期" class="form-item" v-if="taskName == '归还确认'">
+        <uni-datetime-picker v-model="form.returnDate" type="date" :disabled="taskName != '归还确认'" />
+      </uni-forms-item>
+
+      <!-- 操作按钮 -->
+      <view class="form-actions">
+        <uv-button type="primary" @click="submit" v-if="taskName == '设备申请'">提交申请</uv-button>
+        <template v-else>
+          <uv-button type="warning" @click="saves">保存</uv-button>
+          <uv-button type="primary" @click="completeApply">完成审批</uv-button>
+        </template>
+      </view>
+    </uni-forms>
+  </view>
+</template>
+
+<script>
+import { parseTime } from "@/utils/common.js"
+import { listDeviceApproval, getDeviceApproval, updateDeviceApproval, submitDeviceApproval, modifyDeviceApproval } from '@/api/oa/device/deviceApproval'
+import FlowNote from '@/pages/components/flowNote.vue';
+import ProjectPicker from '@/pages/components/ProjectPicker.vue';
+import ProjectInfo from '@/pages/components/ProjectInfo.vue';
+import DevicePicker from "@/pages/components/DevicePicker.vue";
+
+export default {
+  components: {
+    FlowNote,
+    ProjectPicker,
+    ProjectInfo,
+    DevicePicker
+  },
+  props: {
+    taskForm: Object,
+    taskName: String,
+    startUserName: String,
+  },
+  created() {
+    this.applierUserName = this.startUserName;
+    this.initForm();
+  },
+  data() {
+    return {
+      form: {
+        projectId: '',
+        applyDate: '',
+        applyReason: '',
+        beginDate: '',
+        endDate: '',
+        days: 0,
+        dispatchComment: '',
+        managerComment: '',
+        repairDevices: [],
+        remark: '',
+        returnDate: ''
+      },
+      rules: {
+        projectId: {
+          rules: [{ required: true, errorMessage: '请选择项目' }]
+        },
+        devices: {
+          rules: [{ required: true, errorMessage: '请选择设备' }]
+        },
+        applyReason: {
+          rules: [{ required: true, errorMessage: '请输入申领事由' }]
+        },
+        beginDate: {
+          rules: [{ required: true, errorMessage: '请选择开始日期' }]
+        },
+        endDate: {
+          rules: [{ required: true, errorMessage: '请选择结束日期' }]
+        }
+      },
+      applierUserName: '',
+      openProject: false,
+      selectedProject: null,
+      projectObj: {},
+      openDevice: false,
+      selectDevice: [],
+      deviceList: [],
+      modifyDeviceList: [],
+      returnDevicesList: []
+    }
+  },
+  methods: {
+    initForm() {
+      getDeviceApproval(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.form = res.data;
+          this.deviceList = res.data.devices || [];
+          this.modifyDeviceList = res.data.modifyDevices || [];
+          this.returnDevicesList = res.data.returnDevices || [];
+        } else {
+          this.form.applyDate = parseTime(new Date(), "{y}-{m}-{d}");
+        }
+      })
+    },
+    handleConfirm(project) {
+      this.selectedProject = project;
+      this.projectObj = project;
+      this.form.projectId = project.projectId;
+    },
+    handleDeviceConfirm(devices) {
+      this.deviceList = Array.isArray(devices) ? devices : [devices];
+      this.form.devices = this.deviceList.map(item => item.deviceId);
+    },
+    calculateDay() {
+      if (this.form.beginDate && this.form.endDate) {
+        const begin = new Date(this.form.beginDate);
+        const end = new Date(this.form.endDate);
+        this.form.days = Math.ceil((end - begin) / (1000 * 60 * 60 * 24)) + 1;
+      }
+    },
+    replaceRowData(row, index) {
+      this.openDevice = true;
+      this.currentIndex = index;
+    },
+    deleteRowData(row, index) {
+      this.modifyDeviceList.splice(index, 1);
+    },
+    addRowdata() {
+      this.openDevice = true;
+      this.currentIndex = -1;
+    },
+    submit() {
+      this.$refs.form.validate().then(() => {
+        submitDeviceApproval(this.form).then(res => {
+          uni.showToast({
+            title: '提交成功',
+            icon: 'success'
+          });
+          uni.navigateBack();
+        });
+      });
+    },
+    saves() {
+      updateDeviceApproval(this.form).then(res => {
+        uni.showToast({
+          title: '保存成功',
+          icon: 'success'
+        });
+      });
+    },
+    completeApply() {
+      modifyDeviceApproval(this.form).then(res => {
+        uni.showToast({
+          title: '审批完成',
+          icon: 'success'
+        });
+        uni.navigateBack();
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.form-container {
+  padding: 32rpx;
+}
+
+.form-title {
+  text-align: center;
+  margin-bottom: 32rpx;
+
+  .title-text {
+    font-size: 36rpx;
+    font-weight: bold;
+  }
+
+  .title-line {
+    height: 2rpx;
+    background: #eee;
+    margin-top: 16rpx;
+  }
+}
+
+.date-range {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 32rpx;
+}
+
+.form-actions {
+  display: flex;
+  justify-content: center;
+  gap: 32rpx;
+  margin-top: 32rpx;
+}
+
+::v-deep .uni-forms-item__label {
+  font-weight: bold;
+}
+</style>

oa-ui-app/pages/message/apply/apply.vue

@@ -2,41 +2,73 @@
  * @Author: ysh
  * @Date: 2025-01-21 10:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-19 15:55:13
+ * @LastEditTime: 2025-04-11 15:36:40
 -->
 <template>
 	<view>
-		<view class="tag-view text-center margin-top-xs margin-bottom-xs" style="padding: 10rpx;">
-			<uni-tag :text="'您还有' + total + '个任务待审'" />
-		</view>
-		<u-list v-if="todoList.length > 0">
-			<u-list-item v-for="(item, index) in todoList" :key="index">
-				<view @click="goToDetail(item)">
-					<view class="box">
-						<view style="text-align: right;">
-							<span style="font-size: 26rpx;color: #999999;">{{ item.createTime }}</span>
+		<mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+			:up="upOption" :top="20">
+
+			<view class="tag-view text-center margin-top-xs margin-bottom-xs" style="padding: 10rpx;">
+				<uni-tag :text="'您还有' + total + '个任务待审'" />
+			</view>
+
+			<view v-if="todoList.length > 0">
+				<view v-for="(item, index) in todoList" :key="index">
+					<view @click="goToDetail(item)" class="box">
+						<!-- 当前节点标签 -->
+						<view class="node-tag">
+							<uni-tag :text="'流程名称：' + item.procDefName" inverted="true" type="primary" size="small" />
+						</view>
+
+						<!-- 时间与标题区域 -->
+						<view class="header-area">
+							<text class="time-text">{{ item.createTime }}</text>
+							<uni-title type="h4" :title="item.title || '暂无标题'" class="title-text" />
+						</view>
+
+						<!-- 流程信息 -->
+						<view class="process-info">
+							<view class="info-item">
+								<text class="info-label">当前节点：</text>
+								<text class="info-value">{{ item.taskName }}</text>
+							</view>
+							<view class="info-item">
+								<text class="info-label">发起人：</text>
+								<text class="info-value">{{ item.startUserName }}</text>
+							</view>
 						</view>
-						<uni-title type="h3" :title="item.title ? item.title : '暂无标题'"></uni-title>
-						<view>流程名称：{{ item.procDefName }}</view>
-						<view>当前节点：{{ item.taskName }}</view>
-						<view>流程发起人：{{ item.startUserName }}</view>
 					</view>
 				</view>
-			</u-list-item>
-		</u-list>
-		<u-empty v-else></u-empty>
+			</view>
+
+			<u-empty v-else mode="list"></u-empty>
+		</mescroll-uni>
 	</view>
 </template>
 
 <script>
-import {
-	todoList
-} from "@/api/flowable/todo";
+import { todoList } from "@/api/flowable/todo";
+import MescrollMixin from '@/uni_modules/mescroll/components/mescroll-uni/mescroll-mixins.js'
 export default {
+	mixins: [MescrollMixin],
 	data() {
 		return {
 			todoList: [],
 			total: 0,
+			mescroll: null,
+			downOption: {
+				auto: false, // 手动初始化后需要关闭自动加载
+				textOutOffset: '下拉刷新',
+				textLoading: '加载中...'
+			},
+			upOption: {
+				auto: true, // 自动加载初始页
+				page: { num: 0, size: 10 }, // 初始页码和每页数量
+				noMoreSize: 5, // 数据不足时显示"没有更多"
+				empty: { tip: '暂无待审任务' },
+				textNoMore: '~ 没有更多任务了 ~'
+			}
 		};
 	},
 	created() {
@@ -49,6 +81,35 @@ export default {
 		this.getTodoList();
 	},
 	methods: {
+		// 初始化mescroll实例
+		mescrollInit(mescroll) {
+			this.mescroll = mescroll;
+		},
+		// 下拉刷新回调
+		downCallback() {
+			this.mescroll.resetUpScroll(true);
+		},
+		async upCallback(page) {
+			try {
+				const res = await todoList({
+					pageNum: page.num,
+					pageSize: page.size,
+					name: null
+				});
+
+				const curPageLen = res.data.records.length;
+				this.total = res.data.total;
+
+				// 处理分页数据
+				if (page.num == 1) this.todoList = []; // 第一页清空数据
+				this.todoList = this.todoList.concat(res.data.records);
+
+				// 结束加载状态
+				this.mescroll.endSuccess(curPageLen, res.data.total <= this.todoList.length);
+			} catch (e) {
+				this.mescroll.endErr();
+			}
+		},
 		getTodoList() {
 			todoList({
 				pageNum: 1,
@@ -81,10 +142,62 @@ export default {
 </script>
 
 <style lang="scss">
+/* 新增mescroll布局样式 */
+mescroll-body {
+	height: calc(100vh - 100rpx);
+	box-sizing: border-box;
+}
+
 .box {
-	background-color: #fff;
-	border-radius: 4px;
-	padding: 10px 20px;
-	margin: 0 10px 10px;
+	position: relative;
+	background: #fff;
+	border-radius: 12rpx;
+	padding: 32rpx;
+	margin: 20rpx;
+	box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+
+	.node-tag {
+		position: absolute;
+		left: 20rpx;
+		top: 40rpx;
+		z-index: 2;
+	}
+
+	.header-area {
+		margin-top: 16rpx;
+		border-bottom: 1rpx solid #eee;
+
+		.time-text {
+			float: right;
+			font-size: 24rpx;
+			color: #999;
+		}
+
+		.title-text {
+			clear: both;
+			font-weight: 600;
+			color: #333;
+			margin: 16rpx 0;
+		}
+	}
+
+	.process-info {
+		margin-top: 24rpx;
+
+		.info-item {
+			margin-bottom: 12rpx;
+			font-size: 28rpx;
+
+			.info-label {
+				color: #666;
+				margin-right: 16rpx;
+			}
+
+			.info-value {
+				color: #333;
+				font-weight: 500;
+			}
+		}
+	}
 }
 </style>

oa-ui-app/pages/message/apply/detail.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-02-06 09:48:52
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-20 10:24:30
+ * @LastEditTime: 2025-04-11 15:37:23
 -->
 <template>
 	<view>
@@ -19,12 +19,14 @@ import {
 } from "@/api/flowable/definition";
 import Declare from '@/pages/form/declare/declare.vue';
 import Borrow from "@/pages/form/borrow/borrow.vue";
+import Device from "@/pages/form/device/device.vue";
 import EmptyBox from "../../emptyBox.vue";
 export default {
 	components: {
 		Declare,
 		EmptyBox,
 		Borrow,
+		Device
 	},
 	data() {
 		return {
@@ -78,6 +80,9 @@ export default {
 				case '借款审批':
 					this.currentForm = 'Borrow';
 					break;
+				case '设备审批':
+					this.currentForm = 'Device';
+					break;
 				default:
 					console.log('未知流程');
 					this.isEmpty = true;

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

@@ -0,0 +1,209 @@
+<template>
+  <view class="page-container">
+    <!-- 搜索框 -->
+    <view class="search-box">
+      <uni-search-bar radius="34" placeholder="请输入流程名称或标题" @confirm="search" @input="inputChange"
+        v-model="queryParams.keyword" />
+    </view>
+
+    <!-- 流程列表 -->
+    <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :fixed="false" :top="10">
+      <uni-list>
+        <uni-list-item v-for="(item, index) in list" :key="index" :title="item.procDefName"
+          :note="`提交时间：${item.createTime}`" clickable>
+          <template v-slot:body>
+            <view class="list-item">
+              <!-- 状态 -->
+              <view class="status">
+                <uni-tag :text="item.finishTime ? '已完成' : '进行中'" :type="item.finishTime ? 'success' : 'warning'"
+                  size="small" />
+              </view>
+
+              <!-- 主要内容 -->
+              <view class="content">
+                <view class="title-line">
+                  <text class="title"><b>标题：</b>{{ item.title }}</text>
+                </view>
+                <uv-divider :dashed="true"></uv-divider>
+                <view class="info-line">
+                  <view class="time">耗时：{{ item.duration }}</view>
+                  <view class="node">当前节点：{{ item.taskName }}</view>
+                  <view class="assignee">待办人：{{ item.assigneeName || '无' }}</view>
+                </view>
+              </view>
+
+              <!-- 操作按钮 -->
+              <view class="actions">
+                <uni-icons type="more-filled" size="24" @click.stop="showAction(item)"></uni-icons>
+              </view>
+            </view>
+          </template>
+        </uni-list-item>
+      </uni-list>
+    </mescroll-uni>
+
+    <!-- 操作菜单 -->
+    <uni-popup ref="actionPopup" type="bottom">
+      <view class="action-menu">
+        <view class="menu-item" @click="handleFlowRecord(selectedItem)">
+          <text>办理进度</text>
+        </view>
+        <view class="menu-item" @click="handleFlowNote(selectedItem)">
+          <text>表单信息</text>
+        </view>
+        <view class="menu-item danger" @click="handleDelete(selectedItem)"
+          :class="{ disabled: !beDeleted(selectedItem) }">
+          <text>取消流程</text>
+        </view>
+      </view>
+    </uni-popup>
+  </view>
+</template>
+
+<script>
+import MescrollMixin from '@/uni_modules/mescroll/components/mescroll-uni/mescroll-mixins.js'
+import { myProcessList, stopProcess } from "@/api/flowable/process";
+export default {
+  mixins: [MescrollMixin],
+  data() {
+    return {
+      // 我发起的流程列表数据
+      myProcessList: [],
+      list: [], // 列表数据
+      queryParams: {
+        keyword: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      selectedItem: null, // 当前选中项
+      debounceSearch: null // 初始化防抖方法
+    }
+  },
+  created() {
+    // 在生命周期中创建防抖方法
+    this.debounceSearch = uni.$u.debounce(() => {
+      this.search()
+    }, 500)
+  },
+  methods: {
+    // mescroll下拉刷新回调
+    async downCallback() {
+      this.queryParams.pageNum = 1
+      const res = await this.loadData()
+      this.list = res.data.list;
+      console.log(res.data.list);
+      this.mescroll.endSuccess(res.data.length)
+      this.mescroll.endErr()
+    },
+    // mescroll上拉加载回调
+    async upCallback(page) {
+      this.queryParams.pageNum = page.num
+      const res = await this.loadData()
+      this.list = this.list.concat(res.data.list)
+      this.mescroll.endSuccess(res.data.list.length, res.data.hasNextPage)
+    },
+    // 加载数据
+    async loadData() {
+      try {
+        const res = await myProcessList(this.queryParams)
+        return {
+          data: {
+            list: res.data.records,
+            hasNextPage: res.hasNextPage
+          }
+        }
+      } catch (e) {
+        this.mescroll.endErr()
+        return { data: { list: [], hasNextPage: false } }
+      }
+    },
+    // 显示操作菜单
+    showAction(item) {
+      this.selectedItem = item
+      this.$refs.actionPopup.open()
+    },
+    // 输入变化处理
+    inputChange() {
+      this.debounceSearch()
+    },
+
+    // 执行搜索
+    search() {
+      this.mescroll.resetUpScroll()
+    },
+
+    handleFlowRecord(row) { /* ... */ },
+    handleFlowNote(row) { /* ... */ },
+    handleDelete(row) { /* ... */ },
+    beDeleted(row) { /* ... */ },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.list-item {
+  display: flex;
+  align-items: center;
+  padding: 12rpx 0;
+  width: 100%;
+  justify-content: space-between;
+}
+
+.status {
+  margin-right: 20rpx;
+}
+
+.content {
+  flex: 1;
+}
+
+.title-line {
+  // display: flex;
+  justify-content: space-between;
+  margin-bottom: 10rpx;
+}
+
+.title {
+  font-size: 28rpx;
+  color: #333;
+  max-width: 400rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.time {
+  font-size: 24rpx;
+  color: #999;
+}
+
+.info-line {
+  // display: flex;
+  justify-content: space-between;
+  font-size: 24rpx;
+  color: #666;
+}
+
+.actions {
+  padding-left: 20rpx;
+}
+
+.action-menu {
+  background: #fff;
+  border-radius: 16rpx 16rpx 0 0;
+  padding: 30rpx;
+}
+
+.menu-item {
+  padding: 30rpx;
+  border-bottom: 1rpx solid #eee;
+}
+
+.menu-item.danger {
+  color: #f56c6c;
+}
+
+.menu-item.disabled {
+  color: #c0c4cc;
+  pointer-events: none;
+}
+</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-03-26 15:35:31
+ * @LastEditTime: 2025-04-11 15:33:30
 -->
 <template>
   <view class="page-container">
@@ -11,11 +11,16 @@
       <uni-search-bar radius="34" placeholder="请输入流程名称" @confirm="search" @input="inputChange"
         v-model="queryParams.procDefName" />
     </view>
-
+    <view>
+      <!-- <uv-sticky bgColor="#fff">
+        <uv-tabs :list="[{ name: '进行中' }, { name: '已完成' }]" :current="activeTabs" @click="switchTabs"></uv-tabs>
+      </uv-sticky> -->
+    </view>
     <!-- 流程列表 -->
-    <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :fixed="false" :top="10">
+    <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption"
+      :up="upOption" :fixed="false" :top="10">
       <uni-list>
-        <uni-list-item v-for="(item, index) in list" :key="index" clickable>
+        <uni-list-item v-for="(item, index) in myProcessList" :key="index">
           <template v-slot:body>
             <view class="list-item">
               <!-- 状态与标题行 -->
@@ -82,7 +87,7 @@
           <text>表单信息</text>
         </view>
         <view class="menu-item danger" @click="handleDelete(selectedItem)"
-          :class="{ disabled: !beDeleted(selectedItem) }">
+          :class="{ disabled: selectedItem && beDeleted(selectedItem) }">
           <text>取消流程</text>
         </view>
       </view>
@@ -99,15 +104,20 @@
 import { debounce } from 'lodash-es';
 import MescrollMixin from '@/uni_modules/mescroll/components/mescroll-uni/mescroll-mixins.js'
 import { myProcessList, stopProcess } from "@/api/flowable/process";
-import FlowRecord from '../../components/flowable/FlowRecord.vue';
+import FlowRecord from '@/pages/components/flowable/FlowRecord.vue';
+import { getProcessVariables } from "@/api/flowable/definition";
+import { getDeployment, delDeployment, addDeployment, updateDeployment, exportDeployment, flowRecord } from "@/api/flowable/finished";
+import { deleteResources } from "@/utils/deleteResource";
 export default {
   components: { FlowRecord },
   mixins: [MescrollMixin],
   data() {
     return {
+      activeTabs: 0,
+      mescroll: null, // mescroll实例
       // 我发起的流程列表数据
       myProcessList: [],
-      list: [], // 列表数据
+      total: 0,
       queryParams: {
         keyword: '',
         pageNum: 1,
@@ -116,21 +126,48 @@ export default {
       selectedItem: null, // 当前选中项
       debounceSearch: null, // 初始化防抖方法
       clickRow: {},
-      active: 'record'
+      active: 'record',
+      downOption: {
+        auto: false, // 手动初始化后需要关闭自动加载
+        textOutOffset: '下拉刷新',
+        textLoading: '加载中...'
+      },
+      upOption: {
+        auto: true, // 自动加载初始页
+        page: { num: 1, size: 10 }, // 初始页码和每页数量
+        noMoreSize: 5, // 数据不足时显示"没有更多"
+        empty: { tip: '暂无待审任务' },
+        textNoMore: '~ 没有更多任务了 ~'
+      }
     }
   },
   created() {
     // 在生命周期中创建防抖方法
-    this.debounceSearch = debounce(() => {
-      this.search()
-    }, 500)
+    // this.debounceSearch = debounce(() => {
+    //   this.search()
+    // }, 500)
+    // this.getMyprogressList();
+  },
+  onLoad: function (options) {
+    uni.startPullDownRefresh();
+  },
+  mounted() {
   },
   methods: {
+    switchTabs(item) {
+      this.activeTabs = item.index;
+      this.queryParams.finishTime
+    },
+    // 初始化mescroll
+    mescrollInit(mescroll) {
+      this.mescroll = mescroll;
+    },
     // mescroll下拉刷新回调
     async downCallback() {
+      this.myProcessList = []; // 清空列表
       this.queryParams.pageNum = 1
       const res = await this.loadData()
-      this.list = res.data.list;
+      this.myProcessList = res.data.list;
       this.mescroll.endSuccess(res.data.length)
       this.mescroll.endErr()
     },
@@ -138,7 +175,7 @@ export default {
     async upCallback(page) {
       this.queryParams.pageNum = page.num
       const res = await this.loadData()
-      this.list = this.list.concat(res.data.list)
+      this.myProcessList = this.myProcessList.concat(res.data.list)
       this.mescroll.endSuccess(res.data.list.length, res.data.hasNextPage)
     },
     // 加载数据
@@ -156,6 +193,16 @@ export default {
         return { data: { list: [], hasNextPage: false } }
       }
     },
+    getMyprogressList() {
+      myProcessList({
+        pageNum: 1,
+        pageSize: 10,
+      }).then(response => {
+        this.total = response.data.total;
+        this.myProcessList = response.data.records;
+        uni.stopPullDownRefresh();
+      });
+    },
     // 显示操作菜单
     showAction(item) {
       this.selectedItem = item
@@ -173,12 +220,10 @@ export default {
     },
 
     handleFlowRecord(row) {
-      console.log(row);
       this.active = 'record';
       this.$refs.drawer.open();
     },
     handleFlowNote(row) {
-      console.log(row);
       const query = {
         procInsId: row.procInsId,
         executionId: row.executionId,
@@ -192,9 +237,41 @@ export default {
       uni.navigateTo({
         url: `/pages/message/apply/detail?params=${encodedParams}`
       })
+      this.$refs.actionPopup.close();
+    },
+    handleDelete(row) {
+      const ids = row.procInsId || this.ids;// 暂不支持删除多个流程
+      // 显示确认提交对话框
+      uni.showModal({
+        title: '提示',
+        content: '删除流程后不可撤回，确认删除该流程吗？',
+        success: (res) => {
+          if (!res.confirm) {
+            return;
+          }
+          getProcessVariables(row.taskId).then(res => {
+            if (res.data) {
+              let delId = res.data.formId;
+              deleteResources(row.procDefName, delId)
+            }
+            return delDeployment(ids);
+          }).then(() => {
+            this.upCallback();
+            this.$modal.msgSuccess("流程取消成功");
+            this.$refs.actionPopup.close()
+          })
+        }
+      });
+    },
+    beDeleted(row) {
+      if (row.procDefName == '项目预算' || row.procDefName == '技术方案' || row.procDefName == '安全交底' || row.procDefName == '技术交底' || row.finishTime != null) {
+        return true
+      } else if (row.procDefName == '项目流转' && row.taskName != '项目登记') {
+        return true
+      } else {
+        return false
+      }
     },
-    handleDelete(row) { /* ... */ },
-    beDeleted(row) { /* ... */ },
   },
 }
 </script>

oa-ui-app/utils/deleteResource.js

@@ -0,0 +1,186 @@
+/*
+ * @Author: ysh
+ * @Date: 2024-06-13 17:07:59
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-28 15:17:32
+ */
+import request from '@/utils/request'
+
+const apiEndpoints = [
+  {
+    procDefName: '承接合同评审',
+    apiUrl: [
+      '/oa/contract/:id',
+      '/oa/contractWork/:id',
+      '/oa/contractComment/:id',
+      '/oa/contractMeeting/:id',
+      '/oa/contractPayment/:id',
+      '/oa/projectContract/:id',
+      '/oa/contractSubcontract/contractIds/:id',
+    ]
+  },
+  {
+    procDefName: '分包合同评审',
+    apiUrl: [
+      '/oa/subContract/:id',
+      '/oa/contractWork/:id',
+      '/oa/contractComment/:id',
+      '/oa/contractMeeting/:id',
+      '/oa/contractPayment/:id',
+      '/oa/projectSubcontract/:id',
+      '/oa/contractSubcontract/:id',
+    ]
+  },
+  {
+    procDefName: '用车审批',
+    apiUrl: [
+      '/oa/carApproval/:id',
+    ]
+  },
+  {
+    procDefName: '设备审批',
+    apiUrl: [
+      '/oa/deviceApproval/:id',
+    ]
+  },
+  {
+    procDefName: '项目流转',
+    apiUrl: [
+      '/oa/project/:id',
+      '/oa/projectWork/:id',
+      '/oa/projectContract/delete/:id'
+    ]
+  },
+  {
+    procDefName: '项目结算',
+    apiUrl: [
+      '/oa/settle/:id',
+      '/oa/settleSummary/:id',
+      '/oa/settleWork/:id',
+    ]
+  },
+  {
+    procDefName: '借款审批',
+    apiUrl: [
+      '/oa/borrow/:id',
+      '/oa/borrowDetail/:id',
+    ]
+  },
+  {
+    procDefName: '项目变更',
+    apiUrl: [
+      '/oa/projectChange/:id',
+    ]
+  },
+  {
+    procDefName: '成果归档',
+    apiUrl: [
+      '/oa/archive/:id',
+    ]
+  },
+  {
+    procDefName: '其他结算',
+    apiUrl: [
+      '/oa/settle/:id',
+      '/oa/settleSummary/:id',
+      '/oa/settleWork/:id',
+    ]
+  },
+  {
+    procDefName: '品牌项目支付',
+    apiUrl: [
+      '/oa/brand/:id',
+      '/oa/brandPayment/:id'
+    ]
+  },
+  {
+    procDefName: '工作填报',
+    apiUrl: [
+      '/oa/declare/:id'
+    ]
+  },
+  {
+    procDefName: '采购审批',
+    apiUrl: [
+      '/oa/procureApproval/:id',
+      '/oa/procurePlan/:id'
+    ]
+  },
+  {
+    procDefName: '项目委外',
+    apiUrl: [
+      '/oa/outsource/:id',
+      '/oa/outsourceWork/:id'
+    ]
+  },
+  {
+    procDefName: '绩效审批',
+    apiUrl: [
+      '/oa/performance/:id',
+      '/oa/wage/batch/:id'
+    ]
+  },
+  {
+    procDefName: '项目预算',
+    apiUrl: [
+      '/oa/budget/:id',
+      '/oa/budgetSettle/:id',
+      '/oa/budgetCar/:id',
+      '/oa/budgetDevice/:id',
+      '/oa/budgetStaff/:id',
+    ]
+  },
+  {
+    procDefName: '技术方案',
+    apiUrl: [
+      '/oa/technical/:id',
+    ]
+  },
+  {
+    procDefName: '技术交底',
+    apiUrl: [
+      '/oa/technicalPlan/:id',
+    ]
+  },
+  {
+    procDefName: '安全交底',
+    apiUrl: [
+      '/oa/safe/:id',
+    ]
+  },
+  {
+    procDefName: '参培审核',
+    apiUrl: [
+      '/oa/trainApproval/:id',
+    ]
+  },
+]
+
+// 编写一个方法来处理删除请求，并同时发送所有API请求  
+export async function deleteResources(procDefName, id) {
+  // 查找对应的API端点  
+  const endpoint = apiEndpoints.find(endpoint => endpoint.procDefName === procDefName);
+  if (!endpoint) {
+    throw new Error(`No API endpoints found for process definition: ${procDefName}`);
+  }
+
+  // 构建所有请求的Promise数组  
+  const deletePromises = endpoint.apiUrl.map(apiUrl => {
+    // 替换URL中的:id占位符  
+    const url = apiUrl.replace(':id', id);
+    // 发送DELETE请求并返回Promise  
+    console.log(request.delete);
+    return request({
+      url: url,
+      method: 'delete'
+    })
+  });
+
+  // 等待所有请求完成  
+  try {
+    return await Promise.all(deletePromises);
+    console.log('删除完成！');
+  } catch (error) {
+    console.error('One or more deletion requests failed:', error);
+  }
+}