Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue

@@ -117,7 +117,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">税率</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.taxRate" clearable placeholder=""/></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable placeholder=""/></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -233,6 +233,24 @@ export default {
         }
       })
     },
+    getNumber(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('.', '$#$').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
+    },
     supplierTypeChange(value) {
       const choose = this.supplierType_list.filter((item) => item.sid === value)
       if (choose !== null && choose.length > 0) {

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java

@@ -113,9 +113,12 @@ public class PmsSupplierInfoService extends MybatisBaseService<PmsSupplierInfoMa
 			baseSupplierBankDtos.add(baseSupplierBankDto);
 		}
 		baseSupplierInfoDto.setBaseSupplierBankList(baseSupplierBankDtos);
-		baseSupplierInfoFeign.save(baseSupplierInfoDto);
+		ResultBean resultBean = baseSupplierInfoFeign.save(baseSupplierInfoDto);
+		if (resultBean.getSuccess()) {
 			return rb.success();
 		}
+		return rb.setMsg(resultBean.getMsg());
+	}
 	
 	public PmsSupplierInfoDetailsVo fetchDetailsVoBySid(String sid){
 		PmsSupplierInfo entity = fetchBySid(sid);