Merge branch 'master' of http://120.55.44.4:10080/xujunjie/WorkloadApp

pages/daily/form.vue

@@ -66,7 +66,7 @@
         </uni-forms>
         <view class="btn-row">
           <view class="btn-add" @click="addFormData">+ 新增</view>
-          <view class="btn-add" @click="deleteLog">删除</view>
+          <view class="btn-add" @click="deleteLog" v-if="log_id">删除</view>
         </view>
       </view>
       <view class="button" @click="submit">提 交</view>
@@ -79,6 +79,7 @@ import {
   createDaily,
   approvalLogDaily,
   approvalDelLog,
+  approvalEditLog,
 } from "@/services/daily";
 import { mapState, mapActions } from "vuex";
 export default {
@@ -165,6 +166,7 @@ export default {
       }, 1800);
     },
     async initDate(id) {
+      //测试代码 详情接口有问题
       this.formData = [
         {
           project_name: "11111",
@@ -204,6 +206,16 @@ export default {
         uni.navigateBack();
       }, 1800);
     },
+    async editLog() {
+      await approvalEditLog({ log_id: this.log_id, formData: this.formData });
+      uni.showToast({
+        title: "编辑成功",
+      });
+      setTimeout(() => {
+        uni.hideToast();
+        uni.navigateBack();
+      }, 1800);
+    },
   },
 };
 </script>

services/daily.js

@@ -22,3 +22,7 @@ export async function approvalLogDaily(data) {
 export async function approvalDelLog(id) {
   return await request(`v2/approval/log/${id}`, "DELETE");
 }
+//编辑个人日志详情
+export async function approvalEditLog(data) {
+  return await request(`v2/approval/log/${data.log_id}`, "PUT", data.formData);
+}