暂存

src/HDrpManagement/contractManage/components/addContract.vue

@@ -573,12 +573,12 @@
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==1">
               <el-form-item label="订单金额比例(%):" prop="orderratio" >
-                <el-input type="number" size="small" v-model.number="form.orderratio"  placeholder="请输入0-100%" @change="orderratioChange"></el-input>
+                <el-input type="number" size="small" v-model="form.orderratio"  placeholder="请输入0-100%" @change="orderratioChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==2">
               <el-form-item label="居间产品折扣(%):" prop="productdiscount">
-                <el-input type="number" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
+                <el-input type="number" size="small" v-model="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -734,13 +734,15 @@ export default {
           { required: true, message: '请设置发货日期提醒天数', trigger: 'blur' },
         ],
         productdiscount: [
-          { message: '必须为数字', type:'number', trigger: 'change' },
+        /*  { message: '必须为数字', type:'number', trigger: 'change' },*/
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,2}$/,message: '必须为数字',trigger: 'change'},
           { required: true, message: '请填写折扣', trigger: 'blur' },
        /*   { validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
         ],
         orderratio: [
-          { message: '必须为数字', type:'number', trigger: 'change' },
+         /* { message: '必须为数字', type:'number', trigger: 'change' },*/
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,2}$/,message: '必须为数字',trigger: 'change'},
           { required: true, message: '请填写折扣', trigger: 'blur' },
         /*  { validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}

src/api/request.js

@@ -117,6 +117,9 @@ service.interceptors.response.use(response => {
                 case 505:
                     error.message = 'http版本不支持该请求'
                     break;
+                case '(已取消)':
+                    error.message = '当前网络繁忙，请稍后重新登录'
+                    break;
                 default:
                     error.message = `连接错误${error.response.status}`
             }
@@ -135,4 +138,4 @@ service.interceptors.response.use(response => {
         return Promise.resolve(error.response)
     })
     //4.导入文件
-export default service
+export default service