qinhb пре 10 месеци
родитељ
комит
8eb1f587a7
2 измењених фајлова са 31 додато и 12 уклоњено
  1. 12 12
      src/views/base/craftManagement/route/index.vue
  2. 19 0
      src/views/plan/workOrder/index.vue

+ 12 - 12
src/views/base/craftManagement/route/index.vue

@@ -226,7 +226,7 @@ option.value = Object.assign(option.value, {
   searchLabelWidth: 100,
   column: [
     {
-      label: "工艺路线编号",
+      label: "工艺编号",
       prop: "processRouteCode",
       search: true,
       width: 150,
@@ -236,13 +236,13 @@ option.value = Object.assign(option.value, {
       rules: [
         {
           required: true,
-          message: "工艺路线名称不能为空",
+          message: "工艺编号不能为空",
           trigger: "blur",
         },
       ],
     },
     {
-      label: "工艺路线名称",
+      label: "工艺名称",
       prop: "processRouteName",
       width: 150,
       search: true,
@@ -250,13 +250,13 @@ option.value = Object.assign(option.value, {
       rules: [
         {
           required: true,
-          message: "工艺路线名称不能为空",
+          message: "工艺名称不能为空",
           trigger: "blur",
         },
       ],
     },
     {
-      label: "工艺路线类型",
+      label: "工艺类型",
       prop: "processRouteType",
       minWidth: 120,
       search: true,
@@ -264,7 +264,7 @@ option.value = Object.assign(option.value, {
       rules: [
         {
           required: true,
-          message: "工艺路线类型不能为空",
+          message: "工艺类型不能为空",
           trigger: "change",
         },
       ],
@@ -276,7 +276,7 @@ option.value = Object.assign(option.value, {
       },
     },
     {
-      label: "产品名称",
+      label: "物料名称",
       prop: "prodtName",
       overHidden: true,
       width: 150,
@@ -286,14 +286,14 @@ option.value = Object.assign(option.value, {
       rules: [
         {
           required: true,
-          message: "请选择产品",
+          message: "请选择物料",
           trigger: "blur",
         },
       ],
       readOnly: true,
     },
     {
-      label: "产品名称",
+      label: "物料名称",
       prop: "prodtName1",
       overHidden: true,
       width: 150,
@@ -302,7 +302,7 @@ option.value = Object.assign(option.value, {
       rules: [
         {
           required: true,
-          message: "请选择产品",
+          message: "请选择物料",
           trigger: "blur",
         },
       ],
@@ -312,7 +312,7 @@ option.value = Object.assign(option.value, {
       },
     },
     {
-      label: "产品编号",
+      label: "物料编号",
       prop: "prodtCode",
       overHidden: true,
       search: true,
@@ -320,7 +320,7 @@ option.value = Object.assign(option.value, {
       disabled: true,
     },
     {
-      label: "产品型号",
+      label: "物料型号",
       prop: "prodtModel",
       overHidden: true,
       search: true,

+ 19 - 0
src/views/plan/workOrder/index.vue

@@ -18,6 +18,7 @@
       @current-change="dataList"
       @selection-change="selectionChange"
     >
+
       <template #menu-left="{ size }">
         <el-button
           :disabled="toDeleteIds.length < 1"
@@ -731,6 +732,24 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
+      label: "自动拆单",
+      hide: true,
+      type: "switch",
+      dicData: [
+        {
+          label: "否",
+          value: 0,
+        },
+        {
+          label: "是",
+          value: 1,
+        },
+      ],
+      value: 0,
+      editDisplay: false,
+      prop: "autoGenerate",
+    },
+    {
       label: "完成数量",
       width: 85,
       display: false,