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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1887,6 +1887,7 @@
 
           if (index == 1) {
             let params = {
+              p_type:1,
               patient_id: this.patientInfo.id,
               diagnose: this.diagnose,
               sick_type: this.state1,
@@ -1971,7 +1972,8 @@
                 department: this.departmentValue,
                 record_date: this.end_time,
                 his_patient_id: this.hisPatientInfo.id,
-                reg_type: this.register_type
+                reg_type: this.register_type,
+                p_type: 1,
               };
 
               var month_prescriptions = this.deepClone(this.month_prescriptions);

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -91,7 +91,8 @@
                         </el-button>
 
                       <el-button
-                        v-if="(this.hisPatientInfo.id > 0 && this.order.order_status == 1) || (this.hisPatientInfo.id > 0 && this.order.order_status == 2) "
+                        v-if="(this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+
                         size="small" @click="open(9)" type="primary"
                       >撤销明细
                       </el-button>
@@ -1031,7 +1032,7 @@
 
         let params = {
           'record_date': this.record_date
-        };
+         };
         GetHisHospitalChargePatientList(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);

src/xt_pages/hospitalStation/statementPrint.vue

@@ -13,8 +13,8 @@
       </template>
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne :info="info" v-if="org_id != 9990"></printOne>
-        <printTwo  :info="info" v-if="org_id == 9990"></printTwo>
+        <printOne :info="info"></printOne>
+        <!-- <printTwo  :info="info" v-if="org_id == 9990"></printTwo> -->
       </div>
   </div>
 </template>

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -71,14 +71,26 @@
         var ptime = Math.round(new Date().getTime() / 1000);
         this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
-        const style =
+        if(this.org_id != 9990){
+          const style =
           '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
-        printJS({
-          printable: "statement-print",
-          type: "html",
-          style: style,
-          scanStyles: false
-        });
+          printJS({
+            printable: "statement-print",
+            type: "html",
+            style: style,
+            scanStyles: false
+          });
+        }else {
+          const style =
+          '@media print {#statement-print{font-size:12px;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
+          printJS({
+            printable: "statement-print",
+            type: "html",
+            style: style,
+            scanStyles: false
+          });
+        }
+        
 
         // if (this.org_template_info.template_id == 1) {
         //   printJS({

src/xt_pages/outpatientCharges/settlementPrint.vue

@@ -13,7 +13,7 @@
     </template>
     <div class="app-container" style="padding-top:40px;">
         <div class='dialysisPage'>
-            <printOne v-bind:childResponse="childResponse" :paramsObj="paramsObj"></printOne>
+            <printOne v-bind:childResponse="childResponse" :info="info" :p_admin="p_admin" :charge_admin="charge_admin" :paramsObj="paramsObj"></printOne>
         </div>
     </div>
   </div>
@@ -41,8 +41,10 @@ export default {
         { path: false, name: "打印单" }
       ],
       childResponse: {},
-      paramsObj:{}
-      
+      paramsObj:{},
+      info:null,
+      p_admin:{},
+      charge_admin:{},
 
     };
   },
@@ -180,6 +182,8 @@ export default {
 
               console.log(response.data.data.info)
               that.info = response.data.data.info
+              that.p_admin = response.data.data.printor_admin
+              that.charge_admin = response.data.data.charge_admin
               console.log(that.info)
 
               that.info['bed_cost_total'] = response.data.data.bedCostTotal

src/xt_pages/outpatientCharges/statementTemplate/printTwo.vue

@@ -20,7 +20,7 @@
     </div>
     <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;padding-bottom:10px;">
       <div style="flex:1;">单据编码：{{info.number}}</div>
-      <div style="width:33%">就诊时间：{{getTime(info.date)}}</div>
+      <div style="width:33%">就诊时间：{{getTime(order_infos.date)}}</div>
       <div>金额单位：元</div>
     </div>
     <div style="display:flex">
@@ -29,7 +29,7 @@
     </div>
     <div style="display:flex">
       <div style="width:50%">社保卡号</div>
-      <div style="width:50%">诊断：{{info.diagnosis}}</div>
+      <div style="width:50%">诊断：慢性肾脏病5期</div>
     </div>
     <div style="display:flex">
       <div style="width:50%" v-if="info.psn_type == '11'">人员类别:在职</div>
@@ -171,9 +171,8 @@
   }
 
   .statementTitle {
-    font-size: 28px;
+    font-size: 22px;
     text-align: center;
-    font-weight: bold;
     margin-bottom: 10px;
   }
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1887,6 +1887,7 @@
 
           if (index == 1) {
             let params = {
+              p_type:2,
               patient_id: this.patientInfo.id,
               diagnose: this.diagnose,
               sick_type: this.state1,
@@ -1971,7 +1972,8 @@
                 department: this.departmentValue,
                 record_date: this.end_time,
                 his_patient_id: this.hisPatientInfo.id,
-                reg_type: this.register_type
+                reg_type: this.register_type,
+                p_type: 2,
               };
 
               var month_prescriptions = this.deepClone(this.month_prescriptions);