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

src/xt_pages/dialysis/batch_print/batch_print_order_seventytwo.vue

             <div class="inline_block" style="margin-left: 10px">
               年龄：
               <div class="under_line" style="width: 30px; text-align: center">
-                <!-- {{ record.patient.age }} -->
                 {{ getAge(record.patient) }}
               </div>
               岁
                         </div>
                     </div>
                     <div style="display: flex;border-top: 1px solid black;text-align: center;"
-                        v-for="(monitor_record, j) in record.monitor_records" :key="monindex">
+                        v-for="(monitor_record, j) in record.monitor_records" >
                       <div style="flex: 0.8;border-right: 1px solid black;">
                         {{ getTime(monitor_record.operate_time, "{h}:{i}") }}
                       </div>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id!=10402 && org_id!=10206 && org_id!=0 && org_id!=10206">
+                <tr v-if="org_id!=10402 && org_id!=10206  && org_id!=10206">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
                                   advice[0].advice_desc != undefined
                                 "
                               >
-                                <!-- ({{ advice[0].advice_desc
-                                }}{{ advice[0].drug_spec_unit }} ) -->
+                                ({{ advice[0].advice_desc
+                                }}{{ advice[0].drug_spec_unit }} )
                               </span>
 
                               <span v-if="advice[0].prescribing_number"
                   </td>
                 </tr>
 
-                <tr v-if="org_id == 0 || org_id == 10206">
+                <tr v-if="org_id == 10206">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>

src/xt_pages/dialysis/longSignPrint.vue

                         <div>姓名:{{item.patient.name}}</div>  
 
                         <div>
-                            <div>医嘱内容:{{ it.advice_name }} 
+                            <div>药名:{{ it.advice_name }} 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
                                 {{it.prescribing_number}}{{ it.prescribing_number_unit }}
                             
                             规格:{{it.advice_desc}} {{ it.drug_spec_unit }}
                             
                             </div>  
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
+                            <div v-if="org_id == 0 || org_id==10223">
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>核对者:</span>
+                           </div> 
                              
                         </div>
                          
                        <span v-if="it.childAdvice.length >0">&nbsp;</span>  
                        <div v-for="its in it.childAdvice">
-                            <div>医嘱内容:{{ its.advice_name }} 
+                            <div>药名:{{ its.advice_name }} 
                             <span v-if="its.prescribing_number>0 && org_id !=0 && org_id!=10440">
                                 {{its.prescribing_number}}{{ its.prescribing_number_unit }}
                             </span> 
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10223">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
+                            <div v-if="org_id == 0 || org_id==10223">
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>核对者:</span>
+                           </div> 
                         </div>
-                        <div>打印时间:{{time}}</div> 
+                        <div v-if="org_id!=10223 && org_id!=0">打印时间:{{time}}</div> 
+                        <div v-if="org_id==10223 || org_id == 0">配药时间:</div> 
                     </div>  
                 </div>
             </div>

src/xt_pages/dialysis/signPrint.vue

                         <div>姓名:{{item.patient.name}}</div>  
 
                         <div>
-                            <div>医嘱内容:{{ it.advice_name }} 
+                            <div>药名:{{ it.advice_name }} 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
                                 {{it.prescribing_number}}{{ it.prescribing_number_unit }}
                             
                             <div v-if="org_id ==0 || org_id ==10223">
                                 规格:{{it.advice_desc }} {{ it.drug_spec_unit }}
                             </div> 
-                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
+                            <div v-if="org_id == 0 || org_id==10223">
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>核对者:</span>
+                           </div> 
                              
                         </div>
                          
                        <span v-if="it.childAdvice.length >0">&nbsp;</span>  
                        <div v-for="its in it.childAdvice">
-                            <div>医嘱内容:{{ its.advice_name }} 
+                            <div>药名:{{ its.advice_name }} 
                             <span v-if="its.prescribing_number>0 && org_id !=0 && org_id!=10440">
                                 {{its.prescribing_number}}{{ its.prescribing_number_unit }}
                             </span> 
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
+                            <div v-if="org_id == 0 || org_id==10223">
+                                <span>配药者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <span>核对者:</span>
+                           </div> 
                         </div>
