Merge remote-tracking branch 'websoft/master'

# Conflicts: # src/views/business/components/waybill-import-dialog.vue
2026-08-14 02:50:07 +08:00
parent 6e012d766c 3bb0fddcca
commit 6bc9981ffc
43 changed files with 140 additions and 75 deletions
@@ -670,7 +670,7 @@ export const option = {
        label: '备注',
        prop: 'remark',
        type: 'textarea',
-        minRows: 4,
+        minRows: 2,
        span: 24,
        order: 810,
        minWidth: 180,
@@ -788,7 +788,7 @@ export const option = {
        label: '货物信息',
        prop: 'goodsJson',
        type: 'textarea',
-        minRows: 5,
+        minRows: 2,
        span: 24,
        hide: true,
        display: false,
@@ -800,7 +800,7 @@ export const option = {
        label: '承运信息',
        prop: 'carrierJson',
        type: 'textarea',
-        minRows: 4,
+        minRows: 2,
        span: 24,
        hide: true,
        display: false,
@@ -812,7 +812,7 @@ export const option = {
        label: '过程配置',
        prop: 'processJson',
        type: 'textarea',
-        minRows: 4,
+        minRows: 2,
        span: 24,
        hide: true,
        display: false,
@@ -824,7 +824,7 @@ export const option = {
        label: '运费信息',
        prop: 'freightJson',
        type: 'textarea',
-        minRows: 4,
+        minRows: 2,
        span: 24,
        hide: true,
        display: false,