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

src/api/inspection.js

@@ -105,7 +105,14 @@ export function getNewInspectionList(params){
   })
 }
 
+export function getNewInspectionDetailList(params){
 
+  return request({
+    url:"/api/getnewinspectiondetaillist",
+    method:"Get",
+    params:params,
+  })
+}
 
 
 

src/router/modules/Dialysisanalysis.js

@@ -42,7 +42,6 @@ export default {
     //   }
     // },
 
-
     {//透析总量分析
       path: '/Dialysisanalysis/qualitycontrol/new_otherIndicators/Total_analysis',
       component: () => import('@/xt_pages/Dialysisanalysis/new_otherIndicators/components/Total_analysis'),

src/xt_pages/dialysis/batch_print/batch_print_order_seventytwo.vue

@@ -1191,6 +1191,7 @@
                           <div style="flex: 0.9;border-right: 1px solid black;">超滤量<br/>(ml)</div>
                           <div style="flex: 1;border-right: 1px solid black;" v-if="record.prescription.mode_id == 2">置换液流量<br/>(ml/h)</div>
                           <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7 && record.prescription.anticoagulant != ''">肝素剩余量度(ml)</div>
+                          <div style="flex: 1;border-right: 1px solid black;">透析液温度°C</div>
                           <div style="flex: 2;">病情变化及处理</div>
                         </div>
                     </div>
@@ -1226,8 +1227,9 @@
                       <div style="flex: 1;border-right: 1px solid black;" v-if="record.prescription.mode_id == 2">
                         {{ monitor_record.displacement_flow_quantity ? monitor_record.displacement_flow_quantity : "" }}
                       </div>
-                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7 && record.prescription.anticoagulant != ''">
-
+                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="record.prescription.anticoagulant == 7 && record.prescription.anticoagulant != ''"> </div>
+                      <div style="flex: 1;border-right: 1px solid black;">
+                        {{ monitor_record.dialysate_temperature ? monitor_record.dialysate_temperature :'' }}
                       </div>
                       <div style="flex: 2;">
                         <div style="min-height: 35px;
@@ -1600,8 +1602,7 @@
                 </tr>
                 <tr>
                   <td>
-                    <div
-                      class="row"
+                    <div class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1">
@@ -1859,8 +1860,7 @@
                         </div>
                       </div>
                     </div>
-                    <div
-                      class="row"
+                    <div class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
@@ -1900,6 +1900,14 @@
                           {{ getpatientgose(record.assessment_after_dislysis.patient_gose) }}
                         </div>
                       </div>
+                      <div class="inline_block" style="flex: 1">
+                        KT/V：
+                        <div class="under_line"
+                          style="width: 150px; text-align: center"
+                        >
+                            {{ record.assessment_after_dislysis.ktv ? record.assessment_after_dislysis.ktv : "/" }}
+                        </div>
+                      </div>
                     </div>
 
                     <div

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -2371,7 +2371,7 @@
                       >
 
                         <span v-if="org_id!=10460 && org_id!=10551">
-                          透析中入量  (L)：
+                          透析中入量：
                         </span>
                         <span v-if="org_id==10460 || org_id ==10551">
                           透析中入量  (ml)：

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -3195,10 +3195,13 @@ mu
         if(moment().weekday() == 0){
            total_day ="周日"
         }
-
+         
+        console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhh",this.targetAdvices)
         if(this.targetAdvices!=null && this.targetAdvices.length >0){
             for (let i = 0; i < this.targetAdvices.length; i++) {
+              console.log("WOOWOWOWOWOWOW",this.targetAdvices[i].week_day.indexOf(total_day))
               if(this.targetAdvices[i].week_day.indexOf(total_day)!=-1){
+                console.log("尽力啊=--------------------")
                 this.targetAdvices[i].isCheck = 1
               }
               if(this.targetAdvices[i].frequency_type == 1){

src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue

@@ -85,7 +85,7 @@
             </td>
           </tr>
           <tr>
-            <td style="text-align: left" colspan="2">
+            <td style="text-align: left" colspan="3">
               <span style="display: inline-block; margin-left: 15px"
                 >治疗方式:</span
               >
@@ -106,8 +106,16 @@
                     : false
                 "
                 showValue="HP"
-              ></label-box
-              >&nbsp;
+              ></label-box>&nbsp;
+              <label-box
+                :isChecked="
+                  prescription.mode_id == 12
+                    ? true
+                    : false
+                "
+                showValue="HD+HP"
+              ></label-box>&nbsp;
+              
               <!-- <label-box :isChecked="prescription.mode_id == 7 ? true : false" showValue="IUF"></label-box>&nbsp; -->
               <!-- <label-box
                 :isChecked="prescription.mode_id == 5 ? true : false"
@@ -137,9 +145,9 @@
                                 <span v-if="prescription.mode_id == 11">
                                 HFR
                                 </span>
-                                <span v-if="prescription.mode_id == 12">
+                                <!-- <span v-if="prescription.mode_id == 12">
                                 HDF+HP
-                                </span>
+                                </span> -->
                                 <span v-if="prescription.mode_id == 13">
                                 CRRT
                                 </span>
@@ -203,7 +211,7 @@
                                 </span>
                 
             </td>
-            <td style="text-align: left" colspan="5">
+            <td style="text-align: left" colspan="4">
               <span
                 style="display: inline-block; margin-left: 15px; width: 100%"
                 >诊断: {{ patientInfo.diagnose }}</span

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyTwo.vue

@@ -1119,8 +1119,10 @@
                       <div style="flex: 0.9;border-right: 1px solid black;">钠浓度<br/>(mmol/L)</div>
                       <div style="flex: 0.9;border-right: 1px solid black;">超滤量<br/>(ml)</div>
                       <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">置换液流量<br/>(ml/h)</div>
-                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name=='低分子肝素钠'">肝素剩余量度(ml)
+                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name=='低分子肝素钠'">
+                        肝素剩余量度(ml)
                       </div>
+                      <div style="flex: 1;border-right: 1px solid black;">透析液温度°C</div>
                       <div style="flex: 2;">病情变化及处理</div>
                     </div>
                   </div>
@@ -1174,7 +1176,9 @@
                       {{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
                     </div>
                     <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name=='低分子肝素钠'">
-
+                    </div>
+                    <div style="flex: 1;border-right: 1px solid black;">
+                      {{ monitor.dialysate_temperature ? monitor.dialysate_temperature :'' }}
                     </div>
                     <!-- v-if="prescription.anticoagulant == 7 && prescription.anticoagulant_name != ''" -->
                     <div style="flex: 2;">
@@ -1811,6 +1815,16 @@
                         {{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "/" }}
                       </div>
                     </div>
+                    <div class="inline_block" style="flex: 1">
+                      KT/V：
+                      <div class="under_line"
+                        style="width: 150px; text-align: center"
+                      >
+                        
+                          {{ afterdialysis.ktv ? afterdialysis.ktv : "/" }}
+                        
+                      </div>
+                    </div>
                   </div>
 
                   <div

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -1927,11 +1927,7 @@ export default {
     },
 
     checkData() {
-      if (this.receiverTreatmentAccess.way == 0) {
-        this.$message.error("入科方式未填");
-      } else if (this.predialysis.symptom_before_dialysis == "") {
-        this.$message.error("透前症状未填");
-      } else if (this.predialysis.temperature == "") {
+      if (this.predialysis.temperature == '') {
         this.$message.error("透前体温未填");
       } else if (this.predialysis.pulse_frequency == "") {
         this.$message.error("透前脉搏未填");
@@ -1942,61 +1938,88 @@ export default {
         this.predialysis.diastolic_blood_pressure == 0
       ) {
         this.$message.error("透前血压未填完整");
-      } else if (this.predialysis.puncture_way == "") {
-        this.$message.error("穿刺方式未填");
-      } else if (this.predialysis.puncture_needle == "") {
-        this.$message.error("穿刺针未填");
-      } else if (
-        this.predialysis.blood_access_part_id == "" &&
-        this.predialysis.blood_access_part_opera_name == ""
-      ) {
-        this.$message.error("血管通路未填");
+      } else if (this.predialysis.dialysis_interphase == "") {
+        this.$message.error("透析期间未填");
+      } else if (this.predialysis.symptom_before_dialysis == "") {
+        this.$message.error("透前症状未填");
       } else if (this.predialysis.internal_fistula == "") {
         this.$message.error("透前内瘘未填");
       } else if (this.predialysis.catheter == "") {
         this.$message.error("透前导管未填");
-      } else if (this.prescription.mode_id == "") {
-        this.$message.error("透析方式未填");
+      } else if (this.predialysis.complication == "" ) {
+        this.$message.error("合并症未填");
+      } else if (this.receiverTreatmentAccess.score == "") {
+        this.$message.error("跌倒评估未填");
+      } else if (this.predialysis.dry_weight == '' ) {
+        this.$message.error("干体重未填");
+      } else if ( this. predialysis.weight_before == '') {
+        this.$message.error("透前体重未填");
+      } else if (this.predialysis.dehydration == '') {
+        this.$message.error("预增脱水量未填");
+      } else if (this.afterdialysis.temperature == '') {
+        this.$message.error("透后体温未填");
+      } else if (this.afterdialysis.pulse_frequency == "") {
+        this.$message.error("透后脉搏未填");
+      } else if (this.afterdialysis.breathing_rate == "") {
+        this.$message.error("透后呼吸频率未填");
       } else if (
-        this.prescription.displace_liqui_part == 0 &&
-        this.prescription.mode_id == 2
+        this.afterdialysis.systolic_blood_pressure == 0 ||
+        this.afterdialysis.diastolic_blood_pressure == 0
       ) {
+        this.$message.error("透后血压未填完整");
+      } else if (this.afterdialysis.cruor == "") {
+        this.$message.error("凝血未填");
+      } else if (this.afterdialysis.symptom_after_dialysis == "") {
+        this.$message.error("透后症状未填");
+      } else if (this.afterdialysis.internal_fistula == "") {
+        this.$message.error("透后内瘘未填");
+      } else if (this.afterdialysis.catheter == "") {
+        this.$message.error("透后导管未填");
+      } else if (this.afterdialysis.complication == 0) {
+        this.$message.error("并发症未填");
+      } else if (this.afterdialysis.actual_displacement == 0) {
+        this.$message.error("实际置换量未填");
+      } else if (this.afterdialysis.actual_ultrafiltration == 0) {
+        this.$message.error("实际超滤量未填");
+      } else if (this.afterdialysis.weight_after == 0) {
+        this.$message.error("透后体重未填");
+      } else if (this.afterdialysis.weight_loss == 0) {
+        this.$message.error("体重减少未填");
+      } else if (this.afterdialysis.dialysis_intakes == 0) {
+        this.$message.error("透析中入量未填");
+      } else if (this.prescription.target_ultrafiltration == 0) {
+        this.$message.error("处方脱水量未填");
+      } else if (this.afterdialysis.actual_ultrafiltration == 0) {
+        this.$message.error("超滤总量未填");
+      } else if (this.prescription.dialysis_duration_hour == 0) {
+        this.$message.error("透析时长未填");
+      } else if (this.prescription.mode_id == 0) {
+        this.$message.error("透析方式未填");
+      } else if (this.prescription.displace_liqui_part == '') {
         this.$message.error("置换方式未填");
-      } else if (
-        this.prescription.displace_liqui_value == 0 &&
-        this.prescription.mode_id == 2
-      ) {
-        this.$message.error("置换量未填");
+      } else if (this.prescription.displace_liqui_value == 0) {
+        this.$message.error("置换总量未填");
+      } else if (this.predialysis.blood_access_part_opera_name == ''){
+        this.$message.error('血管通路未填');
       } else if (this.prescription.blood_flow_volume == 0) {
         this.$message.error("血流量未填");
       } else if (
-        this.prescription.dialysis_duration_hour == 0 &&
-        this.prescription.dialysis_duration_minute == 0
-      ) {
-        this.$message.error("透析时间未填");
-      } else if (
-        this.prescription.dialyzer_perfusion_apparatus == "" &&
-        this.prescription.dialysis_dialyszers == ""
-      ) {
-        this.$message.error("透析器未填");
-      } else if (this.prescription.dialysis_irrigation == "") {
-        this.$message.error("灌流器未填");
-      } else if (
-        this.prescription.plasma_separator == "" &&
-        this.org_id == 9538
-      ) {
-        this.$message.error("血浆分离器未填");
-      } else if (
-        this.prescription.bilirubin_adsorption_column == "" &&
-        this.org_id == 9538
-      ) {
-        this.$message.error("胆红素吸附柱未填");
-      } else if (this.predialysis.weight_before == 0) {
-        this.$message.error("透前体重未填");
-      } else if (this.predialysis.dry_weight == 0) {
-        this.$message.error("干体重未填");
-      } else if (this.prescription.target_ultrafiltration == 0) {
-        this.$message.error("计划超滤量未填");
+        this.prescription.dialysis_irrigation == '' &&
+        this.prescription.dialysis_dialyszers == ''
+      ){
+        this.$message.error('人工肾装置未填');
+      } else if (this.predialysis.machine_type == 0) {
+        this.$message.error("透析机型未填");
+      } else if (this.dialysisOrder.DeviceNumber.number == 0) {
+        this.$message.error("机号未填");
+      } else if (this.prescription.anticoagulant_name == 0) {
+        this.$message.error("抗凝剂未填");
+      } else if (this.prescription.anticoagulant_shouji == 0) {
+        this.$message.error("首剂未填");
+      } else if (this.prescription.anticoagulant_weichi == 0) {
+        this.$message.error("维持未填");
+      } else if (this.prescription.anticoagulant_zongliang == 0) {
+        this.$message.error("总量未填");
       } else if (this.prescription.calcium == 0) {
         this.$message.error("钙未填");
       } else if (this.prescription.sodium == 0) {
@@ -2007,8 +2030,6 @@ export default {
         this.$message.error("碳酸氢根未填");
       } else if (this.prescription.dialysate_flow == 0) {
         this.$message.error("透析液流量未填");
-      } else if (this.prescription.anticoagulant == 0) {
-        this.$message.error("抗凝剂未填");
       } else if (
         this.prescription.anticoagulant_gaimingcheng == "" &&
         this.prescription.anticoagulant == 5
@@ -2019,36 +2040,13 @@ export default {
         this.prescription.anticoagulant == 5
       ) {
         this.$message.error("钙剂量未填");
-      } else if (this.afterdialysis.temperature == 0) {
-        this.$message.error("透后体温未填");
-      } else if (this.afterdialysis.pulse_frequency == 0) {
-        this.$message.error("透后脉搏未填");
-      } else if (this.afterdialysis.breathing_rate == 0) {
-        this.$message.error("透后呼吸频率未填");
-      } else if (
-        this.afterdialysis.systolic_blood_pressure == 0 ||
-        this.afterdialysis.diastolic_blood_pressure == 0
-      ) {
-        this.$message.error("透后血压未填完整");
       } else if (
         this.afterdialysis.actual_treatment_hour == 0 &&
         this.afterdialysis.actual_treatment_minute == 0
       ) {
         this.$message.error("实际治疗时间未填");
-      } else if (this.afterdialysis.cruor == "") {
-        this.$message.error("透析器凝血未填");
-      } else if (this.afterdialysis.internal_fistula == "") {
-        this.$message.error("透后内瘘未填");
-      } else if (this.afterdialysis.catheter == "") {
-        this.$message.error("透后导管未填");
-      } else if (this.afterdialysis.weight_after == 0) {
-        this.$message.error("透后体重未填");
-      } else if (this.afterdialysis.weight_loss == 0) {
-        this.$message.error("透后体重减少未填");
-      } else if (this.afterdialysis.dialysis_intakes == 0) {
-        this.$message.error("透析中入量未填");
-      } else if (this.afterdialysis.actual_ultrafiltration == 0) {
-        this.$message.error("实际超滤量未填");
+      } else if (this.summary.mission == 0) {
+        this.$message.error("透后宣教未填");
       } else if (this.summary.dialysis_summary == "") {
         this.$message.error("透析小结未填");
       } else if (
@@ -2088,7 +2086,7 @@ export default {
       ) {
         this.$message.error("下机护士未填");
       } else if (this.prescription.creater == 0) {
-        this.$message.error("医生签名未填");
+        this.$message.error("治疗医生未填");
       } else if (this.tableAdvice.length > 0) {
         let num = 0;
         this.tableAdvice.map((item) => {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -3953,7 +3953,8 @@
 
     <div id="dialysis-print-box-1-2" class="dialysis-print-order print-template-two print_page_main_content" style="position: relative;">
       <div class="order-yy-name">{{ orgname }}</div>
-      <div class="order_title">血液净化科医嘱及执行单</div>
+      <div class="order_title" v-if="org_id!=0&&org_id!=10579">血液净化科医嘱及执行单</div>
+      <div class="order_title" v-if="org_id==0|| org_id==10579">血液净化治疗记录单</div>
       <div class="row" style="margin-top: 15px">
         <div class="inline_block">
           科室：
@@ -4130,7 +4131,606 @@
                           />
                         </td>
                       </tr>
+                      
+                      <tr v-if="org_id == 0 || org_id == 10579">
+                  <td colspan="7">
+                  <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                   <div v-if="org_id == 0 || org_id == 10440">
+
+
+
+                    <div class="inline_block" style="flex: 1">
+                      上机护士：
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+
+
+                  </div>
+                  <div v-if="org_id ==10644">
+                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter == ''">
+                      穿刺护士：
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+
+                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter != ''">
+                      换药护士：
+
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                        v-if="org_id==10644"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.change_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.change_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.change_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                        v-if="org_id!=10644"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                  </div>
+
+
+                  <div v-if="org_id !=10644 && org_id!=10440">
+                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter == ''">
+                      穿刺护士：
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+
+                    <div class="inline_block" style="flex: 1" v-if="predialysis.catheter != ''">
+                      穿刺护士：
+
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                        v-if="org_id==10644"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                        v-if="org_id!=10644"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                  </div>
+
+                  <div v-if="org_id==10440">
+
+                    <div class="inline_block" style="flex: 1">
+                     <div>
+                      <span>责任护士：</span>
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+
+                      >
+
+                        <span
+                          style="height: 35px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+
+                    </div>
+
+                  </div>
+
+                  <div v-if="org_id!=0&&org_id!=10440&&org_id!= 10206">
+                    <div class="inline_block" style="flex: 1">
+                      <span v-if="org_id==10414">责任护士：</span>
+                      <span v-else>治疗护士：</span>
+
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                  </div>
+
+
+
+                    <div class="inline_block" style="flex: 1">
+                      <span v-if="org_id==10387 || org_id ==10206 || org_id == 0" >核对护士：</span>
+                      <span v-else >核对人员：</span>
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                        v-if="dialysisOrder == null"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(check == null ? 0 : check.creater) ==
+                            ''
+                          "
+                        >
+                          {{ getAdminUser(check == null ? 0 : check.creater) }}
+                        </span>
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(check == null ? 0 : check.creater)
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                        v-if="
+                          dialysisOrder != null &&
+                          dialysisOrder.start_nurse == check.modifier
+                        "
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(check == null ? 0 : check.creater) ==
+                            ''
+                          "
+                        >
+                          {{ getAdminUser(check == null ? 0 : check.creater) }}
+                        </span>
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(check == null ? 0 : check.creater)
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                        v-if="
+                          dialysisOrder != null &&
+                          dialysisOrder.start_nurse == check.creater
+                        "
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              check == null ? 0 : check.modifier
+                            ) == ''
+                          "
+                        >
+                          {{ getAdminUser(check == null ? 0 : check.modifier) }}
+                        </span>
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(check == null ? 0 : check.modifier)
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                        v-if="
+                          dialysisOrder != null &&
+                          dialysisOrder.start_nurse != check.creater &&
+                          dialysisOrder.start_nurse != check.modifier
+                        "
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(check == null ? 0 : check.creater) ==
+                            ''
+                          "
+                        >
+                          {{ getAdminUser(check == null ? 0 : check.creater) }}
+                        </span>
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(check == null ? 0 : check.creater)
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10579 && org_id!=0">
+                       下机护士：
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.finish_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.finish_nurse
+                            )
+                          }}
+                        </span>
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.finish_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex: 1" v-if="org_id==10579 || org_id == 0">
+                       患者签名
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+
+
+                      </div>
+                    </div>
+                    <div class="inline_block" style="flex: 1">
+                      治疗医生：
+                      <div
+                        v-if="org_id ==10191"
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="setAdminUserES(prescription.creater) == ''"
+                        >
+                          {{ getAdminUser(prescription.creater) }}
+                        </span>
+                        <img
+                          style="height: 40px"
+                          :src="setAdminUserES(prescription.creater)"
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                      <div
+                        v-if="org_id!=10191"
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                      <span v-if="doctor_advices[0]!=null && doctor_advices[0].advice_doctor>0">
+                        <span
+                            style="height: 30px; display: inline-block"
+                            v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
+                          >
+                            {{ getAdminUser(doctor_advices[0].advice_doctor) }}
+                          </span>
+                          <img
+                            style="height: 40px"
+                            :src="setAdminUserES(doctor_advices[0].advice_doctor)"
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                      </span>
 
+                      </div>
+                    </div>
+                  </div>
+                </td>
+              </tr>
 
 
                     </tbody>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -2170,7 +2170,7 @@
                       v-if="org_id != 10223 || org_id!=10375"
                     >
                         <span v-if="org_id!=10460 && org_id!=10551">
-                          透析中入量(L)：
+                          透析中入量：
                         </span>
                         <span v-if="org_id==10460 || org_id ==10551">
                           透析中入量(ml)：
@@ -2185,7 +2185,7 @@
                             : "/"
                         }}
                       </div>
-                      {{ getUnit(afterdialysis.dialysis_intakes_unit) }}
+                      <!-- {{ getUnit(afterdialysis.dialysis_intakes_unit) }} -->
                     </div>
 
                     <div class="inline_block" style="flex: 1">

src/xt_pages/management/components/RepairForm.vue

@@ -752,7 +752,7 @@ export default {
         fault_description: [{ required: true, message: "请填写故障描述" }]
       },
       filename: "",
-      limit: 10,
+      limit: 100,
       page: 1,
       total: 0,
       hiddenShow:false,

src/xt_pages/management/components/UserForm.vue

@@ -855,7 +855,7 @@
                 <td
                   :rowspan="2"
                   style="text-align:center;min-width:40px;font-size:15px"
-                  v-if="org_id!=0&&org_id!=10060&& org_id!=10340 && org_id!=0 && org_id!=10495"
+                  v-if="org_id!=10060&& org_id!=10340 && org_id!=0 && org_id!=10495"
                 >
                  透析机消毒液(更换)
                  
@@ -863,14 +863,14 @@
                 <td
                   :rowspan="2"
                   style="text-align:center;width:80px;font-size:15px"
-                  v-if="org_id!=0&&org_id!=10060&& org_id!=10340 && org_id!=10495 && org_id!=0"
+                  v-if="org_id!=10060&& org_id!=10340 && org_id!=10495 && org_id!=0"
                 >
                  细菌过滤器(更换)
                 </td>
                 <td
                   :rowspan="2"
                   style="text-align:center;width:80px;font-size:15px"
-                  v-if="org_id!=0&&org_id!=10060&& org_id!=10340"
+                  v-if="org_id!=0&&org_id!=10060&& org_id!=10340 && org_id!=10495"
                 >
                  空气滤网
                 </td>
@@ -974,15 +974,15 @@
                   {{ item.disinfection_residue }}
                 </td>
                 <td style="text-align:center;font-size:15px;height:30px"
-                v-if="org_id!=0&&org_id!=10060 && org_id!=10340">
+                v-if="org_id!=0&&org_id!=10060 && org_id!=10340 && org_id!=10495">
                    {{item.dialysis_checked }}
                 </td>
                 <td style="text-align:center;font-size:15px;height:30px"
-                v-if="org_id!=0&&org_id!=10060&& org_id!=10340">
+                v-if="org_id!=0&&org_id!=10060&& org_id!=10340  && org_id!=10495">
                   {{item.germ_checked }}
                 </td>
                 <td style="text-align:center;font-size:15px;height:30px"
-                v-if="org_id!=0&&org_id!=10060&& org_id!=10340">
+                v-if="org_id!=0&&org_id!=10060&& org_id!=10340  && org_id!=10495">
                   {{item.clean}}
                 </td>
 

src/xt_pages/outpatientCharges/listTemplate/listPrintforu.vue

@@ -7,7 +7,7 @@
             <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
             <div>身份证号：{{patient.id_card_no}}</div>
             <div>年龄：{{patient.age}}  岁</div>
-            <div>开方日期：{{getTimes(order.ctime)}}</div>
+            <div>开方日期：{{getTimes(order.settle_accounts_date) }}</div>
         </div>
         <div class="listInfo">
             <div>结算类型：{{order.is_medicine_insurance == 1 ? "医保" : "自费"}}</div>
@@ -19,7 +19,7 @@
             <div>总金额：{{ order.medfee_sumamt }}</div>
             <div>个人支付金额：{{ order.psn_part_amt }}</div>
             <div>基金支付金额：{{ order.fund_pay_sumamt }}</div>
-            <div>收费日期：{{getTimes(order.settle_accounts_date)}}</div>
+            <div>收费日期：{{getTimes(order.ctime)}}</div>
         </div>
         
         <table class="listTable" style="text-align: center;">

src/xt_pages/outpatientDoctorStation/components/dialysishistory.vue

@@ -370,24 +370,14 @@ export default{
       }
     },
     setAnticoagulantsConfit(prescription) {
-      if (
-        typeof this.anticoagulantsConfit[prescription.anticoagulant] ===
-        "undefined"
-      ) {
+      console.log("透析处方----------------",prescription)
+      if (typeof this.anticoagulantsConfit[prescription.anticoagulant] ==="undefined") {
         return "";
       } else {
         if (this.anticoagulantsConfit[prescription.anticoagulant].shouji != 1) {
           return this.anticoagulantsConfit[prescription.anticoagulant].name;
         } else {
-          return (
-            this.anticoagulantsConfit[prescription.anticoagulant].name +
-            "/" +
-            prescription.anticoagulant_shouji +
-            "/" +
-            prescription.anticoagulant_weichi +
-            "/" +
-            prescription.anticoagulant_zongliang
-          );
+          return (this.anticoagulantsConfit[prescription.anticoagulant].name +"/" +prescription.anticoagulant_shouji +"/" + prescription.anticoagulant_weichi +"/" +prescription.anticoagulant_zongliang);
         }
       }
     },
@@ -396,6 +386,7 @@ export default{
     this.modeOptions = this.$store.getters.treatment_mode;
     console.log("patinetid----",this.patientid)
     this.queryParams.patient_id = this.patientid
+    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
     this.getPatientDialysisRecords()
 
   },

src/xt_pages/role/components/AdminInfoForm.vue

@@ -403,7 +403,14 @@
       <el-row :gutter="24">
         <el-col :span="24">
           <el-form-item label="介绍 : ">
-            <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/>
+            <!-- <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/> -->
+            <el-input
+              :height="1000"
+              type="textarea"
+              :rows="120"
+              placeholder="请输入内容"
+              v-model="form.intro">
+            </el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -731,7 +738,9 @@ export default {
               }
             }
             this.form.intro = ""
+            console.log('admin33333333333333333333', admin.intro)
             this.form.intro = admin.intro
+            console.log("intro------------------------",this.form.intro)
             this.form.user_title_name = admin.user_title_name
 
             if (this.form.user_type == 2) {

src/xt_pages/role/components/EditAdminInfo.vue

@@ -168,6 +168,7 @@ export default {
                     this.form.user_title = admin.user_title
                     this.form.role = admin.role_id
                     this.form.intro = ""
+                    console.log("admin=-==============",admin)
                     this.form.intro = admin.intro
                     this.form.deparment_id = admin.deparment_id
                 } else {

src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue

@@ -18,7 +18,6 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             :picker-options="pickerOptions"
-            @change="startTimeChange"
             :clearable="false"
            ></el-date-picker>
             <span>-</span>
@@ -34,9 +33,9 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               :picker-options="pickerOptions"
-              @change="endTimeChange"
               :clearable="false"
           ></el-date-picker>
+          <el-button  type="primary" icon="el-icon-search" @click="getDrugQuery">查询</el-button>
           <span style="font-size:14px;color:#606266">药品类型:</span>
           <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
           filterable
@@ -452,19 +451,36 @@ export default {
            
               list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
               list[i].drugInMoney = list[i].last_price
-              list[i].drugSaleMoney = "/"
+              if(this.org_id == 0){
+                list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
+              }else{
+                list[i].drugSaleMoney = "/"
+              }
+             
 
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
               list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-           
-              list[i].drugAddPrice = "/"
-              list[i].drugAddSalePrice = "/"
+              
+              if(this.org_id == 0){
+                 list[i].drugAddPrice = list[i].last_price
+                 list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
+              }else{
+                list[i].drugAddPrice = "/"
+                list[i].drugAddSalePrice = "/"
+              }
+             
 
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
               list[i].drugOutOne =this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
            
-              list[i].drugOutPrice = "/"
-              list[i].drugOutSalePrice = "/"
+              if(this.org_id == 0){
+                list[i].drugOutPrice = list[i].retail_price
+                list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].retail_price).toFixed(2)
+              }else{
+                list[i].drugOutPrice = "/"
+                list[i].drugOutSalePrice = "/"
+              }
+            
 
          
             if(this.org_id == 10265 || this.org_id ==10210 || this.org_id==10402 || this.org_id ==10215){
@@ -472,10 +488,17 @@ export default {
             }else{
               list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
             }
-            
+             
+            list[i].overDrugOne = this.GetDrugOverOne(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
+            if(this.org_id == 0){
+                list[i].overDrugPrice = list[i].retail_price
+                list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].retail_price).toFixed(2)
+            }else{
              list[i].overDrugPrice = "/"
              list[i].oveDrugSaleMoney = "/"
             }
+           
+            }
             this.tableList = list;
             this.total = response.data.data.total
             this.manufacturerList = response.data.data.manufacturerList
@@ -1469,6 +1492,14 @@ export default {
         return max_str + min_str;
       }
     },
+    GetDrugOverOne(totalone,totaltwo,totalthree,min_number,min_unit,max_unit){
+      var total = 0
+      
+      total = totalone + totaltwo - totalthree
+       
+      return total
+       
+    },
     GetInitStartFlow(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
       var total_one =0
       var total_two = 0
@@ -1589,6 +1620,9 @@ export default {
         return 0
       }
      
+    },
+    getDrugQuery(){
+      this.getlist()
     }
   }
 }

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -18,7 +18,6 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
-            @change="startTimeChange"
             :picker-options="pickerOptions"
             :clearable="false"
            ></el-date-picker> 
@@ -34,10 +33,10 @@
               align="right"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
-              @change="endTimeChange"
               :picker-options="pickerOptions"
               :clearable="false"
           ></el-date-picker>  
+          <el-button  type="primary" icon="el-icon-search" @click="getAllQuery">查询</el-button>
           <span style="font-size:14px;color:#606266">耗材类型:</span>
           <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
           filterable
@@ -69,7 +68,8 @@
             :class="signAndWeighBoxPatients"
             border
           >
-          <el-table-column label="耗材编码" align="center" v-if="org_id ==9956 || org_id == 0">
+        
+            <el-table-column label="耗材编码" align="center" v-if="org_id ==9956 || org_id == 0">
               <template slot-scope="scope">
                 <span v-if="scope.row.good_number>0">{{ scope.row.good_number?scope.row.good_number:"" }}</span> 
               </template>
@@ -287,17 +287,36 @@ export default {
                
               }
               //  list[i].stockIn = list[i].GoodStartFlowInfo.over_count
-               list[i].stock_in_price = "/"
-               list[i].stockMoney = "/"
+               if(this.org_id == 0){
+                  list[i].stock_in_price = list[i].buy_price
+                  list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
+               }else{
+                list[i].stock_in_price = "/"
+                list[i].stockMoney = "/"
+               }
+             
               
               
               list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
-              list[i].addStockMoney = "/"
-              list[i].saleStockMoney = "/"
+
+              if(this.org_id == 0){
+               list[i].addStockMoney = list[i].buy_price 
+                list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
+              }else{
+               list[i].addStockMoney = "/"
+               list[i].saleStockMoney = "/"
+              }
+             
 
               list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
-              list[i].stockOutprice = "/"
-              list[i].saleOutMoney = "/"
+              if(this.org_id == 0){
+                list[i].stockOutprice = list[i].packing_price
+                list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
+              }else{
+                list[i].stockOutprice = "/"
+                list[i].saleOutMoney = "/"
+              }
+             
               if(this.org_id == 10265){
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
               }else{
@@ -312,9 +331,14 @@ export default {
                
               }
             
-            
-              list[i].overPrice = "/"
-              list[i].overMoney = "/"
+              if(this.org_id == 0){
+                list[i].overPrice = list[i].packing_price
+                list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
+              }else{
+                list[i].overPrice = "/"
+                list[i].overMoney = "/"
+              }
+             
              
             }
             console.log("listwowowoowowowow",list)
@@ -622,11 +646,6 @@ export default {
         countfive +=arr5[i].count
       }
     }
-    console.log("countOne",countOne)
-    console.log("countTwo",countTwo)
-    console.log("countthree",countthree)
-    console.log("countfour",countfour)
-    console.log("*********************")
     count = countOne - countTwo + countthree - countfour + countfive
     if(count > 0 ){
       return count
@@ -660,10 +679,7 @@ export default {
      }
     }
     all_count = count + countOne
-    console.log("count2332323223232o2222222222wide",count)
-    console.log("countONE23232322323323223",countOne)
-    console.log("all_count9999999999999wode",all_count)
-    console.log("-------------------------------------------")
+
     if(all_count > 0 ){
       return all_count
     }else{
@@ -1150,7 +1166,10 @@ export default {
         }
       }
       return count
-    } 
+    },
+    getAllQuery(){
+     this.getlist()
+    }
   },
 
 }

src/xt_pages/user/lapsoInspection.vue

@@ -88,7 +88,7 @@
                 type="primary"
                 icon="el-icon-edit-outline"
                 @click="openEdit()"
-                :disabled="itemDate ? false : true"
+                :disabled="itemDateShow ? false : true"
               >修改
               </el-button
               >
@@ -113,9 +113,12 @@
             </div>
             <div v-if="!isPic">
               <el-table
+                highlight-current-row
+               @current-change="handleCurrentChangeOne"
                 :header-cell-style="{
                 backgroundColor: 'rgb(245, 247, 250)',
                 color: '#606266'
+                
               }"
                 :row-style="{ color: '#303133' }"
                 :data="tabileList"
