新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -186,6 +186,7 @@
                       <div class="inline_block" style="flex: 1">
                         透析次数：
                         <div
+                          v-if="org_id!=10234 && org_id!=10121"
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
@@ -197,6 +198,20 @@
                               : "/"
                           }}
                         </div>
+
+                        <div
+                          v-if="org_id ==10234 || org_id ==10121"
+                          class="under_line"
+                          style="width: 70px; text-align: center"
+                        >
+                          {{
+                              record.Count +
+                              record.patient.user_sys_before_count
+                                ?  record.Count +
+                                  record.patient.user_sys_before_count
+                                : "/"
+                            }}
+                        </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
                         透前症状：
@@ -972,8 +987,8 @@
                               : "/"
                           }}
                         </div>
-                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">ml</span> 
-                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471">L</span>
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460">ml</span> 
+                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460">L</span>
                       </div>
 
                       <div class="inline_block" style="flex: 1" v-if="org_id == 10469">
@@ -2428,7 +2443,13 @@
                         style="flex: 1"
                         v-if="org_id != 10223 || org_id!=10375"
                       >
-                        透析中入量(L)：
+  
+                        <span v-if="org_id!=10460">
+                          透析中入量  (L)：
+                        </span>
+                        <span v-if="org_id==10460">
+                          透析中入量  (ml)：
+                        </span>
                         <div
                           class="under_line"
                           style="width: 100px; text-align: center"

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

@@ -52,8 +52,8 @@
                       <td width="150">
                         <div class="under-line">
                           {{
-                            record.patient.admission_number
-                              ? record.patient.admission_number
+                            record.patient.dialysis_no
+                              ? record.patient.dialysis_no
                               : "/"
                           }}
                         </div>
@@ -88,6 +88,7 @@
                       <td width="120">
                         <div class="under-line">&nbsp;
                           <!-- {{last_order?getTime(last_order.dialysis_date, "{y}-{m}-{d}"):''}} -->
+                          {{ getTime(record.lastSchedule.schedule_date, "{y}-{m}-{d}") }}
                         </div>
                       </td>
                       <td width="10"></td>
@@ -100,9 +101,9 @@
                           {{ record.assessment_after_dislysis.actual_treatment_hour ? 
                           record.assessment_after_dislysis.actual_treatment_hour : '' }}
                         </span>h
-                        <span style="width:30px;text-align:left;">
+                        <span style="width:30px;text-align:left;" v-if="record.assessment_after_dislysis.actual_treatment_minute>0">
                           {{ record.assessment_after_dislysis.actual_treatment_minute ? 
-                          record.assessment_after_dislysis.actual_treatment_minute : '' }}
+                          record.assessment_after_dislysis.actual_treatment_minute : '0' }}
                         </span>min
                       </div>
                       </td>
@@ -228,7 +229,7 @@
                                   ></label-box>
                                 </div>
                               </td>
-                              <td width="50">感染:</td>
+                              <!-- <td width="50">感染:</td>
                               <td width="100">
                                 <label-box
                                   :isChecked="
@@ -263,7 +264,7 @@
                                       : ""
                                   }}
                                 </div>
-                              </td>
+                              </td> -->
                               <td width=""></td>
                             </tr>
                           </tbody>
@@ -1893,111 +1894,122 @@
                               <td></td>
                               <td width="70">主管医生:</td>
                               <td width="100">
-                                <div style="text-align: left">
-                                  <span
+                                <div
+                                  class="under_line"
+                                  style="width: 80px; text-align: center"
+                                >
+                                  <template
                                     v-if="
-                                      setAdminUserES(
-                                        record.prescription.prescription_doctor
-                                      ) == ''
+                                      record.prescription &&
+                                      record.prescription.creater
                                     "
                                   >
-                                    {{
-                                      getAdminUser(
-                                        record.prescription.prescription_doctor
-                                      )
-                                    }}
-                                  </span>
-                                  <img
-                                    style="height: 30px"
-                                    :src="
-                                      setAdminUserES(
-                                        record.prescription.prescription_doctor
-                                      )
-                                    "
-                                    alt=""
-                                    srcset=""
-                                    v-else
-                                  />
-
-                                  <!-- {{getXuserName(prescription.prescription_doctor)}} -->
+                                    <span
+                                      v-if="
+                                        setAdminUserES(
+                                          record.prescription,
+                                          'creater'
+                                        ) == ''
+                                      "
+                                      >{{
+                                        getAdminUser(
+                                          record.prescription,
+                                          "creater"
+                                        )
+                                      }}</span
+                                    >
+                                    <img
+                                      class="es-img"
+                                      :src="
+                                        setAdminUserES(
+                                          record.prescription,
+                                          'creater'
+                                        )
+                                      "
+                                      alt=""
+                                      srcset=""
+                                      v-else
+                                      style="height: 40px"
+                                    />
+                                  </template>
                                 </div>
                               </td>
                               <td width="120">穿刺/开管护士:</td>
                               <td width="100">
                                 <div style="text-align: left">
