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/allListPrint.vue

@@ -153,6 +153,8 @@
               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.drug_spec
+                obj['unit'] = details[a].advice.drug.max_unit
+
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2
@@ -172,6 +174,7 @@
               if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
                 obj['name'] = details[a].project.project.project_name
                 obj['spec'] = '1'
+                obj['unit'] = details[a].project.project.unit
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -25,7 +25,7 @@
                         <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.count}}{{item.unit}}</td>
                         <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
                     </tr>
                     <tr>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -74,12 +74,16 @@
                 obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
                 obj['name'] = infos.project.project.project_name
                 obj['spec'] = 1
+                obj['unit'] = infos.project.project.unit
+
               }
 
               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.drug_spec
+                obj['unit'] = infos.advice.drug.max_unit
+
               }
               this.list.push(obj)
               this.list.sort(function(a, b) {

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -8,7 +8,9 @@
             <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 v-if="order.settle_type == 1">收费日期：{{getTimes(order.settle_accounts_date)}}</div>
+          <div v-if="order.settle_type == 2">收费日期：{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
+
 
         </div>
         <table class="listTable" border="1">
@@ -27,7 +29,7 @@
                 <td style="width:31%">{{item.name}}</td>
                 <td style="width:14%">{{item.spec}}</td>
                 <td style="width:10%">{{(item.price).toFixed(2)}}</td>
-                <td style="width:6%">{{item.count}}</td>
+                <td style="width:6%">{{item.count}}{{item.unit}}</td>
                 <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
             </tr>
         </table>