From b4fe2c16274a91fee4fb26d91374f95fbe2dbcec Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期一, 09 十一月 2026 15:28:21 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/record/detailpage/index.vue |  135 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 122 insertions(+), 13 deletions(-)

diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index d52a2b9..99123e5 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -127,10 +127,9 @@
               </el-tooltip>
             </template>
           </el-table-column>
-                <el-table-column
+          <el-table-column
             v-if="
-              orgname == '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�' ||
-              orgname == '涓芥按甯備腑鍖婚櫌'
+              orgname == '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�' || orgname == '涓芥按甯備腑鍖婚櫌'
             "
             label="鎷ㄥ彿鐘舵��"
             width="120"
@@ -305,8 +304,6 @@
             show-overflow-tooltip
           >
           </el-table-column>
-
-
 
           <el-table-column
             prop="bankcardno"
@@ -718,7 +715,13 @@
           <!-- 椤堕儴鎿嶄綔鍖哄煙 -->
           <div class="section-header">
             <h3><i class="el-icon-s-operation"></i> 浜哄伐澶勭悊</h3>
+
             <div class="header-actions">
+              <div v-if="form.doctorOpinion2" class="last-opinion">
+                <i class="el-icon-sunny"></i>
+                <span class="last-opinion-label">涓婃鐨勫鐞嗘剰瑙侊細</span>
+                <span class="last-opinion-text">{{ form.doctorOpinion2 }}</span>
+              </div>
               <!-- 鍩虹鎿嶄綔鎸夐挳缁� -->
               <div class="action-group basic-actions">
                 <el-button type="primary" plain @click="alterpatient('')">
@@ -798,6 +801,8 @@
               </div>
             </div>
           </div>
+
+
 
           <!-- 琛ㄥ崟鍖哄煙 -->
           <div class="form-content">
@@ -1017,6 +1022,14 @@
                   </el-button>
                   <el-button plain type="info" @click="Editsingletaskson('5')">
                     浜哄伐闅忚
+                  </el-button>
+                  <el-button
+                    plain
+                    v-if="orgname != '缂欎簯绗簩浜烘皯鍖婚櫌'"
+                    type="primary"
+                    @click="Editsingletaskson('7')"
+                  >
+                    鍥為櫌澶嶆煡澶嶈瘖
                   </el-button>
                   <el-button
                     type="primary"
@@ -1278,6 +1291,15 @@
                 v-model="form.remark2"
               ></el-input>
             </el-form-item>
+            <el-form-item label="澶勭悊鎰忚">
+              <el-input
+                class="custom-disabled"
+                type="textarea"
+                disabled
+                v-model="form.doctorOpinion2"
+                placeholder="鏃�"
+              ></el-input>
+            </el-form-item>
           </el-collapse-item>
 
           <!-- 涓嬫闅忚淇℃伅 - 榛樿灞曞紑 -->
@@ -1328,7 +1350,10 @@
               </el-col>
             </el-row>
             <el-form-item label="闅忚绫诲瀷" prop="resource">
-              <el-radio-group v-model="form.resource">
+              <el-radio-group
+                v-model="form.resource"
+                @change="handleResourceChange"
+              >
                 <el-radio label="1">鏈梾鍖洪殢璁�</el-radio>
                 <el-radio label="2">闅忚涓績闅忚</el-radio>
               </el-radio-group>
@@ -1336,11 +1361,12 @@
             <el-form-item label="闅忚璁板綍" :required="form.resource == '2'">
               <el-input type="textarea" v-model="form.remark"></el-input>
             </el-form-item>
-            <el-form-item label="鍖荤敓澶勭悊鎰忚" prop="doctorOpinion">
-              <el-input
-                type="textarea"
-                v-model="form.doctorOpinion"
-              ></el-input>
+            <el-form-item
+              label="鍖荤敓澶勭悊鎰忚"
+              prop="doctorOpinion"
+              :required="isDoctorOpinionRequired"
+            >
+              <el-input type="textarea" v-model="form.doctorOpinion"></el-input>
             </el-form-item>
           </el-collapse-item>
         </el-collapse>
@@ -1639,8 +1665,19 @@
             trigger: "change",
           },
         ],
+        // 鍖荤敓澶勭悊鎰忚锛氫粎銆岄殢璁夸腑蹇冮殢璁裤��+銆屼附姘村競涓尰闄€�嶆椂蹇呭~锛屽叾浣欐儏鍐典笉鏍¢獙
         doctorOpinion: [
-          { required: true, message: "璇疯緭鍏ュ尰鐢熷鐞嗘剰瑙�", trigger: "blur" },
+          {
+            validator: (rule, value, callback) => {
+              const needRequired =
+                this.form.resource == "2" && this.orgname === "涓芥按甯備腑鍖婚櫌";
+              if (needRequired && !String(value || "").trim()) {
+                return callback(new Error("璇疯緭鍏ュ尰鐢熷鐞嗘剰瑙�"));
+              }
+              callback();
+            },
+            trigger: "blur",
+          },
         ],
       },
       userrules: {
@@ -1764,6 +1801,10 @@
         failed: "error",
       };
       return typeMap[this.callStatus];
