修改网页端借款中存在的小问题；

修改移动端借款审批表单

oa-ui-app/main.js

@@ -1,8 +1,8 @@
 /*
  * @Author: ysh
  * @Date: 2025-01-16 11:17:07
- * @LastEditors: 
- * @LastEditTime: 2025-03-03 14:24:08
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-18 17:11:37
  */
 import Vue from 'vue'
 import App from './App'
@@ -19,7 +19,7 @@ Vue.prototype.$store = store
 // 创建全局的 publicData 对象
 Vue.prototype.publicData = {
   partySecretary: 4, // 党委书记
-  leagueSecretary: 142, // 团委书记
+  leagueSecretary: 15, // 团委书记
   gm: 7, //总经理
   chairman: 2,//董事长
   zg: 9,

oa-ui-app/manifest.json

@@ -60,7 +60,7 @@
             "port" : 9090,
             "https" : false
         },
-        "title" : "RuoYi-App",
+        "title" : "CMC-App",
         "router" : {
             "mode" : "hash",
             "base" : "./"

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

@@ -0,0 +1,100 @@
+<template>
+  <view>
+    <uv-button @click="chooseFile" text="+ 选择文件" type="primary" v-if="showBtn"></uv-button>
+    <view v-if="fileName" class="file-box">
+      <view class="link">
+        <uv-link :href="`${fileUrl + fileName}`" :text="docName" color="#19be6b" line-color="#19be6b"></uv-link>
+      </view>
+      <view class="delete" v-if="showBtn">
+        <uv-icon name="trash" color="#f56c6c" size="18px" @click="deleteFile()"></uv-icon>
+      </view>
+    </view>
+    <text v-if="showBtn">只能上传1个文件,重复上传将覆盖原文件</text>
+  </view>
+</template>
+<script>
+import config from '@/config';
+import { getToken } from '@/utils/auth'
+import { getFileName } from '@/utils/common';
+import upload from '@/utils/upload'
+export default {
+  props: {
+    fileType: String,
+    fileName: String,
+    showBtn: Boolean
+  },
+  data() {
+    return {
+      value: [],
+      tempFilePath: '',
+      fileUrl: config.baseUrl + '/profile/upload',
+      docName: ''
+    }
+  },
+  watch: {
+    fileName(newval) {
+      this.docName = getFileName(newval);
+    }
+  },
+  created() {
+  },
+  methods: {
+    chooseFile() {
+      uni.chooseFile({
+        count: 1,
+        type: 'all',
+        success: (res) => {
+          this.tempFilePath = res.tempFiles[0].path;
+          let params = {
+            url: '/common/upload',
+            filePath: this.tempFilePath,
+            name: 'file',
+            formData: { // 附加表单数据
+              fileType: this.fileType
+            },
+          }
+          //上传文件
+          upload(params).then(res => {
+            if (res.code == 200) {
+              let fileName = '/' + this.fileType + '/' + res.newFileName
+              this.$modal.msgSuccess(res.msg);
+              this.$emit('success', fileName)
+            }
+          })
+        },
+        fail: (err) => {
+          console.error('选择文件失败：', err);
+        }
+      });
+    },
+    deleteFile() {
+      uni.showModal({
+        title: '提示',
+        content: '是否删除文件？',
+        success: (res) => {
+          if (!res.confirm) {
+            return;
+          }
+          // 继续执行后续代码
+          this.$emit('deleteFile')
+        }
+      });
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.file-box {
+  display: flex;
+  height: 60px;
+  align-items: center;
+  border: 1px solid #ececec;
+  padding: 10px;
+
+  .link {
+    flex: 1;
+
+  }
+}
+</style>

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

@@ -0,0 +1,75 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-03-17 10:04:51
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-18 10:45:52
+-->
+<template>
+  <view>
+    <uv-steps :current="currentNum">
+      <uv-steps-item :error="item.comment && item.comment.type == '退回意见'" v-for="item, index in flowRecordList"
+        :key="'f' + index" :title="item.taskName" :desc="item.finishTime"></uv-steps-item>
+    </uv-steps>
+    <view class="custom-block danger" v-if="isRetrun">
+      <uni-title type="h3" title="任务被退回，请修改后重新提交" color="#900"></uni-title>
+      <view>
+        <p>退回意见：{{ reBackDescription }}</p>
+        <p>办理人：{{ assigneeName }}</p>
+      </view>
+    </view>
+    <uv-divider></uv-divider>
+  </view>
+</template>
+
+<script>
+import { flowRecord, flowRecordFull } from "@/api/flowable/finished";
+export default {
+  props: {
+    taskForm: Object,
+  },
+  data() {
+    return {
+      flowRecordList: [],
+      currentNum: 0,
+      isRetrun: false,
+      reBackDescription: '',
+      assigneeName: ''
+    }
+  },
+  created() {
+    this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
+  },
+  methods: {
+    /** 流程流转记录 */
+    getFlowRecordList(procInsId, deployId) {
+      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 == '退回意见') {
+          this.reBackDescription = res.data.flowList[1].comment.comment
+          this.assigneeName = res.data.flowList[1].assigneeName
+          this.isRetrun = true
+        } else {
+          this.isRetrun = false
+        }
+        this.flowRecordList = res.data.flowList.reverse();
+        this.currentNum = this.flowRecordList.length - 1;
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.custom-block {
+  padding: 10px;
+  border-left-width: 2px;
+  border-left-style: solid;
+  margin: 5px 0;
+}
+
+.danger {
+  background-color: #ffe6e6;
+  border-color: #c00;
+  color: #4d0000;
+}
+</style>

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

@@ -0,0 +1,130 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-03-17 15:04:06
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-03-17 15:43:28
+-->
+<template>
+  <view class="add-popup">
+    <view class="popup-content">
+      <text class="popup-title">退回菜单</text>
+      <uni-forms ref="form" :modelValue="taskForm" :rules="rules" label-position="top" label-width="150">
+        <uni-forms-item label="退回节点" name="targetKey" required class="form-item">
+          <uv-radio-group v-model="taskForm.targetKey" placement="column">
+            <uv-radio :name="item.id" :label="item.name" v-for="(item, index) in returnTaskList" :customStyle="{margin: '8px'}" 
+              :key="'r' + index"></uv-radio>
+          </uv-radio-group>
+        </uni-forms-item>
+        <uni-forms-item label="退回意见" name="comment" required class="form-item">
+          <uv-textarea v-model="taskForm.comment" placeholder="请输入退回意见"></uv-textarea>
+        </uni-forms-item>
+        <view class="popup-buttons">
+          <u-button style="margin-right: 10px;" @click="cancel">取消</u-button>
+          <u-button type="primary" class="confirm" @click="taskReturn">确认</u-button>
+        </view>
+      </uni-forms>
+
+    </view>
+  </view>
+</template>
+
+<script>
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
+export default {
+  props: {
+    taskForm: Object,
+    comment: String,
+  },
+  data() {
+    return {
+      rules: {
+        targetKey: {
+          rules: [{
+            required: true,
+            errorMessage: '请选择退回节点',
+          },]
+        },
+        comment: {
+          rules: [{
+            required: true,
+            errorMessage: '请填写退回意见',
+          },]
+        },
+      },
+      returnTaskList: [],
+    }
+  },
+  created() {
+    this.handleReturn();
+  },
+  mounted() {
+    if (this.comment != '') {
+      this.taskForm.comment = this.comment
+    }
+  },
+  watch: {
+    comment(newval) {
+      this.taskForm.comment = newval
+    }
+  },
+  methods: {
+    /** 可退回任务列表 */
+    handleReturn() {
+      returnList(this.taskForm).then(res => {
+        this.returnTaskList = res.data.reverse();
+        this.taskForm.variables = null;
+      })
+    },
+    /** 提交退回任务 */
+    taskReturn() {
+      this.$refs.form.validate().then(resopnse => {
+        returnTask(this.taskForm).then(res => {
+          this.$modal.msgSuccess(res.msg);
+          this.$emit('goBack')
+        });
+      }).catch(err => {
+        console.log('表单错误信息：', err);
+      })
+    },
+    cancel() {
+      this.$emit('cancel')
+    },
+    confirm() {
+
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.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-title {
+    font-size: 36rpx;
+    font-weight: bold;
+    display: block;
+    margin-bottom: 40rpx;
+  }
+
+  .popup-content {
+    background-color: white;
+    width: 600rpx;
+    padding: 40rpx;
+    border-radius: 20rpx;
+  }
+
+  .popup-buttons {
+    display: flex;
+  }
+}
+</style>

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

@@ -2,13 +2,7 @@
  * @Author: ysh
  * @Date: 2025-02-20 10:20:22
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-03 17:23:02
--->
-<!--
- * @Author: ysh
- * @Date: 2025-02-20 10:20:22
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-03 17:19:59
+ * @LastEditTime: 2025-03-18 17:13:59
 -->
 <template>
   <view class="form-container">
@@ -19,6 +13,7 @@
     </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">
         <uni-tag :inverted="true" type="primary" :text="taskName"></uni-tag>
@@ -26,7 +21,7 @@
 
       <!-- 流程发起人 -->
       <uni-forms-item label="填报人" class="form-item">
-        <uni-tag :inverted="true" type="primary" :text="startUserName"></uni-tag>
+        <b style="font-size:35rpx;">{{ startUserName }}</b>
       </uni-forms-item>
 
       <!-- 填报日期 -->
@@ -54,62 +49,102 @@
 
       <!-- 借款明细 -->
       <uni-forms-item label="借款明细" required class="form-item">
-        <BorrowDetail :borrowId="form.borrowId" :taskName="taskName" @getApplyAmount="setApplyAmount"></BorrowDetail>
+        <BorrowDetail :borrowId="form.borrowId" :taskName="taskName" @getApplyAmount="setApplyAmount"
+          @getManagerAmount="setManagerAmount"></BorrowDetail>
       </uni-forms-item>
 
+      <!-- 最大借款金额限制 -->
+      <uni-forms-item label="最大借款金额" class="form-item" v-if="form.borrowUsage == '0'">
+        <view class="amount-text">¥ {{ totalBudget.toFixed(2) }}</view>
+      </uni-forms-item>
+      <uni-forms-item label="已申请借款" class="form-item" v-if="form.borrowUsage == '0'">
+        <view class="amount-text">¥ {{ hasBorrow.toFixed(2) }}</view>
+      </uni-forms-item>
+      <uni-forms-item label="可用借款" class="form-item" v-if="form.borrowUsage == '0'">
+        <view class="amount-text">¥ {{ (totalBudget - hasBorrow).toFixed(2) }}</view>
+      </uni-forms-item>
       <uni-forms-item label="申请金额" required class="form-item">
-        <view class="amount-text">¥ {{ (this.form.applyAmount).toFixed(2) }}</view>
+        <view class="amount-text">¥ {{ (this.form.applyAmount ? this.form.applyAmount : 0).toFixed(2) }}</view>
         <view class="warning-text" v-if="exceed && form.borrowUsage == '0'">
           超过预算金额：¥ {{ getMoreAmount('0') }}
         </view>
       </uni-forms-item>
-
-      <uni-forms-item label="最大借款金额" class="form-item">
-        <view class="amount-text">¥ {{ totalBudget.toFixed(2) }}</view>
+      <uni-forms-item label="校准金额" required class="form-item" v-if="taskName != '借款申请' && taskName != '部门审核'">
+        <view class="amount-text">¥ {{ (this.form.managerAmount ? this.form.managerAmount : 0).toFixed(2) }}</view>
+        <view class="warning-text" v-if="exceed && form.borrowUsage == '0'">
+          超过预算金额：¥ {{ getMoreAmount('1') }}
+        </view>
       </uni-forms-item>
 
-      <uni-forms-item label="已申请借款" class="form-item">
-        <view class="amount-text">¥ {{ hasBorrow.toFixed(2) }}</view>
+      <!-- 申请人说明 -->
+      <uni-forms-item label="申请人说明" required class="form-item" name="remark">
+        <uv-textarea v-model="form.remark" placeholder="请输入申请人说明" :disabled="taskName != '借款申请'"></uv-textarea>
       </uni-forms-item>
 
-      <uni-forms-item label="可用借款" class="form-item">
-        <view class="amount-text">¥ {{ (totalBudget - hasBorrow).toFixed(2) }}</view>
+      <!-- 附件上传 -->
+      <uni-forms-item label="附件上传" class="form-item" name="borrowDocument">
+        <file-upload :fileType="'借款/申请附件'" :showBtn="taskName == '借款申请'" :fileName="form.borrowDocument"
+          @deleteFile="form.borrowDocument = ''" @success="uploadSuccess"></file-upload>
       </uni-forms-item>
-      <uni-forms-item label="申请人说明" required class="form-item">
-        <uv-textarea v-model="form.remark" placeholder="请输入申请人说明" :disabled="taskName != '借款申请'"></uv-textarea>
+
+      <!-- 部门审核 -->
+      <uni-forms-item label="部门负责人意见" required class="form-item" v-if="taskName != '借款申请'" name="deptComment">
+        <uv-textarea v-model="form.deptComment" placeholder="请输入部门负责人意见" :disabled="taskName != '部门审核'"></uv-textarea>
       </uni-forms-item>
 
+      <!-- 分管审核 -->
+      <uni-forms-item label="分管领导审核意见" required class="form-item" v-if="taskName != '借款申请'" name="managerComment">
+        <uv-textarea v-model="form.managerComment" placeholder="请输入分管领导审核意见"
+          :disabled="taskName != '分管审核'"></uv-textarea>
+      </uni-forms-item>
 
-      <uni-forms-item label="部门负责人意见" required class="form-item" v-if="taskName != '借款申请'">
-        <uv-textarea v-model="form.deptComment" placeholder="请输入部门负责人意见"></uv-textarea>
+      <!-- 总经理审核 -->
+      <uni-forms-item label="总经理审核意见" required class="form-item" v-if="taskName != '借款申请'" name="zjlComment">
+        <uv-textarea v-model="form.zjlComment" placeholder="请输入总经理审核意见" :disabled="taskName != '总经理审核'"></uv-textarea>
       </uni-forms-item>
 
-      <view class="form-button">
-        <u-button type="warning" size="normal" @click="saves" style="margin-right: 10px"
-          v-if="taskName == '借款申请'">保存</u-button>
+      <!-- 非党工团审核 -->
+
+
+      <!-- 操作栏 -->
+      <view class="form-button" v-if="taskName">
+        <u-button type="warning" size="normal" @click="saves" style="margin-right: 10px" v-if="taskName">保存</u-button>
+        <u-button type="error" size="normal" style="margin-right: 10px" @click="$refs.returnPopup.open()"
+          v-if="taskName != '借款申请'">退回</u-button>
         <u-button type="primary" size="normal" @click="submit">{{ taskName == '借款申请' ? '提交申请' : '提交审核' }}</u-button>
       </view>
     </uni-forms>
 
+    <!-- 退回弹窗 -->
+    <uni-popup ref="returnPopup" background-color="#fff">
+      <return-popup @cancel="$refs.returnPopup.close()" :taskForm="taskForm" :comment="commentByRole()"
+        @goBack="goHome"></return-popup>
+    </uni-popup>
+
   </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 { listBudget } from "@/api/oa/budget/budget";
-import { getUserByPost, getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
+import ProjectInfo from '@/pages/components/ProjectInfo.vue';
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
-import config from '@/config'
+import ProjectPicker from '@/pages/components/ProjectPicker.vue';
+import { listProject, getProject } from "@/api/oa/project/project";
+import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
+import { getUserByPost, getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
 import BorrowDetail from './borrowDetail.vue';
+import FlowNote from '@/pages/components/flowNote.vue';
+import ReturnPopup from '@/pages/components/returnPopup.vue';
+import FileUpload from '@/pages/components/fileUpload.vue';
 export default {
   components: {
     ProjectPicker,
     ProjectInfo,
-    BorrowDetail
+    BorrowDetail,
+    FlowNote,
+    ReturnPopup,
+    FileUpload,
   },
   props: {
     taskForm: Object,
@@ -120,17 +155,28 @@ export default {
     this.form.borrowId = this.taskForm.formId;
     this.deptId = this.$store.getters.deptId;
     this.initForm();
+    this.initRules();
     uni.setNavigationBarTitle({
       title: '借款审批'
     });
   },
+  watch: {
+    form: {
+      handler(newVal) {
+        this.initRules();
+      },
+      deep: true // 启用深度监测
+    }
+  },
   data() {
     return {
       form: {
         submitTime: '',
         borrowUsage: '0',
         applyAmount: 0,
+        managerAmount: 0,
         remark: '',
+        applyDate: ''
       },
       rules: {},
       borrowUsageOptions: [{
@@ -163,15 +209,68 @@ export default {
       exceed: false, //是否超预算
       hasBorrow: 0, //已申请借款
       deptId: undefined,
+      returnBack: false,
     }
   },
   methods: {
+    initRules() {
+      this.rules = {
+        // 借款类型验证（必填）
+        borrowUsage: {
+          rules: [{
+            required: true,
+            errorMessage: '请选择借款类型'
+          }]
+        },
+        // 借款事由验证（当 borrowUsage != 0 时必填）
+        applyReason: {
+          rules: [{
+            required: this.form.borrowUsage != '0', // 动态控制必填
+            errorMessage: '请输入借款事由'
+          }]
+        },
+        // 项目选择验证（当 borrowUsage == 0 时必填）
+        projectId: {
+          rules: [{
+            required: this.form.borrowUsage == '0', // 动态控制必填
+            errorMessage: '请选择项目'
+          }]
+        },
+        // 申请人说明验证（必填）
+        remark: {
+          rules: [{
+            required: true,
+            errorMessage: '请输入申请人说明'
+          }]
+        },
+        // 部门意见验证（仅在部门审核步骤必填）
+        deptComment: {
+          rules: [{
+            required: this.taskName === '部门审核',
+            errorMessage: '请输入部门意见'
+          }]
+        },
+        // 分管意见验证（仅在分管审核步骤必填）
+        managerComment: {
+          rules: [{
+            required: this.taskName === '分管审核',
+            errorMessage: '请输入分管意见'
+          }]
+        },
+        // 总经理意见验证（仅在总经理审核步骤必填）
+        zjlComment: {
+          rules: [{
+            required: this.taskName === '总经理审核',
+            errorMessage: '请输入总经理意见'
+          }]
+        }
+      }
+    },
     async initForm() {
       getBorrow(this.taskForm.formId).then(async res => {
         if (res.data) {
           this.formTotal = 1;
           this.form = res.data;
-          console.log(this.form);
           if (this.form.projectId) {
             getProject(this.form.projectId).then(res => {
               if (res.data) {
@@ -232,8 +331,10 @@ export default {
     setApplyAmount(val) {
       this.form.applyAmount = val
     },
+    setManagerAmount(val) {
+      this.form.managerAmount = val
+    },
     handleConfirm(project) {
-      console.log('选中的项目:', project);
       this.selectedProject = project;
       this.projectObj = project;
       this.form.projectId = project.projectId;
@@ -267,10 +368,6 @@ export default {
     // 处理提交逻辑
     handleSubmit() {
       this.$refs.form.validate().then(async res => {
-        if (this.form.borrowUsage == '0' && !this.form.projectId) {
-          this.$modal.msgError('请选择项目！')
-          return
-        }
         if (this.formTotal != 0) {
           // 定义审核节点配置
           const auditConfig = {
@@ -313,7 +410,6 @@ export default {
           // 更新借款申请
           await updateBorrow(this.form);
           const params = { taskId: this.taskForm.taskId };
-          console.log('params', params);
           getNextFlowNode(params).then(async res => {
             // 处理不同的流程节点
             if (this.taskName == '借款申请') {
@@ -369,19 +465,23 @@ export default {
     handleComplete(taskForm) {
       complete(taskForm).then(response => {
         this.$modal.msgSuccess(response.msg);
-        this.$emit('goBack');
+        this.goHome();
       })
     },
     // 借款申请提交方法
     async borrowApprovalFun() {
       let userId;
+      console.log(this.deptId);
+
       // 如果是党工团申请 deptId == 0 为党工团申请
       if (this.deptId === 0) {
         // 2为工会、3为党委
         if (this.form.borrowUsage == 2 || this.form.borrowUsage == 3) {
-          userId = this.publicData.partySecretary;
+          const res = await getUserByPost({ postName: '党总支书记' });
+          userId = res.data[0].userId;
         } else {
-          userId = this.publicData.leagueSecretary;
+          const res = await getUserByPost({ postName: '团委书记' });
+          userId = res.data[0].userId;
         }
         this.taskForm.variables.dept = this.deptId;
         this.taskForm.variables.approval = userId;
@@ -397,6 +497,7 @@ export default {
         const res = await getUserByPost({ postName: '董事长' });
         this.taskForm.variables.dept = this.deptId;
         this.taskForm.variables.approval = res.data[0].userId;
+        this.taskForm.variables.exceed = true;
         this.handleComplete(this.taskForm);
       } else { //普通员工申请项目借款
         const res = await getUsersDeptLeader({ userId: this.$store.getters.userId });
@@ -416,6 +517,30 @@ export default {
       this.taskForm.variables.approvalList = approvalList;
       this.handleComplete(this.taskForm);
     },
+    commentByRole() {
+      if (this.taskName == '部门审核') {
+        return this.form.deptComment
+      } else if (this.taskName == '分管审核') {
+        return this.form.managerComment
+      } else if (this.taskName == '总经理审核') {
+        return this.form.zjlComment
+      } else if (this.taskName == '董事长批准') {
+        return this.form.dszComment
+      } else if (this.taskName == '党工团审核') {
+        return this.form.unionComment
+      } else if (this.taskName == '财务处理') {
+        return this.form.cwComment
+      }
+    },
+    goHome() {
+      uni.switchTab({
+        url: '/pages/message/index'
+      })
+    },
+    uploadSuccess(fileName) {
+      this.form.borrowDocument = fileName
+      updateBorrow(this.form)
+    }
   },
 }
 </script>
@@ -425,12 +550,14 @@ export default {
   font-size: 16px;
   font-weight: bold;
   color: #333;
+  text-align: right;
 }
 
 .warning-text {
   font-size: 14px;
   color: #ff0000;
   margin-top: 5px;
+  text-align: right;
 }
 
 .form-button {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-02-27 10:43:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-03 16:58:18
+ * @LastEditTime: 2025-03-18 16:36:32
 -->
 <template>
   <view class="container">
@@ -28,6 +28,17 @@
           <text class="total-amount">￥{{ item.applyAmount }}</text>
         </view>
       </view>
+      <uv-divider :dashed="true" v-if="taskName != '借款申请' && taskName != '部门审核'"></uv-divider>
+      <view class="list-item" v-if="taskName != '借款申请' && taskName != '部门审核'">
+        <view class="item-left">
+          <text style="color:#398ade;padding-left: 10rpx;">分管审核金额</text>
+        </view>
+        <view class="item-right">
+          <uni-easyinput type="number" v-model="item.managerAmount" placeholder="请输入审核金额" v-if="taskName == '分管审核'"
+            @blur="editManagerAmount(detailList)" />
+          <text class="mg-amount" v-else>￥{{ item.managerAmount }}</text>
+        </view>
+      </view>
       <view class="box-button" v-if="taskName == '借款申请'">
         <u-button size="normal" icon="edit-pen" @click="editItem(item)">修改</u-button>
         <u-button size="normal" icon="trash" @click="deleteItem(item)">删除</u-button>
@@ -38,8 +49,7 @@
     <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 ref="form" :modelValue="newItem" :rules="rules" label-position="top" label-width="150">
           <uni-forms-item label="开支项目" name="borrowItem" required class="form-item">
             <uni-easyinput v-model="newItem.borrowItem" placeholder="请输入开支项目" />
           </uni-forms-item>
@@ -124,24 +134,29 @@ export default {
       this.initList();
     },
     detailList(newval) {
-      let sum = newval.reduce((sum, item) => sum + Number(item.applyAmount), 0);
-      this.$emit('getApplyAmount', sum)
+      this.getAomunt(newval)
     }
   },
   methods: {
     initList() {
-      console.log('borrowId',  this.borrowId);
       listBorrowDetail({ pageSize: 999, borrowId: this.borrowId }).then(res => {
         if (res.rows.length != 0) {
           this.detailList = res.rows
+          if (!this.detailList[0].managerAmount) {
+            this.detailList.forEach(item => {
+              item.managerAmount = item.applyAmount;
+            });
+            this.editManagerAmount(this.detailList);
+          }
         }
       });
     },
     // 确认添加
     confirmAdd() {
-      const borrowId =  this.borrowId
+      const borrowId = this.borrowId
       this.$refs.form.validate().then(async res => {
         this.newItem.applyAmount = this.getTotal();
+        this.newItem.managerAmount = this.getTotal();
         if (this.isModify) {
           await updateBorrowDetail(this.newItem);
         } else {
@@ -189,6 +204,18 @@ export default {
       this.isModify = true;
       this.showAddPopup = true;
     },
+    getAomunt(list) {
+      let sum = list.reduce((sum, item) => sum + Number(item.applyAmount), 0);
+      let managerSum = list.reduce((sum, item) => sum + Number(item.managerAmount), 0);
+      this.$emit('getApplyAmount', sum);
+      this.$emit('getManagerAmount', managerSum);
+    },
+    async editManagerAmount(list) {
+      this.getAomunt(list);
+      for (let item of list) {
+        await updateBorrowDetail(item);
+      }
+    }
   },
 }
 </script>
@@ -255,11 +282,13 @@ export default {
   font-weight: bold;
   color: #333;
   margin-bottom: 15rpx;
+  padding-left: 10rpx;
 }
 
 .item-sub {
   font-size: 26rpx;
   color: #999;
+  padding-left: 10rpx;
 }
 
 .total-amount {
@@ -268,7 +297,12 @@ export default {
   font-weight: bold;
   padding-right: 30rpx;
 }
-
+.mg-amount{
+  font-size: 30rpx;
+  color: #398ade;
+  font-weight: bold;
+  padding-right: 30rpx;
+}
 .delete {
   font-size: 30rpx;
   color: #ff6a6c;
@@ -290,6 +324,7 @@ export default {
 
 
 .item-right {
+  flex: 1;
   min-width: 200rpx;
   text-align: right;
 }

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

@@ -8,6 +8,7 @@
 		<!-- 表单内容 -->
 		<uni-forms ref="form" :modelValue="formData" :rules="rules" label-position="top" label-width="150"
 			class="custom-form">
+			<flow-note :taskForm="taskForm"></flow-note>
 			<!-- 当前节点 -->
 			<uni-forms-item label="当前节点" class="form-item">
 				<uni-tag :inverted="true" type="primary" :text="taskName"></uni-tag>
@@ -15,7 +16,7 @@
 
 			<!-- 流程发起人 -->
 			<uni-forms-item label="填报人" class="form-item">
-				<uni-tag :inverted="true" type="primary" :text="startUserName"></uni-tag>
+				<b style="font-size:35rpx;">{{ startUserName }}</b>
 			</uni-forms-item>
 
 			<!-- 填报日期 -->
@@ -84,7 +85,8 @@
 			</uni-forms-item>
 			<!-- 提交按钮 -->
 			<button class="save-btn" @click="save">保存</button>
-			<button class="submit-btn margin-top-xs" type="primary" @click="submitForm">提交</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>
 		</uni-forms>
 
 		<uv-modal ref="popModal" title="提示" content='是否提交表单？' :showCancelButton="true" @confirm="confirmSubmit"></uv-modal>
@@ -100,10 +102,12 @@ import { listDeclare, getDeclare, addDeclare, updateDeclare } from '@/api/oa/dec
 import { parseTime } from "@/utils/common.js"
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from "@/api/system/post.js";
+import FlowNote from '@/pages/components/flowNote.vue';
 export default {
 	components: {
 		ProjectPicker,
-		ProjectInfo
+		ProjectInfo,
+		FlowNote
 	},
 	props: {
 		taskForm: Object,
@@ -311,8 +315,6 @@ export default {
 		},
 		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) {
@@ -339,7 +341,9 @@ export default {
 				let approval = this.projectObj.projectLeader;
 				this.taskForm.variables.approval = approval
 			} else {
-				let resData = await getUsersDeptLeader({ userId: this.form.userId });
+				let resData = await getUsersDeptLeader({
+					userId: this.form.userId
+				});
 				if (resData.data) {
 					this.taskForm.variables.approval = resData.data.userId
 					this.taskForm.variables.skip = true;
@@ -357,7 +361,9 @@ export default {
 			if (this.taskName == '项目负责人审核') {
 				this.formData.checkStatus = '1';
 				updateDeclare(this.formData);
-				let resData = await getUsersDeptLeader({ userId: this.formData.userId });
+				let resData = await getUsersDeptLeader({
+					userId: this.formData.userId
+				});
 				if (resData.data) {
 					this.taskForm.variables.approval = resData.data.userId;
 					this.handleComplete(this.taskForm);
@@ -378,7 +384,9 @@ export default {
 			})
 		},
 		handleComplete(taskForm) {
-			const params = { taskId: this.taskForm.taskId };
+			const params = {
+				taskId: this.taskForm.taskId
+			};
 			getNextFlowNode(params).then(() => {
 				complete(taskForm).then(response => {
 					uni.showToast({
@@ -430,7 +438,7 @@ export default {
 .form-item {
 	margin-bottom: 20px;
 
-	/deep/ .uni-forms-item__label {
+	::v-deep .uni-forms-item__label {
 		font-weight: 500;
 		color: #666;
 		padding-bottom: 8px;

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-01-21 10:01:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-19 15:18:10
+ * @LastEditTime: 2025-03-17 16:01:12
 -->
 <template>
 	<view class="u-page">
@@ -74,8 +74,11 @@ export default {
 	created() {
 		this.getTodoList();
 	},
-	onLoad() {
-
+	onLoad: function (options) {
+		uni.startPullDownRefresh();
+	},
+	onPullDownRefresh() {
+		this.getTodoList();
 	},
 	methods: {
 		getTodoList() {
@@ -86,7 +89,10 @@ export default {
 			}).then(response => {
 				this.detail = response.data.total;
 				this.todoList = response.data.records;
-				this.acceptTime = response.data.records[0].createTime;
+				if (response.data.records.length != 0) {
+					this.acceptTime = response.data.records[0].createTime;
+				}
+				uni.stopPullDownRefresh();
 			});
 		}
 	},

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

@@ -82,7 +82,7 @@
 
     <uv-popup ref="popup" mode="bottom">
       <view class="bottom-popup">
-        <view v-for="item in sendFlowList">
+        <view v-for="item,index in sendFlowList" :key="index">
           <u-button @click="sendFlow(item)">{{ item.name }}</u-button>
         </view>
       </view>

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

@@ -148,7 +148,7 @@
 .form-item {
   margin-bottom: 20px;
 
-  /deep/ .uni-forms-item__label {
+  ::v-deep .uni-forms-item__label {
     font-weight: 500;
     color: #666;
     padding-bottom: 8px;

oa-ui-app/utils/common.js

@@ -20,7 +20,7 @@ export function showConfirm(content) {
       content: content,
       cancelText: '取消',
       confirmText: '确定',
-      success: function(res) {
+      success: function (res) {
         resolve(res)
       }
     })
@@ -102,4 +102,13 @@ export function parseTime(time, pattern) {
     return value || 0
   })
   return time_str
+}
+
+
+
+export function getFileName(name) {
+  if (name) {
+    let arr = name.split("/");
+    return arr[arr.length - 1];
+  }
 }

oa-ui/src/assets/datas/publicData.js

@@ -2,11 +2,11 @@
  * @Author: ysh
  * @Date: 2024-04-24 15:07:42
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-09 09:20:08
+ * @LastEditTime: 2025-03-18 17:11:26
  */
 const publicData = {
   partySecretary: 4, //党委书记
-  leagueSecretary: 142, //团委书记
+  leagueSecretary: 15, //团委书记
   gm: 7, //总经理
   chairman: 2,//董事长
   zg: 9,

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -114,17 +114,26 @@
           </table>
           <el-button icon="el-icon-plus" size="mini" @click="addDetailList()" type="primary" plain
             :disabled="taskName != '借款申请'"></el-button>
-          <!-- </el-form-item> -->
+
           <el-form-item label="最大借款金额" v-if="isSelect">
-            <el-tag>{{ totalBudget.toFixed(2) }}（大写：{{ formatNumberWithWan(totalBudget) }}）</el-tag>
+            <el-tag>
+              <span class="low-money">{{ totalBudget.toFixed(2) }}</span>
+              <span class="up-money">（大写：{{ formatNumberWithWan(totalBudget) }}）</span>
+            </el-tag>
           </el-form-item>
           <el-form-item label="已申请借款" v-if="isSelect">
-            <el-tag type="danger">{{ hasBorrow.toFixed(2) }}（大写：{{ formatNumberWithWan(hasBorrow) }}）</el-tag>
+            <el-tag type="danger">
+              <span class="low-money">{{ hasBorrow.toFixed(2) }}</span>
+              <span class="up-money">（大写：{{ formatNumberWithWan(hasBorrow) }}）</span>
+            </el-tag>
           </el-form-item>
           <el-form-item label="可用借款" v-if="isSelect">
-            <el-tag type="success">{{ (totalBudget - hasBorrow).toFixed(2) }}（大写：{{ formatNumberWithWan((totalBudget -
-              hasBorrow)) }}）</el-tag>
+            <el-tag type="success">
+              <span class="low-money">{{ (totalBudget - hasBorrow).toFixed(2) }}</span>
+              <span class="up-money">（大写：{{ formatNumberWithWan((totalBudget - hasBorrow)) }}）</span>
+            </el-tag>
           </el-form-item>
+
           <el-row :gutter="20">
             <el-col :span="12" :xs="24">
               <el-form-item label="申请金额" prop="applyAmount">
@@ -770,7 +779,6 @@ export default {
             // 提交到下一个流程
             getNextFlowNode(params).then(res => {
               this.borrowAprrovalFun();
-
             })
           }
         } else {
@@ -786,15 +794,17 @@ export default {
       })
     },
     // 借款申请提交方法
-    borrowAprrovalFun() {
+    async borrowAprrovalFun() {
       let userId;
       // 如果是党工团申请 deptId == 0 为党工团申请
       if (this.deptId == 0) {
         // 2为工会、3为党委
         if (this.form.borrowUsage == 2 || this.form.borrowUsage == 3) {
-          userId = this.publicData.partySecretary
+          const res = await getUserByPost({ postName: '党总支书记' });
+          userId = res.data[0].userId;
         } else {
-          userId = this.publicData.leagueSecretary
+          const res = await getUserByPost({ postName: '团委书记' });
+          userId = res.data[0].userId;
         }
         this.$set(this.taskForm.variables, "dept", this.deptId);
         this.$set(this.taskForm.variables, "approval", userId);
@@ -811,6 +821,7 @@ export default {
         getUserByPost({ postName: '董事长' }).then(res => {
           this.$set(this.taskForm.variables, "dept", this.deptId);
           this.$set(this.taskForm.variables, "approval", res.data[0].userId);
+          this.$set(this.taskForm.variables, "exceed", true);
           this.handleComplete(this.taskForm);
         })
       }
@@ -995,6 +1006,17 @@ table {
   }
 }
 
+.low-money {
+  display: inline-block;
+  width: 75px;
+  text-align: right;
+}
+
+.up-money {
+  display: inline-block;
+  text-align: right;
+}
+
 ::v-deep .el-descriptions-item__label.is-bordered-label {
   width: 110px;
 }

oa-ui/src/views/oa/study/record.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-03-12 10:06:03
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-14 16:48:00
+ * @LastEditTime: 2025-03-17 09:28:35
 -->
 <template>
   <div class="app-container">
@@ -40,7 +40,7 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-              v-hasPermi="['oa:study:export']">导出</el-button>
+              v-hasPermi="['oa:record:export']">导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>