修改移动端借款申请

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

@@ -1,3 +1,9 @@
+/*
+ * @Author: ysh
+ * @Date: 2025-02-10 14:50:24
+ * @LastEditors: 
+ * @LastEditTime: 2025-03-03 09:23:16
+ */
 import request from '@/utils/request'
 
 // 查询cmc借款明细列表
@@ -46,7 +52,7 @@ export function delBorrowDetail(borrowId) {
 // 删除cmc借款明细根据每一项Id
 export function delBorrowDetailByDetailId(borrowDetailId) {
   return request({
-    url: '/oa/borrowDetail/id' + borrowDetailId,
+    url: '/oa/borrowDetail/id/' + borrowDetailId,
     method: 'delete'
   })
 }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2025-02-20 10:20:22
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-27 10:49:10
+ * @LastEditTime: 2025-03-03 11:02:06
 -->
 <template>
   <view class="form-container">
@@ -33,25 +33,42 @@
         <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>
+        <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>
+        <BorrowDetail :borrowId="form.borrowId" :taskName="taskName" @getApplyAmount="setApplyAmount"></BorrowDetail>
       </uni-forms-item>
 
-    </uni-forms>
+      <uni-forms-item label="申请金额" class="form-item">
+        <view>{{ (this.form.applyAmount).toFixed(2) }}</view>
+        <view style="color:#E74C3C" v-if="exceed && form.borrowUsage == '0'">
+          超过预算金额：{{ getMoreAmount('0') }}</view>
+      </uni-forms-item>
 
+      <uni-forms-item label="最大借款金额" class="form-item">
+        {{ totalBudget.toFixed(2) }}
+      </uni-forms-item>
+      <uni-forms-item label="已申请借款" class="form-item">
+        {{ hasBorrow.toFixed(2) }}
+      </uni-forms-item>
+      <uni-forms-item label="可用借款" class="form-item">
+        {{ (totalBudget - hasBorrow).toFixed(2) }}
+      </uni-forms-item>
+      <view>
+        <u-button type="primary" size="normal" @click="submit">提交申请</u-button>
+      </view>
+    </uni-forms>
 
   </view>
 </template>
@@ -62,6 +79,7 @@ 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 BorrowDetail from './borrowDetail.vue';
 export default {
   components: {
@@ -85,6 +103,7 @@ export default {
       form: {
         submitTime: '',
         borrowUsage: '0',
+        applyAmount: 0,
       },
       rules: {},
       borrowUsageOptions: [{
@@ -113,11 +132,14 @@ export default {
       selectedProject: null, //选中的项目
       projectObj: {}, //项目信息的项目
       fromTotal: 0,
+      totalBudget: 0, //预结算额
+      exceed: false, //是否超预算
+      hasBorrow: 0, //已申请借款
     }
   },
   methods: {
-    initForm() {
-      getBorrow(this.taskForm.formId).then(res => {
+    async initForm() {
+      getBorrow(this.taskForm.formId).then(async res => {
         if (res.data) {
           this.fromTotal = 1;
           this.form = res.data;
@@ -129,6 +151,37 @@ export default {
                 this.projectObj = res.data;
               }
             })
+            let budgetData = await listBudget({ projectId: this.form.projectId })
+            if (budgetData.total == 1) {
+              let budget = budgetData.rows[0];
+              this.totalBudget = budget.settleExpense
+            } else if (budgetData.total == 0) {
+              this.totalBudget = 0
+            }
+            if (this.form.borrowUsage == '0') {
+              if ((this.totalBudget - this.form.applyAmount) < 0) {
+                this.exceed = true;
+              } else {
+                this.exceed = false;
+              }
+            } else {
+              this.exceed = false;
+            }
+            let borrow = await listBorrow({ projectId: this.form.projectId })
+            if (borrow.total != 0) {
+              let borrowList = borrow.rows;
+              let hasBorrow = 0;
+              borrowList = borrowList.filter(item => item.borrowId != this.taskForm.formId)
+              borrowList.forEach(element => {
+                if (element.managerAmount) {
+                  hasBorrow = hasBorrow + element.managerAmount
+                }
+                if (!element.managerAmount && element.applyAmount) {
+                  hasBorrow = hasBorrow + element.applyAmount
+                }
+              });
+              this.hasBorrow = hasBorrow
+            }
           }
         } else {
           this.fromTotal = 0;
@@ -136,12 +189,35 @@ export default {
           this.form.applyDate = parseTime(new Date(), "{y}-{m}-{d}");
         }
       })
+
+    },
+    // 计算超过预算的金额
+    getMoreAmount(type) {
+      let result;
+      if (type == '0') {
+        result = this.form.applyAmount - (this.totalBudget - this.hasBorrow);
+      } else {
+        result = this.form.managerAmount - (this.totalBudget - this.hasBorrow);
+      }
+      return result.toFixed(2)
+    },
+    setApplyAmount(val) {
+      console.log(val);
+      console.log(this.from);
+      this.form.applyAmount = val
     },
     handleConfirm(project) {
       console.log('选中的项目:', project);
       this.selectedProject = project;
       this.projectObj = project;
     },
+    submit() {
+      this.$refs.form.validate().then(res => {
+        console.log('表单数据信息：', res);
+      }).catch(err => {
+        console.log('表单错误信息：', err);
+      })
+    }
   },
 }
 </script>

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-02-28 16:27:00
+ * @LastEditTime: 2025-03-03 10:41:01
 -->
 <template>
   <view class="container">
@@ -29,22 +29,15 @@
           <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">
+      <view class="box-button" v-if="taskName == '借款申请'">
         <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">
@@ -78,7 +71,8 @@ import uButton from '../../../uni_modules/uview-ui/components/u-button/u-button.
 export default {
   components: { uButton },
   props: {
-    borrowId: String
+    borrowId: String,
+    taskName: String,
   },
   data() {
     return {
@@ -91,7 +85,32 @@ export default {
         quantity: '',
         applyAmount: 0
       },
-      rules: {},
+      rules: {
+        borrowItem: {
+          rules: [{
+            required: true,
+            errorMessage: '请填写开支项目',
+          },]
+        },
+        unit: {
+          rules: [{
+            required: true,
+            errorMessage: '请填写单位',
+          },]
+        },
+        price: {
+          rules: [{
+            required: true,
+            errorMessage: '请填写单价',
+          },]
+        },
+        quantity: {
+          rules: [{
+            required: true,
+            errorMessage: '请填写数量',
+          },]
+        },
+      },
       errorMessage: '',
     }
   },
@@ -100,6 +119,10 @@ export default {
   watch: {
     borrowId() {
       this.initList();
+    },
+    detailList(newval) {
+      let sum = newval.reduce((sum, item) => sum + Number(item.applyAmount), 0);
+      this.$emit('getApplyAmount', sum)
     }
   },
   methods: {
@@ -118,18 +141,11 @@ export default {
         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();
+      }).catch(err => {
+        console.log('表单错误信息：', err);
       })
 
     },
@@ -154,9 +170,10 @@ export default {
       return (Number(this.newItem.price) * Number(this.newItem.quantity)).toFixed(2)
     },
     deleteItem(item) {
-      this.$modal.confirm('是否删除开支项目为'+item.borrowItem+'的项？').then(() => {
+      this.$modal.confirm('是否删除开支项目为' + item.borrowItem + '的项？').then(() => {
         delBorrowDetailByDetailId(item.borrowDetailId).then(res => {
-          this.$message.success(res.msg)
+          this.$modal.msgSuccess(res.msg);
+          this.initList();
         })
       })
 
@@ -294,4 +311,8 @@ export default {
   display: block;
   margin-bottom: 40rpx;
 }
+
+.popup-buttons {
+  display: flex;
+}
 </style>