修改项目日志

pages/daily/daily.vue

@@ -26,13 +26,15 @@
         @scrolltolower="scrollToLower()"
       >
         <view class="item" v-for="item in list" :key="item.log_id">
-          <view class="time">{{ item.c_time | getTime }}</view>
+          <!-- <view class="time">{{ item.c_time | getTime }}</view> -->
           <view class="box" @click="() => handlerDetailClick(item.log_id)">
-            <view class="title">{{ item.author_name }}的金科环境项目日志</view>
-            <view class="desc">
-              <view class="desc-title">日志概述：</view>
-              <view class="desc-content"> 列表接口没有概述 </view>
+            <!-- <view class="title">{{ item.author_name }}的金科环境项目日志</view> -->
+            <!-- <view class="desc"> -->
+            <view class="desc-title">{{ item.c_time | getTime }}</view>
+            <view class="desc-content">
+              {{ item.author_name }}的金科环境项目日志
             </view>
+            <!-- </view> -->
           </view>
         </view>
         <view class="loadmore">{{ loadMoreText }}</view>
@@ -56,7 +58,7 @@ export default {
       list: [],
     };
   },
-  
+
   onShow() {
     this.pagination.currentPage = 1;
     this.initData();
@@ -155,7 +157,7 @@ export default {
     margin-bottom: 10rpx;
   }
   .box {
-    padding: 40rpx;
+    padding: 20rpx;
     border-radius: 5rpx;
     border: 1px solid #ccc;
     box-shadow: 0 1rpx 4rpx rgba(255, 255, 255, 0.2);

pages/daily/form.vue

@@ -22,16 +22,21 @@
               name="project_name"
               class="formItem"
             >
-              <picker
-                @change="(e) => selectProject(item.key, e)"
-                :range="projectList"
-                range-key="Name"
-              >
-                <view class="proName" v-if="item.project_name">
-                  {{ item.project_name }}
-                </view>
-                <view class="selectPlaceholder" v-else>请选择项目</view>
-              </picker>
+              <template v-if="!project_id">
+                <picker
+                  @change="(e) => selectProject(item.key, e)"
+                  :range="projectList"
+                  range-key="project_name"
+                >
+                  <view class="proName" v-if="item.code_id">
+                    {{ item.project_name || getProjectName(item.code_id) }}
+                  </view>
+                  <view class="selectPlaceholder" v-else>请选择项目</view>
+                </picker>
+              </template>
+              <view class="proName" v-else>
+                {{ getProjectName(project_id) }}
+              </view>
             </uni-forms-item>
             <uni-forms-item
               required
@@ -109,11 +114,11 @@ export default {
     this.queryProjectList();
     if (options.id) {
       this.initDate(options.id);
+      this.log_id = options.id;
     }
     if (options.project_id) {
-      this.project_id = options.project_id;
+      this.project_id = Number(options.project_id);
     }
-    this.log_id = options.id;
   },
   computed: {
     ...mapState(["projectList"]),
@@ -129,10 +134,6 @@ export default {
       const item = this.formData.find((item) => item.key == key);
       item.code_id = select.id;
       item.project_name = select.project_name;
-
-      console.log(this.formData);
-
-      // this.formData = [...this.formData];
     },
     addFormData() {
       this.formData.push({
@@ -145,6 +146,11 @@ export default {
       this.formData.splice(index, 1);
     },
     async submit() {
+      //编辑
+      if (this.log_id) {
+        this.editLog();
+        return;
+      }
       // 从项目列表页进入的日志界面无须选择项目
       if (this.project_id) {
         this.formData.forEach((item) => (item.code_id = this.project_id));
@@ -159,35 +165,10 @@ export default {
       }, 1800);
     },
     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);
+      if (res.data) {
+        this.formData = res.data;
+      }
     },
     async deleteLog() {
       await approvalDelLog(this.log_id);
@@ -203,11 +184,8 @@ export default {
       await approvalEditLog({ log_id: this.log_id, formData: this.formData });
       uni.showToast({
         title: "编辑成功",
+        duration: 1800,
       });
-      setTimeout(() => {
-        uni.hideToast();
-        uni.navigateBack();
-      }, 1800);
     },
   },
 };
@@ -256,7 +234,7 @@ export default {
   }
   .formItem {
   }
-  .proName,
+  // .proName,
   .input,
   .textarea,
   .selectPlaceholder {