Merge remote-tracking branch 'websoft/master'

src/option/base/cargo-type.js

@@ -172,7 +172,7 @@ export const getCargoTypeOption = ctx => ({
       label: '备注',
       prop: 'remark',
       type: 'textarea',
-      minRows: 4,
+      minRows: 2,
       span: 24,
       minWidth: 180,
       placeholder: '请输入',

src/option/base/common-address.js

@@ -74,7 +74,7 @@ export const createOption = () => ({
       prop: 'detailAddress',
       formslot: true,
       type: 'textarea',
-      minRows: 3,
+      minRows: 2,
       span: 24,
       minWidth: 220,
       showOverflowTooltip: true,
@@ -136,7 +136,7 @@ export const createOption = () => ({
       label: '备注',
       prop: 'remark',
       type: 'textarea',
-      minRows: 4,
+      minRows: 2,
       span: 24,
       minWidth: 160,
       overHidden: true,

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,

src/option/job/jobinfo.js

@@ -373,7 +373,7 @@ export default {
           label: '任务描述',
           prop: 'jobDescription',
           type: 'textarea',
-          minRows: 3,
+          minRows: 2,
           span: 24,
         },
       ],
@@ -509,7 +509,7 @@ export default {
           labelTip: '供开发者使用，用于功能扩展，powerjob 自身不会使用该字段',
           prop: 'extra',
           type: 'textarea',
-          minRows: 3,
+          minRows: 2,
           span: 24,
         },
       ],

src/option/job/jobserver.js

@@ -74,7 +74,7 @@ export default {
       label: '任务备注',
       prop: 'jobRemark',
       type: 'textarea',
-      minRows: 3,
+      minRows: 2,
       span: 24,
     },
   ],

src/option/vehicle/accident-record.js

@@ -147,7 +147,7 @@ export const option = {
       label: '事故原因及损坏情况',
       prop: 'accidentReasonDamage',
       type: 'textarea',
-      minRows: 4,
+      minRows: 2,
       span: 24,
       search: true,
       minWidth: 220,
@@ -159,7 +159,7 @@ export const option = {
       label: '备注',
       prop: 'remark',
       type: 'textarea',
-      minRows: 3,
+      minRows: 2,
       span: 24,
       minWidth: 180,
       overHidden: true,

src/option/vehicle/annual-inspection-record.js

@@ -166,7 +166,7 @@ export const option = {
       label: '备注',
       prop: 'remark',
       type: 'textarea',
-      minRows: 3,
+      minRows: 2,
       span: 24,
       minWidth: 180,
       overHidden: true,

src/option/vehicle/equipment-ledger.js

@@ -124,7 +124,7 @@ export const option = {
       label: '备注',
       prop: 'remark',
       type: 'textarea',
-      minRows: 3,
+      minRows: 2,
       span: 24,
       order: 10,
       minWidth: 180,

src/option/vehicle/etc-record.js

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

src/option/vehicle/insurance-record.js

@@ -167,7 +167,7 @@ export const option = {
       label: '备注',
       prop: 'remark',
       type: 'textarea',
-      minRows: 3,
+      minRows: 2,
       span: 24,
       hide: true,
       rules: [{ max: 200, message: '备注最多 200 个字', trigger: 'blur' }],

src/option/vehicle/mileage-record.js

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

src/option/vehicle/oil-electric-record.js

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

src/option/vehicle/other-expense-record.js

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

src/option/vehicle/tire-replacement-record.js

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

src/option/vehicle/transport-change-record.js

@@ -65,7 +65,7 @@ export const option = {
       label: '变更内容',
       prop: 'changeContent',
       type: 'textarea',
-      minRows: 4,
+      minRows: 2,
       span: 24,
       search: true,
       minWidth: 260,
@@ -79,7 +79,7 @@ export const option = {
       label: '备注',
       prop: 'remark',
       type: 'textarea',
-      minRows: 4,
+      minRows: 2,
       span: 24,
       minWidth: 180,
       overHidden: true,

src/option/vehicle/violation-record.js

@@ -181,7 +181,7 @@ export const option = {
       label: '过程描述',
       prop: 'processDescription',
       type: 'textarea',
-      minRows: 3,
+      minRows: 2,
       span: 24,
       minWidth: 220,
       overHidden: true,
@@ -195,7 +195,7 @@ export const option = {
       label: '处理结果',
       prop: 'processResult',
       type: 'textarea',
-      minRows: 3,
+      minRows: 2,
       span: 24,
       minWidth: 220,
       overHidden: true,