Merge remote-tracking branch 'origin/dev' into dev

src/api/system/specialDiseaseNode.js

@@ -52,4 +52,18 @@ export function updateRouteCheckStatus(data) {
         method: 'post',
         data
     })
-}
+}
+// 预览
+export function selectSpecialDiseasenew(id) {
+    return request({
+        url: `/manage/signnode/getList?manageRouteId=${id}`,
+        method: 'get'
+    })
+}
+// 左侧点击事件
+export function getById(id) {
+    return request({
+        url: '/manage/signnode/getById/'+id,
+        method: 'get'
+    })
+}

src/views/manage/Datadetails/index.vue

@@ -108,10 +108,10 @@
                 ></i>
                 <el-button
                   v-if="
-                    taskPartitionCode == 'TPC202405200003' ||
+                    taskPartitionCode == 'MEDICATION_GUIDE' ||
-                    taskPartitionCode == 'TPC202405200004' ||
+                    taskPartitionCode == 'SPORT_GUIDE' ||
-                    taskPartitionCode == 'TPC202405200005' ||
+                    taskPartitionCode == 'DIET_GUIDE' ||
-                    taskPartitionCode == 'TPC202405200006'
+                    taskPartitionCode == 'NURSING_GUIDE'
                   "
                   round
                   style="margin-left: 10px"
