b2894lxlx/tms-erp-web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'websoft/master'

Browse Source
This commit is contained in:
b2894lxlx
2026-08-07 15:44:24 +08:00
parent a8c495a102 44e7a2692b
commit 0469b3e10c
59 changed files with 295 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/option/base/common-address.js
+2
View File
@@ -150,6 +150,7 @@ export const createOption = () => ({
{
label: '更新时间',
prop: 'updateTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -160,6 +161,7 @@ export const createOption = () => ({
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/business/common.js
+2
View File
@@ -227,6 +227,7 @@ export const auditColumns = [
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -237,6 +238,7 @@ export const auditColumns = [
{
label: '更新时间',
prop: 'updateTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/business/contract-manage.js
+5
View File
@@ -313,6 +313,7 @@ export const option = createCrudOption([
{
label: '开始日期',
prop: 'startDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -323,6 +324,7 @@ export const option = createCrudOption([
{
label: '结束日期',
prop: 'endDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -333,6 +335,7 @@ export const option = createCrudOption([
{
label: '临时效力起',
prop: 'temporaryStartDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -343,6 +346,7 @@ export const option = createCrudOption([
{
label: '临时效力止',
prop: 'temporaryEndDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -425,6 +429,7 @@ export const option = createCrudOption([
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/business/project-apply.js
+1
View File
@@ -386,6 +386,7 @@ export const option = createCrudOption([
{
label: '审核通过时间',
prop: 'approvedTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/business/transport-plan.js
+5 -3
View File
@@ -153,19 +153,19 @@ export const config = {
title: '收发货信息',
fields: [
['departureName', '发货地'],
['departureAddress', '发货地址', 2],
['departureContact', '发货联系人'],
['departureAddress', '发货地址'],
['departurePhone', '发货联系方式'],
['arrivalName', '收货地'],
['arrivalAddress', '到货地址', 2],
['arrivalContact', '收货联系人'],
['arrivalAddress', '到货地址'],
['arrivalPhone', '收货联系方式'],
],
},
{
title: '其它信息',
fields: [
['remark', '备注', 2],
['remark', '备注'],
['updateUserName', '更新人'],
['updateTime', '更新时间'],
['createTime', '创建时间'],
@@ -306,6 +306,7 @@ export const option = {
{
label: '计划开始日期',
prop: 'planStartDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -316,6 +317,7 @@ export const option = {
{
label: '计划结束日期',
prop: 'planEndDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
src/option/business/waybill-manage.js
+4
View File
@@ -392,6 +392,7 @@ export const option = {
{
label: '实际发货时间',
prop: 'startDate',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -400,6 +401,7 @@ export const option = {
{
label: '实际完成时间',
prop: 'endDate',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -429,6 +431,7 @@ export const option = {
{
label: '预计发货日期',
prop: 'estimatedStartTime',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -442,6 +445,7 @@ export const option = {
{
label: '预计完成日期',
prop: 'estimatedEndTime',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
src/option/system/authlog.js
+1
View File
@@ -82,6 +82,7 @@ export const authLogOption = {
{
label: '登录时间',
prop: 'loginTime',
sortable: true,
span: 24,
width: 180,
},
src/option/transportCapacity/driver.js
+13 -20
View File
@@ -20,12 +20,20 @@ export const option = {
dialogClickModal: false,
column: [
{
label: '姓名身份证号',
label: '姓名',
prop: 'driverName',
search: true,
searchOrder: 7,
slot: true,
minWidth: 220,
minWidth: 120,
},
{
label: '身份证号',
prop: 'idCardNo',
search: true,
searchOrder: 2,
slot: true,
minWidth: 180,
},
{
label: '手机号码',
@@ -76,6 +84,7 @@ export const option = {
type: 'select',
filterable: true,
dicData: [],
slot: true,
minWidth: 160,
},
{
@@ -101,6 +110,7 @@ export const option = {
{
label: '驾驶认证（日期）',
prop: 'drivingLicenseEndDate',
sortable: true,
slot: true,
minWidth: 140,
align: 'center',
@@ -108,16 +118,10 @@ export const option = {
{
label: '从业资格认证（日期）',
prop: 'qualificationEndDate',
sortable: true,
slot: true,
minWidth: 160,
},
{
label: '身份证号',
prop: 'idCardNo',
search: true,
searchOrder: 2,
hide: true,
},
{
label: '准驾车型',
prop: 'drivingType',
@@ -135,16 +139,5 @@ export const option = {
{ label: 'C2', value: 'C2' },
],
},
{
label: '',
prop: 'expireStatus',
search: true,
searchOrder: 0,
searchSpan: 6,
hide: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
},
],
};
src/option/transportCapacity/transport-ship.js
+1
View File
@@ -40,6 +40,7 @@ export const option = {
type: 'select',
filterable: true,
dicData: [],
slot: true,
minWidth: 160,
},
{
src/option/transportCapacity/transport-vehicle.js
+2 -1
View File
@@ -14,7 +14,7 @@ export const option = {
editBtn: false,
delBtn: false,
viewBtn: false,
menuWidth: 320,
menuWidth: 250,
dialogClickModal: false,
column: [
{
@@ -49,6 +49,7 @@ export const option = {
type: 'select',
filterable: true,
dicData: [],
slot: true,
minWidth: 150,
},
{
src/option/vehicle/accident-record.js
+3
View File
@@ -83,6 +83,7 @@ export const option = {
{
label: '事故发生日期',
prop: 'accidentDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -200,6 +201,7 @@ export const option = {
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -250,6 +252,7 @@ export const option = {
{
label: '更新时间',
prop: 'updateTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/vehicle/annual-inspection-record.js
+4
View File
@@ -82,6 +82,7 @@ export const option = {
{
label: '检测评定日期',
prop: 'inspectionAssessmentDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -93,6 +94,7 @@ export const option = {
{
label: '有效期截止日',
prop: 'validUntilDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -206,6 +208,7 @@ export const option = {
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -254,6 +257,7 @@ export const option = {
{
label: '更新时间',
prop: 'updateTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/vehicle/equipment-ledger.js
+3
View File
@@ -86,6 +86,7 @@ export const option = {
{
label: '出厂日期',
prop: 'factoryDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -133,6 +134,7 @@ export const option = {
{
label: '更新时间',
prop: 'updateTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -144,6 +146,7 @@ export const option = {
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/vehicle/etc-record.js
+4
View File
@@ -62,6 +62,7 @@ export const option = {
{
label: '入口时间',
prop: 'entryTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -85,6 +86,7 @@ export const option = {
{
label: '出口时间',
prop: 'exitTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -169,6 +171,7 @@ export const option = {
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -189,6 +192,7 @@ export const option = {
{
label: '更新时间',
prop: 'updateTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/vehicle/insurance-record.js
+4
View File
@@ -111,6 +111,7 @@ export const option = {
{
label: '开始日期',
prop: 'startDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -120,6 +121,7 @@ export const option = {
{
label: '结束日期',
prop: 'endDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -173,6 +175,7 @@ export const option = {
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -223,6 +226,7 @@ export const option = {
{
label: '更新时间',
prop: 'updateTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/vehicle/mileage-record.js
+2
View File
@@ -157,6 +157,7 @@ export const option = {
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -209,6 +210,7 @@ export const option = {
{
label: '更新时间',
prop: 'updateTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/vehicle/oil-electric-record.js
+3
View File
@@ -51,6 +51,7 @@ export const option = {
{
label: '交易时间',
prop: 'transactionTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -217,6 +218,7 @@ export const option = {
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -265,6 +267,7 @@ export const option = {
{
label: '更新时间',
prop: 'updateTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/vehicle/other-expense-record.js
+3
View File
@@ -81,6 +81,7 @@ export const option = {
{
label: '费用日期',
prop: 'expenseDate',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -173,6 +174,7 @@ export const option = {
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -193,6 +195,7 @@ export const option = {
{
label: '更新时间',
prop: 'updateTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/vehicle/tire-replacement-record.js
+3
View File
@@ -70,6 +70,7 @@ export const option = {
{
label: '换胎时间',
prop: 'replacementTime',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
@@ -140,6 +141,7 @@ export const option = {
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -190,6 +192,7 @@ export const option = {
{
label: '更新时间',
prop: 'updateTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
src/option/vehicle/transport-change-record.js
+2
View File
@@ -96,6 +96,7 @@ export const option = {
{
label: '创建时间',
prop: 'createTime',
sortable: true,
type: 'date',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -146,6 +147,7 @@ export const option = {
{
label: '更新时间',
prop: 'updateTime',
sortable: true,
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',