Merge remote-tracking branch 'origin/master'

src/views/module_cmms/spotcheckContent/modules/SpotcheckContentForm.vue

@@ -119,11 +119,11 @@
           //     return parseInt(index)+1;
           //   }
           // },
-          {
-            title:'点检项ID',
-            align:"center",
-            dataIndex: 'id'
-          },
+          // {
+          //   title:'点检项ID',
+          //   align:"center",
+          //   dataIndex: 'id'
+          // },
           {
             title:'点检项编号',
             align:"center",

src/views/module_cmms/spotcheckContent/modules/SpotcheckContentModalAdd.vue

@@ -66,11 +66,11 @@ import { httpAction, getAction } from '@/api/manage'
           //     return parseInt(index)+1;
           //   }
           // },
-          {
-            title:'点检项ID',
-            align:"center",
-            dataIndex: 'id'
-          },
+          // {
+          //   title:'点检项ID',
+          //   align:"center",
+          //   dataIndex: 'id'
+          // },
           {
             title:'点检项编号',
             align:"center",

src/views/module_cmms/upkeep/modules/UpkeepForm.vue

@@ -170,10 +170,15 @@
           ],
         },
         columns: [
+          // {
+          //   title:'保养项ID',
+          //   align:"center",
+          //   dataIndex: 'id'
+          // },
           {
-            title:'保养项ID',
+            title:'保养项编号',
             align:"center",
-            dataIndex: 'id'
+            dataIndex: 'itemcode'
           },
           {
             title:'保养项名称',
@@ -186,11 +191,6 @@
           //   dataIndex: 'equiptypeName'
           // },
           {
-            title:'保养项编号',
-            align:"center",
-            dataIndex: 'itemcode'
-          },
-          {
             title:'保养项标准',
             align:"center",
             dataIndex: 'itemcontent'

src/views/module_cmms/upkeepPlan/modules/UpkeepPlanModalAdd.vue

@@ -56,10 +56,15 @@ import { httpAction, getAction } from '@/api/manage'
         /* table选中records*/
         selectionRows: [],
         columns: [
+          // {
+          //   title:'保养项ID',
+          //   align:"center",
+          //   dataIndex: 'id'
+          // },
           {
-            title:'保养项ID',
+            title:'保养项编号',
             align:"center",
-            dataIndex: 'id'
+            dataIndex: 'itemcode'
           },
           {
             title:'保养项名称',
@@ -72,11 +77,6 @@ import { httpAction, getAction } from '@/api/manage'
           //   dataIndex: 'equiptypeName'
           // },
           {
-            title:'保养项编号',
-            align:"center",
-            dataIndex: 'itemcode'
-          },
-          {
             title:'保养项标准',
             align:"center",
             dataIndex: 'itemcontent'