1.设备总价合计

2.合同电梯折扣四位小数

ruoyi-ui-vue2/src/views/contract/edit.vue

@@ -1367,7 +1367,7 @@ export default {
           sums[index] = this.$t('common.total');
           return;
         }
-        if(index === 10 ||  index === 7 || index === 12){
+        if([7, 10,12, 13].includes(index)){
           const values = data.map(item => Number(item[column.property]));
           if (!values.every(value => isNaN(value))) {
             sums[index] = values.reduce((prev, curr) => {
@@ -1379,14 +1379,10 @@ export default {
               }
             }, 0);
           }
-          if(index === 7){
-            sums[7] = this.toDecimal2(this.numFormat(Number(delcommafy(sums[7])))) || 0.00
-          }
-          if(index === 12){
-            sums[12] = this.toDecimal2(this.numFormat(Number(sums[12]))) || 0.00
+          if([7, 12, 13].includes(index)){
+            sums[index] = this.toDecimal2(this.numFormat(Number(delcommafy(sums[index])))) || 0.00
           }
         }
-
       });
       return sums;
     },

ruoyi-ui-vue2/src/views/contract/lift/index.vue

@@ -316,7 +316,7 @@
             </template>
           </Column >
           <!--报价折扣-->
-          <InputColumn  :label="$t('lift.quotationDiscount')"  prop="quotationDiscount" :step="0.0001"  :precision="4"  :min="0" :max="100" v-if="checkPermi(['user:contract:lift:quotationDiscountEdit'])"/>
+          <InputNumberColumn  :label="$t('lift.quotationDiscount')"  prop="quotationDiscount" :step="0.0001"  :precision="4"  :min="0" :max="100" v-if="checkPermi(['user:contract:lift:quotationDiscountEdit'])"/>
           <!--预计排产日期-->
           <DatePickSelectColumn  :label="$t('lift.expectedProductionScheduleDate')"  v-if="checkPermi(['user:contract:lift:expectedProductionScheduleDateEdit'])" prop="expectedProductionScheduleDate"  width="250"></DatePickSelectColumn>
           <!--希望排产日期-->