-                                  <span
+                                  <template
                                     v-if="
-                                      setAdminUserES(
-                                        record.dialysis_orderdialysis_order ==
-                                          null
-                                          ? 0
-                                          : record.dialysis_order.puncture_nurse
-                                      ) == ''
+                                      record.dialysis_order &&
+                                      record.dialysis_order.puncture_nurse
                                     "
                                   >
-                                    {{
-                                      getAdminUser(
-                                        record.dialysis_order == null
-                                          ? 0
-                                          : record.dialysis_order.puncture_nurse
-                                      )
-                                    }}</span
-                                  >
-                                  <img
-                                    style="height: 30px"
-                                    :src="
-                                      setAdminUserES(
-                                        record.dialysis_order == null
-                                          ? 0
-                                          : record.dialysis_order.puncture_nurse
-                                      )
-                                    "
-                                    alt=""
-                                    srcset=""
-                                    v-else
-                                  />
+                                    <span
+                                      v-if="
+                                        setAdminUserES(
+                                          record.dialysis_order,
+                                          'puncture_nurse'
+                                        ) == ''
+                                      "
+                                      >{{
+                                        getAdminUser(
+                                          record.dialysis_order,
+                                          "puncture_nurse"
+                                        )
+                                      }}</span
+                                    >
+                                    <img
+                                      class="es-img"
+                                      :src="
+                                        setAdminUserES(
+                                          record.dialysis_order,
+                                          'puncture_nurse'
+                                        )
+                                      "
+                                      alt=""
+                                      srcset=""
+                                      v-else
+                                      style="height: 40px"
+                                    />
+                                  </template>
                                 </div>
                               </td>
                               <td width="70">核对护士:</td>
                               <td width="100">
                                 <div style="text-align: left">
-                                  <span
+                                  <template
                                     v-if="
-                                      setAdminUserES(
-                                        record.check == null
-                                          ? 0
-                                          : record.check.modifier
-                                      ) == ''
+                                      record.check &&
+                                      record.check.modifier
                                     "
                                   >
-                                    {{
-                                      getAdminUser(
-                                        record.check == null
-                                          ? 0
-                                          : record.check.modifier
-                                      )
-                                        ? getAdminUser(
-                                            record.check == null
-                                              ? 0
-                                              : record.check.modifier
-                                          )
-                                        : ""
-                                    }}
-                                  </span>
-                                  <img
-                                    class="es-img"
-                                    :src="
-                                      setAdminUserES(
-                                        record.check == null
-                                          ? 0
-                                          : record.check.modifier
-                                      )
-                                    "
-                                    alt=""
-                                    srcset=""
-                                    style="height: 30px"
-                                    v-else
-                                  />
+                                    <span
+                                      v-if="
+                                        setAdminUserES(
+                                          record.check,
+                                          'modifier'
+                                        ) == ''
+                                      "
+                                      >{{
+                                        getAdminUser(
+                                          record.check,
+                                          "modifier"
+                                        )
+                                      }}</span
+                                    >
+                                    <img
+                                      class="es-img"
+                                      :src="
+                                        setAdminUserES(
+                                          record.check,
+                                          'modifier'
+                                        )
+                                      "
+                                      alt=""
+                                      srcset=""
+                                      v-else
+                                      style="height: 40px"
+                                    />
+                                  </template>
                                 </div>
                               </td>
                             </tr>
@@ -2736,73 +2748,80 @@
                               <td width="150">当班责任护士:</td>
                               <td width="100">
                                 <div style="text-align: left">
-                                  <span
+                                  <template
                                     v-if="
-                                      setAdminUserES(
-                                        record.dialysis_order == null
-                                          ? 0
-                                          : record.dialysis_order.start_nurse
-                                      ) == ''
+                                      record.dialysis_order &&
+                                      record.dialysis_order.start_nurse
                                     "
-                                    >{{
-                                      getAdminUser(
-                                        record.dialysis_order == null
-                                          ? 0
-                                          : record.dialysis_order.start_nurse
-                                      )
-                                    }}</span
                                   >
-                                  <img
-                                    class="es-img"
-                                    style="height: 30px"
-                                    :src="
-                                      setAdminUserES(
-                                        record.dialysis_order == null
-                                          ? 0
-                                          : record.dialysis_order.start_nurse
-                                      )
-                                    "
-                                    alt=""
-                                    srcset=""
-                                    v-else
-                                  />
+                                    <span
+                                      v-if="
+                                        setAdminUserES(
+                                          record.dialysis_order,
+                                          'start_nurse'
+                                        ) == ''
+                                      "
+                                      >{{
+                                        getAdminUser(
+                                          record.dialysis_order,
+                                          "start_nurse"
+                                        )
+                                      }}</span
+                                    >
+                                    <img
+                                      class="es-img"
+                                      :src="
+                                        setAdminUserES(
+                                          record.dialysis_order,
+                                          'start_nurse'
+                                        )
+                                      "
+                                      alt=""
+                                      srcset=""
+                                      v-else
+                                      style="height: 40px"
+                                    />
+                                  </template>
                                 </div>
                               </td>
                               <td width="30"></td>
                               <td width="70">下机护士:</td>
                               <td width="100">
                                 <div style="text-align: left">