@@ -183,17 +186,6 @@
   
             </div>
   
-            <!-- <el-pagination
-              align="right"
-              @current-change="handleCurrentChangePage"
-              :current-page="queryParams.page"
-              :page-size="1"
-              background
-              style="margin-top:20px;"
-              layout="total, prev, pager, next, jumper"
-              :total="total"
-            >
-            </el-pagination> -->
           </el-col>
         </el-row>
       </div>
@@ -218,11 +210,6 @@
               </el-form-item>
             </el-col>
   
-  <!--          <el-col :span="24">-->
-  <!--            <p style="margin-top:20px;">是否弹窗提醒：-->
-  <!--              <el-switch v-model="is_open"></el-switch>-->
-  <!--            </p>-->
-  <!--          </el-col>-->
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -281,7 +268,7 @@
             </el-col>
             <el-col :span="7">
               <el-form-item
-                label="检验日期"
+                label="检验日期222"
                 prop="inspect_date"
                 :rules="[
                   { required: true, message: '请输入检验日期', trigger: 'blur' }
@@ -463,7 +450,8 @@
     fetchPatientInspections,
     setRemind,
     setRemindDialog,
-    getNewInspectionList
+    getNewInspectionList,
+    getNewInspectionDetailList
   } from '@/api/inspection'
   import { getFileExtension, uParseTime } from '@/utils/tools'
   
