Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/precision-effect

 Conflicts:
	precision-effect-web/src/views/purchase/index.vue

precision-effect-system/src/main/java/com/zehong/system/service/impl/debitSettlement/SettlementDebit.java

@@ -14,7 +14,6 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.text.DecimalFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -56,7 +55,7 @@ public class SettlementDebit {
         this.tDebitCredit = tDebitCredit;
         //计算还款日期
         long time = tDebitCredit.getExpectedRepaymentDate().getTime() - tDebitCredit.getSumInterestDate().getTime();
-        int days = Math.round(time / 1000 / 60 / 60 / 24);
+        long days = Math.round(((double)time) / 1000 / 60 / 60 / 24);
         //还款部门
         BigDecimal repayAmount = tDebitCredit.getLittleTotal().multiply( new BigDecimal(1 + 0.08/360 * days)).setScale(2, RoundingMode.HALF_UP);
         tDebitCredit.setRealPaymentDate(new Date());

precision-effect-web/src/views/debit/index.vue

@@ -200,8 +200,9 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="小写合计" prop="littleTotal">
-              <el-input v-model="form.littleTotal" placeholder="请输入小写合计(精确到分)" @blur="getCapitalTotal"
-                        oninput="value=value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"/>
+              <el-input-number v-model="form.littleTotal" :precision="2" @blur="getCapitalTotal" style="width: 100%"/>
+              <!--<el-input v-model="form.littleTotal" placeholder="请输入小写合计(精确到分)" @blur="getCapitalTotal"
+                        oninput="value=value.replace(/^\D*([0-9]+\.[0-9]{0,2}).*$/,'$1')"/>-->
             </el-form-item>
           </el-col>
           <el-col :span="12">