-                                  <span
+                                  <template
                                     v-if="
-                                      setAdminUserES(
-                                        record.dialysis_order == null
-                                          ? 0
-                                          : record.dialysis_order.finish_nurse
-                                      ) == ''
+                                      record.dialysis_order &&
+                                      record.dialysis_order.finish_nurse
                                     "
                                   >
-                                    {{
-                                      getAdminUser(
-                                        record.dialysis_order == null
-                                          ? 0
-                                          : record.dialysis_order.finish_nurse
-                                      )
-                                    }}</span
-                                  >
-                                  <img
-                                    class="es-img"
-                                    style="height: 30px"
-                                    :src="
-                                      setAdminUserES(
-                                        record.dialysis_order == null
-                                          ? 0
-                                          : record.dialysis_order.finish_nurse
-                                      )
-                                    "
-                                    alt=""
-                                    srcset=""
-                                    v-else
-                                  />
+                                    <span
+                                      v-if="
+                                        setAdminUserES(
+                                          record.dialysis_order,
+                                          'finish_nurse'
+                                        ) == ''
+                                      "
+                                      >{{
+                                        getAdminUser(
+                                          record.dialysis_order,
+                                          "finish_nurse"
+                                        )
+                                      }}</span
+                                    >
+                                    <img
+                                      class="es-img"
+                                      :src="
+                                        setAdminUserES(
+                                          record.dialysis_order,
+                                          'finish_nurse'
+                                        )
+                                      "
+                                      alt=""
+                                      srcset=""
+                                      v-else
+                                      style="height: 40px"
+                                    />
+                                  </template>
                                 </div>
                               </td>
                             </tr>
@@ -2889,26 +2908,26 @@
                       </td>
                       <td>
                         <span
-                          v-if="setAdminUserES(advice[0].advice_doctor) == ''"
-                        >
-                          {{ getAdminUser(advice[0].advice_doctor) }}
-                        </span>
-                        <span
-                          v-else
-                          style="
-                            display: flex;
-                            align-items: center;
-                            justify-content: space-around;
-                            height: 36px;
+                          v-if="
+                            setAdminUserES(
+                              advice[0],
+                              'execution_staff'
+                            ) == ''
                           "
+                          >{{
+                            getAdminUser(advice[0], "execution_staff")
+                          }}</span
                         >
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice[0].advice_doctor)"
-                            alt
-                            srcset
-                          />
-                        </span>
+                        <img
+                          class="es-img"
+                          :src="
+                            setAdminUserES(advice[0], 'execution_staff')
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                          style="height: 40px"
+                        />
                       </td>
                       <td style="text-align: left">
                         <span v-for="(item, index) in advice" :key="index">
@@ -2980,26 +2999,26 @@
                       </td>
                       <td>
                         <span
-                          v-if="setAdminUserES(advice[0].execution_staff) == ''"
-                        >
-                          {{ getAdminUser(advice[0].execution_staff) }}
-                        </span>
-                        <span
-                          v-else
-                          style="
-                            display: flex;
-                            align-items: center;
-                            justify-content: space-around;
-                            height: 36px;
+                          v-if="
+                            setAdminUserES(
+                              advice[0],
+                              'execution_staff'
+                            ) == ''
                           "
+                          >{{
+                            getAdminUser(advice[0], "execution_staff")
+                          }}</span
                         >
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice[0].execution_staff)"
-                            alt
-                            srcset
-                          />
-                        </span>
+                        <img
+                          class="es-img"
+                          :src="
+                            setAdminUserES(advice[0], 'execution_staff')
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                          style="height: 40px"
+                        />
                       </td>
                     </tr>
                   </tbody>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -148,8 +148,8 @@
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445 && this.$store.getters.xt_user.template_info.org_id != 9829 &&  this.$store.getters.xt_user.template_info.org_id != 10440  &&  this.$store.getters.xt_user.template_info.org_id != 10469  &&  this.$store.getters.xt_user.template_info.org_id != 10471"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445 || this.$store.getters.xt_user.template_info.org_id == 9829 ||  this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445 && this.$store.getters.xt_user.template_info.org_id != 9829 &&  this.$store.getters.xt_user.template_info.org_id != 10440  &&  this.$store.getters.xt_user.template_info.org_id != 10469  &&  this.$store.getters.xt_user.template_info.org_id != 10471 &&  this.$store.getters.xt_user.template_info.org_id != 10460"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445 || this.$store.getters.xt_user.template_info.org_id == 9829 ||  this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 ||  this.$store.getters.xt_user.template_info.org_id == 10460" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

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

