更新移动端

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBorrowDetailController.java

@@ -96,4 +96,14 @@ public class CmcBorrowDetailController extends BaseController
     {
         return success(cmcBorrowDetailService.deleteCmcBorrowDetailByBorrowIds(borrowIds));
     }
+
+    /**
+     * 删除cmc借款明细通过borrowDetailId
+     */
+    @Log(title = "cmc借款明细", businessType = BusinessType.DELETE)
+    @DeleteMapping("/id/{borrowDetailId}")
+    public AjaxResult removeByBorrowDetailId(@PathVariable String[] borrowDetailId)
+    {
+        return success(cmcBorrowDetailService.deleteCmcBorrowDetailByBorrowDetailId(borrowDetailId));
+    }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcBorrowDetailMapper.java

@@ -58,4 +58,12 @@ public interface CmcBorrowDetailMapper
      * @return 结果
      */
     public int deleteCmcBorrowDetailByBorrowIds(String[] borrowIds);
+
+    /**
+     * 批量删除cmc借款明细
+     *
+     * @param borrowIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcBorrowDetailByBorrowDetailId(String[] borrowDetailId);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcBorrowDetailService.java

@@ -58,4 +58,12 @@ public interface ICmcBorrowDetailService
      * @return 结果
      */
     public int deleteCmcBorrowDetailByBorrowId(String borrowId);
+
+    /**
+     * 批量删除cmc借款明细
+     *
+     * @param borrowIds 需要删除的cmc借款明细主键集合
+     * @return 结果
+     */
+    public int deleteCmcBorrowDetailByBorrowDetailId(String[] borrowDetailId);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcBorrowDetailServiceImpl.java

@@ -90,4 +90,17 @@ public class CmcBorrowDetailServiceImpl implements ICmcBorrowDetailService
     {
         return cmcBorrowDetailMapper.deleteCmcBorrowDetailByBorrowId(borrowId);
     }