@@ -833,25 +833,25 @@ export default {
     },
     // 药品重置
     addresetQuerylist() {
-      if (this.taskPartitionCode == 'TPC202405200003') {    // 用药
+      if (this.taskPartitionCode == 'MEDICATION_GUIDE') {    // 用药
         this.informationqueryParams = {
           pageNum: 1,
           pageSize: 10,
         };
         this.informationInfoinfo();
-      } else if (this.taskPartitionCode == 'TPC202405200004') {//运动
+      } else if (this.taskPartitionCode == 'SPORT_GUIDE') {//运动
         this.SporParams = {
           pageNum: 1,
           pageSize: 10,
         };
         this.spotgetList();
-      } else if (this.taskPartitionCode == 'TPC202405200005') {//饮食
+      } else if (this.taskPartitionCode == 'DIET_GUIDE') {//饮食
         this.DieParams = {
           pageNum: 1,
           pageSize: 10,
         },
           this.DiegetList()
-      } else if (this.taskPartitionCode == 'TPC202405200006') {//居家护理
+      } else if (this.taskPartitionCode == 'NURSING_GUIDE') {//居家护理
         this.NursingParams = {
           pageNum: 1,
           pageSize: 10,
@@ -940,17 +940,17 @@ export default {
     // 知识库获取
     knowledge(index, item) {
       // 用药
-      if (this.taskPartitionCode == 'TPC202405200003') {
+      if (this.taskPartitionCode == 'MEDICATION_GUIDE') {
         this.Drugshow = true
         this.informationInfoinfo()
-      } else if (this.taskPartitionCode == 'TPC202405200004') {//运动
+      } else if (this.taskPartitionCode == 'SPORT_GUIDE') {//运动
         this.Sportshow = true
         this.spotgetList()
-      } else if (this.taskPartitionCode == 'TPC202405200005') {//饮食
+      } else if (this.taskPartitionCode == 'DIET_GUIDE') {//饮食
         this.Dieshow = true
         this.DiegetList()
 
-      } else if (this.taskPartitionCode == 'TPC202405200006') {//居家护理
+      } else if (this.taskPartitionCode == 'NURSING_GUIDE') {//居家护理
         this.Nursingshow = true
         this.NursinggetList()
       }

src/views/manage/components/RehabilitationPlanandRecords.vue

@@ -146,7 +146,7 @@
         <!-- 问卷预览弹框 -->
         <questionopen ref="question" :lookitem="lookitem"></questionopen>
         <!-- 专病节点预览 -->
-        <el-dialog title="专病节点预览" :visible.sync="specialDiseaseNodeopen" width="90%">
+        <el-dialog title="专病节点预览" :visible.sync="specialDiseaseNodeopen" width="90%" v-if="specialDiseaseNodeopen">
             <specialDiseaseNodeopen :lookitem="lookitem">
             </specialDiseaseNodeopen>
         </el-dialog>
@@ -169,6 +169,7 @@ export default {
             baseUrl: process.env.VUE_APP_BASE_API,
             //左侧list
             itemindex: 0,
+            manageRouteId:'',
             namelist: [
                 {
                     name: '专病管理路径'
@@ -199,7 +200,9 @@ export default {
             this.lookitem = {
                 routeName: item.routeName,
                 suitRange: item.suitRange,
-                id: item.specialDiseaseRoute.specialDiseaseRouteId
+                id: item.specialDiseaseRoute.specialDiseaseRouteId,
+                manageRouteId:this.manageRouteId,
+
             }
             this.specialDiseaseNodeopen = true
         },
@@ -250,6 +253,7 @@ export default {
                 this.itemindex = index
                 this.loading.close();
                 this.categorylist = res.data
+                this.manageRouteId=this.categorylist[0].manageRouteId
             })
         },
     }
@@ -382,4 +386,4 @@ export default {
         }
     }
 }
-</style>
+</style>

src/views/manage/components/visitRecords.vue

@@ -3,7 +3,7 @@
         <div class="leftheader">
             <div class="time">
                 <el-date-picker v-model="visitDate" type="daterange" range-separator="至" start-placeholder="开始日期"
-                    value-format="yyyy-MM-dd" :picker-options="pickerOptions" end-placeholder="结束日期">
+                    value-format="yyyy-MM-dd" :picker-options="pickerOptions" end-placeholder="结束日期" style="width:95%">
                 </el-date-picker>
             </div>
             <div class="list">

src/views/manage/continueSigning/index.vue

@@ -208,12 +208,12 @@ export default {
                     { required: true, message: '请选择服务包', trigger: 'change' }
                 ],
                 devices: {
-                    snCode: [
+                    // snCode: [
-                        { required: true, message: '请输入SN码', trigger: 'change' }
+                    //     { required: true, message: '请输入SN码', trigger: 'change' }
-                    ],
+                    // ],
-                    hardwareType: [
+                    // hardwareType: [
-                        { required: true, message: '请选择硬件类型', trigger: 'change' }
+                    //     { required: true, message: '请选择硬件类型', trigger: 'change' }
-                    ],
+                    // ],
                 },
             },
             upload: {

src/views/manage/newSigning/index.vue

@@ -193,12 +193,12 @@ export default {
                     { required: true, message: '请选择专病管理路径', trigger: 'change' }
                 ],
                 devices: {
-                    snCode: [
+                    // snCode: [
-                        { required: true, message: '请输入SN码', trigger: 'change' }
+                    //     { required: true, message: '请输入SN码', trigger: 'change' }
-                    ],
+                    // ],
-                    hardwareType: [
+                    // hardwareType: [
-                        { required: true, message: '请选择硬件类型', trigger: 'change' }
+                    //     { required: true, message: '请选择硬件类型', trigger: 'change' }
-                    ],
+                    // ],
                 },
             },
             upload: {

src/views/manage/preHospitalized/index.vue

@@ -358,8 +358,8 @@
         </template>
       </el-table-column>
       <el-table-column label="入院时间" align="center" prop="admissionTime" width='130' />
-      <el-table-column label="主治医生" align="center" prop="attendingPhysician" /> 
+      <el-table-column label="主治医生" align="center" prop="attendingPhysician" />
-     <el-table-column label="出院方式" align="center" prop="dischargeMethod" /> 
+     <el-table-column label="出院方式" align="center" prop="dischargeMethod" />
       <el-table-column label="患者来源" align="center" prop="patientSource">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.patient_source" :value="scope.row.patientSource" />
@@ -872,10 +872,10 @@
           />
         </el-form-item>
         <el-form-item label="手术记录" prop="surgicalRecord">
-          <editor v-model="formHospital.surgicalRecord" :min-height="192" />
+          <editor v-model="formHospital.surgicalRecord" :min-height="192" style="width:838px"/>
         </el-form-item>
         <el-form-item label="病历内容"  prop="inHospitalInfo">
-          <editor v-model="formHospital.inHospitalInfo" :min-height="192" />
+          <editor v-model="formHospital.inHospitalInfo" :min-height="192" style="width:838px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -1013,7 +1013,7 @@ export default {
       formHospital: {},
       // 表单校验
       rulesHospital:{
-        
+
         hospitalAgencyId: [
           { required: true, message: '请选择医院', trigger: 'change' }
         ],
@@ -1491,7 +1491,7 @@ export default {
       // }
       // getDepartmentList(query).then(res => {
       if (type) {
-  
+
 
         if (!typetwo) {
           this.formHospital.wardId = null

src/views/manage/visitin/index.vue

@@ -661,10 +661,10 @@
           prop="surgicalRecord"
           v-if="form.visitMethod == 'BE_IN_HOSPITAL'"
         >
-          <editor v-model="form.surgicalRecord" :min-height="192" />
+          <editor v-model="form.surgicalRecord" :min-height="192" style="width:838px"/>
         </el-form-item>
         <el-form-item label="病历内容">
-          <editor v-model="form.inHospitalInfo" :min-height="192" />
+          <editor v-model="form.inHospitalInfo" :min-height="192" style="width:838px"/>
         </el-form-item>
         <!-- <el-form-item label="患者来源" prop="patientSource">
           <el-select v-model="form.patientSource" placeholder="请选择患者来源" clearable style="width:200px">
@@ -922,13 +922,13 @@
           />
         </el-form-item>
         <el-form-item label="手术记录" prop="surgicalRecord">
-          <editor v-model="formHospital.surgicalRecord" :min-height="192" />
+          <editor v-model="formHospital.surgicalRecord" :min-height="192" style="width:838px"/>
         </el-form-item>
         <el-form-item label="病历内容" prop="inHospitalInfo">
-          <editor v-model="formHospital.inHospitalInfo" :min-height="192" />
+          <editor v-model="formHospital.inHospitalInfo" :min-height="192" style="width:838px"/>
         </el-form-item>
         <el-form-item label="出院病历" prop="outHospitalInfo">
-          <editor v-model="formHospital.outHospitalInfo" :min-height="192" />
+          <editor v-model="formHospital.outHospitalInfo" :min-height="192" style="width:838px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/manage/visitout/index.vue

@@ -301,13 +301,13 @@
           <el-input v-model="form.surgicalName" placeholder="请输入手术名称" style="width:200px" />
         </el-form-item>
         <el-form-item label="手术记录" prop="surgicalRecord" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
-          <editor v-model="form.surgicalRecord" :min-height="192" />
+          <editor v-model="form.surgicalRecord" :min-height="192" style="width:838px"/>
         </el-form-item>
         <el-form-item label="入院病历">
-          <editor v-model="form.inHospitalInfo" :min-height="192" />
+          <editor v-model="form.inHospitalInfo" :min-height="192" style="width:838px"/>
         </el-form-item>
         <el-form-item label="出院病历" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
-          <editor v-model="form.outHospitalInfo" :min-height="192" />
+          <editor v-model="form.outHospitalInfo" :min-height="192" style="width:838px"/>
         </el-form-item>
         <!-- <el-form-item label="患者来源" prop="patientSource">
           <el-select v-model="form.patientSource" placeholder="请选择患者来源" clearable style="width:200px">