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

src/xt_pages/dialysis/details/index.vue

@@ -43,7 +43,7 @@
       element-loading-spinner="el-icon-loading"
       element-loading-background="rgba(0, 0, 0, 0.8)"
     >
-    <div class="patientBox" style="width:300px;padding-left:10px;position: relative;">
+    <div class="patientBox" style="width:300px;padding-left:10px;position: relative;" v-if="norefresh">
       <el-button
           style="position: absolute;right:0;top:2px;z-index:10"
           size="small"
@@ -863,127 +863,129 @@
     </div>
 
     <div style="width:75%" v-show="!showView">
-      <div style="margin-left:60px;color:#34495e">
-        <span>{{ patient.name }}({{ patient.dialysis_no }})</span>
-        <span v-if="newTime != ''">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
-        <span v-if="newTime != ''">签到时间：{{ newTime }}</span>
-      </div>
-
-      <nav-igation
-        ref="nav"
-        title="弹窗导航"
-        @advice="adviceFunc"
-        :patient="patient"
-        :schedual="schedual"
-        :prescription="prescription"
-        :solution="solution"
-        :receiver_treatment_access="receiver_treatment_access"
-        :predialysis_evaluation="predialysis_evaluation"
-        :doctor_advices="doctor_advices"
-        :double_check="double_check"
-        :assessment_after_dislysis="assessment_after_dislysis"
-        :treatment_summary="treatment_summary"
-        :monitor_records="monitor_records"
-        :dialysis_order="dialysis_order"
-        :admin_users="admin_users"
-        :devices="devices"
-        :device_numbers="device_numbers"
-        :admin_user_map="admin_user_map"
-        :device_map="device_map"
-        :device_number_map="device_number_map"
-        :niprocart_info="niprocart_info"
-        :jms_info="jms_info"
-        :fistula_needle_set_info="fistula_needle_set_info"
-        :fistula_needle_set_16_info="fistula_needle_set_16_info"
-        :hemoperfusion_info="hemoperfusion_info"
-        :dialyser_sterilised_info="dialyser_sterilised_info"
-        :filtryzer_info="filtryzer_info"
-        :dialyzers_info="dialyzers_info"
-        :injector_info="injector_info"
-        :bloodlines_info="bloodlines_info"
-        :tubingHemodialysis_info="tubingHemodialysis_info"
-        :safe_package_info="safe_package_info"
-        :aliquid_info="aliquid_info"
-        :config="config"
-        :longAdvices="longAdvices"
-        :waitUploadAdvices="waitUploadAdvices"
-        :is_open="is_open"
-        :last_predialysis_evaluation="lastPredialysisEvaluation"
-        :last_monitor_record="lastMonitorRecord"
-        :last_assessment_after_dislysis="lastAssessmentAfterDislysis"
-        :last_dialysis_prescribe="lastDialysisPrescribe"
-        :last_dryWeight_dislysis="lastDryWeightDislysis"
-        :special_premission="headNurses"
-        @assessmentAfterDislysis="assessmentAfterDislysisFunc"
-        :system_prescribe="system_prescribe"
-        :his_is_open="his_is_open"
-        :is_advice_open="is_advice_open"
-        :lastAssessment="lastAssessment"
-        :stockType="stockType"
-        :his_doctor_advices="his_doctor_advices"
-        :lastOrder="lastOrder"
-        :dryWeightList="dryWeightList"
-        :docList="docList"
-
-      >
-      </nav-igation>
-
-      <basic-infor
-        :patient="patient"
-        :device_number="schedual.id == 0 ? '' : schedual.device_number.number"
-        :steps="steps"
-        title="基本信息"
-      ></basic-infor>
-
-      <dialysis-prescription
-        :prescription="prescription"
-        :solution="solution"
-        :device_map="device_map"
-        :preparestock="preparestock"
-        title="透析处方"
-      ></dialysis-prescription>
-
-    <!-- <past-data class="往期数据"></past-data> -->
-      <div style="height: 20px;background-color: #f6f8f9"></div>
-      <accepts-assessment
-        :record="receiver_treatment_access"
-        title="接诊评估"
-      ></accepts-assessment>
-
-      <assessment-before
-        :record="predialysis_evaluation"
-        ref="assessment_before"
-        title="透前评估"
-      ></assessment-before>
-
-      <stat-order
-        ref="stat_order"
-        :advices="doctor_advices"
-        :doctor_map="admin_user_map"
-        title="临时医嘱"
-      ></stat-order>
-
-      <double-check
-        ref="double_check"
-        :record="double_check"
-        :admin_map="admin_user_map"
-        title="双人核对 "
-      ></double-check>
-
-      <dialysis-computer
-        ref="dialysis_computer"
-        :record="dialysis_order"
-        :admin_map="admin_user_map"
-        :device_number_map="device_number_map"
-        title="透析上机 "
-      ></dialysis-computer>
+      <!-- <div v-if="Refresh"> -->
+        <div style="margin-left:60px;color:#34495e">
+          <span>{{ patient.name }}({{ patient.dialysis_no }})</span>
+          <span v-if="newTime != ''">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
+          <span v-if="newTime != ''">签到时间：{{ newTime }}</span>
+        </div>
 
