0) || (clockType === 1 && night.value > 0)) return;
const dateTime = dayjs(+new Date().getTime()).valueOf(); // 打卡时间
diff --git a/src/plugins/p-daily-account/p-daily-account.vue b/src/plugins/p-daily-account/p-daily-account.vue
index 44c6908..10ff30b 100644
--- a/src/plugins/p-daily-account/p-daily-account.vue
+++ b/src/plugins/p-daily-account/p-daily-account.vue
@@ -11,8 +11,6 @@ const store = useStore();
function openDailyAccount() {
store.commit('task/setTaskDetailUrl', '');
- sessionStorage.setItem('targetUrl', '');
store.commit('task/setTaskDetailShow', 'dailyAccount');
- sessionStorage.setItem('taskDetailShow', 'dailyAccount');
}
diff --git a/src/plugins/p-deliver/p-audit-records.vue b/src/plugins/p-deliver/p-audit-records.vue
new file mode 100644
index 0000000..9b5a02f
--- /dev/null
+++ b/src/plugins/p-deliver/p-audit-records.vue
@@ -0,0 +1,72 @@
+
+
+
审核记录
+
+
+
+
+
+
+ {{ item.checkerName }}
+
+
+ {{ item.remark }}
+
+
+ {{ dayjs(+item.checkTime).format('MM-DD HH:mm') }}
+
+
+
+
+
已通过
+
已驳回
+
+
+
+
+ {{ percent }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/plugins/p-deliver/p-deliver-check.vue b/src/plugins/p-deliver/p-deliver-check.vue
index f0f3911..c594e33 100644
--- a/src/plugins/p-deliver/p-deliver-check.vue
+++ b/src/plugins/p-deliver/p-deliver-check.vue
@@ -66,7 +66,7 @@
{{ percent }}
@@ -93,15 +93,9 @@ const deliverData = inject('deliver');
const collapsed = ref(false); // 展开/关闭
defineEmits(['check-success']);
-// 历史交付物
-function openDeliverHistory() {}
-
// 交付物链接
function openLink() {
- store.commit('task/setTaskDetailUrl', deliverData.details[0]);
- sessionStorage.setItem('targetUrl', deliverData.details[0]);
- store.commit('task/setTaskDetailShow', '');
- sessionStorage.setItem('taskDetailShow', '');
+ window.open(deliverData.details[0], '_blank');
}
const checkModal = reactive({
@@ -109,8 +103,21 @@ const checkModal = reactive({
deliverRecordId: () => (deliverData.value ? deliverData.value.deliverRecordId : ''), // 交付物记录id
});
+// 历史交付物
+function openDeliverHistory() {
+ const { deliverId } = deliverData.value;
+ store.commit('task/setDeliverId', deliverId); // 设置交付物id
+ store.commit('task/setTaskDetailUrl', ''); // 设置详情页链接
+ store.commit('task/setTaskDetailShow', 'deliverHistory'); // 设置内置组件关键字(根据关键字判断显示的详情页)
+}
+
// 审核记录
-function openMoreRecords() {}
+function openMoreRecords() {
+ const { deliverRecordId } = deliverData.value;
+ store.commit('task/setDeliverRecordId', deliverRecordId); // 设置交付物记录id
+ store.commit('task/setTaskDetailUrl', ''); // 设置详情页链接
+ store.commit('task/setTaskDetailShow', 'auditRecords'); // 设置内置组件关键字(根据关键字判断显示的详情页)
+}