Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/business/components/waybill-import-dialog.vue

src/option/base/cargo-type.js

@@ -35,8 +35,8 @@ export const getCargoTypeOption = ctx => ({
   updateBtnText: '提交',
   searchShow: true,
   searchIcon: true,
-  searchLabelWidth: 50,
-  searchMenuSpan: 10,
+  searchLabelWidth: 88,
+  searchMenuSpan: 12,
   searchIndex: 4,
   searchMenuPosition: 'right',
   border: true,

src/option/business/contract-manage.js

@@ -495,6 +495,7 @@ export const option = createCrudOption([
     prop: 'remark',
     type: 'textarea',
     span: 24,
+    minRows: 2,
     hide: true,
     order: 40,
     maxlength: 2000,

src/option/business/shipping-template.js

@@ -120,7 +120,7 @@ export const option = {
         label: '备注',
         prop: 'remark',
         type: 'textarea',
-        minRows: 3,
+        minRows: 2,
         span: 24,
         order: 360,
         minWidth: 180,
@@ -175,7 +175,7 @@ export const option = {
         label: '备注',
         prop: 'basicRemark',
         type: 'textarea',
-        minRows: 3,
+        minRows: 2,
         span: 24,
         order: 315,
         minWidth: 180,

src/option/business/temporary-credit-limit.js

@@ -87,6 +87,7 @@ export const config = {
 };
 
 export const option = {
+  dialogCustomClass: 'temporary-credit-limit-dialog',
   ...createCrudOption([
     {
       label: '申请单号',
@@ -258,6 +259,7 @@ export const option = {
       prop: 'remark',
       type: 'textarea',
       span: 24,
+      minRows: 2,
       hide: true,
       maxlength: 200,
       showWordLimit: true,

src/option/business/transport-plan.js

@@ -416,7 +416,7 @@ export const option = {
         label: '备注',
         prop: 'remark',
         type: 'textarea',
-        minRows: 4,
+        minRows: 2,
         span: 24,
         order: 330,
         minWidth: 180,
@@ -572,7 +572,7 @@ export const option = {
         prop: 'goodsJson',
         type: 'textarea',
         formslot: true,
-        minRows: 5,
+        minRows: 2,
         span: 24,
         order: 270,
         hide: true,
@@ -593,7 +593,7 @@ export const option = {
         prop: 'attachmentsJson',
         type: 'textarea',
         formslot: true,
-        minRows: 3,
+        minRows: 2,
         span: 24,
         order: 260,
         hide: true,

src/option/business/waybill-manage.js

@@ -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,

src/option/system/user.js

@@ -411,7 +411,7 @@ export const platformOption = {
       label: '用户拓展',
       prop: 'userExt',
       type: 'textarea',
-      minRows: 8,
+      minRows: 2,
       span: 24,
       overHidden: true,
       row: true,
@@ -500,7 +500,7 @@ export const platformFormOption = {
       label: '用户拓展',
       prop: 'userExt',
       type: 'textarea',
-      minRows: 8,
+      minRows: 2,
       span: 24,
     },
   ],

src/option/tool/codesetting.js

@@ -13,7 +13,7 @@ export default {
   grid: true,
   selection: true,
   labelWidth: 'auto',
-  searchLabelWidth: 160,
+  searchLabelWidth: 88,
   menuWidth: 180,
   dialogClickModal: false,
   column: [

src/option/tool/formsetting.js

@@ -13,7 +13,7 @@ export default {
   grid: true,
   selection: true,
   labelWidth: 'auto',
-  searchLabelWidth: 160,
+  searchLabelWidth: 88,
   menuWidth: 180,
   dialogWidth: 500,
   dialogClickModal: false,

src/option/transportCapacity/transport-ship.js

@@ -5,7 +5,7 @@ export const option = {
   searchShow: true,
   searchMenuSpan: 24,
   searchIcon: true,
-  searchIndex: 4,
+  searchIndex: 6,
   searchMenuPosition: 'right',
   border: true,
   index: true,
@@ -96,7 +96,7 @@ export const option = {
     {
       label: '',
       prop: 'expireStatus',
-      search: true,
+      search: false,
       searchOrder: 0,
       searchSpan: 6,
       hide: true,

src/option/transportCapacity/transport-vehicle.js

@@ -5,7 +5,7 @@ export const option = {
   searchShow: true,
   searchMenuSpan: 24,
   searchIcon: true,
-  searchIndex: 4,
+  searchIndex: 6,
   searchMenuPosition: 'right',
   border: true,
   index: true,
@@ -149,7 +149,7 @@ export const option = {
     {
       label: '',
       prop: 'expireStatus',
-      search: true,
+      search: false,
       searchOrder: 0,
       searchSpan: 6,
       hide: true,

src/option/vehicle/accident-record.js

@@ -36,7 +36,7 @@ export const option = {
   dialogWidth: 960,
   labelPosition: 'right',
   labelWidth: 'auto',
-  searchLabelWidth: 160,
+  searchLabelWidth: 88,
   tip: false,
   searchBtnText: '查询',
   emptyBtnText: '重置',

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

@@ -35,7 +35,7 @@ export const option = {
   dialogWidth: 960,
   labelPosition: 'right',
   labelWidth: 'auto',
-  searchLabelWidth: 160,
+  searchLabelWidth: 88,
   tip: false,
   searchBtnText: '查询',
   emptyBtnText: '重置',

src/option/vehicle/equipment-ledger.js

@@ -16,7 +16,7 @@ export const option = {
   dialogWidth: 960,
   labelPosition: 'right',
   labelWidth: 'auto',
-  searchLabelWidth: 160,
+  searchLabelWidth: 88,
   tip: false,
   searchBtnText: '查询',
   emptyBtnText: '重置',

src/option/vehicle/etc-record.js

@@ -25,7 +25,7 @@ export const option = {
   dialogWidth: 960,
   labelPosition: 'right',
   labelWidth: 'auto',
-  searchLabelWidth: 160,
+  searchLabelWidth: 88,
   tip: false,
   searchBtnText: '查询',
   emptyBtnText: '重置',

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

@@ -33,7 +33,7 @@ export const option = {
   dialogWidth: 960,
   labelPosition: 'right',
   labelWidth: 'auto',
-  searchLabelWidth: 160,
+  searchLabelWidth: 88,
   tip: false,
   searchBtnText: '查询',
   emptyBtnText: '重置',

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

@@ -26,7 +26,7 @@ export const option = {
   dialogWidth: 960,
   labelPosition: 'right',
   labelWidth: 'auto',
-  searchLabelWidth: 160,
+  searchLabelWidth: 88,
   tip: false,
   searchBtnText: '查询',
   emptyBtnText: '重置',

src/option/vehicle/violation-record.js

@@ -36,7 +36,7 @@ export const option = {
   dialogWidth: 960,
   labelPosition: 'right',
   labelWidth: 'auto',
-  searchLabelWidth: 160,
+  searchLabelWidth: 88,
   tip: false,
   searchBtnText: '查询',
   emptyBtnText: '重置',