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

src/xt_pages/outpatientCharges/summary.vue

                         <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">
                             退费
                         </el-button>
+                        <!-- <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button> -->
                     </template>
                 </el-table-column>
             </el-table>
             <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
         </el-dialog>
 
+        <!-- <el-dialog
+                class="centerDialog"
+                width="1200px"
+                title="打印"
+                :visible.sync="invoiceVisible">
+            <invoice-print ref="print" :invoiceParams='invoiceParams'></invoice-print>
+        </el-dialog> -->
+
 
     </div>
 </template>
   import NewStatementPrintTwo from './newStatementPrintTwo'
   import { fetchAllAdminUsers } from '@/api/doctor'
   import axios from 'axios'
+  // import invoicePrint from './invoicePrint'
 
   export default {
     components: {
       NewStatementPrint,
       BreadCrumb,
       listPrint,
-      allListPrint
+      allListPrint,
+      // invoicePrint
     },
     data() {
       return {
         listVisible: false,
         allListVisible: false,
         adminUserOptions:[],
+        invoiceVisible:false,
+        paramsObj:{},
+        invoiceParams:{}
 
       }
     },
         } else if (index == 2) {
           this.allListVisible = true
         }
+      },
+      invoicePrint(obj){
+        console.log(obj)
+        let paramsObj = {
+          order_id: obj.order_info.order_id,
+          patient_id: obj.patient_id,
+          name:obj.patient.name,
+          age:obj.age,
+          gend:obj.gend,
+          setl_time:obj.setl_time
+        }
+        this.invoiceParams = paramsObj
+        this.invoiceVisible = true
       }
     }, created() {
 

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

         </div>
         <div class="otherInfo">
             <div class="otherName">药物过敏史：</div>
-            <div style="flex:1;">{{history.past_history?history.past_history:''}}</div>
+            <div style="flex:1;">{{history.allergic_history?history.allergic_history:''}}</div>
         </div>
         <div class="otherInfo">
             <div class="otherName">个人史：</div>
             <div class="otherName">门诊医嘱：</div>
             <div style="flex:1;">{{history.doctor_advice?history.doctor_advice:''}}</div>
         </div>
-        <div style="margin-top:20px;text-align:right;">
-            医生签名：{{getDoctor(history.doctor)?getDoctor(history.doctor):''}}
+        <div style="display:flex;justify-content: space-between;">
+            <div style="margin-top:20px;">
+                打印日期：{{ printDate }}
+            </div>
+            <div style="margin-top:20px;text-align:right;">
+                医生签名：{{getDoctor(history.doctor)?getDoctor(history.doctor):''}}
+            </div>
         </div>
     </div>
 </div>
             educationOptions:[],
             departmentList:[],
             orgname:'',
-            history:{}
+            history:{},
+            printDate:''
         }                   
     },
     methods:{
     }
     },
     created(){
-      this.educationOptions = getDataConfig("patient", "education_types");
-      console.log("22222",this.educationOptions)
-      this.getAllDoctorList()
-      this.getPatientCaseHistory()
+        this.educationOptions = getDataConfig("patient", "education_types");
+        this.getAllDoctorList()
+        this.getPatientCaseHistory()
 
-     var xtuser = this.$store.getters.xt_user
-     this.orgname = xtuser.org.org_name
+        var xtuser = this.$store.getters.xt_user
+        this.orgname = xtuser.org.org_name
+        var data = new Date();
+        var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+        var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+        this.printDate = data.getFullYear() + "-" + month + "-" + date;
     }
 }
 </script>