-                        <div>打印时间:{{time}}</div> 
+                        <div v-if="org_id!=10223 && org_id!=0">打印时间:{{time}}</div> 
+                        <div v-if="org_id==10223 || org_id == 0">配药时间:</div> 
                     </div>  
                 </div>
             </div>

src/xt_pages/user/Informed/components/Medicalhistory.vue

 <template>
   <div style="border:1px solid gainsboro ;padding:10px">
     <div style="position: relative; left: 400px;width: 250px;margin: 20px 0;">
-      <!-- <el-button type="primary" style=""  @click="bianji">
+      <el-button type="primary" style=""  @click="bianji">
             编辑
-        </el-button> -->
+      </el-button>
       <!-- <el-button type="danger" style=""  @click="">
             删除
       </el-button> -->
     <div id="print_content">
       <div class="print_page_main_content">
         <div class="content">
-
           <h2 style="text-align: center;margin-bottom: 20px;">门诊血液透析治疗病历首页</h2>
           <div style="display: flex;padding: 10px 5px">
             <div style="flex: 1;">门诊号<span class="unile">{{ patient.admission_number }}</span></div>
           <div style="padding: 10px 5px">
             合并症或并发症 <span class="unile"></span>
           </div>
-          <div>
+          <div V-html="content"></div>
+          <div v-html="content"></div>
+          <!-- <div>
             <table border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
               <tr>
                 <td colspan="2" class="tablepadd">干体重</td>
                 <td>日期</td>
                 <td>种类</td>
               </tr>
-              <tr v-for="item in 1">
+              <tr v-for="item in 4">
                 <td class="tablepadd"></td>
                 <td></td>
                 <td></td>
                 <td>日期</td>
                 <td>药物名称</td>
               </tr>
-              <tr v-for="item in 1">
+              <tr v-for="item in 4">
                 <td class="tablepadd"></td>
-                <td></td>
+                <td ></td>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td>透析液钙浓度</td>
                 <td>调整日期</td>
               </tr>
-              <tr v-for="item in 1">
+              <tr v-for="item in 4">
                 <td class="tablepadd"></td>
                 <td></td>
                 <td></td>
                 <td></td>
               </tr>
             </table>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>
-    <!-- <el-dialog
+    <!-- 编辑 -->
+    <el-dialog
       title="提示"
       :visible.sync="dialogVisible"
       width="60%">
         <div>
+          <h2 style="text-align: center;margin-bottom: 20px;">门诊血液透析治疗病历首页</h2>
+          <div style="display: flex;padding: 10px 5px">
+            <div style="flex: 1;">门诊号
+              <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">{{ patient.admission_number }}</span>
+            </div>
+            <div style="flex: 1;">住院号 
+              <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">{{ patient.admission_number }}</span>
+            </div>
+            <div style="flex: 1;">姓名：
+              <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">{{ patient.name }}</span>
+            </div>
+            <div style="flex: 1;">性别：
+              <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">
+                <span v-if="sex==1">男</span>
+                <span v-if="sex==2">女</span>
+              </span>
+              <!-- <input type="checkbox" v-model="nv" class="nv"/>女
+              <input type="checkbox" v-model="nan" class="nan"/>男 -->
+            </div>
+          </div>
+          <!-- <div style="display: flex;padding: 10px 5px">
+            <div style="flex: 1;">姓名：<span class="unile">{{ patient.name }}</span></div>
+            <div style="flex: 1;">性别：
+              <span v-if="sex==1">男</span>
+              <span v-if="sex==2">女</span>
+            </div>
+          </div> -->
+          <div style="padding: 10px 5px">诊断：
+            <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">{{ patient.diagnose }}</span>
+          </div>
+          <div style="padding: 10px 5px">合并症或并发症 
+            <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;"></span>
+          </div>
           <keep-alive>
             <editor ref="editor"
                     id="editor"
           <el-button @click="dialogVisible = false">取 消</el-button>
           <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
         </span>
-    </el-dialog> -->
+    </el-dialog>
   </div>
 </template>
 <script>
 import print from "print-js";
 import Editor from '@/components/Editor'
 import { uParseTime } from '@/utils/tools'
