qinhb 1 týždeň pred
rodič
commit
947a8a6564

+ 7 - 7
src/views/base/materials/index.vue

@@ -207,13 +207,6 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
-      label: "科工编码",
-      prop: "engineeringCode",
-      width: 130,
-      overHidden: true,
-      search: true,
-    },
-    {
       label: "物料名称",
       prop: "materialName",
       width: 140,
@@ -228,6 +221,13 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
+      label: "科工编码",
+      prop: "engineeringCode",
+      width: 130,
+      overHidden: true,
+      search: true,
+    },
+    {
       label: "物料属性",
       prop: "attributeDictValue",
       search: true,

+ 3 - 3
src/views/base/modeling/station/index.vue

@@ -177,10 +177,10 @@ const changeItem = (row) => {
       type: "success",
     });
   }).catch(()=>{
-    if(row.enable == 1){
-      row.enable = 0
+    if(row.enable == "1"){
+      row.enable = "0"
     }else{
-      row.enable = 1
+      row.enable = "1"
     }
   });
 };

+ 1 - 1
src/views/plan/order/components/order-page.vue

@@ -68,7 +68,7 @@ option.value = Object.assign(option.value, {
       display: false,
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       search: true,
       width: 150,

+ 12 - 12
src/views/plan/order/index.vue

@@ -368,15 +368,7 @@ option.value = {
   },
   column: [
     {
-      label: "订单编号",
-      prop: "orderCode",
-      search: true,
-      width: 130,
-      overHidden: true,
-      display: false,
-    },
-    {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       search: true,
       width: 150,
@@ -384,7 +376,7 @@ option.value = {
       rules: [
         {
           required: true,
-          message: "订单名称不能为空",
+          message: "计划编号不能为空",
           trigger: "trigger",
         },
       ],
@@ -494,7 +486,7 @@ option.value = {
       rules: [
         {
           required: true,
-          message: "订单编号不能为空",
+          message: "物料编码不能为空",
           trigger: "trigger",
         },
       ],
@@ -505,7 +497,7 @@ option.value = {
       },
     },
     {
-      label: "产品名称",
+      label: "物料名称",
       prop: "materialName",
       search: true,
       width: 130,
@@ -652,6 +644,14 @@ option.value = {
       prop: "projectCode",
     },
     {
+      label: "订单编号",
+      prop: "orderCode",
+      search: true,
+      width: 130,
+      overHidden: true,
+      display: false,
+    },
+    {
       label: "绑定铭牌",
       prop: "nameplated",
       width: "100",

+ 4 - 4
src/views/plan/prepare/index.vue

@@ -121,7 +121,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="订单名称" prop="orderName">
+            <el-form-item label="计划编号" prop="orderName">
               <el-input v-model="form.orderName" disabled />
             </el-form-item>
           </el-col>
@@ -234,7 +234,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="订单名称" prop="orderName">
+            <el-form-item label="计划编号" prop="orderName">
               <el-input v-model="form.orderName" disabled />
             </el-form-item>
           </el-col>
@@ -625,7 +625,7 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
-      label: "计划名称",
+      label: "计划编号",
       prop: "orderName",
       search: true,
       disabled: true,
@@ -634,7 +634,7 @@ option.value = Object.assign(option.value, {
       rules: [
         {
           required: true,
-          message: "计划名称不能为空",
+          message: "计划编号不能为空",
           trigger: "trigger",
         },
       ],

+ 1 - 1
src/views/plan/workOrder/components/work-order-page.vue

@@ -75,7 +75,7 @@ option.value = Object.assign(option.value, {
       overHidden: true,
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       search: true,
       disabled: true,

+ 1 - 1
src/views/plan/workOrder/index.vue

@@ -599,7 +599,7 @@ option.value = Object.assign(option.value, {
       },
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       search: true,
       disabled: true,

+ 1 - 1
src/views/quality/outsource/index.vue

@@ -325,7 +325,7 @@ option.value = Object.assign(option.value, {
       search: true,
     },
     {
-      label: "计划名称",
+      label: "计划编号",
       prop: "orderName",
       width: 150,
       overHidden: true,

+ 1 - 1
src/views/report/productionScheduling/line/index.vue

@@ -108,7 +108,7 @@ option.value = Object.assign(option.value, {
       endPlaceholder: "结束日期",
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "name",
       search: true,
     },

+ 2 - 2
src/views/report/productionScheduling/order/index.vue

@@ -98,7 +98,7 @@ option.value = Object.assign(option.value, {
       endPlaceholder: "结束日期",
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "name",
       search: true,
     },
@@ -230,7 +230,7 @@ const initGantt = (type) => {
     {
       tree: true,
       name: "text",
-      label: "订单名称",
+      label: "计划编号",
       width: "240",
     },
     {

+ 3 - 3
src/views/report/statistics/dailystorage/index.vue

@@ -85,7 +85,7 @@ const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
   }
 };
 const ckickCell = (row, column, cell, event) => {
-  if (column.label === "订单名称") {
+  if (column.label === "计划编号") {
     data2.value.search.completeTime = row.completeTime;
     data2.value.search.orderCode = row.orderCode;
     editDialog.value.visible = true;
@@ -141,7 +141,7 @@ data1.value.option = Object.assign(data1.value.option, {
       editDisabled: true,
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       width: 140,
       overHidden: true,
@@ -159,7 +159,7 @@ data1.value.option = Object.assign(data1.value.option, {
       hide: true,
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       search: false,
       slot: true,

+ 2 - 2
src/views/report/statistics/outputstatistics/index.vue

@@ -89,7 +89,7 @@ data1.value.option = Object.assign(data1.value.option, {
       hide: true,
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       overHidden: true,
       search: true,
@@ -132,7 +132,7 @@ data1.value.option = Object.assign(data1.value.option, {
       hide: true,
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       search: false,
     },

+ 3 - 3
src/views/report/statistics/processanomaly/index.vue

@@ -111,7 +111,7 @@ data1.value.option = Object.assign(data1.value.option, {
       hide: true,
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       overHidden: true,
       search: true,
@@ -136,7 +136,7 @@ data1.value.option = Object.assign(data1.value.option, {
       hide: true,
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       search: false,
     },
@@ -203,7 +203,7 @@ data2.value.option = Object.assign(data2.value.option, {
   delBtn: false,
   column: [
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       search: false,
     },

+ 1 - 1
src/views/report/statistics/stationbeat/index.vue

@@ -116,7 +116,7 @@ data1.value.option = Object.assign(data1.value.option, {
       search: false,
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       search: false,
     },

+ 2 - 2
src/views/report/statistics/workeveryday/index.vue

@@ -252,7 +252,7 @@ data1.value.option = Object.assign(data1.value.option, {
       hide: true,
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       overHidden: true,
       search: true,
@@ -277,7 +277,7 @@ data1.value.option = Object.assign(data1.value.option, {
       hide: true,
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       search: false,
     },

+ 1 - 1
src/views/report/workhourinfo/prodthours/index.vue

@@ -115,7 +115,7 @@ data1.value.option = Object.assign(data1.value.option, {
       search: false,
     },
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       search: false,
     },

+ 1 - 1
src/views/report/workhourinfo/sumhours/index.vue

@@ -201,7 +201,7 @@ data2.value.option = Object.assign(data2.value.option, {
   delBtn: false,
   column: [
     {
-      label: "订单名称",
+      label: "计划编号",
       prop: "orderName",
       search: false,
     },