Sfoglia il codice sorgente

修改借款审批里非项目借款会到董事长审批的错误

余思翰 10 mesi fa
parent
commit
d2170c9e84

+ 9
- 4
oa-ui/src/views/flowable/form/finance/borrowForm.vue Vedi File

@@ -125,19 +125,22 @@
125 125
               <el-form-item label="申请金额" prop="applyAmount">
126 126
                 <el-input v-model="form.applyAmount" placeholder="请输入申请金额" :disabled="taskName != '借款申请'"
127 127
                   @blur="VerificationAmount" />
128
-                <span style="color:#E74C3C" v-if="exceed && form.borrowUsage == 0">超过预算金额:{{ getMoreAmount('0') }}</span>
128
+                <span style="color:#E74C3C" v-if="exceed && form.borrowUsage == 0">超过预算金额:{{ getMoreAmount('0')
129
+                  }}</span>
129 130
               </el-form-item>
130 131
             </el-col>
131 132
             <el-col :span="8" :xs="24">
132 133
               <el-form-item label="核准金额" prop="managerAmount">
133 134
                 <el-input v-model="form.managerAmount" placeholder="请输入核准金额"
134 135
                   :disabled="taskName != '分管审核' && taskName != '党工团审核'" />
135
-                <span style="color:#E74C3C" v-if="form.managerAmount && form.borrowUsage == 0">超过预算金额:{{ getMoreAmount('1') }}</span>
136
+                <span style="color:#E74C3C" v-if="form.managerAmount && form.borrowUsage == 0">超过预算金额:{{
137
+    getMoreAmount('1') }}</span>
136 138
               </el-form-item>
137 139
             </el-col>
138 140
           </el-row>
139 141
           <el-form-item label="申请人说明" prop="remark">
140
-            <el-input type="textarea" :rows="4" v-model="form.remark" placeholder="请输入申请人说明" :disabled="taskName != '借款申请'" />
142
+            <el-input type="textarea" :rows="4" v-model="form.remark" placeholder="请输入申请人说明"
143
+              :disabled="taskName != '借款申请'" />
141 144
           </el-form-item>
142 145
           <el-form-item label="附件上传" prop="borrowDocument">
143 146
             <FileUpload v-if="form.borrowDocument == null || form.borrowDocument == ''" :disabled="taskName != '借款申请'"
@@ -503,12 +506,14 @@ export default {
503 506
         else {
504 507
           this.formTotal = 1;
505 508
           this.form = res.data;
506
-          if (this.isProject) {
509
+          if (this.form.borrowUsage == '0') {
507 510
             if ((this.totalBudget - this.form.applyAmount) < 0) {
508 511
               this.exceed = true;
509 512
             } else {
510 513
               this.exceed = false;
511 514
             }
515
+          } else {
516
+            this.exceed = false;
512 517
           }
513 518
           this.hanldeChangeType();
514 519
           this.handleSelectProject(res.data.projectId)

+ 2
- 2
oa-ui/src/views/flowable/form/oa/deviceForm.vue Vedi File

@@ -2,7 +2,7 @@
2 2
  * @Author: ysh
3 3
  * @Date: 2024-03-07 13:44:39
4 4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-07-15 17:54:16
5
+ * @LastEditTime: 2024-07-17 15:11:45
6 6
 -->
7 7
 
8 8
 <template>
@@ -440,8 +440,8 @@ export default {
440 440
         });
441 441
       } else if (this.taskName == '安排设备') {
442 442
         getUsersManageLeader({ userId: this.form.applier }).then(res => {
443
+          debugger
443 444
           let userId = [];
444
-          console.log(res);
445 445
           res.data.forEach(user => {
446 446
             userId.push(user.userId)
447 447
           })

Loading…
Annulla
Salva