+
+    /**
+     * 批量删除cmc借款明细
+     *
+     * @param borrowIds 需要删除的cmc借款明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBorrowDetailByBorrowDetailId(String[] borrowDetailId)
+    {
+        return cmcBorrowDetailMapper.deleteCmcBorrowDetailByBorrowDetailId(borrowDetailId);
+    }
+
 }

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBorrowDetailMapper.xml

@@ -85,4 +85,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{borrowId}
         </foreach>
     </delete>
+
+    <delete id="deleteCmcBorrowDetailByBorrowDetailId" parameterType="String">
+        delete from cmc_borrow_detail where borrow_detail_id in
+        <foreach item="borrowDetailId" collection="array" open="(" separator="," close=")">
+            #{borrowDetailId}
+        </foreach>
+    </delete>
 </mapper>

oa-ui-app/api/oa/borrow/borrowDetail.js

@@ -42,3 +42,11 @@ export function delBorrowDetail(borrowId) {
     method: 'delete'
   })
 }
+
+// 删除cmc借款明细根据每一项Id
+export function delBorrowDetailByDetailId(borrowDetailId) {
+  return request({
+    url: '/oa/borrowDetail/id' + borrowDetailId,
+    method: 'delete'
+  })
+}

oa-ui-app/api/system/post.js

@@ -0,0 +1,139 @@
+/*
+ * @Author: wrh
+ * @Date: 2024-03-07 17:33:37
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-22 16:17:43
+ */
+import request from '@/utils/request'
+
+// 查询岗位列表
+export function listPost(query) {
+  return request({
+    url: '/system/post/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据岗位查用户
+export function getUserByPost(query) {
+  return request({
+    url: '/system/post/postName',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询岗位详细
+export function getPost(postId) {
+  return request({
+    url: '/system/post/' + postId,
+    method: 'get'
+  })
+}
+
+// 新增岗位
+export function addPost(data) {
+  return request({
+    url: '/system/post',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改岗位
+export function updatePost(data) {
+  return request({
+    url: '/system/post',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除岗位
+export function delPost(postId) {
+  return request({
+    url: '/system/post/' + postId,
+    method: 'delete'
+  })
+}
+
+// 通过deptId获取是否部门负责人
+export function getIsDeptLeader() {
+  return request({
+    url: '/system/post/isDeptLeader',
+    method: 'get'
+  })
+}
+
+// 查询当前用户的部门负责人
+export function getUsersDeptLeader(query) {
+  return request({
+    url: '/system/post/deptLeader',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询经营部门的部门负责人
+export function getDeptLeaders(query) {
+  return request({
+    url: '/system/post/deptLeaders',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询当前部门的部门负责人
+export function getUsersDeptLeaderByDept(query) {
+  return request({
+    url: '/system/post/deptLeaderByDept',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询经营部门的部门负责人
+export function getDeptLeadersByDeptId(query) {
+  return request({
+    url: '/system/post/deptLeadersByDept',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询当前用户的部门负责人
+export function getUsersViceDeptLeader(query) {
+  return request({
+    url: '/system/post/deptViceLeader',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询当前部门的部门负责人
+export function getUsersViceDeptLeaderByDept(query) {
+  return request({
+    url: '/system/post/deptViceLeaderByDept',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询当前用户的分管领导
+export function getUsersManageLeader(query) {
+  return request({
+    url: '/system/post/manageLeader',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询当前部门的分管领导
+export function getUsersManageLeaderByDept(query) {
+  return request({
+    url: '/system/post/manageLeaderByDept',
+    method: 'get',
+    params: query
+  })
+}

oa-ui-app/config.js

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

oa-ui-app/pages.json

@@ -1,3 +1,9 @@
+/*
+ * @Author: ysh
+ * @Date: 2025-01-15 14:42:34
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-02-20 10:20:46
+ */
 {
 	"pages": [{
 			"path": "pages/login",
@@ -80,6 +86,20 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/message/completed/index",
+			"style": {
+				"navigationBarTitleText": "已办任务",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/message/myProcess/index",
+			"style": {
+				"navigationBarTitleText": "我的流程",
+				"enablePullDownRefresh": true
+			}
+		},
 		{
 			"path" : "pages/message/apply/detail",
 			"style" : 
@@ -88,10 +108,17 @@
 			}
 		},
 		{
-			"path" : "pages/message/apply/components/declare/declare",
+			"path" : "pages/form/declare/declare",
+			"style" : 
+			{
+				"navigationBarTitleText" : "工作填报"
+			}
+		},
+		{
+			"path" : "pages/form/borrow/borrow",
 			"style" : 
 			{
-				"navigationBarTitleText" : ""
+				"navigationBarTitleText" : "借款审批"
 			}
 		}
 	],
@@ -126,7 +153,7 @@
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "RuoYi",
+		"navigationBarTitleText": "CMC",
 		"navigationBarBackgroundColor": "#FFFFFF"
 	}
 }

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

@@ -135,8 +135,6 @@
 							pageSize: this.pageSize
 						});
 					}
-
-					console.log(res)
 					this.projectList = this.currentPage === 1 ?
 						res.rows : [...this.projectList, ...res.rows];
 

oa-ui-app/pages/emptyBox.vue

@@ -0,0 +1,21 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-02-19 16:58:25
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-02-20 09:46:49
+-->
+<template>
+  <view>
+    <u-empty mode="list" icon="list" text="抱歉，移动端暂未更新此页面，请前往网页端查看"></u-empty>
+  </view>
+</template>
+
+<script>
+  export default {
+    
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -0,0 +1,149 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-02-20 10:20:22
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-02-27 10:49:10
+-->
+<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">
+      <!-- 当前节点 -->
+      <uni-forms-item label="当前节点" class="form-item">
+        <uni-tag :inverted="true" type="primary" :text="taskName"></uni-tag>
+      </uni-forms-item>
+
+      <!-- 流程发起人 -->
+      <uni-forms-item label="填报人" class="form-item">
+        <uni-tag :inverted="true" type="primary" :text="startUserName"></uni-tag>
+      </uni-forms-item>
+
+      <!-- 填报日期 -->
+      <uni-forms-item label="填报日期" class="form-item">
+        <text>{{ form.applyDate }}</text>
+      </uni-forms-item>
+
+      <!-- 借款类型 -->
+      <uni-forms-item label="借款类型" required class="form-item" name="borrowUsage">
+        <uni-data-checkbox v-model="form.borrowUsage" :localdata="borrowUsageOptions"></uni-data-checkbox>
+      </uni-forms-item>
+
+      <!-- 借款类型 -->
+      <uni-forms-item label="借款事由" required class="form-item" name="applyReason" v-if="form.borrowUsage != 0">
+        <uv-textarea v-model="form.applyReason" placeholder="请输入借款事由"></uv-textarea>
+      </uni-forms-item>
+
+      <!-- 选择项目 -->
+      <uni-forms-item label="选择项目" required class="form-item" v-if="form.borrowUsage == 0" name="projectId">
+        <u-button type="primary" @click="openProject = true" v-if="taskName == '借款申请'">选择项目</u-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">
+        <BorrowDetail :borrowId="form.borrowId"></BorrowDetail>
+      </uni-forms-item>
+
+    </uni-forms>
+
+
+  </view>
+</template>
+
+<script>
+import ProjectPicker from '@/pages/components/ProjectPicker.vue';
+import ProjectInfo from '@/pages/components/ProjectInfo.vue';
+import { parseTime } from "@/utils/common.js"
+import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
+import { listProject, getProject } from "@/api/oa/project/project";
+import BorrowDetail from './borrowDetail.vue';
+export default {
+  components: {
+    ProjectPicker,
+    ProjectInfo,
+    BorrowDetail
+  },
+  props: {
+    taskForm: Object,
+    taskName: String, // 当前节点
+    startUserName: String, // 流程发起人
+  },
+  created() {
+    this.initForm();
+    uni.setNavigationBarTitle({
+      title: '借款审批'
+    });
+  },
+  data() {
+    return {
+      form: {
+        submitTime: '',
+        borrowUsage: '0',
+      },
+      rules: {},
+      borrowUsageOptions: [{
+        text: '项目借款',
+        value: '0',
+        disable: false
+      }, {
+        text: '非项目借款',
+        value: '1',
+        disable: false
+      }, {
+        text: '工会借款',
+        value: '2',
+        disable: false
+      }, {
+        text: '党委借款',
+        value: '3',
+        disable: false
+      }, {
+        text: '团委借款',
+        value: '4',
+        disable: false
+      }
+      ],
+      openProject: false,
+      selectedProject: null, //选中的项目
+      projectObj: {}, //项目信息的项目
+      fromTotal: 0,
+    }
+  },
+  methods: {
+    initForm() {
+      getBorrow(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.fromTotal = 1;
+          this.form = res.data;
+          console.log(this.form);
+          if (this.form.projectId) {
+            getProject(this.form.projectId).then(res => {
+              if (res.data) {
+                this.selectedProject = res.data;
+                this.projectObj = res.data;
+              }
+            })
+          }
+        } else {
+          this.fromTotal = 0;
+          this.form.applier = this.$store.getters.userId;
+          this.form.applyDate = parseTime(new Date(), "{y}-{m}-{d}");
+        }
+      })
+    },
+    handleConfirm(project) {
+      console.log('选中的项目:', project);
+      this.selectedProject = project;
+      this.projectObj = project;
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,297 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-02-27 10:43:04
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-02-28 16:27:00
+-->
+<template>
+  <view class="container">
+    <u-button type="primary" @click="showAddPopup = true">+ 新增借款项</u-button>
+    <!-- 列表标题 -->
+    <view class="list-header">
+      <text class="header-item">开支项目</text>
+      <text class="header-item amount">申请金额</text>
+    </view>
+
+    <!-- 数据列表 -->
+    <view class="list-box" v-for="(item, index) in detailList" :key="item.borrowDetailId">
+      <view class="indexs">
+        <text>{{ index + 1 }}</text>
+      </view>
+      <view class="list-item">
+        <view class="item-left">
+          <text class="item-title">{{ item.borrowItem }}</text>
+          <text class="item-sub">
+            ￥{{ item.price }} × {{ item.quantity }}{{ item.unit }}
+          </text>
+        </view>
+        <view class="item-right">
+          <text class="total-amount">￥{{ item.applyAmount }}</text>
+        </view>
+      </view>
+      <!-- <view class="fg-amount">
+        <text>分管领导审核金额</text>
+        <uni-easyinput v-model="item.managerAmount" placeholder="请输入审核金额" />
+      </view> -->
+      <view class="box-button">
+        <u-button size="normal" icon="edit-pen">修改</u-button>
+        <u-button size="normal" icon="trash" @click="deleteItem(item)">删除</u-button>
+      </view>
+    </view>
+
+    <!-- 借款弹窗 -->
+    <view v-if="showAddPopup" class="add-popup">
+
+      <view class="popup-content">
+        <text class="popup-title">新增借款项</text>
+
+        <uni-forms ref="form" :modelValue="newItem" :rules="rules" label-position="top" label-width="150"
+          class="custom-form">
+          <uni-forms-item label="开支项目" name="borrowItem" required class="form-item">
+            <uni-easyinput v-model="newItem.borrowItem" placeholder="请输入开支项目" />
+          </uni-forms-item>
+          <uni-forms-item label="单位" name="unit" required class="form-item">
+            <uni-easyinput v-model="newItem.unit" placeholder="请输入单位" />
+          </uni-forms-item>
+          <uni-forms-item label="单价" name="price" required class="form-item">
+            <uni-easyinput type="number" v-model="newItem.price" placeholder="请输入单价" />
+          </uni-forms-item>
+          <uni-forms-item label="数量" name="quantity" required class="form-item">
+            <uni-easyinput type="number" v-model="newItem.quantity" placeholder="请输入数量" />
+          </uni-forms-item>
+          <uni-forms-item label="合计">
+            <text>{{ getTotal() }}</text>
+          </uni-forms-item>
+        </uni-forms>
+        <view class="popup-buttons">
+          <u-button @click="cancelAdd">取消</u-button>
+          <u-button type="primary" class="confirm" @click="confirmAdd">确认添加</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';
+export default {
+  components: { uButton },
+  props: {
+    borrowId: String
+  },
+  data() {
+    return {
+      detailList: [],
+      showAddPopup: false,
+      newItem: {
+        borrowItem: '',
+        unit: '',
+        price: '',
+        quantity: '',
+        applyAmount: 0
+      },
+      rules: {},
+      errorMessage: '',
+    }
+  },
+  created() {
+  },
+  watch: {
+    borrowId() {
+      this.initList();
+    }
+  },
+  methods: {
+    initList() {
+      listBorrowDetail({ pageSize: 999, borrowId: this.borrowId }).then(res => {
+        if (res.rows.length != 0) {
+          this.detailList = res.rows
+          console.log(res.rows);
+        }
+      });
+    },
+    // 确认添加
+    confirmAdd() {
+      this.$refs.form.validate().then(res => {
+        console.log('表单数据信息：', res);
+        res.borrowId = this.borrowId;
+        res.applyAmount = this.getTotal();
+        addBorrowDetail(res);
+        // this.detailList.unshift({
+        //   borrowId: this.borrowId,
+        //   borrowItem: this.newItem.borrowItem,
+        //   unit: this.newItem.unit,
+        //   price: Number(this.newItem.price),
+        //   quantity: Number(this.newItem.quantity),
+        //   applyAmount: Number(this.newItem.price) * Number(this.newItem.quantity)
+        // })
+        // console.log(this.detailList);
+        this.clearForm()
+        this.showAddPopup = false
+        this.initList();
+      })
+
+    },
+
+    // 清空表单
+    clearForm() {
+      this.newItem = {
+        borrowItem: '',
+        unit: '',
+        price: '',
+        quantity: '',
+        applyAmount: 0
+      }
+    },
+
+    // 取消添加
+    cancelAdd() {
+      this.clearForm()
+      this.showAddPopup = false
+    },
+    getTotal() {
+      return (Number(this.newItem.price) * Number(this.newItem.quantity)).toFixed(2)
+    },
+    deleteItem(item) {
+      this.$modal.confirm('是否删除开支项目为'+item.borrowItem+'的项？').then(() => {
+        delBorrowDetailByDetailId(item.borrowDetailId).then(res => {
+          this.$message.success(res.msg)
+        })
+      })
+
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  padding: 20rpx 30rpx;
+  background-color: #f8f8f8;
+}
+
+/* 列表标题样式 */
+.list-header {
+  display: flex;
+  justify-content: space-between;
+  padding: 20rpx 0;
+  font-weight: bold;
+  border-bottom: 1rpx solid #eee;
+}
+
+.list-box {
+  margin-bottom: 20rpx;
+  padding: 30rpx 10rpx;
+  border-bottom: 1rpx solid #eee;
+  background-color: #fff;
+  border-radius: 12rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+
+  .indexs {
+    font-size: 25rpx;
+    height: 30rpx;
+    position: relative;
+
+    text {
+      display: block;
+      position: absolute;
+      right: 10rpx;
+      width: 32rpx;
+      height: 32rpx;
+      text-align: center;
+    }
+  }
+
+  .box-button {
+    display: flex;
+    padding: 10rpx;
+
+  }
+}
+
+/* 列表项样式 */
+.list-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.item-left {
+  flex: 1;
+}
+
+.item-title {
+  display: block;
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 15rpx;
+}
+
+.item-sub {
+  font-size: 26rpx;
+  color: #999;
+}
+
+.total-amount {
+  font-size: 30rpx;
+  color: #f1a532;
+  font-weight: bold;
+  padding-right: 30rpx;
+}
+
+.delete {
+  font-size: 30rpx;
+  color: #ff6a6c;
+  font-weight: bold;
+}
+
+.edit {
+  font-size: 30rpx;
+  color: #3c9cff;
+  font-weight: bold;
+  padding-right: 20rpx;
+}
+
+/* 金额列对齐 */
+.amount {
+  min-width: 100rpx;
+  padding-right: 20rpx;
+}
+
+
+.item-right {
+  min-width: 200rpx;
+  text-align: right;
+}
+
+
+
+.add-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: 999;
+}
+
+.popup-content {
+  background-color: white;
+  width: 600rpx;
+  padding: 40rpx;
+  border-radius: 20rpx;
+}
+
+.popup-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  display: block;
+  margin-bottom: 40rpx;
+}
+</style>

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

@@ -0,0 +1,461 @@
+<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="formData" :rules="rules" label-position="top" label-width="150"
+			class="custom-form">
+			<!-- 当前节点 -->
+			<uni-forms-item label="当前节点" class="form-item">
+				<uni-tag :inverted="true" type="primary" :text="taskName"></uni-tag>
+			</uni-forms-item>
+
+			<!-- 流程发起人 -->
+			<uni-forms-item label="填报人" class="form-item">
+				<uni-tag :inverted="true" type="primary" :text="startUserName"></uni-tag>
+			</uni-forms-item>
+
+			<!-- 填报日期 -->
+			<uni-forms-item label="填报日期" class="form-item">
+				<text>{{ formData.submitTime }}</text>
+			</uni-forms-item>
+			<!-- 是否零星项目 -->
+			<uni-forms-item label="是否零星项目" class="form-item" name="isScattered">
+				<uni-data-checkbox v-model="isScattered" :localdata="isScatteredOptions"></uni-data-checkbox>
+			</uni-forms-item>
+
+			<!-- 选择项目 -->
+			<uni-forms-item label="选择项目" required class="form-item" v-if="!isScattered" name="projectId">
+				<!-- <ProjectPicker v-model="formData.projectId" placeholder="请选择项目" :labelKey="'projectName'"
+					:valueKey="'projectId'" @change="handleProjectChange"
+					:customStyle="{ borderColor: '#e5e5e5', borderRadius: '8px' }" v-if="taskName == '工作填报'" /> -->
+				<!-- <ProjectInfo :project="projectObj" v-else></ProjectInfo> -->
+				<u-button type="primary" @click="openProject = true" v-if="taskName == '工作填报'">选择项目</u-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="workType">
+				<uni-data-select :disabled="taskName != '工作填报'" :clear="taskName == '工作填报'" v-model="formData.workType"
+					:localdata="workTypeColumns" @change="bindWorkTypeChange"></uni-data-select>
+			</uni-forms-item>
+
+			<!-- 工作细项 -->
+			<uni-forms-item label="工作细项" required class="form-item" name="workItem">
+				<picker @change="bindWorkItemChange" :value="formData.workItem" :range="workItemList"
+					:disabled="taskName != '工作填报'">
+					<view class="uni-input">
+						<uni-easyinput type="text" :disabled="taskName != '工作填报'" v-model="formData.workItem"
+							@click="showType = true" placeholder="请选择" :styles="inputStyle" />
+					</view>
+				</picker>
+			</uni-forms-item>
+
+			<!-- 具体内容 -->
+			<uni-forms-item label="具体内容" required class="form-item" name="workContent">
+				<uni-easyinput :disabled="taskName != '工作填报'" type="textarea" v-model="formData.workContent"
+					placeholder="请输入具体工作内容" :styles="textareaStyle" />
+			</uni-forms-item>
+
+			<!-- 工天 -->
+			<uni-forms-item label="工天" required class="form-item" name="workLoad">
+				<uni-easyinput :disabled="taskName != '工作填报'" type="number" v-model="formData.workLoad" placeholder="请输入所需工天"
+					:styles="inputStyle">
+					<text slot="right" class="unit">天</text>
+				</uni-easyinput>
+			</uni-forms-item>
+
+			<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 == '填报人确认'">
+				</uni-easyinput>
+			</uni-forms-item>
+
+			<uni-forms-item label="工天单价" class="form-item" v-if="taskName != '工作填报'">
+				<u-tag :text="formData.price + '/人天'" type="success" plain></u-tag>
+			</uni-forms-item>
+
+			<uni-forms-item label="预估绩效" class="form-item" v-if="taskName != '工作填报'">
+				<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">提交</button>
+		</uni-forms>
+
+		<uv-modal ref="popModal" title="提示" content='是否提交表单？' :showCancelButton="true" @confirm="confirmSubmit"></uv-modal>
+	</view>
+</template>
+
+<script>
+import ProjectPicker from '@/pages/components/ProjectPicker.vue';
+import ProjectInfo from '@/pages/components/ProjectInfo.vue';
+import { listPrice, getWorkTypeList, getWorkItemList } from '@/api/oa/price/price'
+import { listProject, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
+import { listDeclare, getDeclare, addDeclare, updateDeclare } from '@/api/oa/declare/declare';
+import { parseTime } from "@/utils/common.js"
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from "@/api/system/post.js";
+export default {
+	components: {
+		ProjectPicker,
+		ProjectInfo
+	},
+	props: {
+		taskForm: Object,
+		taskName: String, // 当前节点
+		startUserName: String, // 流程发起人
+	},
+	created() {
+		this.getProjectList();
+		this.initForm();
+		if (this.taskName != '工作填报') {
+			this.isScatteredOptions.map(item => item.disable = true)
+		}
+		uni.setNavigationBarTitle({
+			title: '工作填报'
+		});
+	},
+	data() {
+		return {
+			openProject: false,
+			selectedProject: null,
+			isScattered: 0,
+			formData: {
+				userId: null,
+				projectId: '',
+				workType: '',
+				workItem: '',
+				workContent: '',
+				workLoad: '',
+				price: 216,
+				submitTime: '',
+				coefficient: undefined,
+			},
+			money: '',
+			rules: {
+				projectId: {
+					rules: [{
+						required: true,
+						errorMessage: '请选择项目',
+					},]
+				},
+				workType: {
+					rules: [{
+						required: true,
+						errorMessage: '请选择工作类别',
+					},]
+				},
+				workItem: {
+					rules: [{
+						required: true,
+						errorMessage: '请选择工作细项',
+					},]
+				},
+				workContent: {
+					rules: [{
+						required: true,
+						errorMessage: '请输入具体内容',
+					},]
+				},
+				workLoad: {
+					rules: [{
+						required: true,
+						errorMessage: '请输入工作量',
+					},]
+				},
+				coefficient: {
+					rules: [{
+						required: true,
+						errorMessage: '请输入系数',
+					},]
+				}
+			},
+			projectObj: {},
+			isScatteredOptions: [{
+				text: '否',
+				value: 0,
+				disable: false
+			}, {
+				text: '是',
+				value: 1,
+				disable: false
+			}],
+			projects: [],
+			projectIndex: -1,
+			inputStyle: {
+				borderColor: '#e5e5e5',
+				borderRadius: '8px'
+			},
+			textareaStyle: {
+				borderColor: '#e5e5e5',
+				borderRadius: '8px',
+				height: '100px'
+			},
+			showType: false,
+			workTypeColumns: [{
+				text: '外业',
+				value: '外业',
+			},
+			{
+				text: '内业',
+				value: '内业'
+			}
+			],
+			workItemList: [],
+			hasForm: false,
+			show: false,
+		};
+	},
+	methods: {
+		handleConfirm(project) {
+			console.log('选中的项目:', project);
+			this.selectedProject = project;
+			this.projectObj = project;
+		},
+		initForm() {
+			if (this.taskName == '工作填报') {
+				this.formData.submitTime = parseTime(new Date(), "{y}-{m}-{d}");
+				this.formData.userId = this.$store.getters.userId;
+			}
+			getDeclare(this.taskForm.formId).then(res => {
+				if (res.data) {
+					this.hasForm = true;
+					this.formData = res.data;
+					if (res.data.projectId) {
+						this.isScattered = 0;
+					} else {
+						this.isScattered = 1;
+					}
+					res.data.project.projectLeader = res.data.projectLeader
+					this.projectObj = res.data.project;
+					this.selectedProject = res.data.project;
+					this.bindWorkTypeChange(this.formData.workType);
+					this.countMoney();
+				} else {
+					this.hasForm = false;
+				}
+			})
+		},
+		bindProjectChange(e) {
+			this.projectIndex = e.detail.value;
+			this.formData.project = this.projects[this.projectIndex];
+		},
+		bindWorkTypeChange(e) {
+			listPrice({
+				workType: e,
+				pageNum: 1,
+				pageSize: 9999
+			}).then(res => {
+				if (res.code == 200) {
+					let data = res.rows;
+					let list = [];
+					for (let d of data) {
+						list.push(d.workItem)
+					}
+					if (e == '内业') {
+						list.push('其他')
+					}
+					this.workItemList = [...new Set(list)];
+				}
+			})
+		},
+		bindWorkItemChange(e) {
+			this.formData.workItem = this.workItemList[e.detail.value];
+		},
+		handleRadioChange(e) {
+			this.formData.isScattered = e.detail.value;
+		},
+		handleProjectChange(row) {
+
+		},
+		getProjectList() {
+			listProject({
+				pageNum: 1,
+				pageSize: 10
+			}).then(res => {
+				this.projects = res.rows
+			})
+		},
+		countMoney() {
+			console.log(this.formData);
+			let result = Number(this.formData.price) * Number(this.formData.workLoad) * Number(this.formData.coefficient)
+			console.log(result);
+			this.money = result.toFixed(2)
+		},
+		async save() {
+			if (!this.isScattered) {
+				this.formData.projectId = this.projectObj.projectId;
+			} else {
+				this.formData.projectId = ''
+			}
+			if (this.hasForm) {
+				let updateRes = await updateDeclare(this.formData);
+			} else {
+				this.formData.formId = this.taskForm.formId;
+				let addRes = await addDeclare(this.formData);
+				if (addRes.code == 200) {
+					this.hasForm = true;
+				} else {
+					this.hasForm = false;
+				}
+			}
+			uni.showToast({
+				title: '保存成功',
+				icon: 'success'
+			});
+		},
+		submitForm() {
+			this.$refs.form.validate().then(res => {
+				console.log('表单数据信息：', res);
+				console.log(this.taskForm);
+				this.taskForm.variables.skip = false;
+				if (!this.projectObj.projectLeader) {
+					if (this.isScattered == 0) {
+						this.$message.error('该项目未指定项目负责人，无法提交。')
+						return
+					}
+				}
+				this.$refs.popModal.open();
+			}).catch(err => {
+				console.log('表单错误信息：', err);
+			})
+		},
+		confirmSubmit() {
+			if (this.taskName == '工作填报') {
+				this.declareSubmit();
+			} else if (this.taskName == '项目负责人审核' || this.taskName == '部门负责人审核') {
+				this.approveForm();
+			} else {
+				this.confirmForm();
+			}
+		},
+		async declareSubmit() {
+			if (this.isScattered == 0) {
+				let approval = this.projectObj.projectLeader;
+				this.taskForm.variables.approval = approval
+			} else {
+				let resData = await getUsersDeptLeader({ userId: this.form.userId });
+				if (resData.data) {
+					this.taskForm.variables.approval = resData.data.userId
+					this.taskForm.variables.skip = true;
+				}
+			}
+			if (this.hasForm) {
+				updateDeclare(this.formData);
+			} else {
+				this.formData.formId = this.taskForm.formId;
+				addDeclare(this.formData);
+			}
+			this.handleComplete(this.taskForm);
+		},
+		async approveForm() {
+			if (this.taskName == '项目负责人审核') {
+				this.formData.checkStatus = '1';
+				updateDeclare(this.formData);
+				let resData = await getUsersDeptLeader({ userId: this.formData.userId });
+				if (resData.data) {
+					this.taskForm.variables.approval = resData.data.userId;
+					this.handleComplete(this.taskForm);
+				}
+			} else if (this.taskName == '部门负责人审核') {
+				this.formData.checkStatus = '1';
+				this.formData.auditStatus = '1';
+				updateDeclare(this.formData);
+				this.taskForm.variables.approval = this.formData.userId;
+				this.handleComplete(this.taskForm);
+			}
+		},
+		confirmForm() {
+			this.$modal.confirm('最后一个节点，提交将结束流程，是否提交？').then(() => {
+				this.formData.confirmStatus = '1';
+				updateDeclare(this.formData);
+				this.handleComplete(this.taskForm);
+			})
+		},
+		handleComplete(taskForm) {
+			const params = { taskId: this.taskForm.taskId };
+			getNextFlowNode(params).then(() => {
+				complete(taskForm).then(response => {
+					uni.showToast({
+						title: response.msg,
+						icon: 'success'
+					});
+					setTimeout(() => {
+						this.$emit('goBack')
+					}, 500);
+				})
+			})
+
+		},
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.form-container {
+	padding: 20px;
+	background-color: #f8f8f8;
+}
+
+.form-title {
+	margin-bottom: 15px;
+	text-align: center;
+
+	.title-text {
+		font-size: 20px;
+		font-weight: bold;
+		color: #333;
+	}
+
+	.title-line {
+		width: 50px;
+		height: 2px;
+		background-color: #007AFF;
+		margin: 8px auto;
+	}
+}
+
+.custom-form {
+	background-color: #fff;
+	padding: 15px;
+	border-radius: 12px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+.form-item {
+	margin-bottom: 20px;
+
+	/deep/ .uni-forms-item__label {
+		font-weight: 500;
+		color: #666;
+		padding-bottom: 8px;
+	}
+}
+
+.picker {
+	width: 100%;
+	padding: 10px;
+	border: 1px solid #e5e5e5;
+	border-radius: 8px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	color: #333;
+}
+
+.radio-label {
+	margin-right: 25px;
+	display: inline-flex;
+	align-items: center;
+}
+
+.unit {
+	color: #999;
+	padding: 0 10px;
+}
+</style>

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

@@ -1,20 +1,26 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-01-21 10:01:39
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-02-19 15:55:13
+-->
 <template>
 	<view>
-		<view class="tag-view text-center" style="padding: 10rpx;">
+		<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)">
-					<uni-card>
+					<view class="box">
 						<view style="text-align: right;">
-							<span style="font-size: 26rpx;color: #999999;">{{item.createTime}}</span>
+							<span style="font-size: 26rpx;color: #999999;">{{ item.createTime }}</span>
 						</view>
-						<uni-title type="h3" :title="item.title ? item.title:'暂无标题'"></uni-title>
-						<view>流程名称：{{item.procDefName}}</view>
-						<view>当前节点：{{item.taskName}}</view>
-						<view>流程发起人：{{item.startUserName}}</view>
-					</uni-card>
+						<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>
@@ -23,48 +29,62 @@
 </template>
 
 <script>
-	import {
-		todoList
-	} from "@/api/flowable/todo";
-	export default {
-		data() {
-			return {
-				todoList: [],
-				total: 0,
-			};
+import {
+	todoList
+} from "@/api/flowable/todo";
+export default {
+	data() {
+		return {
+			todoList: [],
+			total: 0,
+		};
+	},
+	created() {
+		this.getTodoList();
+	},
+	onLoad: function (options) {
+		uni.startPullDownRefresh();
+	},
+	onPullDownRefresh() {
+		this.getTodoList();
+	},
+	methods: {
+		getTodoList() {
+			todoList({
+				pageNum: 1,
+				pageSize: 999,
+				name: null
+			}).then(response => {
+				this.total = response.data.total;
+				this.todoList = response.data.records;
+				uni.stopPullDownRefresh();
+			});
 		},
-		created() {
-			this.getTodoList();
-		},
-		onLoad: function(options) {
-			uni.startPullDownRefresh();
-		},
-		onPullDownRefresh() {
-			this.getTodoList();
-		},
-		methods: {
-			getTodoList() {
-				todoList({
-					pageNum: 1,
-					pageSize: 999,
-					name: null
-				}).then(response => {
-					this.total = response.data.total;
-					this.todoList = response.data.records;
-					uni.stopPullDownRefresh();
-				});
-			},
-			goToDetail(item) {
-				// 跳转到详情页，并传递项目ID
-				console.log(item)
-				uni.navigateTo({
-					url: `/pages/message/apply/detail?procDefName=${item.procDefName}&taskName=${item.taskName}&startUserName=${item.startUserName}&taskId=${item.taskId}`
-				});
+		goToDetail(item) {
+			// 跳转到详情页，并传递项目ID
+			const query = {
+				procInsId: item.procInsId,
+				executionId: item.executionId,
+				deployId: item.deployId,
+				taskId: item.taskId,
+				taskName: item.taskName,
+				startUserName: item.startUserName,
+				procDefName: item.procDefName
 			}
+			const encodedParams = encodeURIComponent(JSON.stringify(query));
+			uni.navigateTo({
+				url: `/pages/message/apply/detail?params=${encodedParams}`
+			})
 		}
 	}
+}
 </script>
 
 <style lang="scss">
-
+.box {
+	background-color: #fff;
+	border-radius: 4px;
+	padding: 10px 20px;
+	margin: 0 10px 10px;
+}
 </style>

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

@@ -1,398 +0,0 @@
-<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="formData" :rules="rules" label-position="top" label-width="150"
-			class="custom-form">
-			<!-- 当前节点 -->
-			<uni-forms-item label="当前节点" class="form-item">
-				<uni-tag :inverted="true" type="primary" :text="taskName"></uni-tag>
-			</uni-forms-item>
-
-			<!-- 流程发起人 -->
-			<uni-forms-item label="填报人" class="form-item">
-				<uni-tag :inverted="true" type="primary" :text="startUserName"></uni-tag>
-			</uni-forms-item>
-
-			<!-- 填报日期 -->
-			<uni-forms-item label="填报日期" class="form-item">
-				<text>{{formData.submitTime}}</text>
-			</uni-forms-item>
-			<!-- 是否零星项目 -->
-			<uni-forms-item label="是否零星项目" required class="form-item" name="isScattered">
-				<uni-data-checkbox v-model="isScattered" :localdata="isScatteredOptions"></uni-data-checkbox>
-			</uni-forms-item>
-
-			<!-- 选择项目 -->
-			<uni-forms-item label="选择项目" required class="form-item" v-if="!isScattered" name="projectId">
-				<!-- <ProjectPicker v-model="formData.projectId" placeholder="请选择项目" :labelKey="'projectName'"
-					:valueKey="'projectId'" @change="handleProjectChange"
-					:customStyle="{ borderColor: '#e5e5e5', borderRadius: '8px' }" v-if="taskName == '工作填报'" /> -->
-				<!-- <ProjectInfo :project="projectObj" v-else></ProjectInfo> -->
-				<u-button type="primary" @click="openProject = true" v-if="taskName == '工作填报'">选择项目</u-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="workType">
-				<uni-data-select :disabled="taskName != '工作填报'" :clear="taskName == '工作填报'" v-model="formData.workType"
-					:localdata="workTypeColumns" @change="bindWorkTypeChange"></uni-data-select>
-			</uni-forms-item>
-
-			<!-- 工作细项 -->
-			<uni-forms-item label="工作细项" required class="form-item" name="workItem">
-				<picker @change="bindWorkItemChange" :value="formData.workItem" :range="workItemList"
-					:disabled="taskName != '工作填报'">
-					<view class="uni-input">
-						<uni-easyinput type="text" :disabled="taskName != '工作填报'" v-model="formData.workItem"
-							@click="showType = true" placeholder="请选择" :styles="inputStyle" />
-					</view>
-				</picker>
-			</uni-forms-item>
-
-			<!-- 具体内容 -->
-			<uni-forms-item label="具体内容" required class="form-item" name="workContent">
-				<uni-easyinput :disabled="taskName != '工作填报'" type="textarea" v-model="formData.workContent"
-					placeholder="请输入具体工作内容" :styles="textareaStyle" />
-			</uni-forms-item>
-
-			<!-- 工天 -->
-			<uni-forms-item label="工天" required class="form-item" name="workLoad">
-				<uni-easyinput :disabled="taskName != '工作填报'" type="number" v-model="formData.workLoad" placeholder="请输入所需工天"
-					:styles="inputStyle">
-					<text slot="right" class="unit">天</text>
-				</uni-easyinput>
-			</uni-forms-item>
-
-			<uni-forms-item label="系数" required class="form-item" name="coefficient" v-if="taskName != '工作填报'">
-				<uni-easyinput type="number" v-model="formData.coefficient" placeholder="请输入系数" :styles="inputStyle"
-					@input="countMoney">
-				</uni-easyinput>
-			</uni-forms-item>
-
-			<uni-forms-item label="工天单价" class="form-item" v-if="taskName != '工作填报'">
-				<u-tag :text="formData.price+'/人天'" type="success" plain></u-tag>
-			</uni-forms-item>
-
-			<uni-forms-item label="预估绩效" class="form-item" v-if="taskName != '工作填报'">
-				<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">提交</button>
-		</uni-forms>
-	</view>
-</template>
-
-<script>
-	import ProjectPicker from '@/pages/components/ProjectPicker.vue';
-	import ProjectInfo from '@/pages/components/ProjectInfo.vue';
-	import {
-		listPrice,
-		getWorkTypeList,
-		getWorkItemList
-	} from '@/api/oa/price/price'
-	import {
-		listProject,
-		submitProject,
-		modifyProject,
-		delProject
-	} from "@/api/oa/project/project";
-	import {
-		listDeclare,
-		getDeclare,
-		addDeclare,
-		updateDeclare
-	} from '@/api/oa/declare/declare';
-	import {
-		parseTime
-	} from "@/utils/common.js"
-	export default {
-		components: {
-			ProjectPicker,
-			ProjectInfo
-		},
-		props: {
-			taskForm: Object,
-			taskName: String, // 当前节点
-			startUserName: String, // 流程发起人
-		},
-		created() {
-			this.getProjectList();
-			this.initForm();
-			if (this.taskName != '工作填报') {
-				this.isScatteredOptions.map(item => item.disable = true)
-			}
-		},
-		data() {
-			return {
-				openProject: false,
-				selectedProject: null,
-				isScattered: 0,
-				formData: {
-					userId: null,
-					projectId: '',
-					workType: '',
-					workItem: '',
-					workContent: '',
-					workLoad: '',
-					price: 216,
-					submitTime: ''
-				},
-				money: '',
-				rules: {
-					isScattered: {
-						rules: [{
-							required: true,
-							errorMessage: '必填项',
-						}, ]
-					},
-					projectId: {
-						rules: [{
-							required: true,
-							errorMessage: '请选择项目',
-						}, ]
-					},
-					workType: {
-						rules: [{
-							required: true,
-							errorMessage: '请选择工作类别',
-						}, ]
-					},
-					workItem: {
-						rules: [{
-							required: true,
-							errorMessage: '请选择工作细项',
-						}, ]
-					},
-					workContent: {
-						rules: [{
-							required: true,
-							errorMessage: '请输入具体内容',
-						}, ]
-					},
-					workLoad: {
-						rules: [{
-							required: true,
-							errorMessage: '请输入工作量',
-						}, ]
-					},
-				},
-				projectObj: {},
-				isScatteredOptions: [{
-					text: '否',
-					value: 0,
-					disable: false
-				}, {
-					text: '是',
-					value: 1,
-					disable: false
-				}],
-				projects: [],
-				projectIndex: -1,
-				inputStyle: {
-					borderColor: '#e5e5e5',
-					borderRadius: '8px'
-				},
-				textareaStyle: {
-					borderColor: '#e5e5e5',
-					borderRadius: '8px',
-					height: '100px'
-				},
-				showType: false,
-				workTypeColumns: [{
-						text: '外业',
-						value: '外业',
-					},
-					{
-						text: '内业',
-						value: '内业'
-					}
-				],
-				workItemList: [],
-				hasForm: false,
-			};
-		},
-		methods: {
-			handleConfirm(project) {
-				console.log('选中的项目:', project);
-				this.selectedProject = project;
-				this.projectObj = project;
-			},
-			initForm() {
-				getDeclare(this.taskForm.formId).then(res => {
-					if (res.data) {
-						this.hasForm = true;
-						this.formData = res.data;
-						console.log(res.data)
-						if (res.data.projectId) {
-							this.isScattered = 0;
-						} else {
-							this.isScattered = 1;
-						}
-						res.data.project.projectLeader = res.data.projectLeader
-						this.projectObj = res.data.project;
-						this.selectedProject = res.data.project;
-						this.bindWorkTypeChange(this.formData.workType);
-						this.countMoney();
-					} else {
-						this.hasForm = false;
-					}
-					if (this.taskName == '工作填报') {
-						this.formData.submitTime = parseTime(new Date(), "{y}-{m}-{d}");
-						this.formData.userId = this.$store.getters.userId;
-						console.log(this.$store.getters)
-					}
-				})
-			},
-			bindProjectChange(e) {
-				this.projectIndex = e.detail.value;
-				this.formData.project = this.projects[this.projectIndex];
-			},
-			bindWorkTypeChange(e) {
-				listPrice({
-					workType: e,
-					pageNum: 1,
-					pageSize: 9999
-				}).then(res => {
-					if (res.code == 200) {
-						let data = res.rows;
-						let list = [];
-						for (let d of data) {
-							list.push(d.workItem)
-						}
-						if (e == '内业') {
-							list.push('其他')
-						}
-						this.workItemList = [...new Set(list)];
-					}
-				})
-			},
-			bindWorkItemChange(e) {
-				this.formData.workItem = this.workItemList[e.detail.value];
-				console.log(this.formData.workItem);
-			},
-			handleRadioChange(e) {
-				this.formData.isScattered = e.detail.value;
-			},
-			handleProjectChange(row) {
-				console.log(row)
-			},
-			getProjectList() {
-				listProject({
-					pageNum: 1,
-					pageSize: 10
-				}).then(res => {
-					this.projects = res.rows
-				})
-			},
-			countMoney() {
-				let result = parseFloat(this.formData.price * this.formData.workLoad * this.formData.coefficient)
-				console.log(result)
-				this.money = result.toFixed(2)
-			},
-			async save() {
-				if (!this.isScattered) {
-					this.formData.projectId = this.projectObj.projectId;
-				} else {
-					this.formData.projectId = ''
-				}
-				if (this.hasForm) {
-					let updateRes = await updateDeclare(this.formData);
-				} else {
-					this.formData.formId = this.taskForm.formId;
-					let addRes = await addDeclare(this.formData);
-					if (addRes.code == 200) {
-						this.hasForm = true;
-					} else {
-						this.hasForm = false;
-					}
-				}
-				uni.showToast({
-					title: '保存成功',
-					icon: 'success'
-				});
-			},
-			submitForm() {
-				this.$refs.form.validate().then(res => {
-					console.log('表单数据信息：', res);
-					uni.showToast({
-						title: '提交成功',
-						icon: 'success'
-					});
-				}).catch(err => {
-					console.log('表单错误信息：', err);
-				})
-			}
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	.form-container {
-		padding: 20px;
-		background-color: #f8f8f8;
-	}
-
-	.form-title {
-		margin-bottom: 15px;
-		text-align: center;
-
-		.title-text {
-			font-size: 20px;
-			font-weight: bold;
-			color: #333;
-		}
-
-		.title-line {
-			width: 50px;
-			height: 2px;
-			background-color: #007AFF;
-			margin: 8px auto;
-		}
-	}
-
-	.custom-form {
-		background-color: #fff;
-		padding: 15px;
-		border-radius: 12px;
-		box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
-	}
-
-	.form-item {
-		margin-bottom: 20px;
-
-		/deep/ .uni-forms-item__label {
-			font-weight: 500;
-			color: #666;
-			padding-bottom: 8px;
-		}
-	}
-
-	.picker {
-		width: 100%;
-		padding: 10px;
-		border: 1px solid #e5e5e5;
-		border-radius: 8px;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		color: #333;
-	}
-
-	.radio-label {
-		margin-right: 25px;
-		display: inline-flex;
-		align-items: center;
-	}
-
-	.unit {
-		color: #999;
-		padding: 0 10px;
-	}
-</style>

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

@@ -1,59 +1,96 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-02-06 09:48:52
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-02-20 10:24:30
+-->
 <template>
 	<view>
 		<!-- 动态加载表单组件 -->
-		<component :is="currentForm" :taskForm="taskForm" :taskName="taskName" :startUserName="startUserName" />
+		<component :is="currentForm" :taskForm="taskForm" :taskName="taskName" :startUserName="startUserName"
+			@goBack="goBack" v-if="!isEmpty" />
+		<component :is="'EmptyBox'" v-if="isEmpty" />
 	</view>
 </template>
 
 <script>
-	import {
-		getProcessVariables
-	} from "@/api/flowable/definition";
-	import Declare from './components/declare/declare.vue';
-	export default {
-		components: {
-			Declare,
-		},
-		data() {
-			return {
-				procDefName: '', // 流程名称
-				taskName: '', // 当前节点
-				startUserName: '', // 流程发起人
-				formId: '',
-				taskForm: {},
-				currentForm: null // 当前加载的表单组件
-			};
-		},
-		onLoad(options) {
-			// 接收传递的参数
-			this.procDefName = options.procDefName;
-			this.taskName = options.taskName;
-			this.startUserName = options.startUserName;
+import {
+	getProcessVariables
+} from "@/api/flowable/definition";
+import Declare from '@/pages/form/declare/declare.vue';
+import Borrow from "@/pages/form/borrow/borrow.vue";
+import EmptyBox from "../../emptyBox.vue";
+export default {
+	components: {
+		Declare,
+		EmptyBox,
+		Borrow,
+	},
+	data() {
+		return {
+			procDefName: '', // 流程名称
+			taskName: '', // 当前节点
+			startUserName: '', // 流程发起人
+			formId: '',
+			taskForm: {
+				returnTaskShow: false, // 是否展示回退表单
+				delegateTaskShow: false, // 是否展示回退表单
+				defaultTaskShow: true, // 默认处理
+				comment: "", // 意见内容
+				procInsId: "", // 流程实例编号
+				instanceId: "", // 流程实例编号
+				deployId: "",  // 流程定义编号
+				taskId: "",// 流程任务编号
+				procDefId: "",  // 流程编号
+				targetKey: "",
+				variables: {
+					variables: {}
+				},
+			},
+			currentForm: null, // 当前加载的表单组件
+			isEmpty: false,
+		};
+	},
+	onLoad(options) {
+		const params = JSON.parse(decodeURIComponent(options.params));
+		// 接收传递的参数
+		this.procDefName = params.procDefName;
+		this.taskName = params.taskName;
+		this.startUserName = params.startUserName;
+		this.taskForm.taskId = params.taskId;
+		this.taskForm.deployId = params.deployId;
+		this.taskForm.procInsId = params.procInsId;
+		this.taskForm.executionId = params.executionId;
+		this.taskForm.instanceId = params.procInsId;
+		getProcessVariables(params.taskId).then(res => {
+			this.taskForm.formId = res.data.formId;
 			// 根据流程名称加载不同的表单组件
-			getProcessVariables(options.taskId).then(res => {
-				this.taskForm = res.data;
-				this.loadForm();
-			})
-
-		},
-		methods: {
-			loadForm() {
-				switch (this.procDefName) {
-					case '工作填报':
-						this.currentForm = 'Declare';
-						break;
-					case '流程B':
-						this.currentForm = 'ProcessBForm';
-						break;
-					default:
-						console.log('未知流程');
-						break;
-				}
+			this.loadForm();
+		})
+	},
+	methods: {
+		loadForm() {
+			this.isEmpty = false;
+			switch (this.procDefName) {
+				case '工作填报':
+					this.currentForm = 'Declare';
+					break;
+				case '借款审批':
+					this.currentForm = 'Borrow';
+					break;
+				default:
+					console.log('未知流程');
+					this.isEmpty = true;
+					break;
 			}
+		},
+		goBack() {
+			uni.navigateTo({
+				url: '/pages/message/apply/apply'
+			})
 		}
 	}
+}
 </script>
 
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>

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

@@ -0,0 +1,21 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-02-19 15:30:13
+ * @LastEditors: 
+ * @LastEditTime: 2025-02-19 15:30:40
+-->
+<template>
+  <view>
+
+  </view>
+</template>
+
+<script>
+  export default {
+    
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-01-21 10:01:39
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-02-19 15:18:10
+-->
 <template>
 	<view class="u-page">
 		<scroll-view class="scroll-list" scroll-y="true">
@@ -15,9 +21,36 @@
 							</view>
 						</view>
 						<view class="info">
-							<span style="font-size: 26rpx;color: #999999;">{{acceptTime}}</span>
-							<u-badge class="info-badge" type="error" count="2" :max="99"
-								:value="detail"></u-badge>
+							<span style="font-size: 26rpx;color: #999999;">{{ acceptTime }}</span>
+							<u-badge class="info-badge" type="error" count="2" :max="99" :value="detail"></u-badge>
+						</view>
+					</view>
+				</view>
+				<view class="uni-list-cell">
+					<view class="uni-media-list" @click="$tab.navigateTo('/pages/message/completed/index')">
+						<view style="margin-right: 20rpx;">
+							<u-image :fade="false" src="@/static/images/message/completed.png" width="40px" height="40px"></u-image>
+						</view>
+						<view class="uni-media-list-body">
+							<view class="uni-media-list-text-top"><span>已办任务</span>
+							</view>
+							<view class="uni-media-list-text-bottom">
+								<uni-text><span>您的已办任务，在此进行撤回或查看已办任务等操作</span></uni-text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="uni-list-cell">
+					<view class="uni-media-list" @click="$tab.navigateTo('/pages/message/myProcess/index')">
+						<view style="margin-right: 20rpx;">
+							<u-image :fade="false" src="@/static/images/message/flowable.png" width="40px" height="40px"></u-image>
+						</view>
+						<view class="uni-media-list-body">
+							<view class="uni-media-list-text-top"><span>我的流程</span>
+							</view>
+							<view class="uni-media-list-text-bottom">
+								<uni-text><span>您发起的流程，在此可取消流程</span></uni-text>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -27,57 +60,57 @@
 </template>
 
 <script>
-	import {
-		todoList
-	} from "@/api/flowable/todo";
-	export default {
-		data() {
-			return {
-				todoList: [],
-				detail: 0,
-				acceptTime: ''
-			};
-		},
-		created() {
-			this.getTodoList();
-		},
-		onLoad() {
+import {
+	todoList
+} from "@/api/flowable/todo";
+export default {
+	data() {
+		return {
+			todoList: [],
+			detail: 0,
+			acceptTime: ''
+		};
+	},
+	created() {
+		this.getTodoList();
+	},
+	onLoad() {
 
-		},
-		methods: {
-			
-			getTodoList() {
-				todoList({
-					pageNum: 1,
-					pageSize: 999,
-					name: null
-				}).then(response => {
-					console.log(response)
-					this.detail = response.data.total;
-					this.todoList = response.data.records;
-					this.acceptTime = response.data.records[0].createTime;
-				});
-			}
-		},
-	};
+	},
+	methods: {
+		getTodoList() {
+			todoList({
+				pageNum: 1,
+				pageSize: 999,
+				name: null
+			}).then(response => {
+				this.detail = response.data.total;
+				this.todoList = response.data.records;
+				this.acceptTime = response.data.records[0].createTime;
+			});
+		}
+	},
+};
 </script>
 <style lang="scss">
-	@import '../common/uni.css';
-	.info{
-		position: relative;
-		.info-badge{
-			position: absolute;
-			right: 0;
-			top:45rpx;
-		}
+@import '../common/uni.css';
+
+.info {
+	position: relative;
+
+	.info-badge {
+		position: absolute;
+		right: 0;
+		top: 45rpx;
 	}
+}
 </style>
 <style>
-	.icon {
-		width: 1em;
-		height: 1em;
-		vertical-align: -0.15em;
-		fill: currentColor;
-		overflow: hidden;
-	}
+.icon {
+	width: 1em;
+	height: 1em;
+	vertical-align: -0.15em;
+	fill: currentColor;
+	overflow: hidden;
+}
 </style>

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

@@ -0,0 +1,15 @@
+<template>
+  <view>
+
+  </view>
+</template>
+
+<script>
+  export default {
+    
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -1,7 +1,7 @@
 <template>
   <view class="work-container">
     <!-- 轮播图 -->
-    <uni-swiper-dot class="uni-swiper-dot-box" :info="data" :current="current" field="content">
+    <!-- <uni-swiper-dot class="uni-swiper-dot-box" :info="data" :current="current" field="content">
       <swiper class="swiper-box" :current="swiperDotIndex" @change="changeSwiper">
         <swiper-item v-for="(item, index) in data" :key="index">
           <view class="swiper-item" @click="clickBannerItem(item)">
@@ -9,12 +9,20 @@
           </view>
         </swiper-item>
       </swiper>
-    </uni-swiper-dot>
+    </uni-swiper-dot> -->
 
     <!-- 宫格组件 -->
-    <uni-section title="系统管理" type="line"></uni-section>
+    <uni-section title="常用操作" type="line"></uni-section>
     <view class="grid-body">
-      <uni-grid :column="4" :showBorder="false" @change="changeGrid">
+      <uni-grid :column="4" :showBorder="false" @change="openSendFlow">
+        <uni-grid-item>
+          <view class="grid-item-box">
+            <uni-icons type="paperplane-filled" size="30" color="#2979ff"></uni-icons>
+            <text class="text">发起流程</text>
+          </view>
+        </uni-grid-item>
+      </uni-grid>
+      <!-- <uni-grid :column="4" :showBorder="false" @change="changeGrid">
         <uni-grid-item>
           <view class="grid-item-box">
             <uni-icons type="person-filled" size="30"></uni-icons>
@@ -69,115 +77,217 @@
             <text class="text">日志管理</text>
           </view>
         </uni-grid-item>
-      </uni-grid>
+      </uni-grid> -->
     </view>
+
+    <uv-popup ref="popup" mode="bottom">
+      <view class="bottom-popup">
+        <view v-for="item in sendFlowList">
+          <u-button @click="sendFlow(item)">{{ item.name }}</u-button>
+        </view>
+      </view>
+    </uv-popup>
   </view>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        current: 0,
-        swiperDotIndex: 0,
-        data: [{
-            image: '/static/images/banner/banner01.jpg'
-          },
-          {
-            image: '/static/images/banner/banner02.jpg'
-          },
-          {
-            image: '/static/images/banner/banner03.jpg'
-          }
-        ]
-      }
-    },
-    methods: {
-      clickBannerItem(item) {
-        console.info(item)
+import { listDefinition } from "@/api/flowable/definition";
+import { Snowflake } from '@/utils/snowFlake.js';
+import { getNextFlowNodeByStart, todoList } from "@/api/flowable/todo";
+import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
+export default {
+  data() {
+    return {
+      current: 0,
+      swiperDotIndex: 0,
+      data: [{
+        image: '/static/images/banner/banner01.jpg'
       },
-      changeSwiper(e) {
-        this.current = e.detail.current
+      {
+        image: '/static/images/banner/banner02.jpg'
       },
-      changeGrid(e) {
-        this.$modal.showToast('模块建设中~')
+      {
+        image: '/static/images/banner/banner03.jpg'
       }
+      ],
+      flowList: ['借款审批', '用车审批', '设备审批', '工作填报'],
+      sendFlowList: [],
+      // 查询参数
+      queryProcessParams: {
+        pageNum: 1,
+        pageSize: 9999,
+        name: null,
+        category: null,
+        key: null,
+        tenantId: null,
+        deployTime: null,
+        derivedFrom: null,
+        derivedFromRoot: null,
+        parentDeploymentId: null,
+        engineVersion: null
+      },
+      definitionList: [],
+      processTotal: 0,
+      processLoading: true
     }
+  },
+  created() {
+    this.getDefinitionList();
+  },
+  methods: {
+    clickBannerItem(item) {
+      console.info(item)
+    },
+    changeSwiper(e) {
+      this.current = e.detail.current
+    },
+    changeGrid(e) {
+      this.$modal.showToast('模块建设中~')
+    },
+    openSendFlow() {
+      this.$refs.popup.open();
+    },
+    sendFlow(row) {
+      let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
+      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
+        let data = res.data;
+        const variables = {};
+        const formData = {};
+        formData.disabled = true;
+        formData.formBtns = false;
+        formData.formId = formId
+        if (row.id) {
+          variables.variables = formData;
+          definitionStart(row.id, JSON.stringify(variables)).then(res => {
+            this.$modal.msgSuccess(res.msg);
+            let procInstanceId = res.data;
+            todoList({
+              pageNum: 1,
+              pageSize: 99999999, processInsId: procInstanceId
+            }).then(toDoRes => {
+              let records = toDoRes.data.records;
+              if (records.length == 1) {
+                records = records[0]
+              }
+              const query = {
+                procInsId: records.procInsId,
+                executionId: records.executionId,
+                deployId: records.deployId,
+                taskId: records.taskId,
+                taskName: records.taskName,
+                startUserName: records.startUserName + '-' + records.startDeptName,
+                formId: formData.formId,
+                procDefName: records.procDefName
+              }
+              const encodedParams = encodeURIComponent(JSON.stringify(query));
+              uni.navigateTo({
+                url: `/pages/message/apply/detail?params=${encodedParams}`
+              })
+              this.$refs.popup.close();
+            })
+          })
+        }
+      })
+    },
+    getDefinitionList() {
+      listDefinition(this.queryProcessParams).then(response => {
+        this.definitionList = response.data.records;
+        this.processTotal = response.data.total;
+        this.processLoading = false;
+        let list = []
+        for (let i of this.definitionList) {
+          if (this.flowList.includes(i.name)) {
+            list.push(i)
+          }
+        }
+        this.sendFlowList = list;
+      });
+    },
   }
+}
 </script>
 
 <style lang="scss">
-  /* #ifndef APP-NVUE */
-  page {
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    background-color: #fff;
-    min-height: 100%;
-    height: auto;
-  }
+/* #ifndef APP-NVUE */
+page {
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  background-color: #fff;
+  min-height: 100%;
+  height: auto;
+}
 
-  view {
-    font-size: 14px;
-    line-height: inherit;
-  }
+view {
+  font-size: 14px;
+  line-height: inherit;
+}
 
-  /* #endif */
+/* #endif */
 
-  .text {
-    text-align: center;
-    font-size: 26rpx;
-    margin-top: 10rpx;
-  }
+.text {
+  text-align: center;
+  font-size: 26rpx;
+  margin-top: 10rpx;
+}
 
-  .grid-item-box {
-    flex: 1;
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 15px 0;
-  }
+.grid-item-box {
+  flex: 1;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 15px 0;
+}
 
-  .uni-margin-wrap {
-    width: 690rpx;
-    width: 100%;
-    ;
-  }
+.uni-margin-wrap {
+  width: 690rpx;
+  width: 100%;
+  ;
+}
 
-  .swiper {
-    height: 300rpx;
-  }
+.swiper {
+  height: 300rpx;
+}
 
-  .swiper-box {
-    height: 150px;
-  }
+.swiper-box {
+  height: 150px;
+}
 
-  .swiper-item {
+.swiper-item {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+  height: 300rpx;
+  line-height: 300rpx;
+}
+
+@media screen and (min-width: 500px) {
+  .uni-swiper-dot-box {
+    width: 400px;
     /* #ifndef APP-NVUE */
-    display: flex;
+    margin: 0 auto;
     /* #endif */
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    color: #fff;
-    height: 300rpx;
-    line-height: 300rpx;
+    margin-top: 8px;
   }
 
-  @media screen and (min-width: 500px) {
-    .uni-swiper-dot-box {
-      width: 400px;
-      /* #ifndef APP-NVUE */
-      margin: 0 auto;
-      /* #endif */
-      margin-top: 8px;
-    }
-
-    .image {
-      width: 100%;
-    }
+  .image {
+    width: 100%;
   }
+}
+
+.bottom-popup {
+  max-height: 50vh;
+  margin-bottom: 65px;
+  padding: 10px;
+  text-align: center;
+
+  .popup-item {}
+}
 </style>

oa-ui-app/static/scss/global.scss

@@ -113,4 +113,48 @@
 		background-color: #f9ae3d;
 		color:#fff;
 		font-size: 16px;
-	}
+	}
+
+
+  
+.form-container {
+	padding: 20px;
+	background-color: #f8f8f8;
+}
+
+.form-title {
+	margin-bottom: 15px;
+	text-align: center;
+
+	.title-text {
+		font-size: 20px;
+		font-weight: bold;
+		color: #333;
+	}
+
+	.title-line {
+		width: 50px;
+		height: 2px;
+		background-color: #007AFF;
+		margin: 8px auto;
+	}
+}
+
+
+.custom-form {
+	background-color: #fff;
+	padding: 15px;
+	border-radius: 12px;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.05);
+}
+
+
+.form-item {
+	margin-bottom: 20px;
+
+	/deep/ .uni-forms-item__label {
+		font-weight: 500;
+		color: #666;
+		padding-bottom: 8px;
+	}
+}

oa-ui-app/store/getters.js

@@ -4,6 +4,6 @@ const getters = {
 	name: state => state.user.name,
 	roles: state => state.user.roles,
 	permissions: state => state.user.permissions,
-	userId: state => state.user.id,
+	userId: state => state.user.userId,
 }
 export default getters

oa-ui-app/store/modules/user.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: ysh
+ * @Date: 2025-01-16 11:17:09
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-02-19 15:06:07
+ */
 import config from '@/config'
 import storage from '@/utils/storage'
 import constant from '@/utils/constant'
@@ -13,7 +19,7 @@ const user = {
     avatar: storage.get(constant.avatar),
     roles: storage.get(constant.roles),
     permissions: storage.get(constant.permissions),
-    id: storage.get(constant.id),
+    userId: storage.get(constant.userId),
   },
 
   mutations: {
@@ -36,9 +42,9 @@ const user = {
       state.permissions = permissions
       storage.set(constant.permissions, permissions)
     },
-    SET_ID: (state, id) => {
-      state.id = id
-      storage.set(constant.id, id)
+    SET_USERID: (state, userId) => {
+      state.userId = userId
+      storage.set(constant.userId, userId)
     },
   },
 
@@ -65,15 +71,16 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.user
-          const avatar = (user == null || user.avatar == "" || user.avatar == null) ? require("@/static/images/profile.jpg") : baseUrl + user.avatar
+          const avatar = (user == null || user.avatar == "" || user.avatar == null) ? require("@/static/images/user.png") : baseUrl + user.avatar
           const username = (user == null || user.nickName == "" || user.nickName == null) ? "" : user.nickName
+          const userId = (user == null || user.userId == "" || user.userId == null) ? "" : user.userId
           if (res.roles && res.roles.length > 0) {
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
-					commit('SET_ID', user.userId)
+					commit('SET_USERID', userId)
           commit('SET_NAME', username)
           commit('SET_AVATAR', avatar)
           resolve(res)

oa-ui-app/utils/constant.js

@@ -2,7 +2,8 @@ const constant = {
    avatar: 'vuex_avatar',
    name: 'vuex_name',
    roles: 'vuex_roles',
-   permissions: 'vuex_permissions'
+   permissions: 'vuex_permissions',
+   userId:'vuex_userId'
  }
 
  export default constant

oa-ui-app/utils/snowFlake.js

@@ -0,0 +1,61 @@
+export var Snowflake = /** @class */ (function() {
+  function Snowflake(_workerId, _dataCenterId, _sequence) {
+      this.twepoch = 1288834974657n;
+      //this.twepoch = 0n;
+      this.workerIdBits = 5n;
+      this.dataCenterIdBits = 5n;
+      this.maxWrokerId = -1n ^ (-1n << this.workerIdBits); // 值为：31
+      this.maxDataCenterId = -1n ^ (-1n << this.dataCenterIdBits); // 值为：31
+      this.sequenceBits = 12n;
+      this.workerIdShift = this.sequenceBits; // 值为：12
+      this.dataCenterIdShift = this.sequenceBits + this.workerIdBits; // 值为：17
+      this.timestampLeftShift = this.sequenceBits + this.workerIdBits + this.dataCenterIdBits; // 值为：22
+      this.sequenceMask = -1n ^ (-1n << this.sequenceBits); // 值为：4095
+      this.lastTimestamp = -1n;
+      //设置默认值,从环境变量取
+      this.workerId = 1n;
+      this.dataCenterId = 1n;
+      this.sequence = 0n;
+      if (this.workerId > this.maxWrokerId || this.workerId < 0) {
+          throw new Error('_workerId must max than 0 and small than maxWrokerId-[' + this.maxWrokerId + ']');
+      }
+      if (this.dataCenterId > this.maxDataCenterId || this.dataCenterId < 0) {
+          throw new Error('_dataCenterId must max than 0 and small than maxDataCenterId-[' + this.maxDataCenterId + ']');
+      }
+
+      this.workerId = BigInt(_workerId);
+      this.dataCenterId = BigInt(_dataCenterId);
+      this.sequence = BigInt(_sequence);
+  }
+  Snowflake.prototype.tilNextMillis = function(lastTimestamp) {
+      var timestamp = this.timeGen();
+      while (timestamp <= lastTimestamp) {
+          timestamp = this.timeGen();
+      }
+      return BigInt(timestamp);
+  };
+  Snowflake.prototype.timeGen = function() {
+      return BigInt(Date.now());
+  };
+  Snowflake.prototype.nextId = function() {
+      var timestamp = this.timeGen();
+      if (timestamp < this.lastTimestamp) {
+          throw new Error('Clock moved backwards. Refusing to generate id for ' +
+              (this.lastTimestamp - timestamp));
+      }
+      if (this.lastTimestamp === timestamp) {
+          this.sequence = (this.sequence + 1n) & this.sequenceMask;
+          if (this.sequence === 0n) {
+              timestamp = this.tilNextMillis(this.lastTimestamp);
+          }
+      } else {
+          this.sequence = 0n;
+      }
+      this.lastTimestamp = timestamp;
+      return ((timestamp - this.twepoch) << this.timestampLeftShift) |
+          (this.dataCenterId << this.dataCenterIdShift) |
+          (this.workerId << this.workerIdShift) |
+          this.sequence;
+  };
+  return Snowflake;
+}());

oa-ui-app/utils/storage.js

@@ -1,16 +1,22 @@
+/*
+ * @Author: ysh
+ * @Date: 2025-01-16 11:17:24
+ * @LastEditors: 
+ * @LastEditTime: 2025-02-17 14:39:22
+ */
 import constant from './constant'
 
 // 存储变量名
 let storageKey = 'storage_data'
 
 // 存储节点变量名
-let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions]
+let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions, constant.userId]
 
 // 存储的数据
 let storageData = uni.getStorageSync(storageKey) || {}
 
 const storage = {
-  set: function(key, value) {
+  set: function (key, value) {
     if (storageNodeKeys.indexOf(key) != -1) {
       let tmp = uni.getStorageSync(storageKey)
       tmp = tmp ? tmp : {}
@@ -18,14 +24,14 @@ const storage = {
       uni.setStorageSync(storageKey, tmp)
     }
   },
-  get: function(key) {
+  get: function (key) {
     return storageData[key] || ""
   },
-  remove: function(key) {
+  remove: function (key) {
     delete storageData[key]
     uni.setStorageSync(storageKey, storageData)
   },
-  clean: function() {
+  clean: function () {
     uni.removeStorageSync(storageKey)
   }
 }