Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/user/courseOfDisease_new.vue

@@ -1,8 +1,11 @@
 <template>
- 
+  <!-- <div class="main-contain">
+      <div class="position">
+         <bread-crumb></bread-crumb>
+      </div> -->
   <div class="patient-container">
     <PatientSidebar :id="patient_id" defaultActive="3-5"></PatientSidebar>
-   
+
     <div v-loading="loading">
       <div class="patient-app-container advice-container app-container" style="">
         <div style="display: flex;">
@@ -22,7 +25,7 @@
                 :highlight-current-row="true"
                 @current-change="getCurrentChangeOne"
                 style="width: 100%">
-                
+
                 <el-table-column prop="index" label="序号" width="50">
                   <template slot-scope="scope">
                      {{ scope.$index + 1 }}
@@ -90,7 +93,7 @@
                   自动生成
                 </el-button>
               </div>
-             
+
               <ueditor ref="editor" id="editors" :content="new_content"></ueditor>
             </div>
           </div>
@@ -203,14 +206,14 @@
             </div>
           </div>
         </div>
-       
+
       </el-dialog>
 
 
 
 
-    
- 
+
+
     </div>
   </div>
 
@@ -298,7 +301,7 @@
     },
     created() {
       this.admin_user_id = this.$store.getters.xt_user.user.id
-    
+
       this.patient_id = parseInt(this.$route.query.id)
       this.org_id = this.$store.getters.xt_user.template_info.org_id;
       if (isNaN(this.patient_id) || this.patient_id <= 0) {
@@ -312,7 +315,7 @@
 
       this.fetchAllDoctorAndNurse()
       this.getlist()
-     
+
 
     },
     methods: {
@@ -327,7 +330,7 @@
         this.id = val.id
       },
       getCurrentChangeTwo(val){
-   
+
         this.$refs.editorOne.contents = val.content
         this.template_content = ""
         this.template_content = val.content
@@ -353,7 +356,7 @@
 
       },
       saveTemplate(){
-   
+
         var params = {
           title:this.title,
           content: this.$refs.editor.contents,
@@ -371,7 +374,7 @@
          template_id:this.template_id,
          content:this.$refs.editorOne.contents
         }
-      
+
         saveCourseOfNewTemplate(params).then(response=>{
            if(response.data.state == 1){
               var msg = response.data.data.msg
@@ -398,7 +401,7 @@
                var list = response.data.data.list
               this.tableData = []
               this.tableData = list
-             
+
             }
         })
      },
@@ -448,7 +451,7 @@
          }
 
         }).catch(error => {
-         
+
         })
       },
       template_click(){
@@ -466,10 +469,10 @@
               this.$refs.record_table_one.setCurrentRow(this.templateList[0])
             }
             console.log("haaaaaaaaaaaaa",this.templateList)
-            
+
           }
         })
-     
+
        }
       },
       auto_click(){
@@ -553,7 +556,7 @@
       createAction() {
         console.log("haaaaaaaaaaaaaaa",this.$refs)
         this.new_content = this.$refs.editor.contents
-        
+
         if (this.new_content.length == 0) {
           this.$message.error('请填写病程内容')
           return
@@ -573,7 +576,7 @@
          }
 
         }).catch(error => {
-         
+
         })
       },
       didSelectTemplate: function(templateContent) {
@@ -618,7 +621,7 @@
 
       },
       showEdit() {
-       
+
         this.add_index =1
         this.disabled = false
 
@@ -902,4 +905,11 @@
       text-align: center;
     }
   }
+  .course{
+    .el-dialog{
+      height: 90%;
+      // position: fixed !important;
+      // top: 10% !important;
+    }
+  }
 </style>

src/xt_pages/user/templateSummaryPrint.vue

@@ -8,7 +8,7 @@
       <div class="order-yy-name"></div>
       <div class="order-title">{{ orgname }}血液透析患者诊疗阶段小结</div>
       
-      <div style="padding-bottom:20px;border-bottom:1px solid #000;margin-top:40px;">
+      <div style="padding-bottom:20px;border-bottom:1px solid #000;margin-top:40px;" v-if="org_id !=10013 &&org_id !=10014">
          <span>姓名:{{patientList.patient.name}}</span>  
          <span style="margin-left:20px;">年龄:{{getNewAge(patientList.patient.id_card_no)}}</span>  
          <span style="margin-left:20px;">性别:
@@ -17,7 +17,7 @@
          </span> 
          <span style="margin-left:20px;">诊断:{{patientList.patient.diagnose}}</span> 
       </div>
-      <div style="padding:20px 0;border-bottom:1px solid #000;font-weight:bold;">
+      <div style="padding:20px 0;border-bottom:1px solid #000;font-weight:bold;" v-if="org_id !=10013 &&org_id !=10014">
         <span>阶段评估时间:{{getTime(patientList.record_time)}}</span>  
       </div>
        <!-- <div style="padding:20px 0;border-bottom:1px solid #000;">
@@ -46,7 +46,7 @@
           </div>
         </div>
       </div> -->
-      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
+      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;" v-if="org_id !=10013 &&org_id !=10014">
         <span style="font-weight:bold;">阶段小结总结:</span>
           <!-- {{patientList.template_summary_content}} -->
           <div style="line-height:24px; word-break: break-all;word-wrap: break-word"