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

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

@@ -182,13 +182,13 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
-      label: "加工要求",
+      label: "工艺条件",
       prop: "processAsk",
       span: 12,
       rules: [
         {
           required: true,
-          message: "加工要求不能为空",
+          message: "工艺条件不能为空",
           trigger: "blur",
         },
       ],

src/views/base/craftManagement/route/bindConfig.ts

@@ -167,6 +167,11 @@ export const formOption = {
       value: 0,
     },
     {
+      label: "工艺条件",
+      prop: "processAsk",
+      span: 24,
+    },
+    {
       label: "工序描述",
       prop: "operationDesc",
       span: 24,

src/views/pro/baseoperation/index.vue

@@ -146,7 +146,7 @@
                     search: false,
                 },*/
                 {
-                    label: "加工要求",
+                    label: "工艺条件",
                     prop: "processAsk",
                     search: false,
                 },