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/batch_print/batch_print_order_eighty.vue

@@ -1162,13 +1162,13 @@
                         <div class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          <span>
+                          <span v-if="predialysis.weight_before !=0 && afterdialysis.weight_after !=0">
                            {{ record.assessment_after_dislysis &&
                             record.assessment_after_dislysis.weight_loss
                               ? record.assessment_after_dislysis.weight_loss
                               : ""}}
                           </span>
-
+                          
                         </div>
                         kg
                       </div>

src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue

@@ -321,16 +321,16 @@
                             </td>
                            <td width="60"></td>
                             <td width="60">穿刺针:</td>
-                            <td width="220">
+                            <td width="280">
                             <div>
-                               &nbsp;
-                               <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle.indexOf('16G') > -1 ? true : false" showValue="16G"></label-box>
-                               &nbsp;
+                                &nbsp;
+                                <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle == '16G' ? true : false" showValue="16G"></label-box>
+                                &nbsp;
                                 <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle.indexOf('17G') > -1 ? true : false" showValue="17G"></label-box>
                                 &nbsp;
                                 <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle.indexOf('钝针') > -1 ? true : false" showValue="钝针"></label-box>
                                 &nbsp;
-                                <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle.indexOf('留置针16G') > -1 ? true : false" showValue="留置针16G"></label-box>
+                                <label-box :isChecked="record.assessment_before_dislysis.puncture_needle && record.assessment_before_dislysis.puncture_needle == '留置针16G' ? true : false" showValue="留置针16G"></label-box>
                             </div>
                             </td>
                             <td></td>

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -387,15 +387,15 @@
                   </td>
                   <td width='20'></td>
                   <td width="70">穿刺针:</td>
-                  <td width="260" style="text-align:left;">
+                  <td width="280" style="text-align:left;">
                     <div>
-                      <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G') > -1 ? true : false" showValue="16G"></label-box>
+                      <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle =='16G' ? true : false" showValue="16G"></label-box>
                       &nbsp;
                       <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G') > -1 ? true : false" showValue="17G"></label-box>
                       &nbsp;
                       <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('钝针') > -1 ? true : false" showValue="钝针"></label-box>
                       &nbsp;
-                      <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('留置针16G') > -1 ? true : false" showValue="留置针16G"></label-box>
+                      <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle == '留置针16G' ? true : false" showValue="留置针16G"></label-box>
                     </div>
                   </td>
 
@@ -2200,12 +2200,12 @@ export default {
             }
             this.check = response.data.data.check
             this.predialysis = response.data.data.PredialysisEvaluation
-            console.log(11111111111111111111111, this.predialysis)
+            console.log('11111111111111111111111222', this.predialysis)
             this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
               this.predialysis.blood_access_part_opera_id
             )
             this.afterdialysis = response.data.data.AssessmentAfterDislysis
-            console.log(22222222222222222222222222, response.data.data)
+            console.log('222222222222222222222222222111', response.data.data)
             this.operators = response.data.data.operators
             this.dialysisOrder =
               response.data.data.dialysisOrder === null

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -1020,10 +1020,10 @@
                             : "/"
                            }}
                          </span> -->
-                         <span>
+                         <span v-if="predialysis.weight_before !=0 && afterdialysis.weight_after !=0">
                           {{(predialysis.weight_before - afterdialysis.weight_after).toFixed(2)}}
                          </span>
-
+                         <span v-else></span>
                       </div>
                       kg
                     </div>

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

@@ -1368,14 +1368,15 @@
                       治疗医生：
                       <div class="under_line"
                         style="width: 80px; text-align: center"
-                      >
+                      > 
+                      <!-- {{ getAdminUser(prescription.creater) }} -->
                         <span style="height: 30px; display: inline-block"
                           v-if=" setAdminUserES(prescription.creater) == ''"
                         >
                           {{ getAdminUser(prescription.creater) }}
                         </span>
                         <img style="height: 40px"
-                          :src="setAdminUserES( prescription.creater)"
+                          :src="setAdminUserES(prescription.creater)"
                           alt=""
                           srcset=""
                           v-else
@@ -1997,7 +1998,7 @@ export default {
         return "";
       }
       for (let i = 0; i < this.adminUser.length; i++) {
-        if (this.adminUser[i].id == id) {
+        if (this.adminUser[i].id == id) {        
           return this.adminUser[i].name;
         }
       }
@@ -2203,7 +2204,7 @@ export default {
           this.afterdialysis.complications_other.join(",");
 
         this.prescription = response.data.data.dialysisPrescription;
-        // console.log("透析处方", this.prescription);
+        console.log("透析处方", this.prescription);
         this.receiverTreatmentAccess =
           response.data.data.receiverTreatmentAccess;
         this.prescription.mode = this.modeName(this.prescription.mode_id);