1111

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -89,10 +89,17 @@
 
               obj.details = this.setNewData(tempDetails)
               obj.total = this.getTotal(obj.details)
-              tempOrderInfo.push(obj)
+
+              obj.details.push({
+                total: obj.total,
+                is_total: 1,
+              })
+              this.list =  this.list.concat(obj.details)
             }
-            this.list = tempOrderInfo
-            console.log(this.list)
+
+
+
+
           }
         })
       }, getTotal:function(items){
@@ -145,9 +152,10 @@
             for (let a = 0; a < details.length; a++) {
               if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
                 obj['name'] = details[a].advice.advice_name
-                obj['spec'] = details[a].advice.drug_spec
+                obj['spec'] = details[a].advice.drug.drug_spec
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
+                obj['is_total'] = 2
                 count = count + details[a].cnt
               }
             }
@@ -166,6 +174,8 @@
                 obj['spec'] = '1'
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
+                obj['is_total'] = 2
+
                 count = count + details[a].cnt
               }
             }

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -6,7 +6,7 @@
           <div>透析号：{{patient.dialysis_no}}</div>
           <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
           <div>年龄：{{patient.age}}  岁</div>
-          <div>收费日期：{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
+          <div>日期：{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
 
         </div>
         <table class="allListTable" border="1">
@@ -19,16 +19,16 @@
                 <td style="width:10%">金额(元)</td>
             </tr>
             <template v-for='item in list'>
-                <tr v-for="sub_item in item.details">
-                    <td style="width:10%">{{sub_item.med_chrgitm_type}}</td>
-                    <td style="width:50%">{{sub_item.name}}</td>
-                    <td style="width:10%">{{sub_item.spec}}</td>
-                    <td style="width:10%">{{(sub_item.price).toFixed(2)}}</td>
-                    <td style="width:10%">{{sub_item.count}}</td>
-                    <td style="width:10%">{{(sub_item.price * sub_item.count).toFixed(2)}}</td>
+                <tr v-if="item.is_total == 2">
+                    <td style="width:10%">{{item.med_chrgitm_type}}</td>
+                    <td style="width:50%">{{item.name}}</td>
+                    <td style="width:10%">{{item.spec}}</td>
+                    <td style="width:10%">{{(item.price).toFixed(2)}}</td>
+                    <td style="width:10%">{{item.count}}</td>
+                    <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
                 </tr>
                 <tr>
-                    <td colspan="6" style="text-align:right;">合计：{{item.total}}元</td>
+                    <td colspan="6" style="text-align:right;" v-if="item.is_total == 1">合计：{{item.total}}元</td>
                 </tr>
             </template>
         </table>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -79,7 +79,7 @@
               if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
                 obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
                 obj['name'] = infos.advice.advice_name
-                obj['spec'] = infos.advice.drug_spec
+                obj['spec'] = infos.advice.drug.drug_spec
               }
               this.list.push(obj)
               this.list.sort(function(a, b) {

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -39,17 +39,37 @@
         <td width="110"></td>
         <td width="80">人员类别</td>
         <td colspan="3" v-if="info.psn_type == '11'">在职</td>
-        <td colspan="3" v-if="info.psn_type == '21'">退休</td>
-        <td colspan="3" v-if="info.psn_type == '31'">离休</td>
-        <td colspan="3" v-if="info.psn_type == '32'">老红军</td>
-        <td colspan="3" v-if="info.psn_type == '33'">一至六级残废军人</td>
-        <td colspan="3" v-if="info.psn_type == '34'">医疗照顾人员</td>
-        <td colspan="3" v-if="info.psn_type == '41'">学龄前儿童</td>
-        <td colspan="3" v-if="info.psn_type == '42'">中小学生</td>
-        <td colspan="3" v-if="info.psn_type == '43'">大学生</td>
-        <td colspan="3" v-if="info.psn_type == '50'">成年居民（非从业）</td>
-        <td colspan="3" v-if="info.psn_type == '60'">老年居民</td>
-        <td colspan="3" v-if="info.psn_type == '91'">其他人员</td>
+        <td colspan="3" v-if="info.psn_type == '1101'">职工在职</td>
+        <td colspan="3" v-if="info.psn_type == '1102'">公务员在职</td>
+        <td colspan="3" v-if="info.psn_type == '1103'">灵活就业人员在职</td>
+        <td colspan="3" v-if="info.psn_type == '1160'">地方其他扩展人员</td>
+
+
+        <td colspan="3" v-if="info.psn_type == '12'">退休人员</td>
+        <td colspan="3" v-if="info.psn_type == '1201'">职工退休</td>
+        <td colspan="3" v-if="info.psn_type == '1202'">公务员退休</td>
+        <td colspan="3" v-if="info.psn_type == '1203'">灵活就业人员退休</td>
+        <td colspan="3" v-if="info.psn_type == '1260'">地方其他扩展人员</td>
+
+
+        <td colspan="3" v-if="info.psn_type == '13'">离休</td>
+        <td colspan="3" v-if="info.psn_type == '1300'">离休人员</td>
+        <td colspan="3" v-if="info.psn_type == '1360'">地方其他扩展人员</td>
+
+        <td colspan="3" v-if="info.psn_type == '14'">居民(未成年)</td>
+        <td colspan="3" v-if="info.psn_type == '1401'">新生儿</td>
+        <td colspan="3" v-if="info.psn_type == '1402'">学龄前儿童</td>
+        <td colspan="3" v-if="info.psn_type == '1403'">中小学生</td>
+        <td colspan="3" v-if="info.psn_type == '1404'">大学生</td>
+        <td colspan="3" v-if="info.psn_type == '1405'">未成年(未入学)</td>
+
+
+        <td colspan="3" v-if="info.psn_type == '15'">居民(成年)</td>
+        <td colspan="3" v-if="info.psn_type == '1501'">普通居民(成年)</td>
+        <td colspan="3" v-if="info.psn_type == '1560'">地方其他扩展身份</td>
+
+        <td colspan="3" v-if="info.psn_type == '16'">居民(老年)</td>
+
 
 
       </tr>