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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

         <div class="tabsBox">
 
           <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>
-          <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable @tab-remove="removeTab"
+          <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card" closable @tab-remove="removeTab"
                    :before-leave="moreState" @tab-click="tabclickEvent">
             <el-tab-pane
               v-for="(item, index) in prescriptions"
 
   .addTab {
     position: absolute;
-    right: 0;
-    top: 6px;
+    right: 3px;
+    top: 3px;
     z-index: 20;
   }
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
         <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
         <desk-prescription  :addtions_charge="addtions_charge" :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
-                           ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
-                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
-                           v-show="titleType == '电子处方'" style="flex:1;"></desk-prescription>
+                          ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
+                          :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
+                          v-show="titleType == '电子处方'" style="flex:1;"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
-                     :hisPatientInfo="hisPatientInfo"   v-show="titleType == '电子病历'" :detalid="detalid" ref="child"></desk-record>
+                    :hisPatientInfo="hisPatientInfo"   v-show="titleType == '电子病历'" :detalid="detalid" ref="child"></desk-record>
 
-         <medicalRecord ref='medicalRecord' @func="getMsgFormSon" ></medicalRecord>
-         <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
+        <medicalRecord ref='medicalRecord' @func="getMsgFormSon" ></medicalRecord>
+        <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
       </div>
 
     </div>
         centerDialogVisible:false,
         tableData:[],
         selecting_schs: [],
-        index:0
+        index:0,
       }
     },
     methods: {
         })
       },
       choosePatient(val) {
+        
         this.patientid = val.patients.id
         let params = {
           'record_date': this.record_date,

src/xt_pages/outpatientDoctorStation/print.vue

       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
+        '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
       printJS({
-        printable: "prescription-print",
+        printable: "prescriptionPrint",
         type: "html",
         style: style,
         scanStyles: false

src/xt_pages/outpatientDoctorStation/template/printOne.vue

             <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
             <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p>
         </div>
+  <div id='prescriptionPrint'>
+    <div v-for="(item,index) in advicePrint" :key="index">
+      <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
+          <div class="printTitle">血液透析中心处方笺</div>
+          <div class="infoTitle">
+              <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
+              <p>性别：
+                <span v-if="item.patient.gender == 1">男</span>
+                <span v-if="item.patient.gender == 2">女</span>
+              </p>
+              <p>年龄：{{item.patient.age?item.patient.age:""}}岁</p>
+          </div>
+          <div class="infoMain">
+              <div style="margin-bottom: 10px;">门诊号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
+              <div style="margin-bottom: 10px;">科室：{{getDepart(item.hisPatient.departments?item.hisPatient.departments:"")}}</div>
+              <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
+              <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
+              <div>地址：{{item.patient.home_address}}</div>
+              <div style="display:flex;width:50%;">临床诊断：{{item.patient.diagnose}}</div>
+          </div>
+          <div class="prescriptionBox">
+              <div class="Rp">Rp:</div>
+              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
+                  <div class="drugsOne">{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
+                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+              </div>
+          </div>
+          <div class="doctorBox">
+              <p>医师：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</p>
+              <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
+          </div>
+          <div class="actionBar">
+              <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+              <p>配对：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</p>
+              <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+              <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
+              <p>药费：</p>
+          </div>
+          <div style="page-break-after:always"></div>
+      </div>
     </div>
 
+  </div>
 
-    
-</div>
 
-    
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
       patient_id:Number,
       record_date:String,
       prescription_id:Number
-    }, 
+    },
     data(){
       return {
         doctorList:[],
       }
     },
    methods:{
-     
+
      getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                console.log("医生列表数据",doctor)
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
             console.log("adviceprint9999",advicePrint)
             this.advicePrint = advicePrint
             this.prescriptions = advicePrint
-           
+
           }
        })
      },
        getInitData().then(response=>{
           if(response.data.state == 1){
             this.department = response.data.data.department
-           
+
           }
        })
      },
      },
 
      getTotalOne(id) {
-        
+
         var total = 0
         var addtotal = 0
         for (let i = 0; i < this.prescriptions.length; i++) {
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
               }
             }
-          
+
             if (this.prescriptions[i].additionalcharge != null) {
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
         }
         return total + addtotal
        }
-      }, 
+      },
+
 
 
-      
    },
    created(){
       this.getAllDoctorList()
       this.getPrescriptionPrint()
       this.getHisPatientDetail()
 
-     
+
    },
   //  watch:{
   //    patient_id:function(val){
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/treatPrint.vue

 <template>
   <div class="main-contain">
     <div class="position">
