From 7c71fcb61dd0bfc6a179a973f9cab5ef979ad5f2 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期一, 02 二月 2026 17:11:56 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/record/detailpage/index.vue |   51 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 8526297..933b61d 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -1017,14 +1017,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="闅忚鏂瑰紡" prop="resource">
+        <el-form-item label="闅忚绫诲瀷" prop="resource">
           <el-radio-group v-model="form.resource">
             <el-radio label="1">鏈梾鍖洪殢璁�</el-radio>
             <el-radio label="2">闅忚涓績闅忚</el-radio>
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item label="闅忚璁板綍">
+        <el-form-item label="闅忚璁板綍" :required="form.resource == '2'">
           <el-input type="textarea" v-model="form.remark"></el-input>
         </el-form-item>
       </el-form>
@@ -1448,7 +1448,8 @@
         {
           value: "涓�涓湀鍚�",
           label: "涓�涓湀鍚�",
-        },   {
+        },
+        {
           value: "涓や釜鏈堝悗",
           label: "涓や釜鏈堝悗",
         },
@@ -1526,16 +1527,16 @@
       }).then((res) => {
         if (res.code === 200) {
           // 閽堝鍐嶆闅忚鏈嶅姟杩涜鍒犻櫎缁撴灉璧嬪��
-          if (this.again && res.data.upScriptResult) {
-            res.data.upScriptResult.forEach((itemA) => {
-              const itemB = res.data.scriptResult.find(
-                (item) => item.scriptContent === itemA.scriptContent
-              );
-              if (itemB) {
-                itemB.scriptResult = itemA.scriptResult;
-              }
-            });
-          }
+          // if (this.again && res.data.upScriptResult) {
+          //   res.data.upScriptResult.forEach((itemA) => {
+          //     const itemB = res.data.scriptResult.find(
+          //       (item) => item.scriptContent === itemA.scriptContent
+          //     );
+          //     if (itemB) {
+          //       itemB.scriptResult = itemA.scriptResult;
+          //     }
+          //   });
+          // }
           this.tableDatatop = res.data.scriptResult;
 
           this.tableDatatop.forEach((item) => {
@@ -1605,17 +1606,17 @@
       // 鏍规嵁閫夋嫨鐨勯殢璁挎柟寮忚绠楅殢璁挎棩鏈�
       if (value.includes("涓冨ぉ鍚�")) {
         followupDate.setDate(dischargeDate.getDate() + 7);
-      } else if (value.includes("15澶╁悗")||value.includes("鍗婁釜鏈堝悗")) {
+      } else if (value.includes("15澶╁悗") || value.includes("鍗婁釜鏈堝悗")) {
         followupDate.setDate(dischargeDate.getDate() + 15);
       } else if (value.includes("涓�涓湀鍚�")) {
         followupDate.setMonth(dischargeDate.getMonth() + 1);
-      }else if (value.includes("涓や釜鏈堝悗")) {
+      } else if (value.includes("涓や釜鏈堝悗")) {
         followupDate.setMonth(dischargeDate.getMonth() + 2);
       } else if (value.includes("涓変釜鏈堝悗")) {
         followupDate.setMonth(dischargeDate.getMonth() + 3);
       } else if (value.includes("鍏釜鏈堝悗")) {
         followupDate.setMonth(dischargeDate.getMonth() + 6);
-      } else if (value.includes("涓�骞村悗")||value.includes("12涓湀鍚�")) {
+      } else if (value.includes("涓�骞村悗") || value.includes("12涓湀鍚�")) {
         followupDate.setFullYear(dischargeDate.getFullYear() + 1);
       }
 
@@ -1760,7 +1761,10 @@
             }
           });
           this.Editsingletasksonyic(6);
-          if (this.visitCount != 1) {
+          const orgName = localStorage.getItem("orgname");
+          console.log(orgName, "orgName");
+
+          if (this.form.isVisitAgain != 1 || orgName == "涓芥按甯備腑鍖婚櫌") {
             this.Torouter();
             return;
           }
@@ -1945,7 +1949,10 @@
         param2: this.patid,
         subId: this.id,
       };
-      if (this.visitCount != 1) {
+      const orgName = localStorage.getItem("orgname");
+      console.log(orgName, "orgName");
+
+      if (this.form.isVisitAgain != 1 || orgName == "涓芥按甯備腑鍖婚櫌") {
         this.Torouter();
         return;
       }
@@ -2165,6 +2172,10 @@
                 this.formtidy();
                 this.dialogFormVisible = true;
               });
+          } else {
+            document.querySelector("#app").scrollTo(0, 0);
+            this.formtidy();
+            this.dialogFormVisible = true;
           }
         } else {
           document.querySelector("#app").scrollTo(0, 0);
@@ -2373,6 +2384,10 @@
             this.$message.error("闅忚鏃堕棿涓嶈兘灏忎簬褰撳墠鏃堕棿");
             return false;
           }
+          if (this.form.resource == "2" && !this.form.remark) {
+            this.$message.error("褰撳墠閫夋嫨涓洪殢璁夸腑蹇冮殢璁块渶杈撳叆闅忚璁板綍");
+            return false;
+          }
           this.form.remark =
             this.form.remark + "銆�" + this.getCurrentTime() + "銆�";
           let form = structuredClone(this.form);

--
Gitblit v1.9.3