提交代码

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1636,7 +1636,7 @@
                   }
                   tempAdvice.push(obj)
                   }
-                 
+
                 }
 
 
@@ -1679,7 +1679,7 @@
                   }
                   tempProject.push(obj)
                   }
-             
+
                 }
 
                 // var preTime = nowTime
@@ -1954,7 +1954,7 @@
                 //药品
                 for (let b = 0; b < prescription.advices.length; b++) {
                   let obj = {
-                    advice_id: prescription.advices[b].id,
+                    advice_id: 0,
                     drug_name: prescription.advices[b].advice_name,
                     single_dose: prescription.advices[b].single_dose,
                     delivery_way: prescription.advices[b].delivery_way,
@@ -1980,7 +1980,7 @@
                 //项目
                 for (let b = 0; b < prescription.project.length; b++) {
                   let obj = {
-                    id: prescription.project[b].id,
+                    id: 0,
                     project_id: prescription.project[b].project_id,
                     project_name: prescription.project[b].project.project_name,
                     statistical_classification: prescription.project[b].project.statistical_classification,
@@ -2020,7 +2020,7 @@
 
                 let index = i + 1
                 let obj = {
-                  id: prescription.id,
+                  id: 0,
                   name: '处方' + index,
                   advices: tempAdvice,
                   project: tempProject,

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -126,7 +126,7 @@
           </div>
           <div style="text-align: center">(以下空白)</div>
         </div>
-        <div class="doctorBox" v-if="org_id != 10188">
+        <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
           <p v-if="org_id == 10217 || org_id == 0">
             医师：
             <span
@@ -154,11 +154,15 @@
           </p>
           <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
         </div>
-        <div class="doctorBox" v-else>
-          <p>药师：</p>
+        <div class="doctorBoxtwo" v-if="org_id == 10188 || org_id == 0">
+          <p >审核、调配：</p>
+          <p style="margin-right: 43px">药师：</p>
+        </div>
+        <div class="doctorBox" v-if="org_id == 10188 || org_id == 0">
+          <p >核对、发药：</p>
           <p>医师：{{ item.doctor ? item.doctor : "" }}</p>
         </div>
-        <div class="actionBar" v-if="org_id != 10188">
+        <div class="actionBar" v-if="org_id != 10188 && org_id != 0">
           <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                  <p>配对：</p>
                  <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
@@ -169,7 +173,7 @@
           <p>配对：</p>
           <p>核对：</p>
           <p>发药：</p>
-          <p>
+          <p >
             药费：{{
               getTotalOne(item.id).toFixed(2)
                 ? getTotalOne(item.id).toFixed(2)
@@ -179,11 +183,8 @@
           <!--            <p>药费：466.2元</p>-->
         </div>
         <div class="actionBar" v-else>
-          <p style="visibility: hidden">审核：</p>
-          <p style="visibility: hidden">配对：</p>
-          <p style="visibility: hidden">核对：</p>
-          <p style="visibility: hidden">发药：</p>
-          <p>
+
+          <p >
             药费：{{
               getTotalOne(item.id).toFixed(2)
                 ? getTotalOne(item.id).toFixed(2)
@@ -528,6 +529,13 @@ export default {
   line-height: 24px;
   border-bottom: 2px solid #000;
 }
+.doctorBoxtwo {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+  line-height: 24px;
+
+}
 .actionBar {
   display: flex;
   justify-content: space-between;