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

src/common/configs/dictDataUtil.ts

@@ -69,6 +69,7 @@ const DictDataUtil = {
     produce_type: "produce_type",
     op_group: "op_group",
     filter_order: "filter_order",
+    quality_grade: "quality_grade",
   },
   EXPAND_FIELD_TABLE: {
     //字段类型

src/views/plan/workOrder/index.vue

@@ -750,17 +750,23 @@ option.value = Object.assign(option.value, {
       prop: "materialModel",
     },
     {
-      label: "是否H级",
+      label: "质量等级",
       prop: "hOrder",
       type: "select", //类型为下拉选择框
       width: 100,
       overHidden: true,
-      dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.filter_order,
+      dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.quality_grade,
       props: {
         label: "dictLabel",
         value: "dictValue",
       },
-      value: "0",
+        rules: [
+            {
+                required: true,
+                message: "质量等级不能为空",
+                trigger: "trigger",
+            },
+        ],
     },
     {
       label: "优先级",