新分支

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -234,7 +234,7 @@
                       alt
                       srcset
                       v-else -->
-                      <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
+                      <!-- <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
                         {{ getAdminUser(advices[0].advice_doctor) }}
                       </span>
                       <img
@@ -244,7 +244,35 @@
                         alt
                         srcset
                         v-else
-                    />
+                    /> -->
+
+                    <span v-if="advices[0]&&advices[0].advice_doctor>0 == 0">
+                        <span v-if="setAdminUserES(prescription.creater) == ''">
+                          {{ getAdminUser(prescription.creater) }}
+                        </span>
+                        <img
+                          class="es-img"
+                          style="height: 30px"
+                          :src="setAdminUserES(prescription.creater)"
+                          alt
+                          srcset
+                          v-else
+                        />
+                       </span>
+
+                       <span v-if="advices[0]&&advices[0].advice_doctor>0">
+                        <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
+                          {{ getAdminUser(advices[0].advice_doctor) }}
+                        </span>
+                        <img
+                          class="es-img"
+                          style="height: 30px"
+                          :src="setAdminUserES(advices[0].advice_doctor)"
+                          alt
+                          srcset
+                          v-else
+                        />
+                       </span>
                   </div>
                 </td>
               </tr>
@@ -664,18 +692,61 @@
                     </div>
                     <div style="display: inline-block; margin-left: 30px;">
                       医生签名：
-                       
-                      <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
-                        {{ getAdminUser(advices[0].advice_doctor) }}
-                      </span>
-                      <img
-                        class="es-img"
-                        style="height: 30px"
-                        :src="setAdminUserES(advices[0].advice_doctor)"
-                        alt
-                        srcset
-                        v-else
-                      />
+                      <span v-if="advices[0]&&advices[0].advice_doctor>0 == 0">
+                        <span v-if="setAdminUserES(prescription.creater) == ''">
+                          {{ getAdminUser(prescription.creater) }}
+                        </span>
+                        <img
+                          class="es-img"
+                          style="height: 30px"
+                          :src="setAdminUserES(prescription.creater)"
+                          alt
+                          srcset
+                          v-else
+                        />
+                       </span>
+
+                       <span v-if="advices[0]&&advices[0].advice_doctor>0">
+                        <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
+                          {{ getAdminUser(advices[0].advice_doctor) }}
+                        </span>
+                        <img
+                          class="es-img"
+                          style="height: 30px"
+                          :src="setAdminUserES(advices[0].advice_doctor)"
+                          alt
+                          srcset
+                          v-else
+                        />
+                       </span>
+                       <!-- <span v-if="advices[0]&&advices[0].advice_doctor>0 == 0">
+                        <span v-if="setAdminUserES(prescription.creater) == ''">
+                          {{ getAdminUser(prescription.creater) }}
+                        </span>
+                        <img
+                          class="es-img"
+                          style="height: 30px"
+                          :src="setAdminUserES(prescription.creater)"
+                          alt
+                          srcset
+                          v-else
+                        />
+                       </span>
+
+                       <span v-if="advices[0]&&advices[0].advice_doctor>0">
+                        <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
+                          {{ getAdminUser(advices[0].advice_doctor) }}
+                        </span>
+                        <img
+                          class="es-img"
+                          style="height: 30px"
+                          :src="setAdminUserES(advices[0].advice_doctor)"
+                          alt
+                          srcset
+                          v-else
+                        />
+                       </span> -->
+                      
                     </div>
                     <div style="display: inline-block; margin-left: 70px;">
                       护士签名：

src/xt_pages/role/admin.vue

@@ -25,12 +25,12 @@
         >医药师登记</el-button>
 
 
-       <!-- <el-button
+       <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">加班</el-button> -->
+          @click="toJiaBan">首拼</el-button>
 
 
           <!-- <el-button

src/xt_pages/stock/stockFlow.vue

@@ -52,7 +52,7 @@
         <span>
           <el-button type="primary" size="small" @click="toExprot">导出</el-button>
 
-          <!-- <el-button type="primary" size="small" @click="toTongBu">同步</el-button> -->
+          <el-button type="primary" size="small" @click="toTongBu">同步</el-button>
         </span>
        
       </div>