Merge remote-tracking branch 'websoft/master'

src/option/business/common-cargo.js

@@ -254,7 +254,7 @@ export const option = createCrudOption([
     label: '备注',
     prop: 'remark',
     type: 'textarea',
-    minRows: 4,
+    minRows: 2,
     span: 24,
     maxlength: 200,
     showWordLimit: true,

src/option/business/common-route.js

@@ -127,7 +127,7 @@ export const option = {
     label: '备注',
     prop: 'remark',
     type: 'textarea',
-    minRows: 4,
+    minRows: 2,
     span: 24,
     minWidth: 180,
     maxlength: 500,

src/option/business/contract-manage.js

@@ -253,7 +253,7 @@ export const option = createCrudOption([
     prop: 'signType',
     type: 'select',
     search: false,
-    span: 6,
+    span: 8,
     order: 190,
     dicData: signTypeOptions,
     minWidth: 120,

src/option/business/process-config.js

@@ -101,7 +101,7 @@ export const option = {
       label: '备注',
       prop: 'remark',
       type: 'textarea',
-      minRows: 4,
+      minRows: 2,
       span: 24,
       minWidth: 180,
       addDisplay: false,