Merge remote-tracking branch 'origin/dev' into dev

maven

5 小时以前 1755192ff6533145a6ed82da31d9f7816bbe00f5

 src/views/qualityManagement/rawMaterialInspection/components/formDia.vue

@@ -54,7 +54,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="数量：" prop="quantity">
              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="请输入" clearable/>
              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="请输入" clearable :precision="2"/>
            </el-form-item>
          </el-col>
        </el-row>
@@ -137,7 +137,7 @@
    unit: [{ required: false, message: "请输入", trigger: "blur" }],
    quantity: [{ required: true, message: "请输入", trigger: "blur" }],
    checkCompany: [{ required: false, message: "请输入", trigger: "blur" }],
    checkResult: [{ required: false, message: "请输入", trigger: "blur" }],
    checkResult: [{ required: true, message: "请选择检测结果", trigger: "change" }],
  },
});
const { form, rules } = toRefs(data);