@@ -349,13 +349,13 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="isShow('透析中入量') && org_id!=10485">
+        <el-col :span="8" v-if="isShow('透析中入量') && org_id!=10485 && org_id!=10460">
           <el-form-item label="透析中入量(L): " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
             <el-input v-model="form.dialysis_intakes"></el-input>
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="isShow('透析中入量') && org_id==10485">
+        <el-col :span="8" v-if="isShow('透析中入量') && (org_id==10485 || org_id ==10460)">
           <el-form-item label="透析中入量(g): " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
             <el-input v-model="form.dialysis_intakes"></el-input>
           </el-form-item>

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

@@ -106,7 +106,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 9829|| this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471)">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 9829|| this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 || this.$store.getters.xt_user.template_info.org_id == 10460)">
                         <el-form-item label="目标超滤量(ml)："
                         prop="target_ultrafiltration" :rules="isCheckmust('目标超滤量')">
                             <el-input
@@ -120,7 +120,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469&& this.$store.getters.xt_user.template_info.org_id != 10471">
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469&& this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10460">
                         <el-form-item
                         label="目标超滤量(L)：" prop="target_ultrafiltration" :rules="isCheckmust('目标超滤量')">
                             <el-input

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySeven.vue

@@ -288,7 +288,7 @@
                   prescription.dialysate_flow ? prescription.dialysate_flow : ""
                 }}
               </span>
-              ml/h;
+              ml/min;
             </td>
             <td width="200" style="padding-left: 10px" colspan="2">
               医师签名：

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1002,8 +1002,8 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">ml</span> 
-                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">L</span>
+                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">ml</span> 
+                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">L</span>
                     </div>
 
 
@@ -1530,7 +1530,7 @@
                             {{
                               monitor.transmembrane_pressure
                                 ? monitor.transmembrane_pressure
-                                : 0
+                                : ""
                             }}
                           </span>
                         </td>
@@ -2423,7 +2423,12 @@
                       style="flex: 1"
                       v-if="org_id != 10223 || org_id!=10375"
                     >
-                      透析中入量(L)：
+                       <span v-if="org_id!=10460">
+                          透析中入量(L)：
+                        </span>
+                        <span v-if="org_id==10460">
+                          透析中入量(ml)：
+                        </span>
                       <div
                         class="under_line"
                         style="width: 70px; text-align: center"

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -125,16 +125,16 @@
                            {{ receiverTreatmentAccess.consciousness == 3 ? '昏迷' : receiverTreatmentAccess.consciousness == 4 ? '模糊' : '' }}
                         </div>
                       </td> -->
-                      <td width="40">感染:</td>
+                      <!-- <td width="40">感染:</td>
                       <td width="80">
                           <label-box :isChecked='(predialysis.complication == "" || predialysis.complication == "无") ? true : false' showValue='无'></label-box>
                           <label-box :isChecked='(predialysis.complication != "" && predialysis.complication != "无") ? true : false' showValue='有'></label-box>
-                      </td>
-                      <td width="100">
+                      </td> -->
+                      <!-- <td width="100">
                         <div class="under-line">
                           &nbsp;{{ (predialysis.complication != "" && predialysis.complication != "无") ? predialysis.complication : "" }}
                         </div>
-                      </td>
+                      </td> -->
                       <td width=""></td>
                     </tr>
                   </tbody>
@@ -1551,6 +1551,7 @@ export default {
           return this.adminUser[i].name
         }
       }
