1、车船模块fix bug

2、运力模块fix bug
3、新增设备台账
4、其他bug 修复
5、调整组织、人员模块

src/option/transportCapacity/transport-ship.js

@@ -14,7 +14,7 @@ export const option = {
   editBtn: false,
   delBtn: false,
   viewBtn: false,
-  menuWidth: 220,
+  menuWidth: 320,
   dialogClickModal: false,
   column: [
     {
@@ -32,6 +32,16 @@ export const option = {
       searchOrder: 4,
       minWidth: 140,
     },
+    {
+      label: '所属组织',
+      prop: 'organizationName',
+      search: true,
+      searchOrder: 1,
+      type: 'select',
+      filterable: true,
+      dicData: [],
+      minWidth: 160,
+    },
     {
       label: '船检登记号',
       prop: 'shipInspectionNo',
@@ -54,28 +64,6 @@ export const option = {
       minWidth: 110,
       align: 'center',
     },
-    {
-      label: '所属组织',
-      prop: 'organizationName',
-      search: true,
-      searchOrder: 1,
-      type: 'select',
-      filterable: true,
-      dicData: [],
-      minWidth: 160,
-    },
-    {
-      label: '状态',
-      prop: 'status',
-      type: 'select',
-      slot: true,
-      dicData: [
-        { label: '启用', value: 1 },
-        { label: '停用', value: 2 },
-      ],
-      minWidth: 90,
-      align: 'center',
-    },
     {
       label: '国籍证有效期至',
       prop: 'nationalityCertEndDate',
@@ -104,5 +92,16 @@ export const option = {
       minWidth: 140,
       align: 'center',
     },
+    {
+      label: '',
+      prop: 'expireStatus',
+      search: true,
+      searchOrder: 0,
+      searchSpan: 6,
+      hide: true,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
   ],
 };