Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/print.vue

@@ -3,7 +3,7 @@
     <div class="dialysisPage" style="padding-top: 40px">
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 10537 ">
 
-        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && org_id != 0" v-bind:childResponse="childResponse"
+        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && org_id != 10644 && org_id != 0" v-bind:childResponse="childResponse"
         :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient"
         :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date"
         :prescription_id="prescription_id"></printOne>

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -60,7 +60,7 @@
             </div>
           </div>
         </div>
-          <div class="prescriptionBox" style="height: 300px;">
+          <div class="prescriptionBox" style="height: 400px;">
             <div class="Rp">Rp:</div>
             <div
               class="drugsBox"
@@ -869,7 +869,7 @@ export default{
 }
 .prescriptionBox {
   padding: 0 10px;
-  min-height: 450px;
+  max-height: 450px;
 }
 .Rp {
   font-size: 22px;

src/xt_pages/outpatientDoctorStation/template/prineight.vue

@@ -20,7 +20,7 @@
             <div style="font-size: 14px;font-weight: normal;text-align: right;" 
               v-if="prescriptions[index].med_type == '1112'">(精二)
             </div>
-            <span>{{ orgname }}处方笺11111</span>
+            <span>{{ orgname }}处方笺</span>
           </div>
           <!-- 非精神处方 -->
           <div  style="border-bottom: 1px solid black;border-top: 1px solid black;width: 100%;" 
@@ -30,7 +30,7 @@
                 NO:
               </div>
               <div style="flex: 1;">
-                开方时间:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
+                开方日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
               </div>
             </div>
             <div style="display: flex;line-height: 24px;padding: 0 10px;">
@@ -58,7 +58,7 @@
                 过敏史:
               </div>
             </div>
-            <div style="width: 100%;margin: 10px 0;padding: 0 10px;">地址：{{ item.patient.home_address }}</div>
+            <div style="flex: 2;margin: 10px 0;">住址/电话:{{ item.patient.home_address }}&nbsp;<span>{{ item.patient.phone }}</span></div>
           </div>
           <!-- 精二 -->
           <div style="border-bottom: 1px solid black;border-top: 1px solid black;width: 100%;"
@@ -136,7 +136,7 @@
                       过敏史:
                     </div>
                   </div>
-                  <div style="width: 100%;margin: 10px 0;padding: 0 10px;">地址：{{ item.patient.home_address }}</div>
+                  <div style="width: 100%;margin: 10px 0;padding: 0 10px;">地址/电话：{{ item.patient.home_address }}&nbsp;<span>{{ item.patient.phone }}</span></div>
                 </div>
                 <!-- 精二 -->
                 <div style="margin: 20px 0px;border-bottom: 1px solid black;border-top: 1px solid black;width: 100%;"
@@ -199,11 +199,6 @@
                     <div style="margin-left: 70px" >
                       <template>
                           用法：
-                          <!-- <div style="display: inline-block;">
-                            <template>
-                              <span style="margin-right: 0;" v-if="it.arr[0].length==0">{{ it.single_dose }}{{ it.single_dose_unit }}</span>
-                            </template>
-                          </div> -->
                         &nbsp;&nbsp;<span>
                           {{ it.execution_frequency }}&nbsp;{{
                             it.delivery_way
@@ -225,10 +220,6 @@
                     </div>
                   <!-- </div> -->
                   <template>
-                      <!-- <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="(item.arr.length>0&&ite[0].groupno!=it.groupno) ||item.arr.length==0">
-                        &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
-                      </div> -->
-
                       <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" >
                         &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
                       </div>
@@ -278,84 +269,12 @@
                   <div style="display: inline-block;position: absolute;left:80%;bottom:30px;margin-left: 5px;" >
                     ×&nbsp;{{ it.prescribing_number}}
                   </div>
-                  <!-- <div> -->
-                    <!-- <div style="display: inline-block;position: absolute;left:80%;bottom:15px;margin-left: 5px;" >
-                      ×&nbsp;{{ it.arr[0].prescribing_number}}
-                    </div> -->
-                  <!-- </div> -->
                   <template>
                       <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;">
                         &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
                       </div>
-
-                      <!-- <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" >
-                        &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
-                      </div> -->
                   </template>
                 </div>
-
-                <!-------------------------------------------------------------------------->
-                <!-- <template>
-                  <div v-for="(ite,indexs) in item.arr" :key="indexs">
-                    <div class="drugsOne" :style="{'border-right':item.arr.length>0 && (ite[0].groupno==it.groupno) ? '1px solid black': 'none','width':'80%'}">
-                    <span style="font-weight: bold" >
-                      {{ index + 1 + "."}}
-                    </span>
-                    {{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;
-                    <span v-if="it.drug.min_unit != it.drug.dose_unit">
-                      {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/
-                      {{it.drug.max_unit}}
-                    </span>&nbsp;
-                    <div >
-                      <template v-if="item.arr.length>0 && ite[0].groupno==it.groupno">
-                        <div >
-                          <span style="margin-left: 38px;">{{ite[0].advice_name ? ite[0].advice_name : ""}}</span>&nbsp;&nbsp;
-                          <span v-if="ite[0].drug.min_unit != ite[0].drug.dose_unit">
-                            {{ ite[0].drug.dose }}{{ ite[0].drug.dose_unit }}&nbsp;* {{ ite[0].drug.min_number }}{{ ite[0].drug.min_unit }}/
-                            {{ite[0].drug.max_unit}}
-                          </span>&nbsp;
-                        </div>
-                        <div style="display: inline-block;position: absolute;left:85%;top:20px;margin-left: 5px;" >
-                          &nbsp;共{{ ite[0].single_dose }}{{ ite[0].single_dose_unit }}
-                        </div>
-                      </template>
-                    </div>
-                    <div style="margin-left: 70px">
-                      用法：
-                      <span v-if="(item.arr.length>0 && item.arr[0][0].groupno!=it.groupno)||item.arr.length==0">{{ it.single_dose }}{{ it.single_dose_unit }}</span>
-                      &nbsp;&nbsp;<span>
-                        {{ it.execution_frequency }}&nbsp;{{
-                          it.delivery_way
-                        }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
-                    </div>
-                    <div style="margin-left: 70px" v-if="it.remark !=''">
-                      备注：<span > {{ it.remark }}</span>
-                    </div>
-                    </div>
-                    <div style="display: inline-block;position: absolute;left:80%;bottom:30px;margin-left: 5px;" >
-                      ×&nbsp;{{ it.prescribing_number}}
-                    </div>
-                    <div >
-                      <template v-if="item.arr.length>0&&ite[0].groupno==it.groupno">
-                        <div style="display: inline-block;position: absolute;left:80%;bottom:15px;margin-left: 5px;" >
-                          ×&nbsp;{{ ite[0].prescribing_number}}
-                        </div>
-                      </template>
-                    </div>
-                    <template>
-                        <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="(item.arr.length>0&&item.arr[0][0].groupno!=it.groupno) || item.arr.length==0">
-                          &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
-                        </div>
-
-                        <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="item.arr.length>0&&item.arr[0][0].groupno==it.groupno">
-                          &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
-                        </div>
-
-                    </template>
-                  </div>
-
-                </template> -->
-
               </div>
               <template v-if="index==yi&&item.advices.length>5">
                 <div style="margin: 20px 0px;" 
@@ -447,8 +366,13 @@
               </div>
             </div>
             <div style="text-align: center">(以下空白)</div>
+            <div style="text-align: center;">/</div>
+            <div style="text-align: center;">/</div>
+            <div style="text-align: center;">/</div>
+          </div>
+          <div style="margin-left: 70px">
+              备注信息：<span style="border-bottom: 1px solid black;"></span>
           </div>
-
           <div v-if="prescriptions[index].med_type != '1111' && prescriptions[index].med_type != '1112'">
             <div style="display: flex;border-top: 1px solid #000;margin: 10px 0;">
               <div style="flex: 1;">医师:{{ getAdminUser(item.creator)}}</div>
@@ -602,7 +526,7 @@ export default{
     },
     getTime(value, temp) {
       if (value != undefined) {
-        return uParseTime(value, '{y}年{m}月{d}日')
+        return uParseTime(value, '{y}年{m}月{d}日 {h}:{i}:{s}')
       }
       return "";
     },
@@ -886,8 +810,9 @@ export default{
 }
 .prescriptionBox {
   padding: 0 10px;
-  min-height: 450px;
+  max-height: 450px;
 }
+
 .Rp {
   font-size: 22px;
   font-weight: bold;