diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementReserveList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementReserveList.vue index 6076ca8e..dc1a1999 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementReserveList.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementReserveList.vue @@ -19,11 +19,11 @@ -
待执行任务:
+
待确认预约:
{{ item.reserveUnit ? '预约单位' : '执法单位' }} - {{ item.reserveUnit || item.enforcementUnit || '-' }} + {{ item.reserveUnit || item.bureauDeptName || '-' }}
企业名称 @@ -31,7 +31,7 @@
检查时间 - {{ item.checkTime || '-' }} + {{ formatDate(item.planDate) }}
@@ -108,6 +108,11 @@ const fetchReserveList = () => { }); }; +const formatDate = (dateStr) => { + if (!dateStr) return '-'; + return dateStr.substring(0, 10); +}; + const onLoad = () => { if (loading.value || finished.value) return; fetchReserveList(); diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementTaskList.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementTaskList.vue index 4533842d..f0e3a508 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementTaskList.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/message/enforcementTaskList.vue @@ -28,11 +28,11 @@
检查时间 - {{ item.checkTime || '-' }} + {{ item.planDate || '-' }}
执法事项 - {{ item.enforcementItem || '-' }} + {{ item.enforceContent || '-' }}
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_message.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_message.vue index a5e3e62d..86a2640b 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_message.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_message.vue @@ -174,7 +174,7 @@ const onBack = () => { display: flex; flex-direction: column; height: 100%; - background: #f0f6ff; + background: #fbfdff; overflow: hidden; } diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_manual.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_manual.vue index b062004b..c8ff05ff 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_manual.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_manual.vue @@ -14,35 +14,32 @@ --> - +
-
-
+
+
-
+ +
+
企业:{{ item.enterpriseName || item.bureauDeptName || '-' }} +
+
已确认
-
企业:{{ item.enterpriseName || item.bureauDeptName || '-' }}
-
{{ formatPlanDate(item.planDate) }} {{ getPlanTimeText(item.planTime) }}
+ +
{{ formatPlanDate(item.planDate) }} {{ + getPlanTimeText(item.planTime) }}
执法单位:
@@ -60,11 +57,18 @@
-
+ + +
+
企业:{{ item.targetEnterpriseName || + item.targetBureauDeptName + || '-' }}
+
待确认
-
企业:{{ item.targetEnterpriseName || item.targetBureauDeptName || '-' }}
+
联合单位
执法单位:
@@ -80,19 +84,21 @@
计划时间:
-
{{ formatPlanDate(item.targetPlanDate) }} {{ getPlanTimeText(item.targetPlanTime) }}
+
{{ formatPlanDate(item.targetPlanDate) }} {{ + getPlanTimeText(item.targetPlanTime) }}
-
+
-
+
查看留言
@@ -264,7 +270,7 @@ const onApprove = (item) => { showDialog({ title: '提示', message: res.msg || '操作失败' }); } }); - }).catch(() => {}); + }).catch(() => { }); }; // 拒绝 @@ -281,7 +287,7 @@ const onReject = (item) => { showDialog({ title: '提示', message: res.msg || '操作失败' }); } }); - }).catch(() => {}); + }).catch(() => { }); }; @@ -322,14 +328,15 @@ const onReject = (item) => { } .reserve-card { - background: #fff; - border-radius: 14px; + background: linear-gradient(220deg, #175cc4 1%, #3b8dda 20%, #0b3fb4 100%); + border-radius: 8px; padding: 0; box-shadow: 0 4px 16px rgba(44, 116, 190, 0.12), 0 1px 4px rgba(0, 0, 0, 0.06); - border: 2.5px solid #1a5fb4; + // border: 2.5px solid #1a5fb4; overflow: hidden; + padding-bottom: 4px; - > .card-header { + >.card-header { padding: 12px 16px; background: linear-gradient(135deg, #0d4fad 0%, #1565c8 50%, #1e7fe0 100%); @@ -348,15 +355,11 @@ const onReject = (item) => { } } - > .reserve-time-row { + >.reserve-time-row { margin: 0 16px; padding: 10px 0; } - > .card-actions { - margin: 0 16px; - padding-bottom: 14px; - } } .approved-card { @@ -368,7 +371,7 @@ const onReject = (item) => { } .pending-card { - border-color: #1a5fb4; + // border-color: #1a5fb4; } .card-header { @@ -396,10 +399,21 @@ const onReject = (item) => { font-size: 14px; font-weight: 500; - &.blue { color: #1f75c9; } - &.green { color: #07c160; } - &.red { color: #ee0a24; } - &.gray { color: #999; } + &.blue { + color: #1f75c9; + } + + &.green { + color: #07c160; + } + + &.red { + color: #ee0a24; + } + + &.gray { + color: #999; + } } .plan-title { @@ -424,13 +438,14 @@ const onReject = (item) => { .label { width: 72px; flex-shrink: 0; - color: #333; + color: #FFFFFF; font-weight: 500; + font-size: 14px; } .value { flex: 1; - color: #8a8a8a; + color: rgba(255, 255, 255, 0.6); &.msg { color: #666; @@ -439,10 +454,29 @@ const onReject = (item) => { } .unit-block { - background: linear-gradient(135deg, #0d4fad 0%, #1565c8 50%, #1e7fe0 100%); padding: 14px 16px; margin-bottom: 0; - border-bottom: 1px solid rgba(255,255,255,0.12); + + // border-bottom: 1px solid rgba(255, 255, 255, 0.12); + .unit-block-content { + display: flex; + justify-content: space-between; + + .unit-block-tip { + width: 52px; + height: 24px; + border-radius: 4px; + background: rgba(56, 255, 113, 0.1); + font-size: 12px; + color: #38FF71; + text-align: center; + line-height: 24px; + } + .pending-tip{ + background: rgba(241, 116, 24, 0.1); + color: #F17418; + } + } .unit-block-tag { background: rgba(255, 255, 255, 0.18); @@ -451,22 +485,31 @@ const onReject = (item) => { .unit-block-title { color: #fff; + font-size: 14px; } .unit-block-subtitle { - color: rgba(255, 255, 255, 0.7); + color: rgba(255, 255, 255, 0.6); + font-size: 14px; } .unit-block-divider { border-bottom-color: rgba(255, 255, 255, 0.2); } + .unit-block-text { + font-size: 14px; + color: #666666; + padding-bottom: 10px; + border-bottom: 1px solid #F6F6F6; + } + .label { - color: rgba(255, 255, 255, 0.85); + color: rgb(255, 255, 255); } .value { - color: rgba(255, 255, 255, 0.75); + color: rgba(255, 255, 255, 0.6); } } @@ -474,6 +517,8 @@ const onReject = (item) => { padding: 14px 16px; border-bottom: none; background: #fff; + margin: 0px 4px 0px 4px; + border-radius: 4px; .unit-block-tag { background: #fff7e6; @@ -489,15 +534,17 @@ const onReject = (item) => { } .unit-block-divider { - border-bottom-color: #eef2f7; + // border-bottom-color: #eef2f7; } .label { - color: #333; + color: #1D1F24; + font-size: 14px; } .value { - color: #8a8a8a; + color: #666666; + font-size: 14px; } } @@ -547,12 +594,15 @@ const onReject = (item) => { } .card-actions { - margin-top: 14px; - padding-top: 12px; + margin: 4px; + padding: 12px; border-top: 1px solid rgba(0, 0, 0, 0.06); display: flex; justify-content: space-between; align-items: center; + background-color: #ffffff; + border-radius: 4px; + margin-bottom: 0px; } .actions-left { diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_system.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_system.vue index 52474814..c291e5c8 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_system.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_system.vue @@ -14,92 +14,108 @@
--> - +
-
-
+
+
-
+ +
+
{{ item.enterpriseName || '-' }}
+
+ {{ getStatusText(item.opStatus) }} +
-
{{ item.enterpriseName || '-' }}
-
{{ formatDateShort(item.planDate) }} {{ getPlanTimeText(item.planTime) }}
+ +
{{ formatDateShort(item.planDate) }} {{ + getPlanTimeText(item.planTime) }}
-
+
执法单位:
{{ item.bureauDeptName || '-' }}
执法人员:
-
{{ formatUserInfo(item.enforceUserNames, item.enforceUserTels) }}
+
{{ formatUserInfo(item.enforceUserNames, + item.enforceUserTels) }}
执法事项:
{{ item.enforceContent || '-' }}
-
+
-
-
- 关联单位 ({{ groupMembersMap[item.id].length }}) -
-
-
{{ member.bureauDeptName || '-' }}
+
+ +
+
+
{{ member.bureauDeptName || '-' }}
+
+ {{ getStatusText(member.opStatus) }} +
+
+ +
联合单位
计划时间:
-
{{ formatDateShort(member.planDate) }} {{ getPlanTimeText(member.planTime) }}
+
{{ formatDateShort(member.planDate) }} {{ + getPlanTimeText(member.planTime) }}
-
+
执法人员:
-
{{ formatUserInfo(member.enforceUserNames, member.enforceUserTels) }}
+
{{ formatUserInfo(member.enforceUserNames, + member.enforceUserTels) }}
执法事项:
{{ member.enforceContent || '-' }}
-
+
-
+
加载关联计划中...
-
+
查看备注
@@ -126,24 +142,14 @@
-
+
{{ opt.bureauDeptName }}
{{ opt.dateLabel }}
没有可选的时间
- 确认选择 + 确认选择
@@ -353,7 +359,7 @@ const onApprove = (item) => { cancelButtonText: '取消', }).then(() => { doApprove(item.id, null); - }).catch(() => {}); + }).catch(() => { }); } }, () => { showDialog({ title: '提示', message: '网络异常,请稍后重试' }); @@ -421,7 +427,7 @@ const onReject = (item) => { showDialog({ title: '提示', message: res.msg || '操作失败' }); } }); - }).catch(() => {}); + }).catch(() => { }); }; @@ -462,14 +468,15 @@ const onReject = (item) => { } .reserve-card { - background: #fff; - border-radius: 14px; + background: linear-gradient(220deg, #175cc4 1%, #3b8dda 20%, #0b3fb4 100%); + border-radius: 8px; padding: 0; box-shadow: 0 4px 16px rgba(44, 116, 190, 0.12), 0 1px 4px rgba(0, 0, 0, 0.06); - border: 2.5px solid #1a5fb4; + // border: 2.5px solid #1a5fb4; overflow: hidden; + padding-bottom: 4px; - > .card-header { + >.card-header { padding: 12px 16px; background: linear-gradient(135deg, #0d4fad 0%, #1565c8 50%, #1e7fe0 100%); @@ -483,16 +490,21 @@ const onReject = (item) => { } } - > .reserve-time-row { + >.reserve-time-row { margin: 0 16px; padding: 10px 0; } - > .card-actions { - margin: 0 16px; - padding-bottom: 14px; - padding-top: 12px; - border-top: 1px solid #999; + >.card-actions { + margin: 4px; + padding: 12px; + border-top: 1px solid rgba(0, 0, 0, 0.06); + display: flex; + justify-content: space-between; + align-items: center; + background-color: #ffffff; + border-radius: 4px; + margin-bottom: 0px; } } @@ -528,18 +540,41 @@ const onReject = (item) => { font-size: 14px; font-weight: 500; - &.blue { color: #1f75c9; } - &.green { color: #07c160; } - &.red { color: #ee0a24; } - &.gray { color: #999; } + &.blue { + color: #1f75c9; + } + + &.green { + color: #07c160; + } + + &.red { + color: #ee0a24; + } + + &.gray { + color: #999; + } } .status-text { font-weight: 500; - &.blue { color: #1f75c9; } - &.green { color: #07c160; } - &.red { color: #ee0a24; } - &.gray { color: #999; } + + &.blue { + color: #1f75c9; + } + + &.green { + color: #07c160; + } + + &.red { + color: #ee0a24; + } + + &.gray { + color: #999; + } } .info-row { @@ -553,24 +588,55 @@ const onReject = (item) => { .label { width: 72px; flex-shrink: 0; - color: #333; + color: #FFFFFF; font-weight: 500; + font-size: 14px; } .value { flex: 1; - color: #8a8a8a; + color: rgba(255, 255, 255, 0.6); &.pre-line { + color: #666; white-space: pre-line; } } .unit-block { - background: linear-gradient(135deg, #0d4fad 0%, #1565c8 50%, #1e7fe0 100%); padding: 14px 16px; margin-bottom: 0; - border-bottom: 1px solid rgba(255,255,255,0.12); + // border-bottom: 1px solid rgba(255, 255, 255, 0.12); + padding-bottom: 0px; + + .unit-block-content { + display: flex; + justify-content: space-between; + + .unit-block-tip { + width: 52px; + height: 24px; + border-radius: 4px; + font-size: 12px; + text-align: center; + line-height: 24px; + } + + .status-textblue { + background: rgba(241, 116, 24, 0.1); + color: #F17418; + } + + .status-textgreen { + background: rgba(19, 103, 254, 0.1); + color: #1367FE; + } + + .pending-tip { + background: rgba(241, 116, 24, 0.1); + color: #F17418; + } + } .unit-block-tag { background: rgba(255, 255, 255, 0.18); @@ -579,10 +645,12 @@ const onReject = (item) => { .unit-block-title { color: #fff; + font-size: 14px; } .unit-block-subtitle { - color: rgba(255, 255, 255, 0.7); + color: rgba(255, 255, 255, 0.6); + font-size: 14px; } .unit-block-divider { @@ -590,11 +658,11 @@ const onReject = (item) => { } .label { - color: rgba(255, 255, 255, 0.85); + color: rgb(255, 255, 255); } .value { - color: rgba(255, 255, 255, 0.75); + color: rgba(255, 255, 255, 0.6); } .status-text { @@ -603,10 +671,12 @@ const onReject = (item) => { } .unit-block-target { - padding: 14px 16px; - border-bottom: none; - background: #fff; + padding: 4px; + // border-bottom: none; + // background: #fff; + // margin: 0px 4px 0px 4px; + // border-radius: 4px; .unit-block-tag { background: #fff7e6; color: #fa8c16; @@ -621,15 +691,17 @@ const onReject = (item) => { } .unit-block-divider { - border-bottom-color: #eef2f7; + // border-bottom-color: #eef2f7; } .label { - color: #333; + color: #1D1F24; + font-size: 14px; } .value { - color: #8a8a8a; + color: #666666; + font-size: 14px; } .status-text { @@ -676,14 +748,26 @@ const onReject = (item) => { } .member-section { - padding-bottom: 10px; + // padding-bottom: 10px; + // margin-bottom: 10px; + // border-bottom: 1px dashed #999; + padding: 14px 16px; + border-bottom: none; + background: #fff; + border-radius: 4px; margin-bottom: 10px; - border-bottom: 1px dashed #999; &:last-child { - padding-bottom: 0; + // padding-bottom: 0; margin-bottom: 0; - border-bottom: none; + // border-bottom: none; + } + + .unit-block-text { + font-size: 14px; + color: #666666; + padding-bottom: 10px; + border-bottom: 1px solid #F6F6F6; } } @@ -714,6 +798,9 @@ const onReject = (item) => { display: flex; justify-content: space-between; align-items: center; + background-color: #ffffff; + border-radius: 4px; + margin-bottom: 0px; } .actions-left { diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/task/cp_task_mine.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/task/cp_task_mine.vue index eb31d80f..f8918b73 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/task/cp_task_mine.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/task/cp_task_mine.vue @@ -283,7 +283,7 @@ const onBack = () => { // 点击任务卡片跳转详情 const onTaskClick = (item) => { - router.push({ path: '/enforcement/task/detail', query: { planId: item.planId } }); + // router.push({ path: '/enforcement/task/detail', query: { planId: item.planId } }); }; // ========== 任务列表 ==========