Merge branch 'cf_dev' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into cf_dev

src/views/base/craftManagement/route/index.vue

@@ -245,13 +245,7 @@ option.value = Object.assign(option.value, {
       addDisplay: true,
       editDisabled: true,
       overHidden: true,
-      rules: [
-        {
-          required: true,
-          message: "工艺路线名称不能为空",
-          trigger: "blur",
-        },
-      ],
+      display: false,
     },
     {
       label: "工艺路线名称",

src/views/plan/workOrder/index.vue

@@ -685,14 +685,14 @@ option.value = Object.assign(option.value, {
       },
     },
     {
-      label: "工艺路线",
+      label: "维修流程",
       prop: "processRouteName",
       width: 125,
       overHidden: true,
       rules: [
         {
           required: true,
-          message: "工艺路线不能为空",
+          message: "维修流程不能为空",
           trigger: "trigger",
         },
       ],