+const content=`<div>
+            <table border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
+              <tr>
+                <td colspan="2" class="tablepadd">干体重</td><td colspan="2" class="tablepadd">血管通路</td>
+                <td colspan="2" class="tablepadd">抗凝剂</td>
+              </tr>
+              <tr>
+                <td class="tablepadd">日期</td><td>体重(kg)</td><td>日期</td>
+                <td>名称</td><td>日期</td><td>种类</td>
+              </tr>
+              <tr>
+                <td class="tablepadd"></td><td></td><td></td><td></td><td></td><td></td>
+              </tr>
+              <tr>
+                <td class="tablepadd"></td><td></td><td></td><td></td><td></td><td></td>
+              </tr>
+              <tr>
+                <td class="tablepadd"></td><td></td><td></td><td></td><td></td><td></td>
+              </tr>
+              <tr>
+                <td class="tablepadd"></td><td></td><td></td><td></td><td></td><td></td>
+              </tr>
+              <tr>
+                <td colspan="2" class="tablepadd">传染病登记</td><td colspan="2" class="tablepadd">肿瘤登记</td>
+                <td colspan="2" class="tablepadd">药物过敏史</td>
+              </tr>
+              <tr>
+                <td class="tablepadd">日期</td><td>名称</td><td>日期</td>
+                <td>名称</td><td>日期</td><td>药物名称</td>
+              </tr>
+              <tr>
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
+              </tr>
+              <tr>
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
+              </tr>
+              <tr>
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
+              </tr>
+              <tr>
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
+              </tr>
+              <tr>
+                <td colspan="6" class="tablepadd">血液透析治疗方案调整</td>
+              </tr>
+              <tr>
+                <td class="tablepadd">治疗频率</td><td>调整日期</td><td>治疗方式</td>
+                <td>调整日期</td><td>透析液钙浓度</td><td>调整日期</td>
+              </tr>
+              <tr>
+                <td class="tablepadd"></td><td></td><td></td><td></td><td></td><td></td>
+              </tr>
+              <tr>
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
+              </tr>
+              <tr>
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
+              </tr>
+              <tr>
+                <td class="tablepadd"></td><td ></td><td></td><td></td><td></td><td></td>
+              </tr>
+
+            </table>
+          </div>`
 export default{
   props: {
     patient_id: {
     return{
       patient:{},
       dialogVisible:false,
+      content:content,
+
+      number:'',
       sex:'',
       sheng:'',
       shi:'',
   },
   created(){
     this.getlist()
-
+    // this.number = 1233444
     // }
   },
   methods:{
       })
     },
     printThisPage(){
-        const style = '@media print {.content p{font-size: 16px;font-family: 新宋体; padding-left: 20px; margin-bottom: 5px;}.unile{display: inline-block;border-bottom: 1px solid black;width: 60%;}.unile2{display: inline-block;border-bottom: 1px solid black;width: 150px;padding: 15px 0;}}'
+        const style = '@media print {.content p{font-size: 16px;font-family: 新宋体; padding-left: 20px; margin-bottom: 5px;}.unile{display: inline-block;border-bottom: 1px solid black;width: 60%;}.unile2{display: inline-block;border-bottom: 1px solid black;width: 150px;padding: 15px 0;}.tablepadd{padding: 0 5px; height: 35px;}}'
         printJS({
             printable: 'print_content',
             type: 'html',
         return sex2.checked=false
       }
     }
+  },
+  mounted(){
+    this.number = 1233444
   }
 }
 

src/xt_pages/user/components/PatientDetail.vue

     <!-- 打印预览 -->
     <div style="display: none">
       <div id="print-info-box">
-        <div class="print_main_content" >
+        <div class="print_main_content" style="margin-top: 70px;">
           <div class="order_title" v-if="org_id!=10210">{{ orgname }} 血液透析门诊病历</div>
           <div class="order_title" v-if="org_id==10210">{{ orgname }} 血液透析住院病历</div>
           <div >
     //    })
     // }
   },
+  
 };
 </script>