Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/user/components/PatientSidebar.vue

@@ -163,10 +163,10 @@ export default {
           name: '3',
           label: '病情记录',
           children: [
-            {
-              name: '3-1',
-              label: '病史'
-            },
+            // {
+            //   name: '3-1',
+            //   label: '病史'
+            // },
             {
               name: '3-4',
               label: '病史新'

src/xt_pages/user/sickHistory_new.vue

@@ -49,7 +49,7 @@
                 <div v-if='add_index == 0'>
                   <el-button type="primary" size="small" @click="showEdit">修改</el-button>
                   <el-button size="small" type="danger" @click="deleteAction">删除</el-button>
-                  <el-button type="primary" size="small" @click="prints">打印</el-button>
+                  <el-button type="primary" size="small" @click="printOne">打印</el-button>
                 </div>
                 <div v-if="add_index == 1">
                   <el-button type="primary" size="small" @click="createAction">保存</el-button>
@@ -408,6 +408,7 @@ export default {
       wayOptions: null,
       patientVascularAccessOne:{},
       orgname:'',
+      ids:[]
     }
   },
   created() {
@@ -461,6 +462,13 @@ export default {
 
   },
   methods: {
+    printOne(){
+      if(this.ids.length == 0){
+        this.$message.error('请选择要打印的病程')
+        return
+      }
+      this.$router.push({ path: "/sickhistory/print?ids="+this.ids+"&patient_id="+this.patient_id});
+    },
     template_dele(){
       console.log("hahhahahah",this.template_id)
      deleteSickHistoryTempalte(this.template_id).then(response=>{
@@ -947,7 +955,9 @@ export default {
 
     },
     getCurrentChange(val){
-      console.log("val--------------",val)
+     
+      this.ids = []
+      this.ids.push(val.id)
       this.$refs.editor.contents = val.content
       this.record_time = this.getTime(val.record_time)
       this.id = val.id