完善单车返利待核对、专项返利待核对

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue

@@ -330,7 +330,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">二次上传金额</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getNumber(formobj.secondaryUploadMoney, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getSpecialNumber(formobj.secondaryUploadMoney, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
             </el-col>
@@ -338,11 +338,11 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getNumber(formobj.secondTreatCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getSpecialNumber(formobj.secondTreatCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getNumber(formobj.secondSuppCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getSpecialNumber(formobj.secondSuppCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中含返利</div>
@@ -674,6 +674,26 @@ export default {
       }
       this.init()
     },
+    getSpecialNumber(val, limit) {
+      val = val.replace(/[^0-9.-]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace(/\-{2,}/g, '.') // 两个以上的“-”号转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点
+      val = val.replace('-', '$#$').replace(/\-/g, '').replace('$#$', '-'); // 只保留一个"-"号
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
     getNumber(val, limit) {
       val = val.replace(/[^0-9.]/g, '') // 保留数字
       val = val.replace(/^00/, '0.') // 开头不能有两个0
@@ -727,10 +747,10 @@ export default {
     // 二次调整页面--返利二次上传模块
     secondCostInput() {
       // 二次上传金额 > 0 时，返利二次上传为勾选状态
-      if (parseFloat(this.formobj.secondaryUploadMoney) > 0) {
-        this.checked = true
-      } else {
+      if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') {
         this.checked = false
+      } else {
+        this.checked = true
       }
       // 其中含返利 = 二次上传金额 - 其中待支付费用 - 其中抵顶费用
       this.formobj.secondRebate = Math.round((parseFloat(this.formobj.secondaryUploadMoney !== '' ? this.formobj.secondaryUploadMoney : 0) - parseFloat(this.formobj.secondTreatCost !== '' ? this.formobj.secondTreatCost : 0) - parseFloat(this.formobj.secondSuppCost !== '' ? this.formobj.secondSuppCost : 0)) * 100) / 100

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue

@@ -126,11 +126,11 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceTreatCost" @keyup.native="formobj.onceTreatCost = getNumber(formobj.onceTreatCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceTreatCost" @keyup.native="formobj.onceTreatCost = getSpecialNumber(formobj.onceTreatCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceSuppCost" @keyup.native="formobj.onceSuppCost = getNumber(formobj.onceSuppCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceSuppCost" @keyup.native="formobj.onceSuppCost = getSpecialNumber(formobj.onceSuppCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">抵顶费用说明</div>
@@ -145,7 +145,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">上传金额</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getNumber(formobj.secondaryUploadMoney, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getSpecialNumber(formobj.secondaryUploadMoney, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
             </el-col>
@@ -153,11 +153,11 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getNumber(formobj.secondTreatCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getSpecialNumber(formobj.secondTreatCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getNumber(formobj.secondSuppCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getSpecialNumber(formobj.secondSuppCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">抵顶费用说明</div>
@@ -248,7 +248,7 @@ export default {
       req.fetchBySid(row.sid).then((resp) => {
         if (resp.success) {
           this.formobj = resp.data
-          if (parseFloat(this.formobj.secondaryUploadMoney) === 0) {
+          if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') {
             this.checked = false
           }
           this.isAdjustmentInput(this.formobj)
@@ -320,10 +320,10 @@ export default {
         val.adjustmentRemarks = ''
         this.adjustOrNot = true
       }
-      if (parseFloat(this.formobj.secondaryUploadMoney) > 0) {
-        this.checked = true
-      } else {
+      if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') {
         this.checked = false
+      } else {
+        this.checked = true
       }
     },
     changeIsAdjustment(val) {

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue

@@ -307,7 +307,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">二次上传金额</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getNumber(formobj.secondaryUploadMoney, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getSpecialNumber(formobj.secondaryUploadMoney, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
             </el-col>
@@ -315,15 +315,15 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中支出费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondItureCost" @keyup.native="formobj.secondItureCost = getNumber(formobj.secondItureCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondItureCost" @keyup.native="formobj.secondItureCost = getSpecialNumber(formobj.secondItureCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getNumber(formobj.secondTreatCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getSpecialNumber(formobj.secondTreatCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getNumber(formobj.secondSuppCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getSpecialNumber(formobj.secondSuppCost, 2)" @input="secondCostInput" clearable placeholder=""/></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -660,6 +660,26 @@ export default {
       }
       this.init()
     },
+    getSpecialNumber(val, limit) {
+      val = val.replace(/[^0-9.-]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace(/\-{2,}/g, '.') // 两个以上的“-”号转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') // 只保留一个小数点
+      val = val.replace('-', '$#$').replace(/\-/g, '').replace('$#$', '-'); // 只保留一个"-"号
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
     getNumber(val, limit) {
       val = val.replace(/[^0-9.]/g, '') // 保留数字
       val = val.replace(/^00/, '0.') // 开头不能有两个0

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue

@@ -102,15 +102,15 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中支出费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceItureCost" @keyup.native="formobj.onceItureCost = getNumber(formobj.onceItureCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceItureCost" @keyup.native="formobj.onceItureCost = getSpecialNumber(formobj.onceItureCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceTreatCost" @keyup.native="formobj.onceTreatCost = getNumber(formobj.onceTreatCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceTreatCost" @keyup.native="formobj.onceTreatCost = getSpecialNumber(formobj.onceTreatCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceSuppCost" @keyup.native="formobj.onceSuppCost = getNumber(formobj.onceSuppCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.onceSuppCost" @keyup.native="formobj.onceSuppCost = getSpecialNumber(formobj.onceSuppCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -127,7 +127,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">上传金额</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getNumber(formobj.secondaryUploadMoney, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondaryUploadMoney" @keyup.native="formobj.secondaryUploadMoney = getSpecialNumber(formobj.secondaryUploadMoney, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
             </el-col>
@@ -135,15 +135,15 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">其中支出费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondItureCost" @keyup.native="formobj.secondItureCost = getNumber(formobj.secondItureCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondItureCost" @keyup.native="formobj.secondItureCost = getSpecialNumber(formobj.secondItureCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中待支付费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getNumber(formobj.secondTreatCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondTreatCost" @keyup.native="formobj.secondTreatCost = getSpecialNumber(formobj.secondTreatCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">其中抵顶费用</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getNumber(formobj.secondSuppCost, 2)" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="isAdjustmentInput(formobj)" v-model="formobj.secondSuppCost" @keyup.native="formobj.secondSuppCost = getSpecialNumber(formobj.secondSuppCost, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -236,7 +236,7 @@ export default {
       req.fetchBySid(row.sid).then((resp) => {
         if (resp.success) {
           this.formobj = resp.data
-          if (parseFloat(this.formobj.secondaryUploadMoney) === 0) {
+          if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') {
             this.checked = false
           }
           this.isAdjustmentInput(this.formobj)
@@ -308,10 +308,10 @@ export default {
         val.adjustmentRemarks = ''
         this.adjustOrNot = true
       }
-      if (parseFloat(this.formobj.secondaryUploadMoney) > 0) {
-        this.checked = true
-      } else {
+      if (parseFloat(this.formobj.secondaryUploadMoney) === 0 || this.formobj.secondaryUploadMoney === '') {
         this.checked = false
+      } else {
+        this.checked = true
       }
     },
     changeIsAdjustment(val) {