Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/settlement/transport-reconciliation.vue

src/option/business/contract-manage.js

@@ -251,12 +251,14 @@ export const option = createCrudOption([
   {
     label: '合同名称',
     prop: 'contractName',
+    align: 'left',
+    headerAlign: 'left',
     search: true,
     searchOrder: 7,
     searchPlaceholder: '请输入',
     order: 180,
     slot: true,
-    minWidth: 180,
+    minWidth: 240,
     rules: textRule('合同名称', 100, true),
   },
   {

src/option/vehicle/insurance-record.js

@@ -28,7 +28,7 @@ export const ocrTemplateDic = [];
 export const option = {
   height: 'auto',
   calcHeight: 32,
-  dialogWidth: 1100,
+  dialogWidth: 1024,
   labelPosition: 'right',
   tip: false,
   searchBtnText: '查询',
@@ -46,7 +46,7 @@ export const option = {
   viewBtn: true,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 180,
+  menuWidth: 120,
   column: [
     {
       label: '车船类型',
@@ -97,7 +97,7 @@ export const option = {
       type: 'select',
       dicData: insuranceTypeDic,
       search: true,
-      minWidth: 130,
+      minWidth: 120,
       rules: [{ required: true, message: '请选择保险类型', trigger: 'change' }],
     },
     {