-      <dialysis-monitoring
-        ref="monitoring"
-        :monitores="monitor_records"
-        title="透析监测"
-      ></dialysis-monitoring>
+        <nav-igation
+          ref="nav"
+          title="弹窗导航"
+          @advice="adviceFunc"
+          :patient="patient"
+          :schedual="schedual"
+          :prescription="prescription"
+          :solution="solution"
+          :receiver_treatment_access="receiver_treatment_access"
+          :predialysis_evaluation="predialysis_evaluation"
+          :doctor_advices="doctor_advices"
+          :double_check="double_check"
+          :assessment_after_dislysis="assessment_after_dislysis"
+          :treatment_summary="treatment_summary"
+          :monitor_records="monitor_records"
+          :dialysis_order="dialysis_order"
+          :admin_users="admin_users"
+          :devices="devices"
+          :device_numbers="device_numbers"
+          :admin_user_map="admin_user_map"
+          :device_map="device_map"
+          :device_number_map="device_number_map"
+          :niprocart_info="niprocart_info"
+          :jms_info="jms_info"
+          :fistula_needle_set_info="fistula_needle_set_info"
+          :fistula_needle_set_16_info="fistula_needle_set_16_info"
+          :hemoperfusion_info="hemoperfusion_info"
+          :dialyser_sterilised_info="dialyser_sterilised_info"
+          :filtryzer_info="filtryzer_info"
+          :dialyzers_info="dialyzers_info"
+          :injector_info="injector_info"
+          :bloodlines_info="bloodlines_info"
+          :tubingHemodialysis_info="tubingHemodialysis_info"
+          :safe_package_info="safe_package_info"
+          :aliquid_info="aliquid_info"
+          :config="config"
+          :longAdvices="longAdvices"
+          :waitUploadAdvices="waitUploadAdvices"
+          :is_open="is_open"
+          :last_predialysis_evaluation="lastPredialysisEvaluation"
+          :last_monitor_record="lastMonitorRecord"
+          :last_assessment_after_dislysis="lastAssessmentAfterDislysis"
+          :last_dialysis_prescribe="lastDialysisPrescribe"
+          :last_dryWeight_dislysis="lastDryWeightDislysis"
+          :special_premission="headNurses"
+          @assessmentAfterDislysis="assessmentAfterDislysisFunc"
+          :system_prescribe="system_prescribe"
+          :his_is_open="his_is_open"
+          :is_advice_open="is_advice_open"
+          :lastAssessment="lastAssessment"
+          :stockType="stockType"
+          :his_doctor_advices="his_doctor_advices"
+          :lastOrder="lastOrder"
+          :dryWeightList="dryWeightList"
+          :docList="docList"
 