+    },
+    // 鍖荤敓澶勭悊鎰忚鏄惁蹇呭~锛氶殢璁跨被鍨嬮�夈�岄殢璁夸腑蹇冮殢璁裤�嶄笖褰撳墠鏈烘瀯涓轰附姘村競涓尰闄�
+    isDoctorOpinionRequired() {
+      return this.form.resource == "2" && this.orgname === "涓芥按甯備腑鍖婚櫌";
     },
     // 鏄惁浠ラ棶鍗峰舰寮忓睍绀猴紙闈炶闊虫湇鍔★紝鎴栬闊虫湇鍔′絾鏃犲畬鏁磋闊虫暟鎹渶鎵嬪姩濉姤锛�
     showQuestionnaireForm() {
@@ -2274,6 +2315,26 @@
             path: "/followvisit/discharge",
           });
         }
+      } else if (this.form.serviceType == 3) {
+        if (this.visitCount != 1) {
+          this.$router.push({
+            path: "/logisticsservice/OutpatientAgain",
+          });
+        } else {
+          this.$router.push({
+            path: "/followvisit/discharge",
+          });
+        }
+      } else if (this.form.serviceType == 19) {
+        if (this.visitCount != 1) {
+          this.$router.push({
+            path: "/logisticsservice/operationAgain",
+          });
+        } else {
+          this.$router.push({
+            path: "/followvisit/discharge",
+          });
+        }
       } else {
         // location.reload();
         this.$router.go(-1);
@@ -2635,7 +2696,8 @@
           console.log(this.form.templatename, "templatename");
 
           this.form.remark = this.form.remark || "";
-          this.form.doctorOpinion = this.form.doctorOpinion || "";
+          this.form.doctorOpinion2 = this.form.doctorOpinion || "";
+          this.form.doctorOpinion = "";
           this.logsheetlist = res.rows[0].serviceSubtaskList;
           this.templateid = this.form.templateid;
           this.selectedTag = this.form.excep;
@@ -3069,6 +3131,14 @@
         }
       });
     },
+    // 鍒囨崲闅忚绫诲瀷鍚庯紝閲嶇疆鍖荤敓澶勭悊鎰忚鐨勬牎楠岀姸鎬侊紙蹇呭~鏉′欢闅忕被鍨嬪彉鍖栵級
+    handleResourceChange() {
+      this.$nextTick(() => {
+        if (this.$refs.zcform) {
+          this.$refs.zcform.clearValidate("doctorOpinion");
+        }
+      });
+    },
     // 鍒涘缓鍐嶆闅忚鏈嶅姟
     setupsubtask() {
       this.$refs["zcform"].validate((valid) => {
@@ -3084,6 +3154,10 @@
           this.form.remark =
             this.form.remark + "銆�" + this.getCurrentTime() + "銆�";
           let form = structuredClone(this.form);
+          // 鍐嶆闅忚鍗斥�滃洖闄㈠鏌ュ璇娾�濓細澶勭悊鎰忚缃负 suggest=7
+          if (String(form.suggest) !== "7") {
+            form.suggest = "7";
+          }
           form.visitTime = this.parseTime(form.date1);
           form.finishtime = "";
           if (form.resource) {
@@ -4121,6 +4195,41 @@
   }
 }
 
+/* 涓婃鐨勫鐞嗘剰瑙� */
+.last-opinion {
+  display: flex;
+  gap: 8px;
+  margin-bottom: 20px;
+  padding: 8px 14px;
+  background: linear-gradient(135deg, #ecfdf5 0%, #f0fdfa 100%);
+  border: 1px solid #d1fae5;
+  border-left: 4px solid #10b981;
+  border-radius: 8px;
+  box-shadow: 0 1px 3px rgba(16, 185, 129, 0.08);
+  line-height: 1.5;
+
+  > i {
+    font-size: 18px;
+    color: #10b981;
+    flex-shrink: 0;
+  }
+
+  .last-opinion-label {
+    font-size: 13px;
+    color: #059669;
+    font-weight: 600;
+    white-space: nowrap;
+    flex-shrink: 0;
+  }
+
+  .last-opinion-text {
+    font-size: 14px;
+    color: #334155;
+    word-break: break-word;
+    white-space: pre-wrap;
+  }
+}
+
 /* 閫氳瘽鎺у埗鍖哄煙 */
 .call-controls {
   margin: 15px 0;

--
Gitblit v1.9.3