Merge remote-tracking branch 'origin/master' into feature/bfi-api-rate

# Conflicts:
#	src/views/vehicle/customer-archive.vue

src/option/base/measurement-unit.js

@@ -38,6 +38,21 @@ export const createOption = () => ({
   menuWidth: 240,
   menuFixed: 'right',
   column: [
+    {
+      label: '计量单位编码',
+      prop: 'unitCode',
+      minWidth: 150,
+      span: 24,
+      search: true,
+      searchOrder: 4,
+      searchSpan: 6,
+      maxlength: 50,
+      showWordLimit: true,
+      rules: [
+        { required: true, message: '请输入计量单位编码', trigger: 'blur' },
+        { max: 50, message: '计量单位编码不能超过50个字', trigger: 'blur' },
+      ],
+    },
     {
       label: '计量单位',
       prop: 'unitName',

src/option/business/shipping-template.js

@@ -55,8 +55,8 @@ export const config = {
     'templateType',
     'transportType',
     'createUserName',
-    'remark',
     'updateTime',
+    'remark',
     'createTime',
   ],
   exportColumns: [
@@ -65,8 +65,8 @@ export const config = {
     { prop: 'templateType', label: '模板类型' },
     { prop: 'transportType', label: '运输方式' },
     { prop: 'createUserName', label: '创建人' },
-    { prop: 'remark', label: '备注' },
     { prop: 'updateTime', label: '更新时间' },
+    { prop: 'remark', label: '备注' },
     { prop: 'createTime', label: '创建时间' },
   ],
   enableAllDept: false,
@@ -82,12 +82,14 @@ export const config = {
   detailAttachmentDescriptionPlain: true,
   enableTransportPlanForm: true,
   enableShippingTemplateFreight: true,
-  editableRoadAddress: true,
+  editableRoadAddress: false,
   fixedTransportAddressType: true,
   enableTemplateCodePreview: true,
   attachmentTitle: '附件',
   defaultForm: {
     templateType: '运输计划',
+    transportType: '公路运输',
+    transportTypeName: '公路运输',
   },
   transportFormRequiredFields: [
     ['projectName', '项目'],
@@ -119,15 +121,16 @@ export const option = {
         labelWidth: 0,
       },
       {
-        label: '模板编号',
-        prop: 'templateCode',
+        label: '模板类型',
+        prop: 'templateType',
+        type: 'select',
         search: true,
-        searchOrder: 4,
+        searchOrder: 2,
         span: 8,
         order: 390,
-        minWidth: 170,
-        disabled: true,
-        placeholder: '系统自动生成',
+        dicData: templateTypeOptions,
+        minWidth: 120,
+        rules: selectRule('模板类型'),
         display: true,
       },
       {
@@ -142,16 +145,15 @@ export const option = {
         display: true,
       },
       {
-        label: '模板类型',
-        prop: 'templateType',
-        type: 'select',
+        label: '模板编号',
+        prop: 'templateCode',
         search: true,
-        searchOrder: 2,
+        searchOrder: 4,
         span: 8,
         order: 370,
-        dicData: templateTypeOptions,
-        minWidth: 120,
-        rules: selectRule('模板类型'),
+        minWidth: 170,
+        disabled: true,
+        placeholder: '系统自动生成',
         display: true,
       },
       {

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

@@ -334,7 +334,7 @@ export const option = {
     },
     ...auditColumns.map(column => ({ ...column, hide: true })),
   ])),
-  dialogWidth: '96%',
+  dialogWidth: 1100,
   menuFixed: 'right',
   menuWidth: 320,
   index: false,

src/option/business/transport-plan.js

@@ -209,12 +209,12 @@ export const config = {
   attachmentTitle: '附件',
   searchRangeMap: {
     planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
-    planEndDateRange: ['planEndDateStart', 'planEndDateEnd'],
+    createTimeRange: ['createTimeStart', 'createTimeEnd', '00:00:00', '23:59:59'],
   },
   actions: ['copy', 'complete'],
   statusProp: 'businessStatus',
   statusTextProp: 'businessStatusName',
-  deleteStatus: ['draft', 'waiting_dispatch'],
+  deleteStatus: ['draft'],
   editStatus: ['draft', 'waiting_dispatch', 'dispatching'],
   detailButton: true,
   detailSections: [
@@ -341,6 +341,7 @@ export const option = {
       {
         label: '发货地址',
         prop: 'departureAddress',
+        slot: true,
         formslot: true,
         search: true,
         searchOrder: 7,
@@ -352,6 +353,7 @@ export const option = {
       {
         label: '到货地址',
         prop: 'arrivalAddress',
+        slot: true,
         formslot: true,
         search: true,
         searchOrder: 6,
@@ -577,8 +579,8 @@ export const option = {
         viewDisplay: false,
       },
       {
-        label: '计划结束日期',
-        prop: 'planEndDateRange',
+        label: '创建时间',
+        prop: 'createTimeRange',
         type: 'date',
         format: 'YYYY-MM-DD',
         valueFormat: 'YYYY-MM-DD',

src/option/business/waybill-manage.js

@@ -543,7 +543,8 @@ export const option = {
         prop: 'projectName',
         formslot: true,
         search: true,
-        searchLabel: '项目',
+        searchLabel: '项目名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 22,
         span: 6,
         order: 890,
@@ -555,6 +556,7 @@ export const option = {
         prop: 'customerName',
         search: true,
         searchLabel: '客户名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 21,
         minWidth: 150,
         addDisplay: false,
@@ -576,6 +578,7 @@ export const option = {
         prop: 'driverName',
         search: true,
         searchLabel: '司机名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 14,
         minWidth: 120,
         display: false,
@@ -626,6 +629,7 @@ export const option = {
         prop: 'carrierName',
         search: true,
         searchLabel: '承运商名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 15,
         minWidth: 150,
         display: false,
@@ -729,6 +733,7 @@ export const option = {
         prop: 'planName',
         formslot: true,
         search: true,
+        searchPlaceholder: '请选择或输入',
         searchOrder: 7,
         span: 6,
         order: 870,
@@ -738,6 +743,7 @@ export const option = {
         label: '货物类型',
         prop: 'cargoType',
         search: true,
+        searchPlaceholder: '请选择或输入',
         searchOrder: 18,
         formatter: row => formatGoodsField(row, ['cargoType', 'goodsType', 'typeName']),
         minWidth: 130,

src/option/system/authlog.js

@@ -5,6 +5,7 @@ export const GRANT_TYPE_DIC = [
   { label: '社交登录', value: 'social' },
   { label: '客户端凭证', value: 'client_credentials' },
   { label: '刷新令牌', value: 'refresh_token' },
+  { label: '退出登录', value: 'logout' },
 ];
 
 export const authLogOption = {
@@ -38,7 +39,7 @@ export const authLogOption = {
       prop: 'realName',
     },
     {
-      label: '授权类型',
+      label: '操作类型',
       prop: 'grantType',
       type: 'select',
       search: true,
@@ -80,7 +81,7 @@ export const authLogOption = {
       width: 120,
     },
     {
-      label: '登录时间',
+      label: '操作时间',
       prop: 'loginTime',
       sortable: true,
       span: 24,

src/option/system/user.js

@@ -1,12 +1,9 @@
 import { getDeptLazyTree } from '@/api/system/dept';
+import { validateLoginPassword } from '@/utils/validate';
 
 export const userOption = safe => {
   const validatePass = (rule, value, callback) => {
-    if (value === '') {
-      callback(new Error('请输入密码'));
-    } else {
-      callback();
-    }
+    validateLoginPassword(rule, value, callback);
   };
   const validatePass2 = (rule, value, callback) => {
     if (value === '') {