+        >
+        </nav-igation>
+
+        <basic-infor
+          :patient="patient"
+          :dialysis_date="dialysis_date"
+          :device_number="schedual.id == 0 ? '' : schedual.device_number.number"
+          :steps="steps"
+          title="基本信息"
+        ></basic-infor>
+
+        <dialysis-prescription
+          :prescription="prescription"
+          :solution="solution"
+          :device_map="device_map"
+          :preparestock="preparestock"
+          title="透析处方"
+        ></dialysis-prescription>
+
+        <!-- <past-data class="往期数据"></past-data> -->
+        <div style="height: 20px;background-color: #f6f8f9"></div>
+        <accepts-assessment
+          :record="receiver_treatment_access"
+          title="接诊评估"
+        ></accepts-assessment>
+
+        <assessment-before
+          :record="predialysis_evaluation"
+          ref="assessment_before"
+          title="透前评估"
+        ></assessment-before>
+
+        <stat-order
+          ref="stat_order"
+          :advices="doctor_advices"
+          :doctor_map="admin_user_map"
+          title="临时医嘱"
+        ></stat-order>
+
+        <double-check
+          ref="double_check"
+          :record="double_check"
+          :admin_map="admin_user_map"
+          title="双人核对 "
+        ></double-check>
+
+        <dialysis-computer
+          ref="dialysis_computer"
+          :record="dialysis_order"
+          :admin_map="admin_user_map"
+          :device_number_map="device_number_map"
+          title="透析上机 "
+        ></dialysis-computer>
+
+        <dialysis-monitoring
+          ref="monitoring"
+          :monitores="monitor_records"
+          title="透析监测"
+        ></dialysis-monitoring>
+      <!-- </div> -->
       <el-dialog
         title="长期医嘱单"
         :visible.sync="dialogFormVisible"
@@ -1172,7 +1174,7 @@
         :record="treatment_summary"
         title="治疗小结"
       ></treatment-of>
-      </div>
+    </div>
     <div v-if="showView" style="text-align:center;margin: 0 auto;font-size:20px;">
       <p style="margin-top:20px;">当前叫号</p>
       <p style="margin-top:20px;">{{ $route.query.patient_name ? $route.query.patient_name : ""}}</p>
