提交

pages/medicalRecords/medical.vue

@@ -383,16 +383,16 @@ export default {
         }
       }
       if (
-            ["妇科", "儿科"].includes(this.currentNode.data.title) ||
+           
-            ["妇科", "儿科"].includes(this.addCertificateForm.labelTitle)
+            ["妇科", "儿科"].includes(this.medicalForm.labelTitle)&&isNewSave!=1
           ) {
             if (
-              this.currentNode.data.title == "妇科" ||
+             
-              this.addCertificateForm.labelTitle == "妇科"
+            this.medicalForm.labelTitle == "妇科"
             ) {
               const value = this.editableMap["personalAndFamilyHistory"] || "";
               const hasKeywords =
-                value.includes("月经") && value.includes("婚育");
+                value.includes("月经") || value.includes("婚育");
 
               if (!hasKeywords) {
                 // 包含“月经”或“婚育”
@@ -400,15 +400,15 @@ export default {
                 const titleHtml = this.getTitleHtml(
                   this.record["personalAndFamilyHistory"]
                 ).replace(/<[^>]*>/g, "");
-                this.$message.error(
+                this.$commonJS.showToast(
                   "请在 " + titleHtml + " 中输入月经或婚育相关内容"
                 );
                 return false;
               }
             }
             if (
-              this.currentNode.data.title == "儿科" ||
+             
-              this.addCertificateForm.labelTitle == "儿科"
+            this.medicalForm.labelTitle == "儿科"
             ) {
               const value = this.editableMap["pastHistory"] || "";
               const hasKeywords = value.includes("疫苗");
@@ -418,7 +418,7 @@ export default {
                 const titleHtml = this.getTitleHtml(
                   this.record["pastHistory"]
                 ).replace(/<[^>]*>/g, "");
-                this.$message.error(
+                this.$commonJS.showToast(
                   "请在 " + titleHtml + " 中输入疫苗接种相关内容"
                 );
                 return false;

pages/medicalRecords/medicalDetail.vue

@@ -20,7 +20,10 @@
        }"
       >
         <view class="loading-spinner" v-if="loading"></view>
-        <uni-notice-bar :color="medicalRecords.state==0?'#eb3c41':medicalRecords.state==2?'#e78083':''" :background-color="medicalRecords.state==3?'#e7808330':medicalRecords.state==2?'#e7808330':''" :text="`审核备注：${medicalRecords.mark}`" v-if="medicalRecords.mark&&medicalRecords.state!=1&&medicalRecords.state!=3" style="margin-bottom: 0;"/>
+        <uni-notice-bar :color="medicalRecords.state==0?'#eb3c41':medicalRecords.state==2?'#e78083':''" 
+        :background-color="medicalRecords.state==3?'#e7808330':medicalRecords.state==2?'#e7808330':''" 
+        :text="`审核备注：${markInfo}`" 
+        v-if="markInfo" style="margin-bottom: 0;"/>
 
 	
         <view style="" class="detail_top"  :class="{ 
@@ -284,6 +287,7 @@ export default {
   props: ["loading", "form", "medicalRecords", "type", "statusId",'page'],
   data() {
     return {
+      markInfo:'',
       editorOptions: {
         theme: "snow", // Quill 编辑器的主题
         modules: {
@@ -738,12 +742,27 @@ export default {
       this.chatId = item.id;
       this.chatName = item.name;
     },
-    //提交
+ 
 
     initRecordData(data) {
+      this.markInfo=''
       this.formData.title = data.title ? data.title : "";
       this.formData.labelId = data.labelId ? data.labelId : "";
       this.formData.labelTitle = data.labelTitle ? data.labelTitle : "";
+      if(data.mark){
+      
+          this.markList = JSON.parse(data.mark);
+          const latest = this.markList.reduce((latest, current) => {
+  return new Date(current.time) > new Date(latest.time) ? current : latest;
+});
+if(data.state!=1&&data.state!=3&&latest){
+  this.markInfo=latest.mark?latest.mark:''
+}
+
+
+     
+        // medicalRecords.mark&&medicalRecords.state!=1&&medicalRecords.state!=3
+      }
       this.record = {
         information: data.information
           ? data.information