+
     },
     getTime(value, temp) {
       if (value == 0) {

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -349,33 +349,32 @@
                   height="32px"
                   class="advice-name"
                   style="padding-left: 7px"
+                 
                 >
-                  <span v-if="advice.parent_id > 0">---></span>
-                  <span>{{ advice.advice_name }}</span>
-                  <span v-if="advice && advice.advice_desc"
-                    >({{ advice.advice_desc
-                    }}{{ advice.drug_spec_unit }})</span
-                  >
-                  <span v-if="advice.prescribing_number"
-                    >&nbsp;&nbsp; {{ advice.prescribing_number
-                    }}{{ advice.prescribing_number_unit }}</span
-                  >
-                  <span v-if="advice.single_dose != 0"
-                    >{{ advice.single_dose
-                    }}{{ advice.single_dose_unit }}</span
-                  >
-                  <span v-if="advice.parent_id == 0">{{
-                    advice.delivery_way
-                  }}</span>
-                  <span v-if="advice.parent_id == 0">{{
-                    advice.execution_frequency
-                  }}</span>
-                  <span
-                    v-if="
-                      advice.parent_id == 0 && advice.remark.length > 0
-                    "
-                    >({{ advice.remark }})</span
-                  >
+                 <tr :rowspan="advice.prescriptionChild.length"  v-for="(it,key)  in advice.prescriptionChild" style="border: none;">
+                   <td style="border: none;">
+                    <span>{{ it.advice_name }}</span>
+                          <span v-if="it && it.advice_desc"
+                            >({{ it.advice_desc
+                            }}{{ it.drug_spec_unit }})</span
+                          >
+                          <span v-if="it.prescribing_number"
+                            >&nbsp;&nbsp; {{ it.prescribing_number
+                            }}{{ it.prescribing_number_unit }}</span
+                          >
+                          <span v-if="it.single_dose != 0"
+                            >{{ it.single_dose
+                            }}{{ it.single_dose_unit }}</span
+                          >
+                          <span>{{ it.delivery_way}}</span>
+                          <span>{{
+                            it.execution_frequency
+                          }}</span>
+                          <span v-if="it.remark.length > 0"
+                            >({{ it.remark }})</span
+                          >
+                   </td>
+                 </tr>
                 </td>
 
                 <td height="32px">
@@ -1324,7 +1323,62 @@ export default {
         }
         this.doctor_advices = [] 
         this.doctor_advices = docArr
-        // console.log(this.advice_groups);
+      
+
+
+       
+          
+        if(this.doctor_advices!=null && this.doctor_advices.length>0){
+
+            for(let i=0;i<this.doctor_advices.length;i++){
+              this.doctor_advices[i].groupPrescriptionId = this.doctor_advices[i].prescription_id + "_"  + this.doctor_advices[i].groupno 
+            }
+            console.log("医嘱内容我我哦我我哦doctor_advices",this.doctor_advices)
+
+            let dataInfo = {}
+            this.doctor_advices.forEach((item, index) => {
+        
+            let { groupPrescriptionId } = item
+            if (!dataInfo[groupPrescriptionId]) {
+              dataInfo[groupPrescriptionId] = {
+                groupPrescriptionId:item.groupPrescriptionId,
+                start_time:item.start_time,
+                advice_name:item.advice_name,
+                advice_desc:item.advice_desc,
+                parent_id:item.parent_id,
+                drug_spec_unit:item.drug_spec_unit,
+                prescribing_number:item.prescribing_number,
+                prescribing_number_unit:item.prescribing_number_unit,
+                single_dose:item.single_dose,
+                single_dose_unit:item.single_dose_unit,
+                delivery_way:item.delivery_way,
+                execution_frequency:item.execution_frequency,
+                remark:item.remark,
+                execution_time:item.execution_time,
+                execution_staff:item.execution_staff,
+                prescriptionChild:[],
+              }
+            }
+          })
+          let newArr = Object.values(dataInfo)
+          
+          if(newArr!=null && newArr.length >0){
+             for(let i=0;i<newArr.length;i++){
+               for(let j=0;j<this.doctor_advices.length;j++){
+                 if(newArr[i].groupPrescriptionId == this.doctor_advices[j].groupPrescriptionId){
+                    newArr[i].prescriptionChild.push(this.doctor_advices[j])
+                 }
+               }
+             }
+          }
+          console.log("newArr",newArr)
+            
+          this.doctor_advices = []
+          this.doctor_advices = newArr
+         
+        }
+        
+
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

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

@@ -1060,7 +1060,7 @@ export default {
           this.tableList[i].drug_type_name =  this.getDrugTypeName(this.tableList[i].drug_type)
           this.tableList[i].specification_name =  this.tableList[i].dose + this.tableList[i].dose_unit + "*" +this.tableList[i].min_number + this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
-
+          this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
           this.tableList[i].stock_in_count = this.getStockIn(this.tableList[i].drug_stock_count, this.tableList[i].max_unit, this.tableList[i].min_unit,this.tableList[i].min_number);
           this.tableList[i].stock_out_count =  this.getActCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
           this.tableList[i].cancle_out_count = this.getCancleOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
@@ -1077,6 +1077,7 @@ export default {
           "药品名称",
           "规格&单位",
           "生产厂商",
+          "经销商",
           "批准文号",
           "国家编码",
           "入库数量",
@@ -1092,6 +1093,7 @@ export default {
           "drug_name",
           "specification_name",
           "manufacturer_name",
+          "dealer_name",
           "number",
           "medical_insurance_number",
           "stock_in_count",

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

@@ -35,8 +35,9 @@
                   <td width="6%">药品类型</td>
                   <td width="10%">药品名称</td>
                   <td width="9%">规格&单位</td>
-                  <td width="13%">生产厂商</td>
-                  <td width="10%">批准文号</td>
+                  <td width="8%">生产厂商</td>
+                  <td width="8%">经销商</td>
+                  <td width="8%">批准文号</td>
                   <td width="6%">国家编码</td>
                   <td width="6%">仓库名称</td>
                   <td width="6%">入库数量</td>
@@ -59,6 +60,9 @@
                   <td>
                     {{ getManufacturName(item.manufacturer) }}
                   </td>
+                  <td>
+                    {{ getDearName(item.dealer) }}
+                  </td>
                   <!-- 批准文号 -->
                    <td >{{item.number}}</td>
                   <td >{{ item.medical_insurance_number }}</td>
@@ -325,6 +329,7 @@ export default {
           this.manufacturerList = response.data.data.manufacturerList;
           this.goodTypeList = response.data.data.goodTypeList;
           this.patientList = response.data.data.patientList;
+          this.dealerList = response.data.data.dealerList
         }
       });
     },
@@ -1255,6 +1260,15 @@ export default {
       }
       return max_str + min_str;
     },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
   },
   created() {
     this.org_id = this.$store.getters.xt_user.org_id;

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

@@ -87,6 +87,11 @@
                  {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="经销商" align="center">
+              <template slot-scope="scope">
+                 {{getDearName(scope.row.dealer)}}
+              </template>
+            </el-table-column>
             <el-table-column label="期初结余" align="center">
 
                  <el-table-column prop="drugIn" label="数量" width="100" align="center">
@@ -200,6 +205,7 @@ export default {
             return v.getTime() < 1667232000000
           },
       },
+     dealerList:[]
     }
 
   },