@@ -1336,7 +1338,6 @@ export default {
       newTime: '',
       scheudle_mode:"",
 
-
       showView:false,
       curPatient:{},
 
@@ -1355,6 +1356,9 @@ export default {
       dryWeightList:[],
       docList:[],
       blood_access_part_opera: [],
+      Dialysis_patient:'',
+      Refresh:true,
+      norefresh:true,
     }
   },
   created() {
@@ -1405,8 +1409,6 @@ export default {
     this.getInitData()
 
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
-
-
   },
   beforeMount() {
     if (this.websocket) {
@@ -1602,6 +1604,7 @@ export default {
       getLongAdviceTwo(params).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
+          console.log('vbnvnffvvvv',resp);
           var status = parseInt(resp.data.status)
           switch (status) {
             case 2:
@@ -2079,8 +2082,7 @@ export default {
             newArr.push(...item.schedules)
           })
 
-
-          console.log("newArrwowowowowoowwowo",newArr)
+          // console.log("newArrwowowowowoowwowo",newArr)
           this.tableData = newArr
           this.getData()
 
@@ -2090,22 +2092,23 @@ export default {
       })
     },
     changePatient(schedual) {
-      this.patient_id = schedual.patient_id
-      this.date = schedual.schedule_date
-      // this.getScheduleDetail();
-      this.getLongAdvice();
-
-      var patient_id = schedual.patient_id
-      var date = schedual.schedule_date
-      this.$router.push({
-        path: '/dialysis/details',
-        query: {
-          patient_id: patient_id,
-          date: date,
-          patient_name: schedual.patient.name,
-          mode_id:schedual.mode_id
-        }
-      })
+        this.patient_id = schedual.patient_id
+        this.date = schedual.schedule_date
+         this.getScheduleDetail();
+        console.log('schedual',schedual);
+        this.getLongAdvice();
+
+        // var patient_id = schedual.patient_id
+        // var date = schedual.schedule_date
+        // this.$router.push({
+        //   path: '/dialysis/details',
+        //   query: {
+        //     patient_id: patient_id,
+        //     date: date,
+        //     patient_name: schedual.patient.name,
+        //     mode_id:schedual.mode_id
+        //   }
+        // })
     },
     handleClick(type) {
       sessionStorage.setItem('nameActive', type.name);

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1,7 +1,18 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <bread-crumb :crumbs="crumbs" style="flex: 2;"></bread-crumb>
+      <template>
+          <div style="margin-right: 10px;">
+            <el-button
+            :loading="loading"
+            size="small"
+            @click="fanhui"
+            type="primary"
+            >返回</el-button>
+          </div>
+      </template>
+
       <template v-if="org_template_info.template_id == 1">
         <el-button
           :loading="loading"
@@ -1356,7 +1367,6 @@
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 70"
           >
-
           </DialysisPrintOrderSeventy>
           <DialysisPrintOrderseventyone
             v-bind:childResponse="childResponse"
@@ -1662,9 +1672,23 @@ export default {
       scheduleStateVal: 0,
       zone_options: [{ id: 0, text: "全部" }],
       zoneVal: 0,
+      x_tdate:'',
     };
   },
   methods: {
+    //返回
+    fanhui(){
+      this.$router.push({
+        path: "/dialysis/details",
+        query: {
+          patient_id: this.patient_id,
+          date: this.date,
+          patient_name: this.patient_name,
+          mode_id: this.mode_id,
+        },
+      });
+      // window.history.back()
+    },
     getAdminUser(id) {
       if (id == 0) {
         return "";
@@ -2189,7 +2213,7 @@ export default {
         });
 
       }
-     
+
     },
     printThisOnePage() {
       var ptime = Math.round(new Date().getTime() / 1000);
@@ -2385,8 +2409,14 @@ export default {
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.childResponse = response;
+           this.mode_id= response.data.data.patientInfo.DialysisSchedule.mode_id
+          this.date = response.data.data.patientInfo.DialysisSchedule.schedule_date
+          this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
+          this.patient_name = response.data.data.patientInfo.name
+          console.log('kkkkkkk222222',this.org_template_info);
           // console.log('this.org_template_info是数据',response.data.data.org_template_info.template_id);
           this.org_template_info = response.data.data.org_template_info;
+           this.org_template_info.template_id= response.data.data.org_template_info.template_id
           this.loading = false;
           //   this.adminUser = response.data.data.users
           //   this.users = response.data.data.users
@@ -2812,14 +2842,24 @@ export default {
       });
     },
     changePatient(schedual) {
-      // console.log(schedual);
+      console.log('schedual',schedual);
       var xtdate = parseTime(schedual.schedule_date, "{y}-{m}-{d}");
+      console.log('fffff',this.org_template_info.template_id);
+      this.x_tdate=xtdate
+    
+      // this.queryParams.xtdate = xtdate;
+      // this.queryParams.xtno = schedual.patient.dialysis_no;
+      // this.queryParams.patient_id = schedual.patient.id
+      // this.getDialysisRecord()
+      // console.log('');
+
       this.$router.push(
         "/dialysis/print?xtdate=" +
           xtdate +
           "&xtno=" +
           schedual.patient.dialysis_no+"&patient_id="+schedual.patient.id
       );
+
       //   this.patient_id = schedual.patient_id;
       //   this.date = schedual.schedule_date;
       //   // this.getScheduleDetail();
@@ -3033,7 +3073,6 @@ export default {
     },
   },
   created() {
-    // console.log("hhahahhahahahah=======",this.org_template_info.template_id)
     // console.log("this.$store.getters.xt_user.org.id",this.$store.getters.xt_user.org.id)
     var schedule_type_selected = this.$store.getters.schedule_type_selected;
     var zone_selected = this.$store.getters.zone_selected;
@@ -3097,6 +3136,7 @@ export default {
       this.queryParams.xtdate = xtdate;
       this.queryParams.xtno = xtno;
       this.queryParams.patient_id = patient_id
+      console.log('wwwwww121212',this.org_template_info.template_id);
       this.getDialysisRecord();
     } else {
       this.$message.error("参数不齐");

src/xt_pages/outpatientDoctorStation/template/printTenOne.vue

@@ -151,7 +151,7 @@
               srcset=""
             />
           </p>
-          <p style="line-height: 50px;" v-if="org_id==10217||org_id==0">打印日期：{{ getTime(new Date()) ? getTime(new Date()) : "" }}</p>
+          <p style="line-height: 50px;" v-if="org_id==10217||org_id==0">打印日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
         </div>
         <div class="actionBar">
           <p >审核、调配：</p>