Browse Source

fix: 修改移动端周日报暂存失败问题

qiny 1 năm trước cách đây
mục cha
commit
71164edcf5

+ 9 - 0
client_h5/src/pages/myLogs/Daily/index.vue

@@ -65,6 +65,7 @@ interface FormData {
   reportWeek: string | number; // 周
   reportDay: string | number; // 本周第几天
   isUpdate?: boolean; // 是否是更新
+  id?: string | number; // 日志id
 }
 
 // 页面数据
@@ -134,6 +135,11 @@ const receiveData = (dailyDetail: any) => {
   formData.reportYear = dailyDetail.reportYear;
   formData.reportMonth = dailyDetail.reportMonth;
   formData.reportWeek = dailyDetail.reportWeek;
+  // 如果也有id
+  if (dailyDetail.id) {
+    formData.id = dailyDetail.id;
+  }
+  // 如果是数据更新
   if (dailyDetail.isUpdate) {
     formData.isUpdate = dailyDetail.isUpdate;
   }
@@ -230,6 +236,9 @@ const onSubmit = async (isTemp: boolean, isRouteLeave?: boolean) => {
   if (isRouteLeave) return; // 如果是退出,则不提示暂存
   const type = isTemp ? "暂存" : "发送";
   if (result.msg == "success") {
+    if (result.data) {
+      formData.id = result.data;
+    }
     showSuccessToast(`${type}成功`);
     if (!isTemp) {
       replace({

+ 9 - 0
client_h5/src/pages/myLogs/Weekly/index.vue

@@ -71,6 +71,7 @@ interface FormData {
   reportMonth: string | number; // 月
   reportWeek: string | number; // 周
   isUpdate?: boolean; // 是否是更新
+  id?: string | number; // 日志id
 }
 const defWeek = () => {
   if (moment().day() == 0) {
@@ -161,6 +162,11 @@ const receiveData = (weekDetail: any) => {
   formData.reportYear = weekDetail.reportYear;
   formData.reportMonth = weekDetail.reportMonth;
   formData.reportWeek = weekDetail.reportWeek;
+  // 如果也有id
+  if (weekDetail.id) {
+    formData.id = weekDetail.id;
+  }
+  // 如果是数据更新
   if (weekDetail.isUpdate) {
     formData.isUpdate = weekDetail.isUpdate;
   }
@@ -218,6 +224,9 @@ const onSubmit = async (isTemp: boolean, isRouteLeave?: boolean) => {
   if (isRouteLeave) return; // 如果是退出,则不提示暂存
   const type = isTemp ? "暂存" : "发送";
   if (result.msg == "success") {
+    if (result.data) {
+      formData.id = result.data;
+    }
     showSuccessToast(`${type}成功`);
     if (!isTemp) {
       replace({

+ 7 - 0
client_h5/src/pages/myLogs/components/LogDetail.vue

@@ -96,6 +96,7 @@
       </van-field>
     </div>
     <van-floating-bubble
+      v-if="logDetail.userId == userInfo.id"
       v-model:offset="offset"
       icon="edit"
       @click="goToEditPage"
@@ -111,6 +112,8 @@ import { reactive } from "vue";
 import { showToast } from "vant";
 import { http } from "../http";
 import { isMyComment } from "../service";
+import { getUserInfo } from "@/utils/tools";
+
 interface FormData {
   reportContent: string; // 内容
   workloadList: any[]; // 工作量分配
@@ -122,6 +125,9 @@ onMounted(() => {
   initCommentList();
 });
 
+// 获取登陆用户详情
+const userInfo = getUserInfo();
+
 // 编辑气泡的位置
 const offset = ref({ y: 100 });
 
@@ -168,6 +174,7 @@ const initData = async () => {
     today.value =
       moment(result.reportEndDate).format("YYYY-MM-DD") ?? today.value;
   }
+  console.log("logDetail", logDetail);
 };
 
 // 初始化评论