@@ -523,7 +511,9 @@
         org_id:0,
         rowList:[],
         tabileList:[],
-        inspectionList:[]
+        inspectionList:[],
+        inspectionData:[],
+        itemDateShow:false
       }
     },
     methods: {
@@ -729,84 +719,31 @@
             this.dialogRemindFormVisible = false
           }
         })
-      }, openEdit() {
-  
-        if (this.project == null) {
-          this.$message.error('请先选择项目')
-          return false
-        }
-        if(this.isPic){
-          this.form.pic_method = 'edit'
-          this.formTitle = '修改' + this.project.project_name
-          this.form.project_id = this.project.project_id
-          this.form.inspect_date = this.itemDate
-          this.form.old_inspect_date = this.itemDate
-          this.form.imgs = []
-          this.form.delete_imgs = []
-          for(var index in this.inspections){
-            this.form.imgs.push({
-              id: this.inspections[index].id,
-              img_url: this.inspections[index].inspect_value,
-              desc: this.inspections[index].item_name
-            })
-          }
-          console.log(this.form.imgs)
-          this.dialogPicFormVisible = true
-        }else{
-          console.log("22222")
-          this.form.method = 'edit'
+      },
+     
+      openEdit(){
+        this.form.formItem = []
+        if(this.inspectionData!=null){
           this.formTitle = '修改' + this.project.project_name
-          this.form.project_id = this.project.project_id
-          this.form.inspect_date = this.itemDate
-          this.form.old_inspect_date = this.itemDate
-          if(this.form.project_id == 14) {
-            this.form.remind_cycle = this.patient_info.remind_cycle
-          }else{
-            this.form.remind_cycle =""
-          }
-          console.log(this.form.remind_cycle)
-           
-         
-          this.form.formItem = []
-          console.log("hhhhhhhhhhhhh",this.project.inspection_reference)
-          console.log("inspectionsMap",this.inspectionsMap)
-          for (var index in this.project.inspection_reference) {
-            if(this.org_id ==10138){
-              this.form.formItem.push({
-                id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
-                project_id: this.project.inspection_reference[index].project_id,
-                project_name: this.project.inspection_reference[index].project_name,
-                item_id: this.project.inspection_reference[index].id,
-                item: this.project.inspection_reference[index].item,
-                item_name: this.project.inspection_reference[index].item_name,
-                range_type: this.project.inspection_reference[index].range_type,
-                value: this.project.inspection_reference[index].item_id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].item_id].inspect_value : '',
-                select_options: this.project.inspection_reference[index].range_options.split(','),
-                unit: this.project.inspection_reference[index].unit,
-                item_id:parseInt(this.project.inspection_reference[index].item_id) ,
-              })
-            }else{
-              this.form.formItem.push({
-              id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
-              project_id: this.project.inspection_reference[index].project_id,
-              project_name: this.project.inspection_reference[index].project_name,
-              item_id: this.project.inspection_reference[index].id,
-              item: this.project.inspection_reference[index].item,
-              item_name: this.project.inspection_reference[index].item_name,
-              range_type: this.project.inspection_reference[index].range_type,
-              value: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].inspect_value : '',
-              select_options: this.project.inspection_reference[index].range_options.split(','),
-              unit: this.project.inspection_reference[index].unit
-            })
-            }
-           
+          
+          for(let i=0;i<this.inspectionData.length;i++){
+            console.log("类型====================",this.inspectionData[i].inspect_type)
+            var obj = {id:0,project_id:0,project_name:"",item_id:0,item_name:"",range_type:"",value:"",unit:"",item_id:0} 
+            obj.id=this.inspectionData[i].id,
+            obj.project_id=this.inspectionData[i].project_id
+            obj.project_name=this.inspectionData[i].project_name
+            obj.item_id = this.inspectionData[i].item_id
+            obj.item_name = this.inspectionData[i].item_name
+            obj.range_type = this.inspectionData[i].inspect_type
+            obj.value = this.inspectionData[i].inspect_value
+            obj.unit = this.inspectionData[i].unit
+            this.form.formItem.push(obj)
           }
-          console.log(this.form.formItem)
-          this.dialogFormVisible = true
-  
         }
