Merge branch 'master' of git.echepei.com:caojunjie/kaihegroup-Ui

src/views/contractPlacing/index.vue

@@ -319,12 +319,12 @@
           </div>
           <div class="mainModules">
             <el-form-item label="箱量" prop="fCntrcount">
-              <el-input style="width:80%;" v-model="list.fCntrcount"/>
+              <el-input style="width:80%;" v-model.number="list.fCntrcount" :maxlength="3" oninput='this.value=this.value.replace(/[^\d.]/g,"")'/>
             </el-form-item>
           </div>
           <div class="mainModules">
             <el-form-item label="单箱重量(吨)" prop="fCntrweight">
-              <el-input style="width:80%;" v-model="list.fCntrweight"/>
+              <el-input style="width:80%;" v-model="list.fCntrweight" @input="cntrWeight"/>
             </el-form-item>
           </div>
           <div class="mainModules">
@@ -732,6 +732,21 @@ export default {
     }
   },
   methods: {
+    cntrWeight(res){
+      if (res < 40 && res > 0){
+        console.log("1111");
+        return
+      }else if( res == '' || res == null){
+        console.log("222")
+      } else {
+        this.$message({
+          showClose: true,
+          message: '单箱重量应在0-40吨之间',
+          type: 'error',
+          offset:90
+        });
+      }
+    },
     temperature(res){
       console.log(res);
       if (res < 20 && res > -30){