Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -671,6 +671,7 @@ export default {
             }
           })
         } else {
+          console.log("------==========`````")
           getPrivateExpensesOrder(params).then((response) => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)
@@ -681,7 +682,7 @@ export default {
               that.info = response.data.data.info
               that.p_admin = response.data.data.printor_admin
               that.charge_admin = response.data.data.charge_admin
-
+              that.info['new_order'] = response.data.data.info
               that.info['p_admin'] = that.p_admin
               that.info['charge_admin'] = that.charge_admin
               that.info['order_number'] = response.data.data.order_number
@@ -779,6 +780,7 @@ export default {
                 }
               }
               console.log(response.data.data.order_infos)
+              console.log(that.info)
 
               var list = []
               //获取所有项目类型进行去重

src/xt_pages/outpatientCharges/statementTemplate/printtwelve.vue

@@ -5,9 +5,9 @@
     </div>
     <div style="display: flex;">
       <div style="flex: 1;">结算ID:</div>
-      <div style="flex: 1;">结算日期:{{info.new_order.setl_time}}</div>
-      <div style="flex: 1;" v-if="info.new_order.med_type == 14">医疗类别:门诊慢病</div>
-      <div style="flex: 1;" v-if="info.new_order.med_type == 11">医疗类别:普通门诊</div>
+      <div style="flex: 1;">结算日期: <span v-if="info.new_order!=null"> {{info.new_order.setl_time ? info.new_order.setl_time.split(' ')[0] : ''}}</span> </div>
+      <div style="flex: 1;" v-if="info.new_order!=null&&info.new_order.med_type == 14">医疗类别:门诊慢病</div>
+      <div style="flex: 1;" v-if="info.new_order!=null&&info.new_order.med_type == 11">医疗类别:普通门诊</div>
       <div style="flex: 1;" v-else>医疗类别:门诊慢病</div>
 
 
@@ -53,7 +53,7 @@
         </tr>
         <tr>
           <td colspan="2">身份证号</td>
-          <td colspan="2">{{info.new_order.id_card_no}}</td>
+          <td colspan="2">{{info.patient.id_card_no}}</td>
           <td colspan="2">险种</td>
           <td colspan="2" v-if="info.new_order.insutype == '310'">职工基本医疗保险</td>
           <td colspan="2" v-if="info.new_order.insutype == '320'">公务员医疗补助</td>
@@ -92,7 +92,9 @@
           <td colspan="2">{{info.new_order.medfee_sumamt}}</td>
           <td colspan="2">{{info.new_order.inscp_scp_amt?info.new_order.inscp_scp_amt:''}}</td>
           <td colspan="2">{{info.new_order.preselfpay_amt?info.new_order.preselfpay_amt:''}}</td>
-          <td colspan="1">{{info.new_order.fulamt_ownpay_amt?info.new_order.fulamt_ownpay_amt:''}}</td>
+          <td colspan="1" v-if="info.new_order.is_medicine_insurance == 1">{{info.new_order.fulamt_ownpay_amt?info.new_order.fulamt_ownpay_amt:''}}</td>
+          <td colspan="1" v-else>{{info.new_order.medfee_sumamt}}</td>
+
           <td colspan="1">{{info.new_order.overlmt_self_pay?info.new_order.overlmt_self_pay:''}}</td>
         </tr>
 
@@ -243,6 +245,9 @@ export default {
       },
       deep: true
     }
+  },
+  created(){
+    console.log("infowoooooooooooooooooooooooo",this.info)
   }
 }
 </script>