Explorar el Código

取消不足600提示

余思翰 hace 3 meses
padre
commit
f3c6f7b6c4

+ 5
- 5
oa-ui/src/views/flowable/form/settleForm.vue Ver fichero

@@ -994,11 +994,11 @@ export default {
994 994
     },
995 995
     calculateSettle(work) {
996 996
       let sum = work.workload * work.coefficient * work.price;
997
-      if (sum < 600 && sum != 0 && work.priceId != 147) {
998
-        this.$message.warning('不足600,按600算')
999
-        work.remark = '不足600,按600算'
1000
-        sum = 600
1001
-      }
997
+      // if (sum < 600 && sum != 0 && work.priceId != 147) {
998
+      //   this.$message.warning('不足600,按600算')
999
+      //   work.remark = '不足600,按600算'
1000
+      //   sum = 600
1001
+      // }
1002 1002
       work.settle = Number(sum).toFixed(2);
1003 1003
       this.calculateSumSettle();
1004 1004
       this.calculateActualSumSettle();

+ 8
- 8
oa-ui/src/views/flowable/form/settleOther.vue Ver fichero

@@ -653,14 +653,14 @@ export default {
653 653
     },
654 654
     calculateSettle(work) {
655 655
       let sum = work.workload * work.coefficient * work.price;
656
-      if (sum < 600 && sum != 0 && work.priceId != 147) {
657
-        this.$message.warning('不足600,按600算')
658
-        work.remark = '不足600,按600算'
659
-        sum = 600
660
-      }
661
-      else {
662
-        work.remark = ''
663
-      }
656
+      // if (sum < 600 && sum != 0 && work.priceId != 147) {
657
+      //   this.$message.warning('不足600,按600算')
658
+      //   work.remark = '不足600,按600算'
659
+      //   sum = 600
660
+      // }
661
+      // else {
662
+      //   work.remark = ''
663
+      // }
664 664
       work.settle = Number(sum).toFixed(2);
665 665
       this.calculateSumSettle();
666 666
       this.calculateActualSumSettle();

Loading…
Cancelar
Guardar