-      <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
        <template>
         <el-button
           :loading="loading"
   },
   data() {
     return {
-       record_date:"",
-       patientTableData:[],
-       advicePrint:[],
-       hisPatient:{},
-       patient:{},
-       search_input:"",
-       loading:false,
-       patient_id:0,
-       prescription_id:0
+      crumbs: [
+        { path: false, name: '门诊医生站' },
+        { path: false, name: '打印' }
+      ],
+      record_date:"",
+      patientTableData:[],
+      advicePrint:[],
+      hisPatient:{},
+      patient:{},
+      search_input:"",
+      loading:false,
+      patient_id:0,
+      prescription_id:0
     };
   },
   methods:{
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 300px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain p{width: 50%;line-height: 1px;}.prescriptionBox{padding:0 10px;min-height:600px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
+        '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.prescription-print{font-size: 14px;}.printTitle{font-size: 18px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:5px;padding:0 10px;}.infoTitle div{width: 300px;margin-bottom:5px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;}.prescriptionBox{padding:0 10px;min-height:380px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; padding:0 10px;margin:5px 0;} .actionBar div{width:150px;}}';
       printJS({
-        printable: "prescription-print",
+        printable: "prescriptionPrint",
         type: "html",
         style: style,
         scanStyles: false

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

                     <td></td>
                     <td>{{it.remark}}</td>
                     <td>{{it.day}}</td>
-                   
+
                 </tr>
             </table>
         </div>
             </tr>
         </table>
      </div>
+    <div id='prescriptionPrint'>
+        <div v-for="(item,index) in advicePrint" :key="index">
+            <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
+                <div style="display:flex;justify-content: space-between;font-weight:bold;">
+                    <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
+                        <span>费别</span>
+                        <span>自费</span>
+                        <span>公费</span>
+                        <span>保险</span>
+                        <span>其他</span>
+                    </div>
+                    <div>就诊日期：{{getTime(item.ctime)}}</div>
+                </div>
+                <div class="printTitle">血液透析中心</div>
+                <div class="printTitle">处方、治疗单</div>
+                <div class="infoTitle">
+                    <div>门诊编号：</div>
+                    <div>电脑号：</div>
+                </div>
+                <div class="infoMain">
+                    <div style="margin-bottom: 10px;width:25%">姓名：{{item.patient.name}}</div>
+                    <div style="margin-bottom: 10px;width:25%">性别：
+                        <span v-if="item.patient.gender == 1">男</span>
+                        <span v-if="item.patient.gender == 2">女</span>
+                    </div>
+                    <div style="margin-bottom: 10px;width:25%">年龄：
+                        <span>{{item.patient.age}}</span>
+                    </div>
+                    <div style="margin-bottom: 10px;width:25%">参保类型：</div>
+                    <div style="margin-bottom: 10px;width:50%;">联系电话：{{item.patient.phone}}</div>
+                    <div style="width:50%;">地址：{{item.patient.unit_address}}</div>
+                    <div style="width:100%;">诊断：{{item.patient.diagnose}}</div>
+                </div>
+                <div class="prescriptionBox">
+                    <table style="width:100%;text-align:center;line-height:25px;">
+                        <tr>
+                            <td>序号</td>
+                            <td>项目名称</td>
+                            <td>数量</td>
+                            <td>单位</td>
+                            <td>单价</td>
+                            <td>部位</td>
+                            <td>备注</td>
+                            <td>天数</td>
+                        </tr>
+                        <tr v-for="(it,index) in item.project" :key="index">
+                            <td>{{index+1}}</td>
+                            <td>{{getProjectName(it.project_id)}}</td>
+                            <td>{{it.single_dose}}</td>
+                            <td>{{getUnit(it.unit)}}</td>
+                            <td>{{it.price}}</td>
+                            <td></td>
+                            <td>{{it.remark}}</td>
+                            <td>{{it.day}}</td>
+
+                        </tr>
+                    </table>
+                </div>
+                <div class="infoTitle">
+                    <div>开单医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
+                    <div>签章：</div>
+                </div>
+                <div class="actionBar">
+                    <div>执行医生：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</div>
+                    <div>费用：</div>
+                </div>
+                <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
+                    <tr>
+                        <td style="width:16%;">治疗时间</td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                    </tr>
+                    <tr>
+                        <td style="width:16%;">医生签字</td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                        <td style="width:16%;"></td>
+                    </tr>
+                    <tr>
+                        <td style="width:16px;">患者签字</td>
+                        <td style="width:16px;"></td>
+                        <td style="width:16px;"></td>
+                        <td style="width:16px;"></td>
+                        <td style="width:16px;"></td>
+                        <td style="width:16px;"></td>
+                    </tr>
+                </table>
+            </div>
+        </div>
     </div>
 </template>
 <script>
       patient_id:Number,
       record_date:String,
       prescription_id:Number
-    }, 
+    },
     data(){
       return {
         doctorList:[],
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
           patient_id:this.$route.query.patient_id,
           record_date:this.$route.query.record,
           prescription_id:this.$route.query.prescription_id,
-          ids:this.$route.query.ids, 
+          ids:this.$route.query.ids,
         }
         console.log("999999",params)
        getPrescriptionPrint(params).then(response=>{
             var projectlist =  response.data.data.projectlist
             console.log("所有项目列表",projectlist)
             this.projectList = projectlist
-            
+
           }
        })
      },
      },
 
        getTotalOne(id) {
-        
+
         var total = 0
         var addtotal = 0
         for (let i = 0; i < this.prescriptions.length; i++) {
                 total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
               }
             }
-          
+
             if (this.prescriptions[i].additionalcharge != null) {
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
         }
         return total + addtotal
        }
-      }, 
+      },
    },
    created(){
       this.getAllDoctorList()
 
 
 <style lang="scss" scoped>
+.prescription-print{
+    font-size: 14px;
+}
 .printTitle{
-    font-size: 22px;
+    font-size: 18px;
     text-align: center;
     font-weight: bold;
 }
     line-height: 24px;
     padding:0 10px;
 }
-.infoTitle p{
+.infoTitle div{
     width: 300px;
 }
 .infoMain{
     border-bottom: 2px solid #000;
     padding:0 10px;
 }
-.infoMain p{
+.infoMain div{
     width: 50%;
     line-height: 24px;
 }
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }
-.actionBar p{
+.actionBar div{
     width:150px;
 }
 </style>

src/xt_pages/workforce/components/ScheduleItem.vue

     <div >
         <el-tooltip placement="right" :disabled="scheduleDetail.patient.length>0?false:true" >
             <div slot="content">
-                {{scheduleDetail.patient}}11
+                {{scheduleDetail.patient}}
                 <br/>
                 <span v-if="scheduleDetail.mode_name.length>0">({{scheduleDetail.mode_name}})</span>
             </div>