调整 合同、运力、客商、项目

src/option/transportCapacity/vehicle-dispatch.js

@@ -36,6 +36,7 @@ export const option = {
   menuFixed: 'right',
   menuWidth: 320,
   column: [
+    // ========== 表格列（顺序固定）==========
     {
       label: '申请单号',
       prop: 'applicationNo',
@@ -50,14 +51,14 @@ export const option = {
       placeholder: '保存后自动生成',
     },
     {
-      label: '调度车辆',
+      label: '车牌号',
       prop: 'plateNo',
       search: true,
       searchOrder: 4,
       searchPlaceholder: '请输入',
       minWidth: 120,
       formslot: true,
-      rules: [{ required: true, message: '请输入车牌号', trigger: 'blur' }],
+      rules: [{ required: true, message: '请选择车牌号', trigger: 'blur' }],
     },
     {
       label: '所属组织',
@@ -67,7 +68,7 @@ export const option = {
       searchPlaceholder: '请输入',
       minWidth: 140,
       disabled: true,
-      placeholder: '选择调度车辆后自动填充',
+      placeholder: '选择车牌号后自动填充',
       rules: [{ required: true, message: '请输入所属组织', trigger: 'blur' }],
     },
     {
@@ -79,7 +80,15 @@ export const option = {
       minWidth: 140,
       formslot: true,
       span: 12,
-      rules: [{ required: true, message: '请输入使用部门', trigger: 'blur' }],
+      rules: [{ required: true, message: '请选择使用部门', trigger: 'blur' }],
+    },
+    {
+      label: '车辆类型',
+      prop: 'vehicleType',
+      minWidth: 110,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
     },
     {
       label: '审批状态',
@@ -107,31 +116,6 @@ export const option = {
       addDisplay: false,
       editDisplay: false,
     },
-    {
-      label: '申请人',
-      prop: 'createUserName',
-      hide: true,
-      display: true,
-      addDisplay: true,
-      editDisplay: true,
-      viewDisplay: true,
-      disabled: true,
-      span: 12,
-    },
-    {
-      label: '申请时间',
-      prop: 'createTime',
-      type: 'datetime',
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-      hide: true,
-      display: true,
-      addDisplay: true,
-      editDisplay: true,
-      viewDisplay: true,
-      disabled: true,
-      span: 12,
-    },
     {
       label: '创建人',
       prop: 'createUserName',
@@ -149,10 +133,37 @@ export const option = {
       addDisplay: false,
       editDisplay: false,
     },
+    // ========== 新增/编辑表单专用（不进表格）==========
+    {
+      label: '申请人',
+      prop: 'applicantName',
+      hide: true,
+      display: true,
+      addDisplay: true,
+      editDisplay: true,
+      viewDisplay: true,
+      disabled: true,
+      span: 12,
+    },
+    {
+      label: '申请时间',
+      prop: 'applyTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      hide: true,
+      display: true,
+      addDisplay: true,
+      editDisplay: true,
+      viewDisplay: true,
+      disabled: true,
+      span: 12,
+    },
     {
       label: '备注',
       prop: 'remark',
       type: 'textarea',
+      hide: true,
       span: 24,
       maxlength: 200,
       showWordLimit: true,
@@ -164,7 +175,6 @@ export const option = {
       hide: true,
       span: 24,
       minWidth: 100,
-      slot: true,
       formslot: true,
     },
   ],