Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/tm/tool/index.vue

@@ -310,12 +310,12 @@
                 </el-date-picker>
             </el-form-item>
             <el-form-item v-else label="最低寿命" prop="nextMaintenPeriod">
-              <el-input v-model="form.nextMaintenPeriod" placeholder="请输入最低寿命" />
+              <el-input-number style="width:100%;" :min="0"  v-model="form.nextMaintenPeriod"  />
             </el-form-item >
           </el-col>
             <el-col :span="12">
             <el-form-item label="剩余寿命" prop="lifeTime">
-              <el-input v-model="form.lifeTime" placeholder="请输入剩余寿命" />
+              <el-input-number style="width:100%;" :min="0"  v-model="form.lifeTime"  />
             </el-form-item>
           </el-col>
           </el-row>
@@ -553,6 +553,20 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      if(this.form.maintenType==='USAGE'){
+      if(this.form.nextMaintenPeriod==0){
+        this.open = true;
+        this.$modal.confirm('请输入最低寿命数值');
+        return;
+      }
+    }
+      
+      if(this.form.lifeTime==0){
+        this.open = true;
+        this.$modal.confirm('请输入剩余寿命数值');
+        return;
+      }
+    
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.toolId != null) {