修改借款中，非项目借款也出现超预算的提示

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

@@ -125,14 +125,14 @@
               <el-form-item label="申请金额" prop="applyAmount">
                 <el-input v-model="form.applyAmount" placeholder="请输入申请金额" :disabled="taskName != '借款申请'"
                   @blur="VerificationAmount" />
-                <span style="color:#E74C3C" v-if="exceed">超过预算金额：{{ getMoreAmount('0') }}</span>
+                <span style="color:#E74C3C" v-if="exceed && form.borrowUsage == 0">超过预算金额：{{ getMoreAmount('0') }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8" :xs="24">
               <el-form-item label="核准金额" prop="managerAmount">
                 <el-input v-model="form.managerAmount" placeholder="请输入核准金额"
                   :disabled="taskName != '分管审核' && taskName != '党工团审核'" />
-                <span style="color:#E74C3C" v-if="form.managerAmount">超过预算金额：{{ getMoreAmount('1') }}</span>
+                <span style="color:#E74C3C" v-if="form.managerAmount && form.borrowUsage == 0">超过预算金额：{{ getMoreAmount('1') }}</span>
               </el-form-item>
             </el-col>
           </el-row>

oa-ui/src/views/flowable/form/settleForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-12 10:12:15
+ * @LastEditTime: 2024-07-15 09:29:00
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -308,7 +308,7 @@
                   </el-input> -->
                   <el-select v-model="dept.content" placeholder="请选择" filterable clearable style="width:100%;"
                     :disabled="isModify">
-                    <el-option v-for="  item   in   deptList  " :key="item.deptId" :label="item.deptName"
+                    <el-option v-for="item  in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
                       :value="item.deptName">
                     </el-option>
                   </el-select>
@@ -533,7 +533,7 @@ export default {
     'chooseProject.projectId'(val) {
       this.getBudgetSettle();
     },
-    'taskForm.formId'(){
+    'taskForm.formId'() {
       this.initForm();
     }
   },
@@ -817,9 +817,14 @@ export default {
         if (vaild) {
           this.preserve();
           if (this.taskName == "结算发起") {
-            getUserByRole({ roleId: 4 }).then((res) => {
-              this.getNextFlowNodeFn(res.data[0]);
-            });
+            this.$confirm('结算合计总金额大于了预算内项目结算总金额，将走《超预算或预算外支付（报销）》流程', '提示', {
+              confirmButtonText: '确定',
+              type: 'warning'
+            }).then(() => {
+              getUserByRole({ roleId: 4 }).then((res) => {
+                this.getNextFlowNodeFn(res.data[0]);
+              });
+            })
           } else if (this.taskName == "综合事务部处理") {
             this.getNextFlowNodeFn(null, 109, false);
           } else if (this.taskName == "技术质量部审核") {
@@ -1008,14 +1013,9 @@ export default {
       }
       this.settleSumTr.amount = sum.toFixed(2);
       if (sum > this.budgetSettle) {
-        this.$confirm('结算合计总金额大于了预算内项目结算总金额，将走《超预算或预算外支付（报销）》流程', '提示', {
-          confirmButtonText: '确定',
-          type: 'warning'
-        }).then(() => {
-          this.exceed = true;
-          this.calcaulatExceed();
-          return
-        })
+        this.exceed = true;
+        this.calcaulatExceed();
+
       } else {
         this.exceed = false;
       }

oa-ui/src/views/oa/borrow/index.vue

@@ -16,6 +16,20 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="借款类型" prop="borrowUsage">
+        <el-select v-model="queryParams.borrowUsage" filterable clearable @change="handleQuery">
+          <el-option label="项目借款" value="0">
+          </el-option>
+          <el-option label="非项目借款" value="1">
+          </el-option>
+          <el-option label="工会借款" value="2">
+          </el-option>
+          <el-option label="党委借款" value="3">
+          </el-option>
+          <el-option label="团委借款" value="4">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
@@ -50,7 +64,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="借款事由" align="center" prop="applyReason" />
+      <el-table-column label="借款事由" align="center" prop="applyReason" :formatter="setReasonByUsage" />
       <el-table-column label="申请金额" align="center" prop="applyAmount" />
       <el-table-column label="核准金额" align="center" prop="managerAmount" />
       <el-table-column label="借款人" align="center" prop="applier">
@@ -58,7 +72,7 @@
           {{ getUserName(scope.row.applier) }}
         </template>
       </el-table-column>
-      <el-table-column label="借款人说明" align="center" prop="remark" />
+      <el-table-column label="借款人说明" align="center" prop="remark" show-overflow-tooltip />
       <el-table-column label="借款日期" align="center" prop="applyDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
@@ -154,7 +168,7 @@ export default {
       projectList: [],
       taskForm: {
         formId: '',
-        procDefName:'借款审批'
+        procDefName: '借款审批'
       }
     };
   },
@@ -311,6 +325,14 @@ export default {
       } else if (row == '14') {
         return ''
       }
+    },
+    setReasonByUsage(row) {
+      console.log(row);
+      if (row.projectId) {
+        return row.project.projectNumber + '-' + row.project.projectName
+      } else {
+        return row.applyReason
+      }
     }
   }
 };