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

src/xt_pages/dialysis/batch_print/batch_print_order_fiftynine.vue

@@ -472,10 +472,8 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1">
-                        <span v-if="org_id == 10138 || org_id == 9675"
-                          >治疗模式：</span
-                        >
-                        <span v-else>透析方式：</span>
+                        
+                        <span>透析方式：</span>
                         <div
                           class="under_line"
                           style="
@@ -719,12 +717,14 @@
                           class="under_line"
                           style="width: 100px; text-align: center"
                         >
-                          /
+                          {{
+                          getDisplaceLiquiPart(record.prescription.displace_liqui_part)
+                        }}
                         </div>
                       </div>
                       <div
                         class="inline_block"
-                        style="margin-left: 10px; flex: 1"
+                        style="margin-left: 10px; flex: 0.8"
                       >
                         置换量：
                         <div
@@ -760,7 +760,7 @@
                       </div>
                       <div
                         class="inline_block"
-                        style="margin-left: 10px; flex: 1"
+                        style="flex: 1"
                       >
                         透析时间：
                         <div
@@ -1062,6 +1062,23 @@
                           <span v-if="record.prescription.anticoagulant == 7"
                             >&nbsp;低分子肝素钠</span
                           >
+                          <span v-if="record.prescription.anticoagulant == 8"
+                            >&nbsp;依诺肝素</span
+                          >
+                           <span v-if="record.prescription.anticoagulant == 9"
+                            >&nbsp;达肝素</span
+                          >
+                           <span v-if="record.prescription.anticoagulant == 10"
+                            >&nbsp;体外抗凝</span
+                          > <span v-if="record.prescription.anticoagulant == 11"
+                            >&nbsp;那屈肝素</span
+                          >
+                           <span v-if="record.prescription.anticoagulant == 12"
+                            >&nbsp;无抗凝剂</span
+                          >
+                           <span v-if="record.prescription.anticoagulant == 13"
+                            >&nbsp;那屈肝素钙</span
+                          >
                         </div>
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
@@ -1077,6 +1094,18 @@
                               : "/"
                           }}
                         </div>
+                         <span v-if="record.prescription.anticoagulant == 10 ||record.prescription.anticoagulant == 11||record.prescription.anticoagulant==13"
+                          >mg</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 8 || record.prescription.anticoagulant == 9"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 6"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 7"
+                          >iu</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 4"
                           >mg</span
                         >
@@ -1122,6 +1151,21 @@
                               : 0
                           }}
                         </div>
+                        <span v-if="record.prescription.anticoagulant == 10 ||record.prescription.anticoagulant == 11||record.prescription.anticoagulant==13"
+                          >mg/h</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 9"
+                          >iu/h</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 8"
+                          >iu/h</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 7"
+                          >iu/h</span
+                        >
+                         <span v-if="record.prescription.anticoagulant == 6"
+                          >iu/h</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 5"
                           >ml/h</span
                         >
@@ -1151,6 +1195,24 @@
                               : "/"
                           }}
                         </div>
+                        <span v-if="record.prescription.anticoagulant == 10 ||record.prescription.anticoagulant == 11||record.prescription.anticoagulant==13"
+                          >mg</span
+                        >
+                         <span v-if="record.prescription.anticoagulant == 9"
+                          >iu</span
+                        >
+                         <span v-if="record.prescription.anticoagulant == 8"
+                          >iu</span
+                        >
+                         <span v-if="record.prescription.anticoagulant == 7"
+                          >iu</span
+                        >
+                         <span v-if="record.prescription.anticoagulant == 6"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 5"
+                          >ml</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 4"
                           >mg</span
                         >
@@ -1181,6 +1243,31 @@
                         </div>
                       </div>
                     </div>
+                    <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                   
+                  >
+                    <div
+                      class="inline_block"
+                      style="flex: 1; display: inline-block"
+                    >
+                      备注：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 860px;
+                          line-height: 25px;
+                          text-align: left;
+                          margin-left: 2px;
+                          display: inline-block;
+                          white-space: normal;
+                        "
+                      >
+                        {{ record.assessment_before_dislysis.remark ? record.assessment_before_dislysis.remark : "/" }}
+                      </div>
+                    </div>
+                  </div>
                   </td>
                 </tr>
                 <tr>
@@ -1218,23 +1305,17 @@
                           <td width="60" v-if="org_id == 9836">体温(°C)</td>
                           <td
                             width="50"
-                            v-if="
-                              org_id != 9538 &&
-                              org_id != 10121 &&
-                              org_id != 9675 &&
-                              org_id != 0
-                            "
                           >
                             电导度<br />(ms/cm)
                           </td>
