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/batch_print_checkTemplate/index.vue

@@ -13,7 +13,7 @@
       </template> -->
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <prisntOne :printData="printData"></prisntOne>
       </div>
   </div>
 </template>

src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/printOne.vue

@@ -41,13 +41,13 @@
                     </div>
                 </div>
                 <div style="display:flex;justify-content: space-between;border-top:1px solid #000;line-height:40px;padding:0 10px;">
-                    <div>开单医生：{{ doctor ? doctor : '' }}</div>
+                    <div>开单医生：{{ i.info.doctor ? i.info.doctor : '' }}</div>
                     <div>开单日期：
-                        {{getTime(pre_time) ? getTime(pre_time).split(' ')[0] : ''}}
+                        {{getTime(i.info.ctime) ? getTime(i.info.ctime).split(' ')[0] : ''}}
                     </div>
-                    <div>医生签字：{{ doctor ? doctor : '' }}</div>
+                    <div>医生签字：{{ i.info.doctor ? i.info.doctor : '' }}</div>
                 </div>
-            </div>   
+            </div>
             <img style="width:100%;" v-if="org_id == 10138 || org_id == 10278" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         </div>
       </div>
@@ -56,16 +56,12 @@
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
-import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail,getPatientCaseHistory} from "@/api/project/project"
+import {getAllDoctorList} from "@/api/project/project"
 import {getInitData} from "@/api/his/his"
 export default {
     props:{
-      patient_id:Number,
-      record_date:String,
-      prescription_id:Number,
-      ids:String,
       printData:Array
-    }, 
+    },
     data(){
       return {
         doctorList:[],
@@ -90,29 +86,16 @@ export default {
       }
     },
    methods:{
-    getPatientCaseHistory(){
-        const params = {
-          patient_id:this.patient_id
-        }
-        getPatientCaseHistory(params).then(response=>{
-            if(response.data.state == 1){
-                var history = response.data.data.history
-                console.log("中国history222222",history)
-                this.history = history
-            }
-        })
-    },
      getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
-
-      getDoctor(id){
+     getDoctor(id){
         var name = ""
         for(let i=0;i<this.doctorList.length;i++){
           if(id == this.doctorList[i].admin_user_id){
@@ -121,82 +104,11 @@ export default {
         }
         return name
       },
-      getTime(value, temp) {
+     getTime(value, temp) {
         if (value != undefined) {
             return uParseTime(value, temp)
         }
         return ''
-     },
-       getPrescriptionPrint(){
-         var params = {
-          // patient_id:this.patient_id,
-          // record_date:this.record_date,
-          // prescription_id:this.prescription_id,
-          patient_id:this.patient_id,
-          record_date:this.record_date,
-          prescription_id:this.prescription_id,
-          ids:this.ids
-        }
-        console.log("params",params)
-       getPrescriptionPrint(params).then(response=>{
-         if(response.data.state == 1){
-            var advicePrint =  response.data.data.advicePrint
-            console.log("adviceprint9999",advicePrint)
-            this.advicePrint = advicePrint
-            this.prescriptions = advicePrint
-            console.log("处方222222",this.prescriptions)
-            var hisPatient = response.data.data.hisPatient
-            console.log("hisPatient",hisPatient)
-            this.hisPatient = hisPatient
-            let projectPrint = []
-            let total = 0
-            this.advicePrint.map(item => {
-              console.log("imte233232323232323223",item.project)
-              if(item.project.length > 0){
-                  item.project.map(it => {
-                        if(it.type == 2){
-                            if(it.project.cost_classify == 3){
-                                projectPrint.push(it)
-                                total += (it.project.price*parseInt(it.count))
-                            }
-                        }
-                  })
-                
-              }
-            })
-            let data = []
-            let data2 = []
-            projectPrint.map(item => {
-              if(item.team.id != 0){
-                let status = data.some(it => (it.team.id == item.team.id))
-                if(!status){
-                  data.push(item)
-                }
-              }
-              if(item.team.id == 0){
-                data2.push(item)
-              }
-              
-            })
-          
-            this.total = total.toFixed(2)
-            this.pre_time = this.advicePrint[0].pre_time
-            this.doctor = this.advicePrint[0].doctor
-            this.projectPrint = data
-            this.singleProjectPrint = data2
-            console.log('99999999999999999',projectPrint)
-            var projectlist =  response.data.data.projectlist
-
-            var projectlist =  response.data.data.projectlist
-            console.log("所有项目列表",projectlist)
-            this.projectList = projectlist
-            this.getPage()
-            let outputlist1Name = response.data.data.his.patient_info ? JSON.parse(response.data.data.his.patient_info) : {};
-            this.faber = outputlist1Name
-
-            
-          }
-       })
      },
      getTeam(prescriptions){
         let projectPrint = []
@@ -211,7 +123,7 @@ export default {
                         }
                     }
               })
-            
+
           }
         })
         let data = []
@@ -222,9 +134,9 @@ export default {
               data.push(item)
             }
           }
-          
+
         })
-      
+
         this.total = total.toFixed(2)
         this.pre_time = prescriptions[0].pre_time
         this.doctor = prescriptions[0].doctor
@@ -244,7 +156,7 @@ export default {
                         }
                     }
               })
-            
+
           }
         })
         let data = []
@@ -252,30 +164,18 @@ export default {
           if(item.team.id == 0){
                 data.push(item)
               }
-          
+
         })
