Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-front

src/views/quality/defectType/index.vue

@@ -95,6 +95,7 @@
 				</template>
 			</el-table-column>
 			<el-table-column width="150" label="不良名称" align="center" prop="defectSubclass" />
+      <el-table-column width="150" label="不良系数" align="center" prop="ratio" />
 			<el-table-column width="180" label="备注" align="center" prop="defectRemark" />
 			<el-table-column width="100" label="创建人" align="center" prop="createBy" />
 			<el-table-column width="180" label="创建时间" align="center" prop="createTime">
@@ -155,6 +156,9 @@
 				<el-form-item label="不良名称" prop="defectSubclass">
 					<el-input v-model="form.defectSubclass" placeholder="请输入不良名称" />
 				</el-form-item>
+        <el-form-item label="不良系数" prop="ratio">
+					<el-input type="number" v-model="form.ratio" placeholder="请输入不良系数" />
+				</el-form-item>
 				<el-form-item label="备注" prop="defectRemark">
 					<el-input v-model="form.defectRemark" placeholder="请输入备注" />
 				</el-form-item>
@@ -245,6 +249,15 @@ export default {
 			form: {},
 			// 表单校验
 			rules: {
+        defectType: [
+					{ required: true, message: "请选择不良类型", trigger: "blur" }
+				],
+        defectSubclass: [
+					{ required: true, message: "请输入不良名称", trigger: "blur" }
+				],
+				ratio: [
+					{ required: true, pattern: /^(0(?:\.\d{1,2})?|1(?:\.0{0,2})?)$/ ,message: "请输入(0-1)之间的两位小数", trigger: "blur" }
+				],
 			}
 		};
 	},
@@ -366,9 +379,8 @@ export default {
           }
         }
       }
-
 			this.$modal.confirm('是否确认删除不良类型维护编号为"' + defectCodes + '"的数据项？').then(function() {
-				return deldefectType(defectIds);
+				return delDefectType(defectIds);
 			}).then(() => {
 				this.getList();
 				this.$modal.msgSuccess("删除成功");