diff --git a/src/views/erp/purchase/supplier/car/CarForm.vue b/src/views/erp/purchase/supplier/car/CarForm.vue index a11c06f..51d452b 100644 --- a/src/views/erp/purchase/supplier/car/CarForm.vue +++ b/src/views/erp/purchase/supplier/car/CarForm.vue @@ -1,5 +1,79 @@ - + + + + + 基本信息 + + + + + + + + + + + + + 车辆参数 + + + + + + + + + + + + + + + + + + + 其他信息 + + + + {{ dict.label }} + + + + + + + + + + + + + + + + \ No newline at end of file + + + \ No newline at end of file diff --git a/src/views/erp/purchase/supplier/car/index.vue b/src/views/erp/purchase/supplier/car/index.vue index 02ccd2e..c3ebe25 100644 --- a/src/views/erp/purchase/supplier/car/index.vue +++ b/src/views/erp/purchase/supplier/car/index.vue @@ -1,112 +1,196 @@ - - - - - - - + + + + + - - - 搜索 - 重置 - - 新增 - - - 导入 - - - 导出 - - - - + + + + + + + + + + + + + + + {{ row.licensePlate }} + + + + + 司机 + {{ row.driverName }} + + + 电话 + {{ row.contactPhone || '-' }} + + + 核定吨位 + {{ row.ratedTonnage ? row.ratedTonnage + ' 吨' : '-' }} + + + 车辆尺寸 + {{ row.carLength && row.carWidth ? `${row.carLength}m × ${row.carWidth}m` : '-' }} + + + + + - - - - - - - - - - - - {{ formatDate(new Date(scope.row.createTime)) }} - - - - - - - - - - - - 编辑 - - - 删除 - - - - - - + + + + + + + + + + + + + + + + 重置 + 确认筛选 + + + + + + + + + + + + + + + + + 搜索 + 重置 + + 新增 + + + 导入 + + + 导出 + + + + + + + + + + + + + + + + + {{ formatDate(new Date(scope.row.createTime)) }} + + + + + + + + + + + + 编辑 + + + 删除 + + + + + + + + @@ -116,6 +200,7 @@ + + diff --git a/src/views/system/notify/my/MyNotifyMessageDetail.vue b/src/views/system/notify/my/MyNotifyMessageDetail.vue index 0bfa30c..ca21793 100644 --- a/src/views/system/notify/my/MyNotifyMessageDetail.vue +++ b/src/views/system/notify/my/MyNotifyMessageDetail.vue @@ -1,5 +1,48 @@ - + + + + + {{ detailData.templateNickname }} + {{ formatDate(detailData.createTime) }} + + + + + 消息类型 + + + + 状态 + + + + 阅读时间 + {{ formatDate(detailData.readTime) }} + + + + + 消息内容 + {{ detailData.templateContent }} + + + + + + + + + + {{ detailData.templateNickname }} @@ -23,12 +66,17 @@ + + diff --git a/src/views/system/notify/my/index.vue b/src/views/system/notify/my/index.vue index ae4b9c5..b7f48db 100644 --- a/src/views/system/notify/my/index.vue +++ b/src/views/system/notify/my/index.vue @@ -1,128 +1,199 @@ - + + + + + 我的站内信 + + 全部已读 + + - - - - - - - - - - - - - 搜索 - 重置 - - 标记已读 - - - 全部已读 - - - - + + + 全部 + 未读 + 已读 + + + + + + + + + + + + {{ row.templateNickname }} + + {{ formatTime(row.createTime) }} + + + + + + {{ row.templateContent }} + + + - - - - - - - - - - - - - - - - - - - - - - {{ scope.row.readStatus ? '详情' : '已读' }} - - - - - - + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + 标记已读 + + + 全部已读 + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ scope.row.readStatus ? '详情' : '已读' }} + + + + + + + + + +