Pārlūkot izejas kodu

修改结算不足600的问题

余思翰 5 mēnešus atpakaļ
vecāks
revīzija
45a9e57867

+ 2
- 2
oa-ui/src/views/flowable/form/components/print/settlePrint.vue Parādīt failu

83
         </tr>
83
         </tr>
84
         <tr>
84
         <tr>
85
           <td :colspan="4" class="header">实际结算总金额</td>
85
           <td :colspan="4" class="header">实际结算总金额</td>
86
-          <td :colspan="6">{{ actualSumSettle.toFixed(2) }}</td>
86
+          <td :colspan="3">{{ actualSumSettle.toFixed(2) }}</td>
87
         </tr>
87
         </tr>
88
         <!-- 分页就加入样式 style="page-break-after: always;" -->
88
         <!-- 分页就加入样式 style="page-break-after: always;" -->
89
         <tr>
89
         <tr>
208
       for (let s of this.settleList) {
208
       for (let s of this.settleList) {
209
         if (s.tableNumber == '0') {
209
         if (s.tableNumber == '0') {
210
           this.deductionsList.push(s)
210
           this.deductionsList.push(s)
211
-        } else if (s.tableNumber == '1') {
211
+        } else if (s.tableNumber == '1' && s.content != '实际结算总金额') {
212
           this.deptSettleList.push(s)
212
           this.deptSettleList.push(s)
213
         } else {
213
         } else {
214
           this.settleSum = s
214
           this.settleSum = s

+ 17
- 2
oa-ui/src/views/flowable/form/settleForm.vue Parādīt failu

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-04-30 09:03:14
3
  * @Date: 2024-04-30 09:03:14
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-12-30 10:46:54
5
+ * @LastEditTime: 2024-12-31 11:06:44
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="app-container" v-loading="loading">
8
   <div class="app-container" v-loading="loading">
223
               </td>
223
               </td>
224
               <td>
224
               <td>
225
                 <!-- <el-input-number style="width:100px" v-model="work.settle" clearable :controls="false"></el-input-number> -->
225
                 <!-- <el-input-number style="width:100px" v-model="work.settle" clearable :controls="false"></el-input-number> -->
226
-                {{ work.settle }}
226
+                <div>{{ work.settle }}</div>
227
+                <div v-if="taskName == '结算发起'">
228
+                  <el-button size="mini" type="text" v-if="Number(work.settle) <= 600 && Number(work.settle) != 0" @click="setSettle(work)">置为600</el-button>
229
+                  <el-button size="mini" type="text" v-if="Number(work.settle) <= 600 && Number(work.settle) != 0" @click="resetSettle(work)">还原</el-button>
230
+                </div>
227
               </td>
231
               </td>
228
               <td>
232
               <td>
229
                 <el-input v-model="work.remark" type="textarea" clearable :disabled="isModify"
233
                 <el-input v-model="work.remark" type="textarea" clearable :disabled="isModify"
1014
       this.calculateSumSettle();
1018
       this.calculateSumSettle();
1015
       this.calculateActualSumSettle();
1019
       this.calculateActualSumSettle();
1016
     },
1020
     },
1021
+    // 置为600
1022
+    setSettle(work){
1023
+      work.settle = 600;
1024
+      work.remark = '不足600,按600算';
1025
+      this.calculateSumSettle();
1026
+      this.calculateActualSumSettle();
1027
+    },
1028
+    resetSettle(work){
1029
+      work.remark = '';
1030
+      this.calculateSettle(work)
1031
+    },
1017
     calculateSumSettle() {
1032
     calculateSumSettle() {
1018
       let sum = 0;
1033
       let sum = 0;
1019
       let arr = this.settleWorkList;
1034
       let arr = this.settleWorkList;

+ 9
- 0
oa-ui/src/views/flowable/form/settleOther.vue Parādīt failu

665
       this.calculateSumSettle();
665
       this.calculateSumSettle();
666
       this.calculateActualSumSettle();
666
       this.calculateActualSumSettle();
667
     },
667
     },
668
+    // 置为600
669
+    setSettle(work){
670
+      work.settle = 600;
671
+      this.calculateSumSettle();
672
+      this.calculateActualSumSettle();
673
+    },
674
+    resetSettle(work){
675
+      this.calculateSettle(work)
676
+    },
668
     calculateSumSettle() {
677
     calculateSumSettle() {
669
       let sum = 0;
678
       let sum = 0;
670
       let arr = this.settleWorkList;
679
       let arr = this.settleWorkList;

Notiek ielāde…
Atcelt
Saglabāt