bug修复提交

src/views/technology/control/components/user-edit.vue

@@ -46,7 +46,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8" v-if="form.checkMethod==2">
+<!--        <el-col :span="8" v-if="form.checkMethod==2">
           <el-form-item label="互检:" prop="huj">
              <el-switch
                v-model="form.huj"
@@ -65,7 +65,7 @@
               >
               </el-switch>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="8">
           <el-form-item label="报工方式:" prop="submitMethod">
             <el-select filterable v-model="form.submitMethod" placeholder="请选择">

src/views/technology/parameter/components/user-edit.vue

@@ -208,6 +208,27 @@
               ? parameter.update
               : parameter.save;
 
+            const defaultValue = this.form.defaultValue
+            const maxValue = this.form.maxValue
+            const minValue = this.form.minValue
+            if(defaultValue!=''&maxValue!=''){
+               if(defaultValue>maxValue){
+                  this.loading = false;
+                  return this.$message.warning('默认值应小于参数上限')
+               }
+            }
+            if(defaultValue!=''&minValue!=''){
+               if(defaultValue<minValue){
+                  this.loading = false;
+                  return this.$message.warning('默认值应大于参数下限')
+               }
+            }
+            if(maxValue!=''&minValue!=''){
+               if(maxValue<minValue){
+                  this.loading = false;
+                  return this.$message.warning('参数上限应大于参数下限')
+               }
+            }
             saveOrUpdate(this.form)
               .then((msg) => {
                 this.loading = false;

src/views/technology/production/components/parameter/index.vue

@@ -145,7 +145,8 @@
 
       /* 刷新表格 */
       reload(where) {
-        this.$refs.table.reload({ page: 1, where: where });
+        console.log('where',where)
+        this.$refs.tableParameter.reload({ page: 1, where: where });
       },
       /* 打开编辑弹窗 */
       openEdit(row) {