@@ -223,6 +229,8 @@ export default {
            this.manufacturerList = response.data.data.manufacturerList
 
            this.patientList = response.data.data.patientList
+
+           this.dealerList = response.data.data.dealerList
          }
       })
     },
@@ -1219,14 +1227,15 @@ export default {
           this.tableList[i].query_date = this.start_time+"~"+this.end_time
           this.tableList[i].good_type = this.getDrugTypeName(this.tableList[i].drug_type)
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+          this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
           this.tableList[i].specification_name = this.tableList[i].dose + this.tableList[i].dose_unit +"*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
 
         }
         import('@/vendor/Export2Excel').then(excel => {
-           const multiHeader = [['序号', '查询日期','  药品类型','药品名称','规格&单位','生产产商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
-           const header = ['', '','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
-           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:I1', 'J1:L1', 'M1:O1', 'P1:R1']
-           const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','manufacturer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
+           const multiHeader = [['序号', '查询日期','  药品类型','药品名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+           const header = ['', '','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:J1', 'K1:M1', 'N1:P1', 'Q1:S1']
+           const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','manufacturer_name','dealer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
 
            const data = this.formatJson(filterVal, this.tableList)
 
@@ -1245,6 +1254,15 @@ export default {
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]));
     },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
   }
 }
 </script>

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

@@ -88,6 +88,11 @@
                  {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="经销商" align="center">
+              <template slot-scope="scope">
+                 {{getDearName(scope.row.dealer)}}
+              </template>
+            </el-table-column>
             <el-table-column label="期初结余" align="center">
 
                  <el-table-column prop="drugIn" label="数量" width="100" align="center">
@@ -201,6 +206,7 @@ export default {
             return v.getTime() < 1667491200000
           },
       },
+     dealerList:[]
     }
 
   },
@@ -224,6 +230,7 @@ export default {
            this.manufacturerList = response.data.data.manufacturerList
 
            this.patientList = response.data.data.patientList
+           this.dealerList = response.data.data.dealerList
          }
       })
     },
