新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -748,12 +748,23 @@
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          {{
+                         
+
+                          <span v-if="org_id==10223">
+                              {{
+                            record.prescription.replacement_total
+                              ? record.prescription.replacement_total
+                              : "/"
+                           }}
+                          </span>
+                          <span v-if="org_id!=10223">
+                            {{
                             record.prescription &&
                             record.prescription.displace_liqui_value
                               ? record.prescription.displace_liqui_value
                               : "/"
                           }}
+                          </span>
                         </div>
                         L
                       </div>

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

@@ -821,7 +821,7 @@
 
                     <el-col :span="8">
                         <el-form-item
-                                label="置换液："
+                                label="置换方式："
                                 v-if="isShows('置换液')&&this.$store.getters.xt_user.org.id != 10206"
                                 v-show="huShow"
                                 prop="displace_liqui_part"
@@ -841,7 +841,7 @@
                             </el-select>
                         </el-form-item>
                       <el-form-item
-                        label="置换液："
+                        label="置换方式："
                         v-if="isShows('置换方式')&&this.$store.getters.xt_user.org.id == 10206"
                         v-show="huShow"
                         prop="displace_liqui_part"

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -762,11 +762,18 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                        {{
+                      <span v-if="org_id==10223"> {{
                           prescription.replacement_total
                             ? prescription.replacement_total
                             : "/"
                         }}
+                        </span> 
+                        <span v-if="org_id!=10223"> {{
+                          prescription.displace_liqui_value
+                            ? prescription.displace_liqui_value
+                            : "/"
+                        }}
+                        </span> 
                       </div>
                       L
                     </div>
@@ -4275,12 +4282,15 @@ export default {
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
         if(this.org_id ==10515 || this.org_id == 0 || this.org_id == 10510){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
+            
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
               this.doctor_advices.push(response.data.data.doctorAdevieInfo[i])
+              console.log("寄哪里 222")
               // this.doctor_advices_2.push(response.data.data.doctorAdevieInfo[i])
             }
          }
 
+        console.log("医护哦我我我哦我我哦",this.doctor_advices)
 
          let projects = [];
         response.data.data.projects.map((item) => {

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -139,7 +139,7 @@
                   <span v-else-if="prescription.anticoagulant == 14">肝素钙注射液</span>
                   <span v-else-if="prescription.anticoagulant == 15">甲磺酸萘莫司他</span>
                   &nbsp; 
-                  <span style="width:135px;display: inline-block;" 
+                  <span style="width:150px;display: inline-block;" 
                   v-if=" prescription.anticoagulant != 1 && prescription.anticoagulant != 12 && prescription.anticoagulant != 5">
                     首剂： {{ prescription.anticoagulant_shouji }} 
                     <span v-if="prescription.anticoagulant == 4">mg</span>

src/xt_pages/role/admin.vue

@@ -25,6 +25,12 @@
         >医药师登记</el-button>
 
 
+        <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toJiaBan">加班</el-button>
        
 
          <!-- <el-button
@@ -202,6 +208,8 @@
           style="float:left"
           @click="toCheckPDFInformation">PDF验证</el-button> -->
 
+         
+
         
      </div>
     
@@ -503,7 +511,7 @@
 import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement,toTestThrityMent,saveEnterprise,getEnterPriseById,getMobileCode,savePersionEnterPrise,getPerseEnterPriseById,CreatePersionSeal,CreateNewEnterPrise,toTestThrity,toEndEnterPrise,getEnterPriseDetail
   ,CreateQianshuUserName,CreateSKDSendInformation,toSavePDFInformation,toCheckPDFInformation,getdruginfoInformation} from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
-
+import { UploadPrintOrder } from "@/api/role/admin"
 import { parseTime } from "@/utils";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import AdminInfoForm from "./components/AdminInfoForm";
@@ -1153,6 +1161,13 @@ export default {
     //      }
     //   })
     // }
+    toJiaBan(){
+      UploadPrintOrder().then(response=>{
+        if(response.data.state ==1){
+           
+        }
+      })
+    }
 
   },
   watch: {