Browse Source

提交代码

陈少旭 1 year ago
parent
commit
cb31f585d5

+ 5 - 5
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue View File

1636
                   }
1636
                   }
1637
                   tempAdvice.push(obj)
1637
                   tempAdvice.push(obj)
1638
                   }
1638
                   }
1639
-                 
1639
+
1640
                 }
1640
                 }
1641
 
1641
 
1642
 
1642
 
1679
                   }
1679
                   }
1680
                   tempProject.push(obj)
1680
                   tempProject.push(obj)
1681
                   }
1681
                   }
1682
-             
1682
+
1683
                 }
1683
                 }
1684
 
1684
 
1685
                 // var preTime = nowTime
1685
                 // var preTime = nowTime
1954
                 //药品
1954
                 //药品
1955
                 for (let b = 0; b < prescription.advices.length; b++) {
1955
                 for (let b = 0; b < prescription.advices.length; b++) {
1956
                   let obj = {
1956
                   let obj = {
1957
-                    advice_id: prescription.advices[b].id,
1957
+                    advice_id: 0,
1958
                     drug_name: prescription.advices[b].advice_name,
1958
                     drug_name: prescription.advices[b].advice_name,
1959
                     single_dose: prescription.advices[b].single_dose,
1959
                     single_dose: prescription.advices[b].single_dose,
1960
                     delivery_way: prescription.advices[b].delivery_way,
1960
                     delivery_way: prescription.advices[b].delivery_way,
1980
                 //项目
1980
                 //项目
1981
                 for (let b = 0; b < prescription.project.length; b++) {
1981
                 for (let b = 0; b < prescription.project.length; b++) {
1982
                   let obj = {
1982
                   let obj = {
1983
-                    id: prescription.project[b].id,
1983
+                    id: 0,
1984
                     project_id: prescription.project[b].project_id,
1984
                     project_id: prescription.project[b].project_id,
1985
                     project_name: prescription.project[b].project.project_name,
1985
                     project_name: prescription.project[b].project.project_name,
1986
                     statistical_classification: prescription.project[b].project.statistical_classification,
1986
                     statistical_classification: prescription.project[b].project.statistical_classification,
2020
 
2020
 
2021
                 let index = i + 1
2021
                 let index = i + 1
2022
                 let obj = {
2022
                 let obj = {
2023
-                  id: prescription.id,
2023
+                  id: 0,
2024
                   name: '处方' + index,
2024
                   name: '处方' + index,
2025
                   advices: tempAdvice,
2025
                   advices: tempAdvice,
2026
                   project: tempProject,
2026
                   project: tempProject,

+ 18 - 10
src/xt_pages/outpatientDoctorStation/template/printOne.vue View File

126
           </div>
126
           </div>
127
           <div style="text-align: center">(以下空白)</div>
127
           <div style="text-align: center">(以下空白)</div>
128
         </div>
128
         </div>
129
-        <div class="doctorBox" v-if="org_id != 10188">
129
+        <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
130
           <p v-if="org_id == 10217 || org_id == 0">
130
           <p v-if="org_id == 10217 || org_id == 0">
131
             医师:
131
             医师:
132
             <span
132
             <span
154
           </p>
154
           </p>
155
           <p>日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
155
           <p>日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
156
         </div>
156
         </div>
157
-        <div class="doctorBox" v-else>
158
-          <p>药师:</p>
157
+        <div class="doctorBoxtwo" v-if="org_id == 10188 || org_id == 0">
158
+          <p >审核、调配:</p>
159
+          <p style="margin-right: 43px">药师:</p>
160
+        </div>
161
+        <div class="doctorBox" v-if="org_id == 10188 || org_id == 0">
162
+          <p >核对、发药:</p>
159
           <p>医师:{{ item.doctor ? item.doctor : "" }}</p>
163
           <p>医师:{{ item.doctor ? item.doctor : "" }}</p>
160
         </div>
164
         </div>
161
-        <div class="actionBar" v-if="org_id != 10188">
165
+        <div class="actionBar" v-if="org_id != 10188 && org_id != 0">
162
           <!-- <p>审核:{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
166
           <!-- <p>审核:{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
163
                  <p>配对:</p>
167
                  <p>配对:</p>
164
                  <p>核对:{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
168
                  <p>核对:{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
169
           <p>配对:</p>
173
           <p>配对:</p>
170
           <p>核对:</p>
174
           <p>核对:</p>
171
           <p>发药:</p>
175
           <p>发药:</p>
172
-          <p>
176
+          <p >
173
             药费:{{
177
             药费:{{
174
               getTotalOne(item.id).toFixed(2)
178
               getTotalOne(item.id).toFixed(2)
175
                 ? getTotalOne(item.id).toFixed(2)
179
                 ? getTotalOne(item.id).toFixed(2)
179
           <!--            <p>药费:466.2元</p>-->
183
           <!--            <p>药费:466.2元</p>-->
180
         </div>
184
         </div>
181
         <div class="actionBar" v-else>
185
         <div class="actionBar" v-else>
182
-          <p style="visibility: hidden">审核:</p>
183
-          <p style="visibility: hidden">配对:</p>
184
-          <p style="visibility: hidden">核对:</p>
185
-          <p style="visibility: hidden">发药:</p>
186
-          <p>
186
+
187
+          <p >
187
             药费:{{
188
             药费:{{
188
               getTotalOne(item.id).toFixed(2)
189
               getTotalOne(item.id).toFixed(2)
189
                 ? getTotalOne(item.id).toFixed(2)
190
                 ? getTotalOne(item.id).toFixed(2)
528
   line-height: 24px;
529
   line-height: 24px;
529
   border-bottom: 2px solid #000;
530
   border-bottom: 2px solid #000;
530
 }
531
 }
532
+.doctorBoxtwo {
533
+  display: flex;
534
+  justify-content: space-between;
535
+  padding: 0 10px;
536
+  line-height: 24px;
537
+
538
+}
531
 .actionBar {
539
 .actionBar {
532
   display: flex;
540
   display: flex;
533
   justify-content: space-between;
541
   justify-content: space-between;