-  
-      },setRemindDialog(){
+        console.log("this.form.formItem-----------------------",this.form.formItem)
+        this.dialogFormVisible = true
+      },
+      setRemindDialog(){
         this.dialogRemindDialogFormVisible = true
   
   
@@ -832,11 +769,6 @@
         this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
         this.form.formItem = []
         for (var index in this.project.inspection_reference) {
-          // var formItem = this.project.inspection_reference[index];
-          // formItem["value"] = '';
-          // if (formItem.range_type==2) {
-          //   formItem["select_options"] = formItem.range_options.split(",");
-          // }
           this.form.formItem.push({
             id: 0,
             project_id: this.project.inspection_reference[index].project_id,
@@ -893,86 +825,94 @@
         console.log('form.formItem', this.form.formItem)
         this.dialogFormVisible = true
       },
-      submitEdit(formName) {
-        this.$refs[formName].validate(valid => {
-          if (valid) {
-            this.formLoading = true
-            if (this.form.formItem.length == 0) {
-              this.$message.error('未填写项目')
-              return false
-            }
-            for (var index in this.form.formItem) {
-              this.form.formItem[index].value = '' + this.form.formItem[index].value
-            }
-  
-            EditPatientInspection(this.patientID, this.form, this.form.remind_cycle, this.form.inspect_date, this.form.project_id).then(response => {
-              if (response.data.state == 1) {
-                this.$notify({
-                  title: '成功',
-                  message: '修改成功',
-                  type: 'success',
-                  duration: 2000
-                })
-                this.patient_info.remind_cycle =
-                  response.data.data.remind_cycle
-                this.itemDate = this.form.inspect_date
-                this.items = []
-                var inspections = response.data.data.inspections
-                this.inspections = response.data.data.inspections
-                if (inspections == null) {
-                  this.inspections = []
-                  return false
-                }
-                var inspectionsMap = {}
-                this.inspectionsMap = {}
-                for (var index in inspections) {
-                  inspectionsMap[inspections[index].item_id] =
-                    inspections[index]
-                  this.inspectionsMap[inspections[index].item_id] =
-                    inspections[index]
-                }
-                var items = this.project.inspection_reference
-                console.log('itmes', items)
-                for (var index in items) {
-                  if (items[index].id in inspectionsMap) {
-                    var item = {}
-                    for (var key in items[index]) {
-                      item[key] = items[index][key]
-                    }
-                    item.value = inspectionsMap[items[index].id].inspect_value
-                    item.value_direction = ''
-                    if (item.range_type == 1) {
-                      var value = parseFloat(item.value)
-                      var range_min = parseFloat(item.range_min)
-                      var range_max = parseFloat(item.range_max)
-                      if (value < range_min) {
-                        item.value_direction = '↓'
-                      } else if (value > range_max) {
-                        item.value_direction = '↑'
-                      }
-                    }
-                    this.items.push(item)
-                  }
-                }
-  
-                this.resetForm(formName)
-                this.dialogFormVisible = false
-              } else {
-                this.$message.error(response.data.msg)
-                return false
-              }
-            })
-              .catch(v => {
-                this.$message.error(v)
-                return false
-              })
-            this.formLoading = false
-            return false
-          } else {
-            return false
-          }
+      // submitEdit(formName) {
+      //   this.$refs[formName].validate(valid => {
+      //     if (valid) {
+      //       this.formLoading = true
+      //       if (this.form.formItem.length == 0) {
+      //         this.$message.error('未填写项目')
+      //         return false
+      //       }
+      //       for (var index in this.form.formItem) {
+      //         this.form.formItem[index].value = '' + this.form.formItem[index].value
+      //       }
+  
+      //       EditPatientInspection(this.patientID, this.form, this.form.remind_cycle, this.form.inspect_date, this.form.project_id).then(response => {
+      //         if (response.data.state == 1) {
+      //           this.$notify({
+      //             title: '成功',
+      //             message: '修改成功',
+      //             type: 'success',
+      //             duration: 2000
+      //           })
+      //           this.patient_info.remind_cycle =
+      //             response.data.data.remind_cycle
+      //           this.itemDate = this.form.inspect_date
+      //           this.items = []
+      //           var inspections = response.data.data.inspections
+      //           this.inspections = response.data.data.inspections
+      //           if (inspections == null) {
+      //             this.inspections = []
+      //             return false
+      //           }
+      //           var inspectionsMap = {}
+      //           this.inspectionsMap = {}
+      //           for (var index in inspections) {
+      //             inspectionsMap[inspections[index].item_id] =
+      //               inspections[index]
+      //             this.inspectionsMap[inspections[index].item_id] =
+      //               inspections[index]
+      //           }
+      //           var items = this.project.inspection_reference
+      //           console.log('itmes', items)
+      //           for (var index in items) {
+      //             if (items[index].id in inspectionsMap) {
+      //               var item = {}
+      //               for (var key in items[index]) {
+      //                 item[key] = items[index][key]
+      //               }
+      //               item.value = inspectionsMap[items[index].id].inspect_value
+      //               item.value_direction = ''
+      //               if (item.range_type == 1) {
+      //                 var value = parseFloat(item.value)
+      //                 var range_min = parseFloat(item.range_min)
+      //                 var range_max = parseFloat(item.range_max)
+      //                 if (value < range_min) {
+      //                   item.value_direction = '↓'
+      //                 } else if (value > range_max) {
+      //                   item.value_direction = '↑'
+      //                 }
+      //               }
+      //               this.items.push(item)
+      //             }
+      //           }
+  
+      //           this.resetForm(formName)
+      //           this.dialogFormVisible = false
+      //         } else {
+      //           this.$message.error(response.data.msg)
+      //           return false
+      //         }
+      //       })
+      //         .catch(v => {
+      //           this.$message.error(v)
+      //           return false
+      //         })
+      //       this.formLoading = false
+      //       return false
+      //     } else {
+      //       return false
+      //     }
+      //   })
+      // },
+      submitEdit(){
+         
+         console.log("hhahahahh",this.form.formItem)
+        EditPatientNewInspection().then(response=>{
+
         })
       },
+      
       submitNew(formName) {
         this.$refs[formName].validate(valid => {
           if (valid) {
@@ -1154,27 +1094,7 @@
                 }
               }
               this.total += 1
-              // var inspections = response.data.data.inspections
-              // this.inspections = response.data.data.inspections
-              // if (inspections == null) {
-              //   this.inspections = []
-              //   return false
-              // }
-              // var inspectionsMap = {}
-              // this.inspectionsMap = {}
-              //
-              // var items = this.project.inspection_reference
-              // for (var index in items) {
-              //   if (items[index].id in inspectionsMap) {
-              //     var item = {}
-              //     for (var key in items[index]) {
-              //       item[key] = items[index][key]
-              //     }
-              //     item.value = inspectionsMap[items[index].id].inspect_value
-              //     item.value_direction = ''
-              //     this.items.push(item)
-              //   }
-              // }
+             
               this.dialogPicFormVisible = false
               this.queryParams.patient = this.patientID
               this.queryParams.project_id = this.project.project_id
@@ -1237,9 +1157,10 @@
           this.queryParams.page = 1
           this.total = 0
          
+        
+          this.getNewInspectionList(this.queryParams)
           // this.fetchPatientInspections(this.queryParams)
 
-          this.getNewInspectionList(this.queryParams)
         }
       },
   
@@ -1251,7 +1172,7 @@
       fetchPatientInspections(params) {
         this.items = []
         this.isPic = false
-        console.log("params------------------",params)
+       
         fetchPatientInspections(params)
           .then(response => {
             if (response.data.state == 1) {
@@ -1374,22 +1295,21 @@
       },
 
       getNewInspectionList(params){
-         console.log("params-----",params)
          getNewInspectionList(params).then(response=>{
            if(response.data.state == 1){
              var list =  response.data.data.list
-             console.log("list=====================",list)
+            
              this.isPic = false
              this.tabileList = list
 
              var inspectionGroup = response.data.data.inspectionGroup
 
              this.rowList = inspectionGroup
-              console.log("inspectionGroup",inspectionGroup)
+             
              var inspection = response.data.data.inspection
 
              this.inspectionList = inspection
-             console.log("inspection-------------",inspection)
+           
              this.pageLoading = false
              this.itemLoading = false
              this.formLoading = false
@@ -1397,7 +1317,30 @@
         })
       },
       getInspecValue(inspect_date,item_id){
+        var inspect_value = ""
+        for(let i=0;i<this.inspectionList.length;i++){
+          if(inspect_date == this.inspectionList[i].inspect_date && item_id == this.inspectionList[i].item_id){
+             inspect_value = this.inspectionList[i].inspect_value
+          }
+        }
+        return inspect_value
+      },
+      handleCurrentChangeOne(val){
         
+           var params = {
+             patient_id:this.patientID,
+             project_id:val.project_id,
+             inspect_date:val.inspect_date,
+           }
+         getNewInspectionDetailList(params).then(response=>{
+            if(response.data.state == 1){
+                var inspection =  response.data.data.inspection
+                this.itemDateShow = true
+                this.inspectionData = inspection
+                this.form.inspect_date = uParseTime(val.inspect_date, '{y}-{m}-{d} {h}:{i}')
+              
+            }
+         })
       }
     },
     created() {