调整基础数据模块

src/option/base/common-address.js

@@ -33,8 +33,6 @@ export const createOption = () => ({
     {
       label: '地址名称',
       prop: 'addressName',
-      search: true,
-      searchOrder: 8,
       span: 24,
       minWidth: 150,
       showOverflowTooltip: true,
@@ -58,8 +56,6 @@ export const createOption = () => ({
       prop: 'addressType',
       type: 'select',
       formslot: true,
-      search: true,
-      searchOrder: 7,
       span: 24,
       minWidth: 140,
       dicData: addressTypeOptions,
@@ -76,8 +72,6 @@ export const createOption = () => ({
     {
       label: '详细地址',
       prop: 'detailAddress',
-      search: true,
-      searchOrder: 5,
       formslot: true,
       type: 'textarea',
       minRows: 3,
@@ -108,8 +102,6 @@ export const createOption = () => ({
     {
       label: '行政区划',
       prop: 'regionName',
-      search: true,
-      searchOrder: 4,
       display: false,
       minWidth: 150,
       rules: [{ required: true, message: '请选择行政区划', trigger: 'change' }],
@@ -117,8 +109,6 @@ export const createOption = () => ({
     {
       label: '联系人',
       prop: 'contactName',
-      search: true,
-      searchOrder: 2,
       minWidth: 110,
       placeholder: '请输入',
       maxlength: 50,
@@ -127,12 +117,14 @@ export const createOption = () => ({
     {
       label: '联系方式',
       prop: 'contactPhone',
-      search: true,
-      searchOrder: 1,
       minWidth: 130,
       placeholder: '请输入',
       maxlength: 20,
-      rules: [{ max: 20, message: '联系方式不能超过20个字', trigger: 'blur' }],
+      formslot: true,
+      rules: [
+        { max: 20, message: '联系方式不能超过20个字', trigger: 'blur' },
+        { pattern: /^\d*$/, message: '联系方式只能输入数字', trigger: 'blur' },
+      ],
     },
     {
       label: '组织',
@@ -214,8 +206,6 @@ export const createOption = () => ({
     {
       label: '站点编码',
       prop: 'siteCode',
-      search: true,
-      searchOrder: 6,
       hide: true,
       addDisplay: false,
       editDisplay: false,
@@ -224,11 +214,121 @@ export const createOption = () => ({
       label: '组织',
       prop: 'deptId',
       type: 'select',
-      search: true,
-      searchOrder: 3,
       hide: true,
       display: false,
       dicData: [],
     },
+    // 搜索字段与表格、表单字段独立，避免筛选配置影响数据展示和编辑布局。
+    {
+      label: '地址名称',
+      prop: 'searchAddressName',
+      searchProp: 'addressName',
+      search: true,
+      searchOrder: 8,
+      searchPlaceholder: '请输入',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '类型',
+      prop: 'searchAddressType',
+      searchProp: 'addressType',
+      type: 'select',
+      searchType: 'select',
+      search: true,
+      searchOrder: 7,
+      searchPlaceholder: '请选择',
+      dicData: addressTypeOptions,
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '详细地址',
+      prop: 'searchDetailAddress',
+      searchProp: 'detailAddress',
+      search: true,
+      searchOrder: 6,
+      searchPlaceholder: '请输入',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '行政区划',
+      prop: 'searchRegionName',
+      searchProp: 'regionName',
+      search: true,
+      searchOrder: 5,
+      searchPlaceholder: '请输入',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '站点编码',
+      prop: 'searchSiteCode',
+      searchProp: 'siteCode',
+      search: true,
+      searchOrder: 4,
+      searchPlaceholder: '请输入',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '组织',
+      prop: 'searchDeptId',
+      searchProp: 'deptId',
+      type: 'select',
+      searchType: 'select',
+      search: true,
+      searchOrder: 3,
+      searchPlaceholder: '请选择',
+      dicData: [],
+      filterable: true,
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '联系人',
+      prop: 'searchContactName',
+      searchProp: 'contactName',
+      search: true,
+      searchOrder: 2,
+      searchPlaceholder: '请输入',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '联系方式',
+      prop: 'searchContactPhone',
+      searchProp: 'contactPhone',
+      search: true,
+      searchOrder: 1,
+      searchPlaceholder: '请输入',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
   ],
 });

src/option/business/common-cargo.js

@@ -75,6 +75,7 @@ export const option = createCrudOption([
     display: false,
     addDisplay: false,
     editDisabled: true,
+    minWidth: 180,
   },
   // 搜索字段与表格、表单字段独立，避免筛选配置影响数据展示和编辑布局。
   {
@@ -169,31 +170,20 @@ export const option = createCrudOption([
     viewDisplay: false,
   },
   {
-    label: '包装品牌',
-    prop: 'packageBrand',
-    slot: true,
-    minWidth: 150,
-    addDisplay: false,
-    editDisplay: false,
-    viewDisplay: false,
+    label: '包装',
+    prop: 'packageType',
+    type: 'select',
+    dicData: packageOptions,
+    minWidth: 100,
   },
   {
     label: '品牌',
     prop: 'brand',
     search: false,
-    hide: true,
     minWidth: 120,
     placeholder: '请输入',
     rules: textRule('品牌', 50),
   },
-  {
-    label: '包装',
-    prop: 'packageType',
-    type: 'select',
-    dicData: packageOptions,
-    hide: true,
-    minWidth: 100,
-  },
   {
     label: '规格',
     prop: 'specification',