浏览代码

feat: 我收到的,日志和周报

qiny 1 年之前
父节点
当前提交
f28f68e88a
共有 1 个文件被更改,包括 17 次插入13 次删除
  1. 17 13
      client_h5/src/pages/myLogs/Receive/index.vue

+ 17 - 13
client_h5/src/pages/myLogs/Receive/index.vue

@@ -1,5 +1,3 @@
-import { isHidden } from 'vant/lib/utils'; import { format } from 'path'; import
-{ spawn } from 'child_process';
 <template>
   <div class="my-receive-log-list">
     <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
@@ -20,13 +18,19 @@ import { isHidden } from 'vant/lib/utils'; import { format } from 'path'; import
               item.reportType == "weekly" ? "周报" : "日报"
             }}
           </div>
-          <div>
-            <span class="label">开始日期:</span
-            >{{ moment(item.reportStartDate).format("YYYY-MM-DD") }}
+          <div v-if="item.reportType == 'weekly'">
+            <div>
+              <span class="label">开始日期:</span
+              >{{ moment(item.reportStartDate).format("YYYY-MM-DD") }}
+            </div>
+            <div>
+              <span class="label">结束日期:</span
+              >{{ moment(item.reportEndDate).format("YYYY-MM-DD") }}
+            </div>
           </div>
-          <div>
-            <span class="label">结束日期:</span
-            >{{ moment(item.reportEndDate).format("YYYY-MM-DD") }}
+          <div v-else>
+            <span class="label">日志日期:</span
+            >{{ moment(item.reportStartDate).format("YYYY-MM-DD") }}
           </div>
           <div class="label">本周完成工作:</div>
           <div class="van-multi-ellipsis--l2">
@@ -47,8 +51,7 @@ import { isHidden } from 'vant/lib/utils'; import { format } from 'path'; import
 /**
  * @description 我收到的日志
  */
-import { ref, computed, toRefs } from "vue";
-import { List } from "vant";
+import { ref } from "vue";
 import { http } from "../http";
 import moment from "moment";
 
@@ -56,7 +59,7 @@ onMounted(async () => {
   await onLoad();
 });
 
-const list = ref([]);
+const list = ref<any>([]);
 const loading = ref(false);
 const finished = ref(false);
 const refreshing = ref(false);
@@ -77,7 +80,8 @@ const onLoad = async () => {
   if (!refreshing.value) {
     list.value.push(
       ...dataSource.filter(
-        (item) => !list.value.find((existing) => existing.id === item.id)
+        (item: any) =>
+          !list.value.find((existing: any) => existing.id === item.id)
       )
     );
   } else {
@@ -103,7 +107,7 @@ const onRefresh = async () => {
 
 // 查看详情
 const { push } = useRouter();
-const toDetail = (detail) => {
+const toDetail = (detail: any) => {
   push({
     path: "/logsDetail",
     query: {