Renxy 1 year ago
parent
commit
9d9c6c02df
3 changed files with 60 additions and 6 deletions
  1. 1 1
      pages/daily/daily.vue
  2. 54 4
      pages/daily/form.vue
  3. 5 1
      services/daily.js

+ 1 - 1
pages/daily/daily.vue

@@ -73,7 +73,7 @@ export default {
     ...mapActions(["queryProjectList"]),
     handelSearchConfirm() {},
     scrollToLower() {
-      if (this.projectList.length >= this.pagination.total) {
+      if (this.list.length >= this.pagination.total) {
         this.loadMoreText = "没有更多数据了";
         return;
       }

+ 54 - 4
pages/daily/form.vue

@@ -65,7 +65,10 @@
             </uni-forms-item>
           </view>
         </uni-forms>
-        <view class="btn-add" @click="addFormData">+ 新增</view>
+        <view class="btn-row">
+          <view class="btn-add" @click="addFormData">+ 新增</view>
+          <view class="btn-add" @click="deleteLog">删除</view>
+        </view>
       </view>
       <view class="button" @click="submit">提 交</view>
     </view>
@@ -73,7 +76,11 @@
 </template>
 
 <script>
-import { createDaily } from "@/services/daily";
+import {
+  createDaily,
+  approvalLogDaily,
+  approvalDelLog,
+} from "@/services/daily";
 import { mapState } from "vuex";
 export default {
   data() {
@@ -105,7 +112,7 @@ export default {
   },
   onLoad(options) {
     if (options.id) {
-      this.initDate();
+      this.initDate(options.id);
     }
     this.log_id = options.id;
   },
@@ -146,7 +153,46 @@ export default {
         uni.navigateBack();
       }, 1800);
     },
-    async initDate() {},
+    async initDate(id) {
+      this.formData = [
+        {
+          project_name: "11111",
+          code_id: "11111",
+          title: "11111",
+          content: "11111",
+        },
+        {
+          project_name: "3333",
+          code_id: "22222",
+          title: "22222",
+          content: "22222",
+        },
+        {
+          project_name: "45",
+          code_id: "111511",
+          title: "111161",
+          content: "111811",
+        },
+        {
+          project_name: "110111",
+          code_id: "111911",
+          title: "111119",
+          content: "119111",
+        },
+      ];
+      // const res = await approvalLogDaily({ id });
+      // console.log(res);
+    },
+    async deleteLog() {
+      await approvalDelLog(this.log_id);
+      uni.showToast({
+        title: "删除成功",
+      });
+      setTimeout(() => {
+        uni.hideToast();
+        uni.navigateBack();
+      }, 1800);
+    },
   },
 };
 </script>
@@ -231,6 +277,10 @@ export default {
   line-height: 100rpx;
   text-align: center;
 }
+.btn-row {
+  display: flex;
+  justify-content: space-between;
+}
 .btn-add {
   width: 140rpx;
   height: 50rpx;

+ 5 - 1
services/daily.js

@@ -10,7 +10,11 @@ export async function queryProjectList() {
 export async function createDaily(data) {
   return await request("v2/approval/log", "POST", data);
 }
-//请个人日志详情
+//请个人日志详情
 export async function approvalLogDaily(data) {
   return await request(`v2/approval/log/${data.id}`, "GET", data);
 }
+//删除个人日志详情
+export async function approvalDelLog(id) {
+  return await request(`v2/approval/log/${id}`, "DELETE");
+}