@@ -1234,14 +1241,15 @@ export default {
           this.tableList[i].query_date = this.start_time+"~"+this.end_time
           this.tableList[i].good_type = this.getDrugTypeName(this.tableList[i].drug_type)
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+          this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
           this.tableList[i].specification_name = this.tableList[i].dose + this.tableList[i].dose_unit +"*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
 
         }
         import('@/vendor/Export2Excel').then(excel => {
-           const multiHeader = [['序号', '查询日期','  药品类型','药品名称','规格&单位','生产产商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
-           const header = ['', '','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
-           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:I1', 'J1:L1', 'M1:O1', 'P1:R1']
-           const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','manufacturer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
+           const multiHeader = [['序号', '查询日期','  药品类型','药品名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+           const header = ['', '','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:J1', 'K1:M1', 'N1:P1', 'Q1:S1']
+           const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','manufacturer_name','dealer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
 
            const data = this.formatJson(filterVal, this.tableList)
 
@@ -1316,7 +1324,16 @@ export default {
           this.$message.success("调试成功")
         }
       })  
-    }
+    },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
   }
 }
 </script>

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

@@ -29,6 +29,7 @@
                                   <td rowspan="2" width="80">药品名称</td>
                                   <td rowspan="2" width="80">规格&单位</td>
                                   <td rowspan="2" width="80">生产厂商</td>
+                                  <td rowspan="2" width="80">经销商</td>
                                   <td width="80" colspan="3">期初结余</td>
                                   <td width="80" colspan="3">本期增加</td>
                                   <td width="80" colspan="3">本期减少</td>
@@ -57,6 +58,7 @@
                                  <td> {{item.drug_name}}</td>
                                  <td> {{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</td>
                                  <td>{{getManufacturName(item.manufacturer)}}</td>
+                                 <td>{{getDearName(item.dealer)}}</td>
                                  <td>{{item.drugIn}}</td>
                                  <td>{{item.drugInMoney}}</td>
                                  <td>{{item.drugSaleMoney}}</td>
@@ -117,7 +119,8 @@ export default {
           autoCountList:[],
           cancelCountList:[],
           org_id:0,
-          drugTypeList:[]
+          drugTypeList:[],
+          dealerList:[]
         }
     },
     methods:{
@@ -135,6 +138,7 @@ export default {
       getStorehouseList().then(response=>{
          if(response.data.state == 1){
            this.manufacturerList = response.data.data.manufacturerList
+           this.dealerList= response.data.data.dealerList
          }
       })
     },
@@ -1159,7 +1163,16 @@ export default {
         }else{
             return max_str + min_str;
        }
-    }
+    },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
    },
     created(){
       this.org_id =  this.$store.getters.xt_user.org_id

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
+        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877 && orgId!=10387 && orgId!=0">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -78,7 +78,7 @@
       </div> 
 
 
-      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
+      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877 || orgId == 0 || orgId ==10387">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>

src/xt_pages/stock/query/goodNewQuery.vue

@@ -803,6 +803,7 @@ export default {
             this.tableList[i].type_name =  this.getGoodTypeName(this.tableList[i].good_type_id)
             this.tableList[i].spec = this.tableList[i].specification_name +"/"+ this.tableList[i].packing_unit
             this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+            this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
             this.tableList[i].stock_in_count = this.GetExportStockInCount(this.tableList[i].xt_good_stock,this.tableList[i].id)
             this.tableList[i].stock_out_count =this.getExportStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
             this.tableList[i].stock_cancel_count = this.getExportCancelStockInfo(this.tableList[i].xt_good_stock,this.tableList[i].id)
@@ -813,10 +814,12 @@ export default {
           }
          }
          
-         const tHeader = ['序号','耗材类型', '耗材名称', '规格&单位','生产厂商','批准文号','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
-         const filterVal = ['index','type_name', 'good_name', 'spec','manufacturer_name','number','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
+
+         const tHeader = ['序号','耗材类型', '耗材名称', '规格&单位','生产厂商','经销商','批准文号','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
+         const filterVal = ['index','type_name', 'good_name', 'spec','manufacturer_name','dealer_name','number','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
         
          const data = this.formatJson(filterVal, this.tableList)
+         
          excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/stock/query/goodNewQueryPrint.vue

@@ -37,6 +37,7 @@
                   <td width="10%">耗材名称</td>
                   <td width="10%">规格&单位</td>
                   <td width="15%">生产厂商</td>
+                  <td width="15%" v-if="org_id==10485 || org_id == 0">经销商</td>
                   <td width="9%">批准文号</td>
                   <td width="9%">国家编码</td>
                   <td width="6%">仓库名称</td>
@@ -64,6 +65,10 @@
                   <td>
                     {{ getManufacturName(item.manufacturer) }}
                   </td>
+
+                  <td v-if="org_id == 0 || org_id == 10485">
+                    {{ getDearName(item.dealer) }}
+                  </td>
                    <!--  批准文号-->
                   <td>
                     {{item.number}}
@@ -367,6 +372,7 @@ export default {
       good_type: 0,
       goodTypeList: [],
       houseList: [],
+      dealerList:[],
     };
   },
   methods: {
@@ -391,6 +397,7 @@ export default {
             this.houseList.push(houseList[i]);
           }
           this.manufacturerList = response.data.data.manufacturerList;
+          this.dealerList = response.data.data.dealerList
           this.goodTypeList = response.data.data.goodTypeList;
           this.patientList = response.data.data.patientList;
         }
@@ -828,6 +835,15 @@ export default {
         return 0;
       }
     },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
   },
   created() {
     this.org_id = this.$store.getters.xt_user.org_id;

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -95,6 +95,11 @@
                  {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="经销商" align="center">
+              <template slot-scope="scope">
+                 {{getDearName(scope.row.dealer)}}
+              </template>
+            </el-table-column>
             <el-table-column label="期初结余" align="center">
                
                  <el-table-column prop="stockIn" label="数量" width="100">
@@ -211,6 +216,7 @@ export default {
             return v.getTime() < 1667491200000
           },
       },
+     dealerList:[],
     }
   
   },
@@ -238,6 +244,7 @@ export default {
              this.goodTypeList.push(goodTypeList[i])
             }
            this.patientList = response.data.data.patientList
+           this.dealerList = response.data.data.dealerList
          }
       })
     },
@@ -289,6 +296,7 @@ export default {
             this.total = response.data.data.total
 
            this.manufacturerList = response.data.data.manufacturerList
+          
            
          }
       })