-                          <td
+                          <!-- <td
                             width="50"
                             v-if="
                               org_id == 10121 || org_id == 9675 || org_id == 0
                             "
                           >
                             SpO₂<br />(%)
-                          </td>
+                          </td> -->
                           <td width="50">超滤量<br />(ml)</td>
                           <td
                             v-if="
@@ -1246,27 +1327,6 @@
                           >
                             置换量<br />(ml)
                           </td>
-
-                          <td
-                            width="50"
-                            v-if="
-                              org_id == 9919 ||
-                              org_id == 9538 ||
-                              org_id == 9675 ||
-                              org_id == 9671
-                            "
-                          >
-                            KT/V
-                          </td>
-                          <td
-                            width="50"
-                            v-if="
-                              org_id == 9538 || org_id == 9675 || org_id == 9671
-                            "
-                          >
-                            血容量<br />(L)
-                          </td>
-
                           <td width="200">病情变化及处理</td>
                         </tr>
 
@@ -1353,12 +1413,6 @@
                             {{monitor_record.conductivity? monitor_record.conductivity : ""}}
                           </td> -->
                           <td
-                            v-if="
-                              org_id != 9538 &&
-                              org_id != 10121 &&
-                              org_id != 9675 &&
-                              org_id != 0
-                            "
                           >
                             {{
                               monitor_record.conductivity
@@ -1367,7 +1421,7 @@
                             }}
                           </td>
 
-                          <td
+                          <!-- <td
                             v-if="
                               org_id == 10121 || org_id == 9675 || org_id == 0
                             "
@@ -1377,7 +1431,7 @@
                                 ? monitor_record.blood_oxygen_saturation
                                 : ""
                             }}
-                          </td>
+                          </td> -->
 
                           <td v-if="org_id == 9538">
                             {{
@@ -1409,7 +1463,7 @@
                                 : ""
                             }}
                           </td>
-                          <td
+                          <!-- <td
                             width="50"
                             v-if="
                               org_id == 9919 ||
@@ -1427,7 +1481,7 @@
                             "
                           >
                             {{ monitor_record.accumulated_blood_volume }}
-                          </td>
+                          </td> -->
 
                           <td style="line-height: 16px; padding: 0px">
                             <div
@@ -1488,12 +1542,6 @@
                           <td></td>
                           <td></td>
                           <td></td>
-                          <td
-                            v-if="
-                              org_id == 9919 || org_id == 9538 || org_id == 9675
-                            "
-                          ></td>
-                          <td v-if="org_id == 9538 || org_id == 9675"></td>
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="
@@ -1561,12 +1609,12 @@
 
                         <template v-if="record.advices">
                           <tr
-                            v-for="(advice, advice_index) in record.advices"
+                            v-for="(advice, advice_index) in record.his_advices"
                             :key="advice_index"
                           >
                             <td height="35px">
-                              <span v-if="advice[0].start_time">
-                                {{ getTime(advice[0].start_time, "{h}:{i}") }}
+                              <span v-if="advice.start_time">
+                                {{ getTime(advice.start_time, "{h}:{i}") }}
                               </span>
                             </td>
 
@@ -1576,57 +1624,54 @@
                               class="advice-name"
                               style="padding-left: 7px"
                             >
-                              <span v-if="advice[0].parent_id > 0">---></span>
-                              <span>{{ advice[0].advice_name }}</span>
+                              <span v-if="advice.parent_id > 0">---></span>
+                              <span>{{ advice.advice_name }}</span>
 
                               <span
-                                v-if="
-                                  advice[0] &&
-                                  advice[0].advice_desc != undefined
-                                "
+                               v-if="advice && advice.advice_desc"
                               >
-                                ({{ advice[0].advice_desc
-                                }}{{ advice[0].drug_spec_unit }} )
+                                ({{ advice.advice_desc
+                                }}{{ advice.drug_spec_unit }} )
                               </span>
 
-                              <span v-if="advice[0].prescribing_number"
-                                >&nbsp;&nbsp; {{ advice[0].prescribing_number
-                                }}{{ advice[0].prescribing_number_unit }}</span
+                              <span v-if="advice.prescribing_number"
+                                >&nbsp;&nbsp; {{ advice.prescribing_number
+                                }}{{ advice.prescribing_number_unit }}</span
                               >
-                              <span v-if="advice[0].single_dose != 0">
-                                {{ advice[0].single_dose
-                                }}{{ advice[0].single_dose_unit }}</span
+                              <span v-if="advice.single_dose != 0">
+                                {{ advice.single_dose
+                                }}{{ advice.single_dose_unit }}</span
                               >
 
