Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -975,13 +975,13 @@
                               v-if="
                                 setAdminUserES(
                                   record.assessment_before_dislysis,
-                                  'modifier'
+                                  'creater'
                                 ) == ''
                               "
                               >{{
                                 getAdminUser(
                                   record.assessment_before_dislysis,
-                                  "modifier"
+                                  "creater"
                                 )
                               }}</span
                             >
@@ -990,7 +990,7 @@
                               :src="
                                 setAdminUserES(
                                   record.assessment_before_dislysis,
-                                  'modifier'
+                                  'creater'
                                 )
                               "
                               alt

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -939,31 +939,31 @@
                             </div>
                           </td>
                           <td>
-                            <!--<span-->
-                              <!--v-if="-->
-                                <!--setAdminUserES(-->
-                                  <!--record.assessment_before_dislysis,-->
-                                  <!--'creater'-->
-                                <!--) == ''-->
-                              <!--"-->
-                              <!--&gt;{{-->
-                                <!--getAdminUser(-->
-                                  <!--record.assessment_before_dislysis,-->
-                                  <!--"creater"-->
-                                <!--)-->
-                              <!--}}</span-->
-                            <!--&gt;-->
-                            <!--<img-->
-                              <!--class="es-img"-->
-                              <!--:src="-->
-                                <!--setAdminUserES(-->
-                                  <!--record.assessment_before_dislysis,-->
-                                  <!--'creater'-->
-                                <!--)-->
-                              <!--"-->
-                              <!--alt=""-->
-                              <!--srcset=""-->
-                              <!--v-else-->
+                            <span
+                              v-if="
+                                setAdminUserES(
+                                  record.assessment_before_dislysis,
+                                  'creater'
+                                ) == ''
+                              "
+                              >{{
+                                getAdminUser(
+                                  record.assessment_before_dislysis,
+                                  "creater"
+                                )
+                              }}</span
+                            >
+                            <img
+                              class="es-img"
+                              :src="
+                                setAdminUserES(
+                                  record.assessment_before_dislysis,
+                                  'creater'
+                                )
+                              "
+                              alt=""
+                              srcset=""
+                              v-else
                             />
                           </td>
                         </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -1137,7 +1137,7 @@ export default {
           this.check = response.data.data.check;
           console.log("核对信息", this.check);
           this.predialysis = response.data.data.PredialysisEvaluation;
-          console.log("透前评估", this.predialysis);
+          //console.log("透前评估", this.predialysis);
           this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
             this.predialysis.blood_access_part_opera_id
           );

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -697,17 +697,17 @@
                         </div>
                       </td>
                       <td>
-                        <!--<span-->
-                          <!--v-if="setAdminUserES(predialysis.modifier) == ''"-->
-                          <!--&gt;{{ getAdminUser(predialysis.modifier) }}</span-->
-                        <!--&gt;-->
-                        <!--<img-->
-                          <!--class="es-img"-->
-                          <!--:src="setAdminUserES(predialysis.modifier)"-->
-                          <!--alt=""-->
-                          <!--srcset=""-->
-                          <!--v-else-->
-                        <!--/>-->
+                        <span
+                          v-if="setAdminUserES(predialysis.creater) == ''"
+                          >{{ getAdminUser(predialysis.creater) }}</span
+                        >
+                        <img
+                          class="es-img"
+                          :src="setAdminUserES(predialysis.creater)"
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
                       </td>
                     </tr>