@@ -998,13 +1006,14 @@ export default {
           this.tableList[i].query_date = this.start_time+"~"+this.end_time
           this.tableList[i].good_type = this.getGoodTypeName(this.tableList[i].good_type_id)
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+          this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
           this.tableList[i].specification_name_one = this.tableList[i].specification_name + "/"+this.tableList[i].packing_unit
         }
         import('@/vendor/Export2Excel').then(excel => {
-           const multiHeader = [['序号', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
-           const header = ['', '','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
-           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:I1', 'J1:L1', 'M1:O1', 'P1:R1']
-           const filterVal = ['index', 'query_date', 'good_type','good_name','specification_name_one','manufacturer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
+           const multiHeader = [['序号', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+           const header = ['', '','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:J1', 'K1:M1', 'N1:P1', 'Q1:S1']
+           const filterVal = ['index', 'query_date', 'good_type','good_name','specification_name_one','manufacturer_name','dealer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
     
            const data = this.formatJson(filterVal, this.tableList)
            
@@ -1030,7 +1039,16 @@ export default {
            this.$message.success("调试成功")
          }
        })
-     }
+     },
+     getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
   },
 
 }

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -12,7 +12,7 @@
             <div id="print_content">
                 <div class="print_main_content">
                     <div class="order_title_panl">
-                        <span class="main_title">药品进销存查询表</span>
+                        <span class="main_title">耗材进销存查询表</span>
                     </div>
                     <div style="text-align:left;margin-bottom:20px;font-size: 14px;margin-bottom:-30px">
                       <span class="time_p">查询日期:{{start_time}} ~</span><span class="time_p">{{end_time}}</span> 
@@ -29,6 +29,7 @@
                                   <td rowspan="2" width="80">耗材类型</td>
                                   <td rowspan="2" width="80">规格&单位</td>
                                   <td rowspan="2" width="80">生产厂商</td>
+                                  <td rowspan="2" width="80">经销商</td>
                                   <td width="80" colspan="3">期初结余</td>    
                                   <td width="80" colspan="3">本期增加</td>   
                                   <td width="80" colspan="3">本期减少</td>  
@@ -57,6 +58,7 @@
                                  <td>{{getGoodTypeName(item.good_type_id)}}</td>
                                  <td>{{item.specification_name}}</td>
                                  <td> {{getManufacturName(item.manufacturer)}}</td>
+                                 <td> {{getDearName(item.dealer)}}</td>
                                  <td>{{item.stockIn}}</td>   
                                  <td>{{item.stock_in_price}}</td> 
                                  <td>{{item.stockMoney}}</td>   
@@ -119,6 +121,7 @@ export default {
           cancelCountList:[],
           org_id:0,
           goodTypeList:[],
+          dealerList:[]
         }
     },
     methods:{
@@ -142,8 +145,9 @@ export default {
             var goodTypeList = response.data.data.goodTypeList
             for(let i=0;i<goodTypeList.length;i++){
                 this.goodTypeList.push(goodTypeList[i])
-                }
-            }
+             }
+            this.dealerList = response.data.data.dealerList
+          }
         })
         },
         getlist(){
@@ -657,6 +661,15 @@ export default {
       }
       return manufacturer_name
     },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
     getEndOverPrice(val,val3,val1,val2,val4){
      var total_price = 0
      var total_price_one = 0
@@ -702,6 +715,7 @@ export default {
       return "0.00"
      }
    },
+
    },
     created(){
       this.org_id =  this.$store.getters.xt_user.org_id

src/xt_pages/user/components/PatientDetail.vue

@@ -596,7 +596,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="家庭住址 : " prop="homeAddress">
-                <el-input v-model="form.homeAddress" disabled></el-input>
+                <el-input v-model="form.homeAddress" disabled style="width: 350px;"></el-input>
               </el-form-item>
             </el-col>
 

src/xt_pages/user/components/PatientForm.vue

@@ -638,7 +638,7 @@
 
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item label="家庭住址 : " prop="homeAddress"  class="is-required">
-                  <el-input v-model="form.homeAddress"></el-input>
+                  <el-input v-model="form.homeAddress" style="width: 350px;"></el-input>
                 </el-form-item>
               </el-col>
 

src/xt_pages/user/inspection.vue

@@ -1348,7 +1348,7 @@ export default {
                 }
               }
               console.log("items23233232",item)
-              if(this.org_id!=0&& this.org_id!=10503){
+              if(this.org_id!=10503){
                 if(item.item_name!=""){
                  this.items.push(item)
                }
@@ -1359,9 +1359,16 @@ export default {
 
               console.log("items232232332wo",item.value.indexOf('http'))
 
-              if(item.value.indexOf("http") >= -1){
+              if(item.value.indexOf("http") <0){
                 this.isPic = true
               }
+
+              if(this.org_id!=10503){
+                this.isPic = false
+              }
+ 
+              console.log("woowwoow",this.isPic)
+              
               
               
               console.log("isPicwowowow",this.items)