1、基础数据修复bug

2、客商模块修复bug

src/option/base/cargo-type.js

@@ -56,10 +56,10 @@ export const getCargoTypeOption = ctx => ({
       type: 'radio',
       dataType: 'number',
       dicData: typeLevelDic,
-      search: true,
-      searchSpan: 6,
+      search: false,
       value: 2,
       span: 24,
+      order: 100,
       hide: true,
       minWidth: 120,
       editDisabled: true,
@@ -70,20 +70,34 @@ export const getCargoTypeOption = ctx => ({
       label: '货物类型',
       prop: 'cargoName',
       minWidth: 150,
+      search: true,
+      searchPlaceholder: '请输入',
+      searchSpan: 6,
+      searchOrder: 2,
+      order: 70,
+      placeholder: '请输入',
       maxlength: 50,
       showWordLimit: true,
       showOverflowTooltip: true,
-      rules: [{ validator: validateCargoName, trigger: 'blur' }],
+      rules: [
+        { required: true, message: '请输入货物类型名称', trigger: 'blur' },
+        { validator: validateCargoName, trigger: 'blur' },
+      ],
     },
     {
       label: '货物类型编码',
       prop: 'cargoCode',
       minWidth: 140,
       search: true,
+      searchPlaceholder: '请输入',
       searchSpan: 6,
+      searchOrder: 1,
       maxlength: 4,
+      order: 60,
+      placeholder: '请输入',
       editDisabled: true,
       rules: [
+        { required: true, message: '请输入货物类型编码', trigger: 'blur' },
         {
           validator: (rule, value, callback) => {
             const form = ctx.form || {};
@@ -115,6 +129,8 @@ export const getCargoTypeOption = ctx => ({
       hide: true,
       display: false,
       span: 12,
+      order: 90,
+      placeholder: '请输入',
       rules: [{ required: true, message: '请选择上级货物类型', trigger: 'change' }],
     },
     {
@@ -128,16 +144,19 @@ export const getCargoTypeOption = ctx => ({
       minWidth: 160,
     },
     {
-      label: '上级货物编码',
+      label: '上级货物类型编码',
       prop: 'parentCargoCode',
       slot: true,
       readonly: true,
       editDisabled: true,
+      addDisabled: true,
       addDisplay: false,
       editDisplay: false,
       display: false,
       span: 12,
+      order: 80,
       minWidth: 160,
+      placeholder: '请输入',
       rules: [{ required: true, message: '请选择上级货物类型', trigger: 'change' }],
     },
     {
@@ -156,6 +175,7 @@ export const getCargoTypeOption = ctx => ({
       minRows: 4,
       span: 24,
       minWidth: 180,
+      placeholder: '请输入',
       maxlength: 200,
       showWordLimit: true,
       overHidden: true,

src/option/base/common-address.js

@@ -27,18 +27,154 @@ export const createOption = () => ({
   delBtn: false,
   addBtn: false,
   dialogClickModal: false,
-  menuWidth: 160,
+  menuFixed: 'right',
+  menuWidth: 220,
   column: [
+    {
+      label: '地址名称',
+      prop: 'addressName',
+      search: true,
+      searchOrder: 8,
+      span: 24,
+      minWidth: 150,
+      showOverflowTooltip: true,
+      placeholder: '请输入',
+      maxlength: 100,
+      showWordLimit: true,
+      rules: [
+        { required: true, message: '请输入地址名称', trigger: 'blur' },
+        { max: 100, message: '地址名称不能超过100个字', trigger: 'blur' },
+      ],
+    },
+    {
+      label: '地址编号',
+      prop: 'addressCode',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
     {
       label: '类型',
       prop: 'addressType',
       type: 'select',
       formslot: true,
       search: true,
+      searchOrder: 7,
       span: 24,
+      minWidth: 140,
       dicData: addressTypeOptions,
       rules: [{ required: true, message: '请选择类型', trigger: 'change' }],
     },
+    {
+      label: '站点编码',
+      prop: 'siteCodeDisplay',
+      search: false,
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '详细地址',
+      prop: 'detailAddress',
+      search: true,
+      searchOrder: 5,
+      formslot: true,
+      type: 'textarea',
+      minRows: 3,
+      span: 24,
+      minWidth: 220,
+      showOverflowTooltip: true,
+      rules: [
+        { required: true, message: '请输入详细地址', trigger: 'blur' },
+        { max: 255, message: '详细地址不能超过255个字', trigger: 'blur' },
+      ],
+    },
+    {
+      label: '经度',
+      prop: 'longitude',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '纬度',
+      prop: 'latitude',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '行政区划',
+      prop: 'regionName',
+      search: true,
+      searchOrder: 4,
+      display: false,
+      minWidth: 150,
+      rules: [{ required: true, message: '请选择行政区划', trigger: 'change' }],
+    },
+    {
+      label: '联系人',
+      prop: 'contactName',
+      search: true,
+      searchOrder: 2,
+      minWidth: 110,
+      placeholder: '请输入',
+      maxlength: 50,
+      rules: [{ max: 50, message: '联系人不能超过50个字', trigger: 'blur' }],
+    },
+    {
+      label: '联系方式',
+      prop: 'contactPhone',
+      search: true,
+      searchOrder: 1,
+      minWidth: 130,
+      placeholder: '请输入',
+      maxlength: 20,
+      rules: [{ max: 20, message: '联系方式不能超过20个字', trigger: 'blur' }],
+    },
+    {
+      label: '组织',
+      prop: 'deptName',
+      minWidth: 150,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '备注',
+      prop: 'remark',
+      type: 'textarea',
+      minRows: 4,
+      span: 24,
+      minWidth: 160,
+      overHidden: true,
+      showOverflowTooltip: true,
+      placeholder: '请输入',
+      maxlength: 200,
+      showWordLimit: true,
+      rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],
+    },
+    {
+      label: '更新时间',
+      prop: 'updateTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      width: 180,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      width: 180,
+      addDisplay: false,
+      editDisplay: false,
+    },
     {
       label: '港口',
       prop: 'portId',
@@ -75,133 +211,24 @@ export const createOption = () => ({
       span: 24,
       rules: [{ required: true, message: '请选择机场标准名称', trigger: 'change' }],
     },
-    {
-      label: '地址名称',
-      prop: 'addressName',
-      search: true,
-      span: 24,
-      minWidth: 150,
-      maxlength: 100,
-      showWordLimit: true,
-      rules: [
-        { required: true, message: '请输入地址名称', trigger: 'blur' },
-        { max: 100, message: '地址名称不能超过100个字', trigger: 'blur' },
-      ],
-    },
-    {
-      label: '地址编号',
-      prop: 'addressCode',
-      minWidth: 120,
-      addDisplay: false,
-      editDisplay: false,
-    },
-    {
-      label: '站点编码',
-      prop: 'siteCodeDisplay',
-      search: false,
-      minWidth: 120,
-      addDisplay: false,
-      editDisplay: false,
-    },
     {
       label: '站点编码',
       prop: 'siteCode',
       search: true,
+      searchOrder: 6,
       hide: true,
       addDisplay: false,
       editDisplay: false,
     },
-    {
-      label: '行政区划',
-      prop: 'regionName',
-      search: true,
-      display: false,
-      minWidth: 150,
-      rules: [{ required: true, message: '请选择行政区划', trigger: 'change' }],
-    },
-    {
-      label: '详细地址',
-      prop: 'detailAddress',
-      search: true,
-      formslot: true,
-      type: 'textarea',
-      minRows: 3,
-      span: 24,
-      minWidth: 220,
-      rules: [
-        { required: true, message: '请输入详细地址', trigger: 'blur' },
-        { max: 255, message: '详细地址不能超过255个字', trigger: 'blur' },
-      ],
-    },
     {
       label: '组织',
       prop: 'deptId',
       type: 'select',
       search: true,
+      searchOrder: 3,
       hide: true,
       display: false,
       dicData: [],
     },
-    {
-      label: '组织',
-      prop: 'deptName',
-      minWidth: 150,
-      addDisplay: false,
-      editDisplay: false,
-    },
-    {
-      label: '联系人',
-      prop: 'contactName',
-      search: true,
-      minWidth: 110,
-      maxlength: 50,
-      rules: [{ max: 50, message: '联系人不能超过50个字', trigger: 'blur' }],
-    },
-    {
-      label: '联系方式',
-      prop: 'contactPhone',
-      search: true,
-      minWidth: 130,
-      maxlength: 20,
-      rules: [{ max: 20, message: '联系方式不能超过20个字', trigger: 'blur' }],
-    },
-    {
-      label: '备注',
-      prop: 'remark',
-      type: 'textarea',
-      minRows: 4,
-      span: 24,
-      hide: true,
-      maxlength: 200,
-      showWordLimit: true,
-      rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],
-    },
-    {
-      label: '更新人',
-      prop: 'updateUserName',
-      minWidth: 120,
-      addDisplay: false,
-      editDisplay: false,
-    },
-    {
-      label: '更新时间',
-      prop: 'updateTime',
-      type: 'datetime',
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-      minWidth: 160,
-      addDisplay: false,
-      editDisplay: false,
-    },
-    {
-      label: '创建时间',
-      prop: 'createTime',
-      type: 'datetime',
-      format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-      minWidth: 160,
-      addDisplay: false,
-      editDisplay: false,
-    },
   ],
 });

src/option/business/common-cargo.js

@@ -6,6 +6,15 @@ import {
   textRule,
 } from './common';
 
+const listDicFormatter = res => {
+  const data = res?.data || res;
+  if (Array.isArray(data)) return data;
+  if (Array.isArray(data?.records)) return data.records;
+  if (Array.isArray(data?.data)) return data.data;
+  if (Array.isArray(data?.data?.records)) return data.data.records;
+  return [];
+};
+
 export const config = {
   title: '常用货物',
   permission: 'common_cargo',
@@ -17,12 +26,29 @@ export const config = {
 };
 
 export const option = createCrudOption([
+  {
+    label: '货物名称',
+    prop: 'cargoName',
+    minWidth: 150,
+    placeholder: '请输入',
+    rules: textRule('货物名称', 100, true),
+  },
+  {
+    label: '货物编号',
+    prop: 'cargoCode',
+    formslot: true,
+    minWidth: 120,
+    maxlength: 20,
+    showWordLimit: true,
+    rules: [
+      { required: true, message: '请输入货物编号', trigger: 'blur' },
+      { max: 20, message: '货物编号不能超过20个字符', trigger: 'blur' },
+    ],
+  },
   {
     label: '一级货物类型',
     prop: 'firstCargoTypeName',
     formslot: true,
-    search: true,
-    searchOrder: 3,
     minWidth: 150,
     editDisabled: true,
     rules: [{ required: true, message: '请选择一级货物类型', trigger: 'change' }],
@@ -39,8 +65,6 @@ export const option = createCrudOption([
     label: '二级货物类型',
     prop: 'secondCargoTypeName',
     formslot: true,
-    search: true,
-    searchOrder: 4,
     minWidth: 150,
     editDisabled: true,
     rules: [{ required: true, message: '请选择二级货物类型', trigger: 'change' }],
@@ -48,47 +72,118 @@ export const option = createCrudOption([
   {
     label: '二级货物类型编码',
     prop: 'secondCargoTypeCode',
-    hide: true,
     display: false,
     addDisplay: false,
     editDisabled: true,
   },
+  // 搜索字段与表格、表单字段独立，避免筛选配置影响数据展示和编辑布局。
   {
     label: '货物名称',
-    prop: 'cargoName',
+    prop: 'searchCargoName',
+    searchProp: 'cargoName',
     search: true,
-    searchOrder: 1,
-    minWidth: 150,
-    rules: textRule('货物名称', 100, true),
+    searchOrder: 5,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
   },
   {
     label: '货物编号',
-    prop: 'cargoCode',
-    formslot: true,
+    prop: 'searchCargoCode',
+    searchProp: 'cargoCode',
+    search: true,
+    searchOrder: 4,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '一级货物类型',
+    prop: 'searchFirstCargoTypeName',
+    searchProp: 'firstCargoTypeName',
+    type: 'select',
+    searchType: 'select',
+    search: true,
+    searchOrder: 3,
+    searchPlaceholder: '请选择',
+    dicUrl: '/blade-system/cargo-type/list?current=1&size=9999&typeLevel=1',
+    dicFormatter: listDicFormatter,
+    props: {
+      label: 'cargoName',
+      value: 'cargoName',
+    },
+    filterable: true,
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '二级货物类型',
+    prop: 'searchSecondCargoTypeName',
+    searchProp: 'secondCargoTypeName',
+    type: 'select',
+    searchType: 'select',
     search: true,
     searchOrder: 2,
-    minWidth: 120,
-    maxlength: 20,
-    showWordLimit: true,
-    rules: [
-      { required: true, message: '请输入货物编号', trigger: 'blur' },
-      { max: 20, message: '货物编号不能超过20个字符', trigger: 'blur' },
-    ],
+    searchPlaceholder: '请选择',
+    dicUrl: '/blade-system/cargo-type/list?current=1&size=9999&typeLevel=2',
+    dicFormatter: listDicFormatter,
+    props: {
+      label: 'cargoName',
+      value: 'cargoName',
+    },
+    filterable: true,
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
   },
   {
     label: '组织',
-    prop: 'deptName',
+    prop: 'searchDeptId',
+    searchProp: 'deptId',
+    type: 'select',
+    searchType: 'select',
     search: true,
-    searchOrder: 5,
+    searchOrder: 1,
+    searchPlaceholder: '请选择',
+    dicData: [],
+    props: {
+      label: 'label',
+      value: 'value',
+    },
+    filterable: true,
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '包装品牌',
+    prop: 'packageBrand',
+    slot: true,
     minWidth: 150,
     addDisplay: false,
     editDisplay: false,
+    viewDisplay: false,
   },
   {
     label: '品牌',
     prop: 'brand',
     search: false,
+    hide: true,
     minWidth: 120,
+    placeholder: '请输入',
     rules: textRule('品牌', 50),
   },
   {
@@ -96,10 +191,25 @@ export const option = createCrudOption([
     prop: 'packageType',
     type: 'select',
     dicData: packageOptions,
+    hide: true,
     minWidth: 100,
   },
   {
-    label: '货值',
+    label: '规格',
+    prop: 'specification',
+    minWidth: 120,
+    placeholder: '请输入',
+    rules: textRule('规格', 50),
+  },
+  {
+    label: '型号',
+    prop: 'model',
+    minWidth: 120,
+    placeholder: '请输入',
+    rules: textRule('型号', 50),
+  },
+  {
+    label: '单价',
     prop: 'cargoValue',
     formslot: true,
     minWidth: 120,
@@ -129,29 +239,26 @@ export const option = createCrudOption([
     minWidth: 120,
   },
   {
-    label: '规格',
-    prop: 'specification',
-    minWidth: 120,
-    rules: textRule('规格', 50),
-  },
-  {
-    label: '型号',
-    prop: 'model',
-    minWidth: 120,
-    rules: textRule('型号', 50),
-  },
-  {
-    label: '说明',
-    prop: 'descriptionOne',
-    minWidth: 160,
-    rules: textRule('说明', 100),
-  },
-  {
-    label: '数据来源',
-    prop: 'dataSource',
+    label: '尺寸',
+    prop: 'sizeText',
     minWidth: 120,
     addDisplay: false,
     editDisplay: false,
+    rules: textRule('尺寸', 100),
+  },
+  {
+    label: '其他说明1',
+    prop: 'descriptionOne',
+    minWidth: 160,
+    placeholder: '请输入',
+    rules: textRule('其他说明1', 100),
+  },
+  {
+    label: '其他说明2',
+    prop: 'descriptionTwo',
+    minWidth: 160,
+    placeholder: '请输入',
+    rules: textRule('其他说明2', 100),
   },
   {
     label: '备注',
@@ -159,12 +266,25 @@ export const option = createCrudOption([
     type: 'textarea',
     minRows: 4,
     span: 24,
-    hide: true,
     maxlength: 200,
     showWordLimit: true,
+    placeholder: '请输入',
     rules: textRule('备注', 200),
   },
-  ...auditColumns,
+  {
+    label: '组织',
+    prop: 'deptName',
+    minWidth: 150,
+    addDisplay: false,
+    editDisplay: false,
+  },
+  ...auditColumns
+    .filter(column => ['updateTime', 'createTime'].includes(column.prop))
+    .sort(
+      (first, second) =>
+        ['updateTime', 'createTime'].indexOf(first.prop) -
+        ['updateTime', 'createTime'].indexOf(second.prop)
+    ),
 ]);
 
 export const excelOption = {

src/option/business/common-route.js

@@ -5,6 +5,8 @@ export const config = {
   permission: 'common_route',
   exportUrl: '/blade-transport/common-route/export-common-route',
   exportName: '常用线路',
+  importUrl: '/blade-transport/common-route/import-common-route',
+  templateUrl: '/blade-transport/common-route/export-template',
   enableAllDept: false,
 };
 
@@ -12,17 +14,14 @@ export const option = createCrudOption([
   {
     label: '线路名称',
     prop: 'routeName',
-    search: true,
-    searchOrder: 1,
-    span: 24,
+    span: 12,
     minWidth: 150,
+    overHidden: true,
     rules: textRule('线路名称', 100, true),
   },
   {
     label: '线路编号',
     prop: 'routeCode',
-    search: true,
-    searchOrder: 2,
     minWidth: 120,
     addDisplay: false,
     editDisabled: true,
@@ -30,8 +29,6 @@ export const option = createCrudOption([
   {
     label: '发货地',
     prop: 'departureName',
-    search: true,
-    searchOrder: 3,
     minWidth: 140,
     addDisplay: false,
     editDisplay: false,
@@ -40,10 +37,9 @@ export const option = createCrudOption([
     label: '发货地址',
     prop: 'departureAddress',
     formslot: true,
-    search: true,
-    searchOrder: 4,
     span: 24,
     minWidth: 220,
+    overHidden: true,
     rules: textRule('发货地址', 255, true),
   },
   {
@@ -53,6 +49,8 @@ export const option = createCrudOption([
     precision: 6,
     minWidth: 120,
     hide: true,
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '发货纬度',
@@ -61,6 +59,8 @@ export const option = createCrudOption([
     precision: 6,
     minWidth: 120,
     hide: true,
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '发货联系人',
@@ -77,8 +77,6 @@ export const option = createCrudOption([
   {
     label: '收货地',
     prop: 'arrivalName',
-    search: true,
-    searchOrder: 5,
     minWidth: 140,
     addDisplay: false,
     editDisplay: false,
@@ -87,10 +85,9 @@ export const option = createCrudOption([
     label: '收货地址',
     prop: 'arrivalAddress',
     formslot: true,
-    search: true,
-    searchOrder: 6,
     span: 24,
     minWidth: 220,
+    overHidden: true,
     rules: textRule('收货地址', 255, true),
   },
   {
@@ -100,6 +97,8 @@ export const option = createCrudOption([
     precision: 6,
     minWidth: 120,
     hide: true,
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '收货纬度',
@@ -108,6 +107,8 @@ export const option = createCrudOption([
     precision: 6,
     minWidth: 120,
     hide: true,
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '收货联系人',
@@ -121,25 +122,160 @@ export const option = createCrudOption([
     minWidth: 140,
     rules: [phoneRule('收货联系方式'), ...textRule('收货联系方式', 50)],
   },
-  {
-    label: '组织',
-    prop: 'deptName',
-    search: true,
-    searchOrder: 7,
-    minWidth: 150,
-    addDisplay: false,
-    editDisplay: false,
-  },
   {
     label: '备注',
     prop: 'remark',
     type: 'textarea',
     minRows: 4,
     span: 24,
-    hide: true,
+    minWidth: 180,
     maxlength: 500,
     showWordLimit: true,
     rules: textRule('备注', 500),
   },
-  ...auditColumns,
+  {
+    label: '组织',
+    prop: 'deptName',
+    minWidth: 150,
+    addDisplay: false,
+    editDisplay: false,
+  },
+  // 搜索字段独立于表格和表单字段，避免筛选配置影响数据展示和编辑布局。
+  {
+    label: '线路名称',
+    prop: 'searchRouteName',
+    searchProp: 'routeName',
+    search: true,
+    searchOrder: 7,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '线路编号',
+    prop: 'searchRouteCode',
+    searchProp: 'routeCode',
+    search: true,
+    searchOrder: 6,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '发货地',
+    prop: 'searchDepartureName',
+    searchProp: 'departureName',
+    search: true,
+    searchOrder: 5,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '发货地址',
+    prop: 'searchDepartureAddress',
+    searchProp: 'departureAddress',
+    search: true,
+    searchOrder: 4,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '收货地',
+    prop: 'searchArrivalName',
+    searchProp: 'arrivalName',
+    search: true,
+    searchOrder: 3,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '收货地址',
+    prop: 'searchArrivalAddress',
+    searchProp: 'arrivalAddress',
+    search: true,
+    searchOrder: 2,
+    searchPlaceholder: '请输入',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  },
+  {
+    label: '组织',
+    prop: 'searchDeptId',
+    searchProp: 'deptId',
+    search: true,
+    searchOrder: 1,
+    searchType: 'cascader',
+    searchPlaceholder: '请选择',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+    dicData: [],
+    props: {
+      label: 'label',
+      value: 'value',
+      children: 'children',
+    },
+    checkStrictly: true,
+    emitPath: false,
+    showAllLevels: false,
+    filterable: true,
+  },
+  ...auditColumns
+    .filter(column => column.prop !== 'createUserName')
+    .map(column =>
+      ['createTime', 'updateTime'].includes(column.prop) ? { ...column, minWidth: 190 } : column
+    )
+    .sort(
+      (first, second) =>
+        ['updateUserName', 'updateTime', 'createTime'].indexOf(first.prop) -
+        ['updateUserName', 'updateTime', 'createTime'].indexOf(second.prop)
+    ),
 ]);
+
+export const excelOption = {
+  submitBtn: false,
+  emptyBtn: false,
+  column: [
+    {
+      label: '导入模板',
+      prop: 'excelTemplate',
+      formslot: true,
+      span: 24,
+    },
+    {
+      label: 'Excel文件',
+      prop: 'excelFile',
+      type: 'upload',
+      drag: true,
+      loadText: '模板上传中，请稍等',
+      span: 24,
+      propsHttp: {
+        res: 'data',
+      },
+      tip: '请上传 .xls,.xlsx 标准格式文件',
+    },
+  ],
+};

src/option/business/contract-manage.js

@@ -241,7 +241,7 @@ export const option = createCrudOption([
     prop: 'partyA',
     type: 'select',
     order: 160,
-    dicUrl: '/blade-transport/customer-archive/list?current=1&size=9999&approvalStatus=approved',
+    dicUrl: '/blade-transport/customer-archive/list?current=1&size=9999&approvalStatus=approved&status=1',
     dicFormatter: listDicFormatter,
     props: {
       label: 'fullName',
@@ -256,7 +256,7 @@ export const option = createCrudOption([
     prop: 'partyB',
     type: 'select',
     order: 150,
-    dicUrl: '/blade-transport/customer-archive/list?current=1&size=9999&approvalStatus=approved',
+    dicUrl: '/blade-transport/customer-archive/list?current=1&size=9999&approvalStatus=approved&status=1',
     dicFormatter: listDicFormatter,
     props: {
       label: 'fullName',

src/option/business/process-config.js

@@ -13,7 +13,7 @@ export const config = {
   permission: 'process_config',
   exportUrl: '/blade-transport/process-config/export-process-config',
   exportName: '过程配置',
-  enableAllDept: false,
+  enableAllDept: true,
   actions: ['copy', 'enable', 'disable'],
   statusProp: 'status',
   statusTextProp: 'statusName',
@@ -29,21 +29,13 @@ export const option = applyTableMenuWidth({
       span: 24,
       hide: true,
     },
-    {
-      label: '配置编号',
-      prop: 'configCode',
-      search: true,
-      searchOrder: 4,
-      minWidth: 130,
-      addDisplay: false,
-      editDisplay: false,
-      editDisabled: true,
-    },
     {
       label: '配置名称',
       prop: 'configName',
       search: true,
       searchOrder: 6,
+      searchSpan: 6,
+      searchPlaceholder: '请输入',
       span: 12,
       minWidth: 150,
       addDisplay: false,
@@ -51,13 +43,16 @@ export const option = applyTableMenuWidth({
       rules: textRule('配置名称', 100, true),
     },
     {
-      label: '项目ID集合',
-      prop: 'projectIds',
-      hide: true,
-      display: false,
+      label: '配置编号',
+      prop: 'configCode',
+      search: true,
+      searchOrder: 4,
+      searchSpan: 6,
+      searchPlaceholder: '请输入',
+      minWidth: 130,
       addDisplay: false,
       editDisplay: false,
-      rules: textRule('项目ID集合', 1000, true),
+      editDisabled: true,
     },
     {
       label: '项目',
@@ -65,7 +60,9 @@ export const option = applyTableMenuWidth({
       formslot: true,
       search: true,
       searchOrder: 5,
-      searchType: 'select',
+      searchType: 'input',
+      searchSpan: 6,
+      searchPlaceholder: '请输入',
       type: 'textarea',
       minRows: 2,
       span: 12,
@@ -77,48 +74,98 @@ export const option = applyTableMenuWidth({
       rules: textRule('项目', 1000, true),
     },
     {
-      label: '包含过程节点',
+      label: '过程节点',
       prop: 'includedNodes',
-      search: true,
-      searchOrder: 3,
       type: 'select',
       multiple: true,
       dicData: nodeOptions,
-      minWidth: 180,
-      rules: selectRule('包含过程节点'),
+      minWidth: 260,
+      overHidden: false,
+      slot: true,
+      addDisplay: false,
+      editDisplay: false,
+      rules: selectRule('过程节点'),
     },
     {
-      label: '默认完成运输天数',
+      label: '默认运输完成天数',
       prop: 'defaultFinishDays',
       formslot: true,
       type: 'number',
-      min: 1,
+      min: 0,
       max: 999,
       span: 12,
+      minWidth: 170,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '备注',
+      prop: 'remark',
+      type: 'textarea',
+      minRows: 4,
+      span: 24,
+      minWidth: 180,
+      addDisplay: false,
+      editDisplay: false,
+      maxlength: 500,
+      showWordLimit: true,
+      rules: textRule('备注', 500),
+    },
+    {
+      label: '组织',
+      prop: 'deptName',
       minWidth: 150,
       addDisplay: false,
       editDisplay: false,
     },
+    ...auditColumns
+      .filter(column => ['updateTime', 'createTime'].includes(column.prop))
+      .map(column => ({ ...column, minWidth: 190 }))
+      .sort(
+        (first, second) =>
+          ['updateTime', 'createTime'].indexOf(first.prop) -
+          ['updateTime', 'createTime'].indexOf(second.prop)
+      ),
+    {
+      label: '项目ID集合',
+      prop: 'projectIds',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      rules: textRule('项目ID集合', 1000, true),
+    },
     {
       label: '状态',
       prop: 'status',
       type: 'select',
       search: true,
       searchOrder: 1,
+      searchSpan: 6,
+      searchPlaceholder: '请选择',
       dicData: processStatusOptions,
       slot: true,
-      minWidth: 100,
+      hide: true,
+      fixed: false,
       addDisplay: false,
       editDisplay: false,
     },
     {
       label: '组织',
-      prop: 'deptName',
+      prop: 'searchDeptId',
+      searchProp: 'deptId',
+      type: 'select',
       search: true,
       searchOrder: 2,
-      minWidth: 150,
+      searchSpan: 6,
+      searchPlaceholder: '请选择',
+      hide: true,
+      display: false,
       addDisplay: false,
       editDisplay: false,
+      viewDisplay: false,
+      dicData: [],
+      filterable: true,
     },
     {
       label: '',
@@ -127,22 +174,9 @@ export const option = applyTableMenuWidth({
       span: 24,
       hide: true,
     },
-    {
-      label: '备注',
-      prop: 'remark',
-      type: 'textarea',
-      minRows: 4,
-      span: 24,
-      hide: true,
-      addDisplay: false,
-      editDisplay: false,
-      maxlength: 500,
-      showWordLimit: true,
-      rules: textRule('备注', 500),
-    },
-    ...auditColumns,
   ]),
+  saveBtnText: '保存',
+  updateBtnText: '保存',
   dialogTop: '10px',
   dialogWidth: '96%',
-  searchSpan: 8,
 }, 5);