-      
+
         this.total = total.toFixed(2)
         return data
      },
-     getHisPatientDetail(){
-          const params = {
-              patient_id:this.patient_id
-          }
-       getHisPatientDetail(params).then(response=>{
-          if(response.data.state == 1){
-             var hisPatient =  response.data.data.hisPatient
-             console.log("挂号病人",hisPatient)
-             this.hisPatient = hisPatient
-          }
-       })
-     },
+
      getInitData(){
        getInitData().then(response=>{
           if(response.data.state == 1){
             this.department = response.data.data.department
             this.diagnoses = response.data.data.diagnose.sort(this.compare('id'))
-            console.log("争端",this.diagnoses)
           }
        })
      },
@@ -307,7 +207,7 @@ export default {
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
-       
+
        }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
@@ -317,7 +217,7 @@ export default {
                 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
@@ -329,7 +229,7 @@ export default {
 
         return total + addtotal
       },
-      
+
      getProjectName(id){
         var project_name = ""
         for(let i=0;i<this.projectList.length;i++){
@@ -344,14 +244,9 @@ export default {
         let newIds = ids.split(',').sort(function(a,b){
           return a-b;
         })
-        
-        var name = ""
+
         let nameArr = []
         for(let i=0;i<this.diagnoses.length;i++){
-          // if(id == this.diagnoses[i].id){
-          //    name = this.diagnoses[i].class_name
-          // }
-          
           if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
             // name += diagnoses[i].class_name + ' '
             nameArr.push(this.diagnoses[i].class_name)
@@ -361,7 +256,7 @@ export default {
         nameArr.map((item,index) => {
           if(item == '尿毒症'){
             newNameArr.push(item)
-            nameArr.splice(index,1,'') 
+            nameArr.splice(index,1,'')
           }
         })
         newNameArr.push(...nameArr)
@@ -385,7 +280,7 @@ export default {
             this.page = 1
             arr.push(item.advices.length)
             item.pageArr.push(arr)
-            
+
           }else if(item.advices.length > 5){
             this.page = parseInt(item.advices.length / 5)
             let num = item.advices.length % 5
@@ -483,7 +378,7 @@ export default {
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
       this.org_id = this.$store.getters.xt_user.org_id
-     
+
    },
    watch:{
      ids:function(val){
@@ -498,7 +393,7 @@ export default {
 <style lang="scss" scoped>
 .prescription-print{
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
@@ -556,7 +451,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/print.vue

@@ -53,7 +53,7 @@
 
         <!-- <printSix v-if="org_id != 10088 && org_id != 10215" 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"></printSix> -->
       </div>
-      <div v-else-if="org_id == 10243 || org_id == 9675">
+      <div v-else-if="org_id == 10243 || org_id == 9675 || org_id == 0 ">
         <printSix
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"

src/xt_pages/outpatientDoctorStation/template/printSix.vue

@@ -13,14 +13,15 @@
           {{ orgname }}第二类精神处方笺
         </div>
         <div
+            v-if="prescriptions[0].med_type != '1112' && prescriptions[0].med_type != '1111'"
           class="printTitle"
         >
-        <div style="line-height: 60px;font-size: 30px;">{{ orgname }}处方笺</div>
-          
-          <img class="logo" src="../assets/shuiyin.jpg" alt="加载失败..">
+          {{ orgname }}处方笺  普通
+<!--        <div v-else style="line-height: 60px;font-size: 30px;">{{ orgname }}处方笺</div>-->
+<!--          <img class="logo" src="../assets/shuiyin.jpg" alt="加载失败..">-->
         </div>
 
-        
+
 
         <div class="infoTitle" style="border-bottom:1px solid #000;">
           <p>科室：{{ item.info ? getDepart(item.info.departments) : "" }}</p>
@@ -129,10 +130,10 @@
           <div class="actionBar_list">
             医师：
            <span>{{ item.doctor ? item.doctor : "" }}
-             </span> 
+             </span>
 
             <!-- <p class="actionBar_val" style="border-bottom:3px solid red">
-              
+
             </p> -->
           </div>
           <div class="actionBar_list">
@@ -142,7 +143,7 @@
                 : ""
             }}
             <!-- <div class="actionBar_val">
-              
+
             </div> -->
           </div>
 
@@ -154,7 +155,7 @@
                 : 0
             }}
             <!-- <div class="actionBar_val">
-           
+
             </div> -->
           </div>
         </div>
@@ -172,7 +173,7 @@
               }}
             </div>
             <!-- <div class="actionBar_val">
-              
+
             </div> -->
           </div>
           <div class="actionBar_list">
@@ -184,7 +185,7 @@
               }}
             </div>
             <!-- <div class="actionBar_val">
-              
+
             </div> -->
           </div>
         </div>
@@ -284,15 +285,11 @@ export default {
       getPrescriptionPrint(params).then((response) => {
         if (response.data.state == 1) {
           var advicePrint = response.data.data.advicePrint;
-          console.log("adviceprint9999", advicePrint);
           this.advicePrint = advicePrint;
           this.prescriptions = advicePrint;
-          console.log("处方222222", this.prescriptions);
           var hisPatient = response.data.data.hisPatient;
-          console.log("hisPatient", hisPatient);
           this.hisPatient = hisPatient;
           var projectlist = response.data.data.projectlist;
-          console.log("所有项目列表", projectlist);
           this.projectList = projectlist;
         }
       });