feat(core): 统一全站时间列加排序并优化司机管理显示
- 所有含时间的列表列(创建时间、更新时间、起止日期等)均增加排序功能,兼顾Avue option和手写el-table-column - 司机管理「姓名身份证号」列拆分为独立的「姓名」「身份证号」两列,分别使用插槽渲染 - 修复车辆/船舶/司机管理「所属组织」列前导空格问题,value 使用无缩进原始标签 - 调整司机管理页到期筛选标签位置,移至搜索菜单行并优化样式,删除过渡占位筛选字段 - 增加组织名称列自定义插槽,去除已入库旧数据的前导空白 - 更新相关样式,删除无用样式代码,增加表格列排序样式支持
This commit is contained in:
@@ -158,6 +158,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',
|
||||
@@ -168,6 +169,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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -82,6 +82,7 @@ export const authLogOption = {
|
||||
{
|
||||
label: '登录时间',
|
||||
prop: 'loginTime',
|
||||
sortable: true,
|
||||
span: 24,
|
||||
width: 180,
|
||||
},
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
@@ -40,6 +40,7 @@ export const option = {
|
||||
type: 'select',
|
||||
filterable: true,
|
||||
dicData: [],
|
||||
slot: true,
|
||||
minWidth: 160,
|
||||
},
|
||||
{
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
{
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -434,6 +434,7 @@ export default {
|
||||
{
|
||||
label: '过期时间',
|
||||
prop: 'expireTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
@@ -512,7 +513,8 @@ export default {
|
||||
{ label: '请求方法', prop: 'method', slot: true, width: 85 },
|
||||
{ label: '调用IP', prop: 'remoteIp', search: true, width: 140 },
|
||||
{ label: '耗时(ms)', prop: 'time', width: 85 },
|
||||
{ label: '日志时间', prop: 'createTime', span: 24, width: 180 },
|
||||
{ label: '日志时间', prop: 'createTime',
|
||||
sortable: true, span: 24, width: 180 },
|
||||
{ label: '用户代理', prop: 'userAgent', span: 24, hide: true },
|
||||
{ label: '请求数据', prop: 'params', type: 'textarea', span: 24, minRows: 2, hide: true },
|
||||
],
|
||||
|
||||
@@ -393,7 +393,8 @@ export default {
|
||||
{ label: '服务IP', prop: 'serverIp', hide: true, width: 160 },
|
||||
{ label: '环境', prop: 'env', hide: true, width: 85 },
|
||||
{ label: '用户代理', prop: 'userAgent', span: 24, hide: true },
|
||||
{ label: '触发时间', prop: 'createTime', span: 24, width: 170 },
|
||||
{ label: '触发时间', prop: 'createTime',
|
||||
sortable: true, span: 24, width: 170 },
|
||||
{ label: '请求数据', prop: 'params', type: 'textarea', span: 24, minRows: 2, hide: true },
|
||||
],
|
||||
},
|
||||
|
||||
@@ -447,6 +447,7 @@ export default {
|
||||
{
|
||||
label: '更新时间',
|
||||
prop: 'updateTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
@@ -458,6 +459,7 @@ export default {
|
||||
{
|
||||
label: '创建时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -203,6 +203,7 @@ export default {
|
||||
{
|
||||
label: '生效日期',
|
||||
prop: 'effectiveDate',
|
||||
sortable: true,
|
||||
type: 'date',
|
||||
format: 'YYYY-MM-DD',
|
||||
valueFormat: 'YYYY-MM-DD',
|
||||
@@ -224,6 +225,7 @@ export default {
|
||||
{
|
||||
label: '失效日期',
|
||||
prop: 'expiryDate',
|
||||
sortable: true,
|
||||
type: 'date',
|
||||
format: 'YYYY-MM-DD',
|
||||
valueFormat: 'YYYY-MM-DD',
|
||||
@@ -287,6 +289,7 @@ export default {
|
||||
{
|
||||
label: '更新时间',
|
||||
prop: 'updateTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -135,6 +135,7 @@ export default {
|
||||
{
|
||||
label: '更新时间',
|
||||
prop: 'updateTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
@@ -146,6 +147,7 @@ export default {
|
||||
{
|
||||
label: '创建时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -214,6 +214,7 @@ export default {
|
||||
{
|
||||
label: '更新时间',
|
||||
prop: 'updateTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
@@ -225,6 +226,7 @@ export default {
|
||||
{
|
||||
label: '创建时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -629,6 +629,7 @@ export default {
|
||||
{
|
||||
label: '更新时间',
|
||||
prop: 'updateTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
@@ -639,6 +640,7 @@ export default {
|
||||
{
|
||||
label: '创建时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -411,6 +411,7 @@ export default {
|
||||
{
|
||||
label: '更新时间',
|
||||
prop: 'updateTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
@@ -422,6 +423,7 @@ export default {
|
||||
{
|
||||
label: '创建时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -1344,7 +1344,7 @@
|
||||
<template #default="{ row }">{{ formatFileSize(row.size) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="uploadUserName" label="上传人" width="140" align="center" />
|
||||
<el-table-column prop="uploadTime" label="上传时间" width="170" align="center" />
|
||||
<el-table-column prop="uploadTime" label="上传时间" width="170" align="center" sortable/>
|
||||
<el-table-column label="操作" width="120" align="center">
|
||||
<template #default="{ row, $index }">
|
||||
<el-link
|
||||
@@ -1607,7 +1607,7 @@
|
||||
<template #default="{ row }">{{ formatFileSize(row.size) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="uploadUserName" label="上传人" width="140" align="center" />
|
||||
<el-table-column prop="uploadTime" label="上传时间" width="160" align="center" />
|
||||
<el-table-column prop="uploadTime" label="上传时间" width="160" align="center" sortable/>
|
||||
<el-table-column label="操作" width="100" align="center">
|
||||
<template #default="{ row, $index }">
|
||||
<el-link
|
||||
@@ -1633,7 +1633,7 @@
|
||||
<template #changeRecordJson-form>
|
||||
<el-table :data="changeRecordRows" border class="business-crud-page__change-table">
|
||||
<el-table-column type="index" label="序号" width="70" align="center" />
|
||||
<el-table-column prop="changeDate" label="变更日期" min-width="150" align="center" />
|
||||
<el-table-column prop="changeDate" label="变更日期" min-width="150" align="center" sortable/>
|
||||
<el-table-column prop="handlerUserName" label="经办人" min-width="140" align="center" />
|
||||
<el-table-column prop="changeType" label="变更类型" min-width="160" align="center" />
|
||||
<el-table-column
|
||||
@@ -1855,7 +1855,7 @@
|
||||
<template #default="{ row }">{{ formatFileSize(row.size) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="uploadUserName" label="上传人" width="140" />
|
||||
<el-table-column prop="uploadTime" label="上传时间" width="180" />
|
||||
<el-table-column prop="uploadTime" label="上传时间" width="180" sortable/>
|
||||
</el-table>
|
||||
</section>
|
||||
</div>
|
||||
@@ -2315,7 +2315,7 @@
|
||||
min-width="160"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
sortable/>
|
||||
<el-table-column label="操作" width="220" align="center" fixed="right">
|
||||
<template #default="{ row, $index }">
|
||||
<div class="business-crud-page__dispatch-actions">
|
||||
@@ -2830,7 +2830,7 @@
|
||||
<template #default="{ row }">{{ formatFileSize(row.size) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="uploadUserName" label="上传人" width="140" align="center" />
|
||||
<el-table-column prop="uploadTime" label="上传时间" width="160" align="center" />
|
||||
<el-table-column prop="uploadTime" label="上传时间" width="160" align="center" sortable/>
|
||||
<el-table-column label="操作" width="100" align="center">
|
||||
<template #default="{ $index }">
|
||||
<el-link type="danger" @click="removeDispatchItemAttachment($index)">删除</el-link>
|
||||
@@ -3271,8 +3271,8 @@
|
||||
min-width="120"
|
||||
:formatter="formatTransportRouteUpdateUserName"
|
||||
/>
|
||||
<el-table-column prop="updateTime" label="更新时间" min-width="160" />
|
||||
<el-table-column prop="createTime" label="创建时间" min-width="160" />
|
||||
<el-table-column prop="updateTime" label="更新时间" min-width="160" sortable/>
|
||||
<el-table-column prop="createTime" label="创建时间" min-width="160" sortable/>
|
||||
<el-table-column label="操作" width="110" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-link type="primary" @click.stop="selectTransportRouteRow(row)">
|
||||
@@ -3378,8 +3378,8 @@
|
||||
<el-table-column prop="contactPhone" label="联系方式" min-width="140" />
|
||||
<el-table-column prop="deptName" label="组织" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column prop="remark" label="备注" min-width="180" show-overflow-tooltip />
|
||||
<el-table-column prop="updateTime" label="更新时间" min-width="160" />
|
||||
<el-table-column prop="createTime" label="创建时间" min-width="160" />
|
||||
<el-table-column prop="updateTime" label="更新时间" min-width="160" sortable/>
|
||||
<el-table-column prop="createTime" label="创建时间" min-width="160" sortable/>
|
||||
<el-table-column label="操作" width="110" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-link type="primary" @click.stop="selectTransportAddressRow(row)">
|
||||
@@ -3460,8 +3460,8 @@
|
||||
<el-table-column prop="latitude" label="纬度" min-width="120" />
|
||||
<el-table-column prop="regionName" label="行政区划" min-width="160" show-overflow-tooltip />
|
||||
<el-table-column prop="remark" label="备注" min-width="180" show-overflow-tooltip />
|
||||
<el-table-column prop="updateTime" label="更新时间" min-width="160" />
|
||||
<el-table-column prop="createTime" label="创建时间" min-width="160" />
|
||||
<el-table-column prop="updateTime" label="更新时间" min-width="160" sortable/>
|
||||
<el-table-column prop="createTime" label="创建时间" min-width="160" sortable/>
|
||||
<el-table-column label="操作" width="110" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-link type="primary" @click.stop="selectTransportStationRow(row)">
|
||||
@@ -3607,8 +3607,8 @@
|
||||
/>
|
||||
<el-table-column prop="remark" label="备注" min-width="180" show-overflow-tooltip />
|
||||
<el-table-column prop="deptName" label="组织" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column prop="updateTime" label="更新时间" min-width="160" />
|
||||
<el-table-column prop="createTime" label="创建时间" min-width="160" />
|
||||
<el-table-column prop="updateTime" label="更新时间" min-width="160" sortable/>
|
||||
<el-table-column prop="createTime" label="创建时间" min-width="160" sortable/>
|
||||
<el-table-column label="操作" width="110" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-link type="primary" @click.stop="selectCommonCargoRow(row)">
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<el-table-column prop="batchNo" label="运单批次号" min-width="150" /><el-table-column prop="projectName" label="项目名称" min-width="150" />
|
||||
<el-table-column prop="carrierName" label="承运商" min-width="140" /><el-table-column prop="carrierType" label="承运类型" min-width="120" />
|
||||
<el-table-column prop="waybillCount" label="运单数" width="90" /><el-table-column prop="importTypeName" label="导入方式" width="100" />
|
||||
<el-table-column prop="createTime" label="创建时间" min-width="170" /><el-table-column prop="updateTime" label="更新时间" min-width="170" />
|
||||
<el-table-column prop="createTime" label="创建时间" min-width="170" sortable/><el-table-column prop="updateTime" label="更新时间" min-width="170" sortable/>
|
||||
<el-table-column prop="statusName" label="状态" width="100" /><el-table-column label="操作" width="180" fixed="right">
|
||||
<template #default="{ row }"><el-link type="primary" @click="openDetail(row)">查看</el-link><el-link type="primary" @click="editBatch(row)">编辑</el-link><el-link type="danger" @click="removeBatch(row)">删除</el-link></template>
|
||||
</el-table-column>
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
<el-dialog v-model="detailVisible" title="导入运单详情" width="90%" append-to-body>
|
||||
<el-form :inline="true" :model="detailQuery"><el-form-item label="车牌号/船号"><el-input v-model="detailQuery.vehicleNo" clearable /></el-form-item><el-form-item label="货物名称"><el-input v-model="detailQuery.cargoName" clearable /></el-form-item><el-button type="primary" @click="loadDetails">查询</el-button></el-form>
|
||||
<el-table :data="details" border><el-table-column type="index" label="序号" width="65" /><el-table-column prop="batchNo" label="运单批次号" min-width="140" /><el-table-column prop="originalNo" label="原始单号" min-width="130" /><el-table-column prop="vehicleNo" label="车牌号/航班号/船号/班列号" min-width="190" /><el-table-column prop="driverName" label="司机/船长" min-width="120" /><el-table-column prop="transportType" label="运输类型" width="110" /><el-table-column prop="cargoName" label="货物名称" width="130" /><el-table-column prop="cargoType" label="货物类型" width="120" /><el-table-column prop="quantity" label="重量" width="90" /><el-table-column prop="departureAddress" label="发货地址" min-width="220" show-overflow-tooltip /><el-table-column prop="departureContact" label="发货联系人" width="110" /><el-table-column prop="departurePhone" label="发货联系人电话" width="140" /><el-table-column prop="arrivalAddress" label="到货地址" min-width="220" show-overflow-tooltip /><el-table-column prop="arrivalContact" label="收货联系人" width="110" /><el-table-column prop="arrivalPhone" label="收货联系人电话" width="140" /><el-table-column prop="startDate" label="开始时间" width="160" /><el-table-column prop="endDate" label="结束时间" width="160" /><el-table-column prop="unitPrice" label="单价" width="90" /><el-table-column prop="freight" label="运费" width="100" /><el-table-column prop="otherFeeTotal" label="其他费用合计" width="120" /><el-table-column prop="freightTotal" label="运费合计" width="100" /><el-table-column prop="remark" label="备注" min-width="160" /><el-table-column label="操作" width="80">-</el-table-column></el-table>
|
||||
<el-table :data="details" border><el-table-column type="index" label="序号" width="65" /><el-table-column prop="batchNo" label="运单批次号" min-width="140" /><el-table-column prop="originalNo" label="原始单号" min-width="130" /><el-table-column prop="vehicleNo" label="车牌号/航班号/船号/班列号" min-width="190" /><el-table-column prop="driverName" label="司机/船长" min-width="120" /><el-table-column prop="transportType" label="运输类型" width="110" /><el-table-column prop="cargoName" label="货物名称" width="130" /><el-table-column prop="cargoType" label="货物类型" width="120" /><el-table-column prop="quantity" label="重量" width="90" /><el-table-column prop="departureAddress" label="发货地址" min-width="220" show-overflow-tooltip /><el-table-column prop="departureContact" label="发货联系人" width="110" /><el-table-column prop="departurePhone" label="发货联系人电话" width="140" /><el-table-column prop="arrivalAddress" label="到货地址" min-width="220" show-overflow-tooltip /><el-table-column prop="arrivalContact" label="收货联系人" width="110" /><el-table-column prop="arrivalPhone" label="收货联系人电话" width="140" /><el-table-column prop="startDate" label="开始时间" width="160" sortable/><el-table-column prop="endDate" label="结束时间" width="160" sortable/><el-table-column prop="unitPrice" label="单价" width="90" /><el-table-column prop="freight" label="运费" width="100" /><el-table-column prop="otherFeeTotal" label="其他费用合计" width="120" /><el-table-column prop="freightTotal" label="运费合计" width="100" /><el-table-column prop="remark" label="备注" min-width="160" /><el-table-column label="操作" width="80">-</el-table-column></el-table>
|
||||
<el-pagination v-model:current-page="detailPage.current" v-model:page-size="detailPage.size" layout="total, prev, pager, next, sizes" :page-sizes="[10, 20, 50]" :total="detailPage.total" @current-change="loadDetails" @size-change="loadDetails" />
|
||||
</el-dialog>
|
||||
|
||||
|
||||
@@ -297,8 +297,8 @@
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column label="数据来源" prop="dataSource" min-width="130" show-overflow-tooltip />
|
||||
<el-table-column label="创建时间" prop="createTime" min-width="170" show-overflow-tooltip />
|
||||
<el-table-column label="更新时间" prop="updateTime" min-width="170" show-overflow-tooltip />
|
||||
<el-table-column label="创建时间" prop="createTime" min-width="170" show-overflow-tooltip sortable/>
|
||||
<el-table-column label="更新时间" prop="updateTime" min-width="170" show-overflow-tooltip sortable/>
|
||||
<el-table-column
|
||||
label="过程节点"
|
||||
prop="currentProcessNode"
|
||||
@@ -805,7 +805,7 @@
|
||||
<el-table-column prop="weight" label="重量(吨)" min-width="120" />
|
||||
<el-table-column prop="volume" label="体积(方)" min-width="120" />
|
||||
<el-table-column prop="quantity" label="数量" min-width="100" />
|
||||
<el-table-column prop="planDate" label="计划日期" min-width="130" />
|
||||
<el-table-column prop="planDate" label="计划日期" min-width="130" sortable/>
|
||||
<el-table-column prop="unitPrice" label="货物单价(元)" min-width="150" />
|
||||
<el-table-column prop="materialCode" label="物料编码" min-width="130" />
|
||||
<el-table-column prop="equipmentCode" label="设备编码" min-width="130" />
|
||||
|
||||
@@ -511,7 +511,7 @@
|
||||
<template #default="{ row }">{{ formatFileSize(row.size) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="uploadUserName" label="上传人" min-width="140" align="center" />
|
||||
<el-table-column prop="uploadTime" label="上传时间" min-width="170" align="center" />
|
||||
<el-table-column prop="uploadTime" label="上传时间" min-width="170" align="center" sortable/>
|
||||
<el-table-column label="操作" width="110" align="center">
|
||||
<template #default="{ row, $index }">
|
||||
<el-link type="primary" @click="downloadAttachment(row)">下载</el-link>
|
||||
@@ -543,7 +543,7 @@
|
||||
class="project-apply-form__table"
|
||||
>
|
||||
<el-table-column type="index" label="序号" width="80" align="center" />
|
||||
<el-table-column prop="changeDate" label="变更日期" min-width="140" align="center" />
|
||||
<el-table-column prop="changeDate" label="变更日期" min-width="140" align="center" sortable/>
|
||||
<el-table-column prop="changeType" label="变更类型" min-width="160" align="center" />
|
||||
<el-table-column prop="handler" label="经办人" min-width="120" align="center" />
|
||||
<el-table-column
|
||||
|
||||
@@ -182,6 +182,7 @@ export default {
|
||||
{
|
||||
label: '记录时间',
|
||||
prop: 'recordTime',
|
||||
sortable: true,
|
||||
width: '180',
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -129,6 +129,7 @@ const option = reactive({
|
||||
{
|
||||
label: '通知日期',
|
||||
prop: 'releaseTime',
|
||||
sortable: true,
|
||||
type: 'date',
|
||||
gridRow: true,
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -131,6 +131,7 @@ export default {
|
||||
{
|
||||
label: '通知日期',
|
||||
prop: 'releaseTime',
|
||||
sortable: true,
|
||||
type: 'date',
|
||||
gridRow: true,
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -107,6 +107,7 @@ export default {
|
||||
{
|
||||
label: '开始时间',
|
||||
prop: 'startTime',
|
||||
sortable: true,
|
||||
width: 170,
|
||||
},
|
||||
],
|
||||
|
||||
@@ -210,6 +210,7 @@ export default {
|
||||
{
|
||||
label: '部署时间',
|
||||
prop: 'deploymentTime',
|
||||
sortable: true,
|
||||
width: 170,
|
||||
},
|
||||
],
|
||||
|
||||
@@ -243,11 +243,13 @@ export default {
|
||||
{
|
||||
label: '创建时间',
|
||||
prop: 'created',
|
||||
sortable: true,
|
||||
overHidden: true,
|
||||
},
|
||||
{
|
||||
label: '更新时间',
|
||||
prop: 'lastUpdated',
|
||||
sortable: true,
|
||||
overHidden: true,
|
||||
},
|
||||
],
|
||||
|
||||
@@ -91,6 +91,7 @@ export default {
|
||||
{
|
||||
label: '日志时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
width: '180',
|
||||
},
|
||||
{
|
||||
|
||||
@@ -88,6 +88,7 @@ export default {
|
||||
{
|
||||
label: '日志时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
width: '180',
|
||||
},
|
||||
{
|
||||
|
||||
@@ -88,6 +88,7 @@ export default {
|
||||
{
|
||||
label: '日志时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
width: '180',
|
||||
},
|
||||
{
|
||||
|
||||
@@ -84,10 +84,12 @@ export default {
|
||||
{
|
||||
label: '创建时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
},
|
||||
{
|
||||
label: '更新时间',
|
||||
prop: 'updateTime',
|
||||
sortable: true,
|
||||
},
|
||||
],
|
||||
},
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="currentNode" label="当前节点" min-width="130" />
|
||||
<el-table-column prop="currentProcessor" label="当前处理人" min-width="130" />
|
||||
<el-table-column prop="approvedTime" label="审核通过时间" min-width="170" />
|
||||
<el-table-column prop="approvedTime" label="审核通过时间" min-width="170" sortable/>
|
||||
<el-table-column prop="status" label="状态" width="90">
|
||||
<template #default="{ row }">{{ Number(row.status) === 1 ? '启用' : '停用' }}</template>
|
||||
</el-table-column>
|
||||
|
||||
@@ -308,6 +308,7 @@ export default {
|
||||
{
|
||||
label: '过期时间',
|
||||
prop: 'expireTime',
|
||||
sortable: true,
|
||||
width: 180,
|
||||
slot: true,
|
||||
addDisplay: false,
|
||||
@@ -350,6 +351,7 @@ export default {
|
||||
label: '过期时间',
|
||||
labelTip: '代表租户可使用的最后日期,若不限制则默认为空',
|
||||
prop: 'expireTime',
|
||||
sortable: true,
|
||||
type: 'date',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
>批量删除
|
||||
</el-button>
|
||||
</template>
|
||||
<template #expireStatus-search>
|
||||
<template #search-menu>
|
||||
<div class="driver-page__expiry-tags">
|
||||
<el-check-tag
|
||||
v-for="item in expiryTagOptions"
|
||||
@@ -54,10 +54,13 @@
|
||||
</div>
|
||||
</template>
|
||||
<template #driverName="{ row }">
|
||||
<div class="driver-page__identity">
|
||||
<el-link type="primary" @click="openDriver(row, true)">{{ row.driverName }}</el-link>
|
||||
<span>{{ row.idCardNo || '-' }}</span>
|
||||
</div>
|
||||
<el-link type="primary" @click="openDriver(row, true)">{{ row.driverName }}</el-link>
|
||||
</template>
|
||||
<template #idCardNo="{ row }">
|
||||
<span>{{ row.idCardNo || '-' }}</span>
|
||||
</template>
|
||||
<template #organizationName="{ row }">
|
||||
{{ String(row.organizationName || '').replace(/^[\s\u3000]+/, '') }}
|
||||
</template>
|
||||
<template #status="{ row }">
|
||||
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
|
||||
@@ -756,11 +759,11 @@ export default {
|
||||
formatDeptOptions(tree = [], level = 0) {
|
||||
const result = [];
|
||||
tree.forEach(item => {
|
||||
const label = item.title || item.deptName || item.name;
|
||||
const rawLabel = item.title || item.deptName || item.name;
|
||||
result.push({
|
||||
label: `${' '.repeat(level)}${label}`,
|
||||
value: label,
|
||||
rawLabel: label,
|
||||
label: `${' '.repeat(level)}${rawLabel}`,
|
||||
value: rawLabel,
|
||||
rawLabel,
|
||||
id: item.id || item.value,
|
||||
});
|
||||
if (item.children && item.children.length) {
|
||||
@@ -1341,18 +1344,14 @@ export default {
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.driver-page {
|
||||
&__identity {
|
||||
display: flex;
|
||||
gap: 4px;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
&__expiry-tags {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
width: 100%;
|
||||
order: -1;
|
||||
margin-right: auto;
|
||||
min-width: 0;
|
||||
|
||||
:deep(.el-check-tag) {
|
||||
margin: 0;
|
||||
@@ -1441,11 +1440,4 @@ export default {
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
@media (max-width: 1200px) {
|
||||
.driver-page {
|
||||
&__expiry-tags {
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -61,6 +61,9 @@
|
||||
{{ row.shipName }}
|
||||
</el-button>
|
||||
</template>
|
||||
<template #organizationName="{ row }">
|
||||
{{ String(row.organizationName || '').replace(/^[\s\u3000]+/, '') }}
|
||||
</template>
|
||||
<template #status="{ row }">
|
||||
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
|
||||
{{ row.status === 1 ? '启用' : '停用' }}
|
||||
@@ -756,11 +759,11 @@ export default {
|
||||
flattenDeptOptions(tree = [], level = 0) {
|
||||
const result = [];
|
||||
tree.forEach(item => {
|
||||
const label = item.title || item.deptName || item.name;
|
||||
const rawLabel = item.title || item.deptName || item.name;
|
||||
result.push({
|
||||
label: `${' '.repeat(level)}${label}`,
|
||||
value: label,
|
||||
rawLabel: label,
|
||||
label: `${' '.repeat(level)}${rawLabel}`,
|
||||
value: rawLabel,
|
||||
rawLabel,
|
||||
id: item.id || item.value,
|
||||
});
|
||||
if (item.children && item.children.length) {
|
||||
|
||||
@@ -58,6 +58,9 @@
|
||||
{{ row.plateNo }}
|
||||
</el-button>
|
||||
</template>
|
||||
<template #organizationName="{ row }">
|
||||
{{ String(row.organizationName || '').replace(/^[\s\u3000]+/, '') }}
|
||||
</template>
|
||||
<template #status="{ row }">
|
||||
<el-tag :type="row.status === 1 ? 'primary' : 'info'">
|
||||
{{ row.status === 1 ? '启用' : '停用' }}
|
||||
@@ -761,11 +764,11 @@ export default {
|
||||
flattenDeptOptions(tree = [], level = 0) {
|
||||
const result = [];
|
||||
tree.forEach(item => {
|
||||
const label = item.title || item.deptName || item.name;
|
||||
const rawLabel = item.title || item.deptName || item.name;
|
||||
result.push({
|
||||
label: `${' '.repeat(level)}${label}`,
|
||||
value: label,
|
||||
rawLabel: label,
|
||||
label: `${' '.repeat(level)}${rawLabel}`,
|
||||
value: rawLabel,
|
||||
rawLabel,
|
||||
id: item.id || item.value,
|
||||
});
|
||||
if (item.children && item.children.length) {
|
||||
|
||||
@@ -33,6 +33,7 @@ export default {
|
||||
{
|
||||
label: '申请日期',
|
||||
prop: 'date',
|
||||
sortable: true,
|
||||
type: 'date',
|
||||
row: true,
|
||||
},
|
||||
|
||||
@@ -103,6 +103,7 @@ export default {
|
||||
{
|
||||
label: '申请日期',
|
||||
prop: 'date',
|
||||
sortable: true,
|
||||
type: 'date',
|
||||
span: 14,
|
||||
row: true,
|
||||
|
||||
@@ -449,6 +449,7 @@ export default {
|
||||
{
|
||||
label: '创建时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -405,7 +405,7 @@
|
||||
<span>{{ row.__index }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="评分日期" min-width="150" align="center">
|
||||
<el-table-column label="评分日期" min-width="150" align="center" sortable>
|
||||
<template #default="{ row }">
|
||||
<span>{{ row.scoreDate }}</span>
|
||||
</template>
|
||||
@@ -642,7 +642,7 @@
|
||||
<span>{{ row.uploadUserName || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="上传时间" min-width="170">
|
||||
<el-table-column label="上传时间" min-width="170" sortable>
|
||||
<template #default="{ row }">
|
||||
<span>{{ row.uploadTime || '-' }}</span>
|
||||
</template>
|
||||
@@ -660,7 +660,7 @@
|
||||
<section-card title="变更记录">
|
||||
<el-table :data="archiveForm.changeRecords" border>
|
||||
<el-table-column label="序号" type="index" width="90" align="center" />
|
||||
<el-table-column label="变更日期" prop="changeTime" min-width="170" />
|
||||
<el-table-column label="变更日期" prop="changeTime" min-width="170" sortable />
|
||||
<el-table-column label="变更内容" prop="changeContent" min-width="260" />
|
||||
<el-table-column label="变更账号" prop="changeUserName" min-width="160" />
|
||||
</el-table>
|
||||
@@ -1130,7 +1130,7 @@
|
||||
<span>{{ row.uploadUserName || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="上传时间" min-width="180" align="center">
|
||||
<el-table-column label="上传时间" min-width="180" align="center" sortable>
|
||||
<template #default="{ row }">
|
||||
<span>{{ row.uploadTime || '-' }}</span>
|
||||
</template>
|
||||
@@ -1424,7 +1424,7 @@ export default {
|
||||
editBtn: false,
|
||||
selection: true,
|
||||
dialogClickModal: false,
|
||||
menuWidth: 260,
|
||||
menuWidth: 280,
|
||||
column: [
|
||||
{
|
||||
label: '客商编号',
|
||||
@@ -1531,6 +1531,7 @@ export default {
|
||||
{
|
||||
label: '审核通过时间',
|
||||
prop: 'approvedTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -246,6 +246,7 @@ export default {
|
||||
{
|
||||
label: '保养时间',
|
||||
prop: 'maintenanceTime',
|
||||
sortable: true,
|
||||
type: 'date',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
@@ -323,6 +324,7 @@ export default {
|
||||
{
|
||||
label: '下次保养时间',
|
||||
prop: 'nextMaintenanceTime',
|
||||
sortable: true,
|
||||
type: 'date',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
@@ -361,6 +363,7 @@ export default {
|
||||
{
|
||||
label: '创建时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
type: 'date',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
@@ -411,6 +414,7 @@ export default {
|
||||
{
|
||||
label: '更新时间',
|
||||
prop: 'updateTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -234,6 +234,7 @@ export default {
|
||||
{
|
||||
label: '维修时间',
|
||||
prop: 'maintenanceTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
@@ -299,6 +300,7 @@ export default {
|
||||
{
|
||||
label: '出厂时间',
|
||||
prop: 'factoryTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
@@ -348,6 +350,7 @@ export default {
|
||||
{
|
||||
label: '创建时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
type: 'date',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
@@ -398,6 +401,7 @@ export default {
|
||||
{
|
||||
label: '更新时间',
|
||||
prop: 'updateTime',
|
||||
sortable: true,
|
||||
type: 'datetime',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
valueFormat: 'YYYY-MM-DD HH:mm:ss',
|
||||
|
||||
@@ -144,6 +144,7 @@ export default {
|
||||
{
|
||||
label: '申请时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
width: 180,
|
||||
},
|
||||
],
|
||||
|
||||
@@ -138,6 +138,7 @@ export default {
|
||||
{
|
||||
label: '申请时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
width: 180,
|
||||
},
|
||||
],
|
||||
|
||||
@@ -147,6 +147,7 @@ export default {
|
||||
{
|
||||
label: '申请时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
width: 180,
|
||||
},
|
||||
],
|
||||
|
||||
@@ -165,6 +165,7 @@ export default {
|
||||
{
|
||||
label: '部署时间',
|
||||
prop: 'deploymentTime',
|
||||
sortable: true,
|
||||
width: 170,
|
||||
},
|
||||
],
|
||||
|
||||
@@ -144,6 +144,7 @@ export default {
|
||||
{
|
||||
label: '申请时间',
|
||||
prop: 'createTime',
|
||||
sortable: true,
|
||||
width: 180,
|
||||
},
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user