From 6be49398a90a339a6c72ac9ea7a09fc368acda87 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 30 四月 2025 15:48:08 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/record/detailpage/index.vue |   54 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 62dfbbc..5e0f9e1 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 鑱婅繛椤甸潰璁板綍 -->
-  <div class="Followupdetailspage">
+  <div class="Followupdetailspage" id="app-container">
     <div class="Followuserinfo">
       <div>
         <div class="userinfo-text">
@@ -243,7 +243,11 @@
               <el-button plain type="info" @click="Editsingletaskson('5')"
                 >涓績闅忚</el-button
               >
-              <el-button type="primary" round @click="sendAgain()"
+              <el-button
+                type="primary"
+                round
+                v-if="this.form.isVisitAgain != 2"
+                @click="sendAgain()"
                 >鍐嶆闅忚</el-button
               >
             </div>
@@ -532,7 +536,11 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <el-dialog title="鎮ｈ�呭啀娆￠殢璁�" :visible.sync="dialogFormVisible">
+    <el-dialog
+      title="鎮ｈ�呭啀娆￠殢璁�"
+      v-dialogDrags
+      :visible.sync="dialogFormVisible"
+    >
       <el-form ref="zcform" :rules="zcrules" :model="form" label-width="80px">
         <el-form-item label="浠诲姟鍚嶇О">
           <el-input
@@ -595,7 +603,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">鍙� 娑�</el-button>
+        <el-button type="warning" @click="dialogFormVisible = false"
+          >鍙� 娑�</el-button
+        >
         <el-button type="primary" @click="setupsubtask">纭鍒涘缓鏈嶅姟</el-button>
       </div>
     </el-dialog>
@@ -809,11 +819,15 @@
             }
           });
           this.Editsingletasksonyic(6);
+
           this.$modal
             .confirm(
-              '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' + this.userform.name + '"鍐嶆闅忚锛�'
+              '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' +
+                this.logsheetlist[0].sendname +
+                '"鍐嶆闅忚锛�'
             )
             .then(() => {
+              document.querySelector("#app").scrollTo(0, 0);
               this.dialogFormVisible = true;
             })
             .catch(() => {});
@@ -852,6 +866,7 @@
               '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' + this.userform.name + '"鍐嶆闅忚锛�'
             )
             .then(() => {
+              document.querySelector("#app").scrollTo(0, 0);
               this.dialogFormVisible = true;
             })
             .catch(() => {});
@@ -948,6 +963,8 @@
     },
     // 璋冭捣鍐嶆鍙戦��
     sendAgain() {
+      document.querySelector("#app").scrollTo(0, 0);
+      // scrollTo(0, 0)
       this.dialogFormVisible = true;
     },
     // 鏌ョ湅璇︽儏
@@ -1008,29 +1025,52 @@
     setupsubtask() {
       this.$refs["zcform"].validate((valid) => {
         if (valid) {
+          this.form.remark =
+            this.form.remark + "銆�" + this.getCurrentTime() + "銆�";
           let form = structuredClone(this.form);
           form.longSendTime = this.formatTime(form.date1);
           form.finishtime = "";
           if (form.resource) {
             if (form.resource == 2) {
-              form.serviceType = 10;
+              form.serviceType = 13;
             }
           } else {
             this.$modal.msgError("鏈�夋嫨闅忚鏂瑰紡");
           }
-          form.id = null;
+          // form.id = null;
           form.sendstate = 2;
           addserviceSubtask(form).then((res) => {
             if (res.code == 200) {
               this.$modal.msgSuccess("鍒涘缓鎴愬姛");
+              if (form.serviceType == 13) {
+                this.$router.push({
+                  path: "/logisticsservice/record",
+                });
+              }else if (form.serviceType == 2) {
+                this.$router.push({
+                  path: "/followvisit/discharge",
+                });
+              }
             } else {
               this.$modal.msgError("鍒涘缓澶辫触");
             }
+            document.querySelector("#app").scrollTo(0, 0);
             this.dialogFormVisible = false;
           });
         }
       });
     },
+    getCurrentTime() {
+      const now = new Date();
+      const year = now.getFullYear();
+      const month = String(now.getMonth() + 1).padStart(2, "0");
+      const day = String(now.getDate()).padStart(2, "0");
+      const hours = String(now.getHours()).padStart(2, "0");
+      const minutes = String(now.getMinutes()).padStart(2, "0");
+      const seconds = String(now.getSeconds()).padStart(2, "0");
+
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    },
     updateScore(a, b, c) {
       console.log(a);
       console.log(b);

--
Gitblit v1.9.3