-                              <span v-if="advice[0].parent_id == 0">{{
-                                advice[0].delivery_way
+                              <span v-if="advice.parent_id == 0">{{
+                                advice.delivery_way
                               }}</span>
-                              <span v-if="advice[0].parent_id == 0">{{
-                                advice[0].execution_frequency
+                              <span v-if="advice.parent_id == 0">{{
+                                advice.execution_frequency
                               }}</span>
                               <span
                                 v-if="
-                                  advice[0].parent_id == 0 &&
-                                  advice[0].remark.length > 0
+                                  advice.parent_id == 0 &&
+                                  advice.remark.length > 0
                                 "
-                                >({{ advice[0].remark }})</span
+                                >({{ advice.remark }})</span
                               >
                             </td>
 
                             <td height="35px">
                               <span
                                 v-if="
-                                  setAdminUserES(advice[0], 'advice_doctor') ==
+                                  setAdminUserES(advice, 'advice_doctor') ==
                                   ''
                                 "
                                 >{{
-                                  getAdminUser(advice[0], "advice_doctor")
+                                  getAdminUser(advice, "advice_doctor")
                                 }}</span
                               >
                               <img
                                 class="es-img"
                                 :src="
-                                  setAdminUserES(advice[0], 'advice_doctor')
+                                  setAdminUserES(advice, 'advice_doctor')
                                 "
                                 alt=""
                                 srcset=""
@@ -1639,18 +1684,18 @@
                               <span
                                 v-if="
                                   setAdminUserES(
-                                    advice[0],
+                                    advice,
                                     'execution_staff'
                                   ) == ''
                                 "
                                 >{{
-                                  getAdminUser(advice[0], "execution_staff")
+                                  getAdminUser(advice, "execution_staff")
                                 }}</span
                               >
                               <img
                                 class="es-img"
                                 :src="
-                                  setAdminUserES(advice[0], 'execution_staff')
+                                  setAdminUserES(advice, 'execution_staff')
                                 "
                                 alt=""
                                 srcset=""
@@ -1659,8 +1704,8 @@
                               />
                             </td>
                             <td height="35px">
-                              <span v-if="advice[0].execution_time">{{
-                                getTime(advice[0].execution_time, " {h}:{i}")
+                              <span v-if="advice.execution_time">{{
+                                getTime(advice.execution_time, " {h}:{i}")
                               }}</span>
                             </td>
                           </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -407,7 +407,7 @@
                       <div class="under_line" style="width: 100px;text-align: center">
                         {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
                       </div>
-                      L
+                    ml
                     </div>
                     <div class="inline_block" style="flex:1;">
                       干体重：

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -1036,4 +1036,8 @@ export default {
   background: #6fb5fa;
 }
 
+.el-autocomplete-suggestion{
+    width: 400px !important;
+  }
+
 </style>

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -1334,4 +1334,9 @@ export default {
   background: #6fb5fa;
 }
 
+.el-autocomplete-suggestion{
+    width: 400px !important;
+  }
+
+
 </style>

src/xt_pages/stock/stockInOrderAdd.vue

@@ -1012,7 +1012,7 @@
   .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
     background: #6fb5fa;
   }
-  .el-autocomplete-suggestion{
+.el-autocomplete-suggestion{
     width: 400px !important;
   }
 

src/xt_pages/stock/stockInventory.vue

@@ -28,7 +28,7 @@
 <script>
 import BreadCrumb from "../components/bread-crumb";
 import inventory from './inventory.vue'
-import newInventory from './newInventory.vue'
+// import newInventory from './newInventory.vue'
 import inventoryDetails from './inventoryDetails.vue'
 import stockDamaged from "./stockDamaged.vue"
 export default {
@@ -38,7 +38,7 @@ export default {
         inventory,
         inventoryDetails,
         stockDamaged,
-        newInventory
+        // newInventory
     },
     data() {
         return{

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -1049,7 +1049,7 @@ export default {
 }
 </style>
 
-<style>
+<style lang="scss">
 .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
   font-size: 12px;
 }
@@ -1057,7 +1057,7 @@ export default {
 .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
   background: #6fb5fa;
 }
-.el-autocomplete-suggestion{
+s.el-autocomplete-suggestion{
   width: 400px !important;
 }
 ::-webkit-scrollbar{

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -1042,5 +1042,9 @@
   .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
     background: #6fb5fa;
   }
+  .el-autocomplete-suggestion{
+    width: 400px !important;
+  }
+
 
 </style>