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
@@ -193,7 +193,7 @@ export default {
        dialogWidth: 960,
        labelPosition: 'right',
        labelWidth: 'auto',
-        searchLabelWidth: 160,
+        searchLabelWidth: 88,
        tip: false,
        searchShow: true,
        searchMenuSpan: 24,
@@ -346,7 +346,7 @@ export default {
            label: '备注',
            prop: 'remark',
            type: 'textarea',
-            minRows: 5,
+            minRows: 2,
            span: 24,
            hide: true,
            placeholder: '请输入',
@@ -180,7 +180,7 @@ export default {
        dialogWidth: 960,
        labelPosition: 'right',
        labelWidth: 'auto',
-        searchLabelWidth: 160,
+        searchLabelWidth: 88,
        tip: false,
        searchShow: true,
        searchMenuSpan: 24,
@@ -333,7 +333,7 @@ export default {
            label: '备注',
            prop: 'remark',
            type: 'textarea',
-            minRows: 5,
+            minRows: 2,
            span: 24,
            hide: true,
            placeholder: '请输入',