From c1f1ecb1045b0eaf2933e7279eabbbde17559eab Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 24 七月 2025 16:59:30 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/record/detailpage/index.vue |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index c6b50f5..fb42e14 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -727,6 +727,7 @@
                 :picker-options="pickerOptions"
                 align="right"
                 v-model="form.date1"
+                class="custom-disabled"
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -852,6 +853,10 @@
         },
       },
       pickerOptions: {
+        disabledDate(time) {
+        // 绂佺敤浠婂ぉ鍙婁箣鍓嶇殑鏃ユ湡
+        return time.getTime() < Date.now() - 24 * 60 * 60 * 1000;
+      },
         shortcuts: [
           {
             text: "涓冨ぉ鍚�",
@@ -1194,10 +1199,10 @@
                     path: "/logisticsservice/record",
                   });
                 }
-              } else if (form.serviceType == 2) {
+              } else if (this.form.serviceType == 2) {
                 if (this.visitCount) {
                   this.$router.push({
-                    path: "/followvisit/again",
+                    path: "/logisticsservice/again",
                   });
                 } else {
                   this.$router.push({
@@ -1280,7 +1285,7 @@
             })
             .catch(() => {
               if (this.form.serviceType == 13) {
-                if (this.visitCount) {
+                if (this.visitCount!=1) {
                   this.$router.push({
                     path: "/logisticsservice/zbAgain",
                   });
@@ -1290,7 +1295,7 @@
                   });
                 }
               } else if (form.serviceType == 2) {
-                if (this.visitCount) {
+                if (this.visitCount!=1) {
                   this.$router.push({
                     path: "/followvisit/again",
                   });
@@ -1326,11 +1331,12 @@
           this.form = res.rows[0].serviceSubtaskList.find(
             (item) => item.id == this.id
           );
+          console.log(this.form.serviceType,'serviceType');
+
           this.logsheetlist = res.rows[0].serviceSubtaskList;
           this.templateid = this.logsheetlist[0].templateid;
           const targetDate = new Date(this.form.longSendTime); // 鐩爣鏃ユ湡
           const now = new Date(); // 褰撳墠鏃堕棿
-          this.form.endtime = this.formatTime(this.form.endtime);
           if (now < targetDate && this.form.sendstate == 2) {
             this.$confirm("褰撳墠鏈嶅姟鏈埌鍙戦�佹椂闂磋璋ㄦ厧淇敼", "鎻愮ず", {
               confirmButtonText: "纭畾",
@@ -1482,7 +1488,6 @@
           form.finishtime = "";
           if (form.resource) {
             if (form.resource == 2) {
-              form.serviceType = 13;
               form.visitDeptCode = localStorage.getItem("deptCode");
               form.visitDeptName = "闅忚涓績";
             } else {
@@ -1495,16 +1500,18 @@
           }
           // form.id = null;
           form.sendstate = 2;
+          console.log(form.serviceType,'form.serviceType');
+
           addserviceSubtask(form).then((res) => {
             if (res.code == 200) {
               this.$modal.msgSuccess("鍒涘缓鎴愬姛");
               if (form.serviceType == 13) {
                 this.$router.push({
-                  path: "/logisticsservice/again",
+                  path: "/logisticsservice/zbAgain",
                 });
               } else if (form.serviceType == 2) {
                 this.$router.push({
-                  path: "/logisticsservice/zbAgain",
+                  path: "/logisticsservice/again",
                 });
               }
             } else {

--
Gitblit v1.9.3