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

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -346,7 +346,7 @@
                             </span>
                         </td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}</span></td>
-                        <td>&nbsp;<span v-if="monitor.operate_time && org_id!=10215" >{{ monitor.ktv ? monitor.ktv : "/" }}</span></td>
+                        <td v-if="org_id!=10215">&nbsp;<span v-if="monitor.operate_time" >{{ monitor.ktv ? monitor.ktv : "/" }}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
@@ -357,7 +357,7 @@
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
 <!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>-->
 <!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>-->
-                        <td>&nbsp;<span v-if="monitor.operate_time && org_id!=10215">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td>
+                        <td v-if="org_id!=10215">&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td>
                         <td style="text-align:left;padding-left:10px;">
                             <div style="line-height:20px;text-align: left;display: inline-block;">
                                 &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}
@@ -654,7 +654,8 @@ export default {
         "出血",
         "心衰",
         "腹痛"
-      ]
+      ],
+      org_id: "",
     };
   },
   created() {
@@ -666,7 +667,7 @@ export default {
     this.precaution_arr = getDataConfig("hemodialysis", "precaution");
     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
-
+    this.org_id = this.$store.getters.xt_user.org.id;
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     //   this.orgname = "遂溪方济医院";

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1539,104 +1539,113 @@
                           <td style="font-size: 16px" width="10%">时间</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
-                          
-                        <template v-if="record.his_advices">
-                          <tr
-                          v-for="(advice, advice_index) in record.his_advices"
-                          :key="advice_index"
-                        >
-                          <td height="35px">
-                            <span v-if="advice.start_time">
-                              {{ getTime(advice.start_time, "{h}:{i}") }}
-                            </span>
-                          </td>
 
-                          <td
-                            height="35px"
-                            colspan="2"
-                            class="advice-name"
-                            style="padding-left: 7px"
+                        <template v-if="record.advices">
+                          <tr
+                            v-for="(advice, advice_index) in record.advices"
+                            :key="advice_index"
                           >
-                            <span v-if="advice.parent_id > 0">---></span>
-                            <span>{{ advice.advice_name }}</span>
+                            <td height="35px">
+                              <span v-if="advice[0].start_time">
+                                {{ getTime(advice[0].start_time, "{h}:{i}") }}
+                              </span>
+                            </td>
 
-                            <span
-                              v-if="
-                                advice[advice_index] &&
-                                advice.advice_desc != undefined
-                              "
+                            <td
+                              height="35px"
+                              colspan="2"
+                              class="advice-name"
+                              style="padding-left: 7px"
                             >
-                              ({{ advice.advice_desc
-                              }}{{ advice.drug_spec_unit }} )
-                            </span>
+                              <span v-if="advice[0].parent_id > 0">---></span>
+                              <span>{{ advice[0].advice_name }}</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[0] &&
+                                  advice[0].advice_desc != undefined
+                                "
+                              >
+                                ({{ advice[0].advice_desc
+                                }}{{ advice[0].drug_spec_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
-                            >
-                          </td>
+                              <span v-if="advice[0].prescribing_number"
+                                >&nbsp;&nbsp; {{ advice[0].prescribing_number
+                                }}{{ advice[0].prescribing_number_unit }}</span
+                              >
+                              <span v-if="advice[0].single_dose != 0">
+                                {{ advice[0].single_dose
+                                }}{{ advice[0].single_dose_unit }}</span
+                              >
 
-                          <td height="35px">
-                            <span
-                              v-if="
-                                setAdminUserES(advice, 'advice_doctor') == ''
-                              "
-                              >{{ getAdminUser(advice, "advice_doctor") }}</span
-                            >
-                            <img
-                              class="es-img"
-                              :src="setAdminUserES(advice, 'advice_doctor')"
-                              alt=""
-                              srcset=""
-                              v-else
-                              style="height: 40px"
-                            />
-                          </td>
+                              <span v-if="advice[0].parent_id == 0">{{
+                                advice[0].delivery_way
+                              }}</span>
+                              <span v-if="advice[0].parent_id == 0">{{
+                                advice[0].execution_frequency
+                              }}</span>
+                              <span
+                                v-if="
+                                  advice[0].parent_id == 0 &&
+                                  advice[0].remark.length > 0
+                                "
+                                >({{ advice[0].remark }})</span
+                              >
+                            </td>
 
-                          <td height="35px">
-                            <span
-                              v-if="
-                                setAdminUserES(advice, 'execution_staff') == ''
-                              "
-                              >{{
-                                getAdminUser(advice, "execution_staff")
-                              }}</span
-                            >
-                            <img
-                              class="es-img"
-                              :src="setAdminUserES(advice, 'execution_staff')"
-                              alt=""
-                              srcset=""
-                              v-else
-                              style="height: 40px"
-                            />
-                          </td>
-                          <td height="35px">
-                            <span v-if="advice.execution_time">{{
-                              getTime(advice.execution_time, " {h}:{i}")
-                            }}</span>
-                          </td>
-                        </tr>
+                            <td height="35px">
+                              <span
+                                v-if="
+                                  setAdminUserES(advice[0], 'advice_doctor') ==
+                                  ''
+                                "
+                                >{{
+                                  getAdminUser(advice[0], "advice_doctor")
+                                }}</span
+                              >
+                              <img
+                                class="es-img"
+                                :src="
+                                  setAdminUserES(advice[0], 'advice_doctor')
+                                "
+                                alt=""
+                                srcset=""
+                                v-else
+                                style="height: 40px"
+                              />
+                            </td>
+
+                            <td height="35px">
+                              <span
+                                v-if="
+                                  setAdminUserES(
+                                    advice[0],
+                                    'execution_staff'
+                                  ) == ''
+                                "
+                                >{{
+                                  getAdminUser(advice[0], "execution_staff")
+                                }}</span
+                              >
+                              <img
+                                class="es-img"
+                                :src="
+                                  setAdminUserES(advice[0], 'execution_staff')
+                                "
+                                alt=""
+                                srcset=""
+                                v-else
+                                style="height: 40px"
+                              />
+                            </td>
+                            <td height="35px">
+                              <span v-if="advice[0].execution_time">{{
+                                getTime(advice[0].execution_time, " {h}:{i}")
+                              }}</span>
+                            </td>
+                          </tr>
                         </template>
-                        
                       </tbody>
                     </table>
                   </td>
@@ -2874,7 +2883,7 @@ export default {
               this.records[recordIndex].advices.push(item);
             }
           }
-          console.log(this.records,'this.records')
+          console.log(this.records, "this.records");
           // this.records.forEach(o => {
           //   console.log(o,'jj')
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(

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

@@ -94,6 +94,11 @@
                 {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="批准文号" align="center">
+              <template slot-scope="scope">
+                {{scope.row.medical_insurance_number}}
+              </template>
+            </el-table-column>
             <el-table-column label="国家编码" align="center">
               <template slot-scope="scope">
                 {{scope.row.medical_insurance_number}}

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

@@ -34,16 +34,17 @@
                   <td width="5%">序号</td>
                   <td width="6%">药品类型</td>
                   <td width="10%">药品名称</td>
-                  <td width="10%">规格&单位</td>
-                  <td width="15%">生产厂商</td>
-                  <td width="9%">国家编码</td>
+                  <td width="9%">规格&单位</td>
+                  <td width="13%">生产厂商</td>
+                  <td width="10%">批准文号</td>
+                  <td width="6%">国家编码</td>
                   <td width="6%">仓库名称</td>
                   <td width="6%">入库数量</td>
                   <td width="6%">出库数量</td>
                   <td width="6%">退库数量</td>
                   <td width="6%">实际出库</td>
                   <td width="6%">剩余库存</td>
-                  <td width="6%">总库存量</td>
+                  <td width="9%">总库存量</td>
                 </tr>
               </thead>
               <tbody>
@@ -58,6 +59,8 @@
                   <td>
                     {{ getManufacturName(item.manufacturer) }}
                   </td>
+                  <!-- 批准文号 -->
+                   <td ></td>
                   <td >{{ item.medical_insurance_number }}</td>
                   <!-- 仓库名称   -->
                   <td style="padding: 0;text-align:center;">

src/xt_pages/stock/query/goodNewQuery.vue

@@ -68,6 +68,11 @@
                   {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="批准文号" align="center">
+              <template slot-scope="scope">
+                  {{getManufacturName(scope.row.manufacturer)}}
+              </template>
+            </el-table-column>
             <el-table-column label="国家编码" align="center">
               <template slot-scope="scope">
                 {{scope.row.social_security_directory_code}}

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="9%">批准文号</td>
                   <td width="9%">国家编码</td>
                   <td width="6%">仓库名称</td>
                   <td width="6%">入库数量</td>
@@ -60,6 +61,10 @@
                     {{ item.specification_name }}/{{ item.packing_unit }}
                   </td>
                   <!--  生产厂商-->
+                  <td>
+                    {{ getManufacturName(item.manufacturer) }}
+                  </td>
+                   <!--  批准文号-->
                   <td>
                     {{ getManufacturName(item.manufacturer) }}
                   </td>