11月14日 库存扣减更新

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1751,7 +1751,34 @@
                           />
                         </div>
                       </div>
-                      <div class="inline_block" style="flex:1;">
+                     <div class="inline_block" style="flex:1;">
+                      核对人员：
+                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.dialysis_order == null">
+                        <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(record.check, 'creater') == ''">
+                          {{getAdminUser(record.check, "creater") ? getAdminUser(record.check, "creater"): "/"}}
+                        </span>
+                        <img style="height:30px;" :src="setAdminUserES(record.check, 'creater') == ''" alt="" srcset="" v-else />
+                      </div>
+                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.dialysis_order != null && record.dialysis_order.start_nurse == record.check.modifier">
+                        <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(record.check, 'creater') == ''">
+                          {{getAdminUser(record.check, "creater") ? getAdminUser(record.check, "creater"): "/"}}
+                        </span>
+                        <img style="height:30px;" :src="setAdminUserES(record.check, 'creater') == ''" alt="" srcset="" v-else />
+                      </div>
+                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.dialysis_order != null && record.dialysis_order.start_nurse == record.check.creater">
+                        <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(record.check, 'modifier') == ''">
+                           {{getAdminUser(record.check, "creater") ? getAdminUser(record.check, "modifier"): "/"}}
+                        </span>
+                        <img style="height:30px;" :src="setAdminUserES(record.check, 'modifier') == ''" alt="" srcset="" v-else />
+                      </div>
+                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.dialysis_order  != null && record.dialysis_order.start_nurse != record.check.creater && record.dialysis_order.start_nurse != record.check.modifier">
+                        <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(record.check, 'creater') == ''">
+                          {{getAdminUser(record.check, "creater") ? getAdminUser(record.check, "creater"): "/"}}
+                        </span>
+                        <img style="height:30px;" :src="setAdminUserES(record.check, 'creater') == ''" alt="" srcset="" v-else />
+                      </div>
+                    </div>
+                      <!-- <div class="inline_block" style="flex:1;">
                         核对人员：
                         <div
                           class="under_line"
@@ -1764,12 +1791,8 @@
                           style="width: 80px;text-align: left"
                         >
                           <div
-                            style="width: 80px;text-align: left;display: inline-block;white-space: nowrap;"
-                            v-if="
-                              record.dialysis_order != null &&
-                               record.check.creater ==
-                                  record.check.creater
-                            "
+                            style="width: 80px;text-align: left;display: inline-block;white-space: nowrap;" 
+                            v-if="record.dialysis_order != null && record.check.creater ==record.check.creater"
                           >
                             <span
                               v-if="
@@ -1790,14 +1813,11 @@
                               style="height: 40px;"
                             />
                           </div>
+
                           <div
                             class="under_line"
                             style="width: 80px;text-align: left"
-                            v-if="
-                              record.dialysis_order != null &&
-                                record.dialysis_order.start_nurse ==
-                                  record.check.modifier
-                            "
+                            v-if=" record.dialysis_order != null &&record.dialysis_order.start_nurse ==record.check.modifier "
                           >
                             <span
                               v-if="
@@ -1813,15 +1833,11 @@
                               v-else
                             />
                           </div>
+
                           <div
                             class="under_line"
                             style="width: 80px;text-align: left"
-                            v-if="
-                              record.dialysis_order != null &&
-                                record.dialysis_order.start_nurse !=
-                                  record.check.modifier &&
-                                record.dialysis_order.start_nurse !=
-                                  record.check.creater
+                            v-if="record.dialysis_order != null &&record.dialysis_order.start_nurse != record.check.modifier &&record.dialysis_order.start_nurse != record.check.creater
                             "
                           >
                             <span
@@ -1838,13 +1854,14 @@
                               v-else
                             />
                           </div>
+
                         </div>
                         <div
                           class="under_line"
                           style="width: 80px;text-align: left"
                           v-if="!record.check"
                         ></div>
-                      </div>
+                      </div> -->
                       <div class="inline_block" style="flex:1;">
                         下机护士：
                         <div

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1610,7 +1610,7 @@ export default {
           response.data.data.dialysisOrder === null
             ? null
             : response.data.data.dialysisOrder
-
+        console.log("上机233232323232",this.dialysisOrder)
         if (this.operators.length > 0) {
           var operatorsLen = this.operators.length
           for (var index = 0; index < operatorsLen; index++) {