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

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -40,7 +40,7 @@
         <li v-if="isShow('实际置换量')">
           <label>实际置换量 : </label>
           <span class="content">{{ actual_displacement }}</span>
-          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 13 || this.$store.getters.xt_user.template_info.template_id == 40">ml</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 13 || this.$store.getters.xt_user.template_info.template_id != 40">ml</span>
           <span class="unit" v-else>L</span>
         </li>
         <li v-if="isShow('压迫后内瘘震颤')">

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -432,7 +432,7 @@
         <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShow('实际置换量')">
-          <el-form-item v-if="this.template_id == 20 || this.template_id == 21 || this.template_id == 40" label="实际置换量(ml): ">
+          <el-form-item v-if="this.template_id == 20 || this.template_id == 21" label="实际置换量(ml): ">
             <el-input v-model="form.actual_displacement"></el-input>
           </el-form-item>
           <el-form-item v-else label="实际置换量(L): ">

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -506,7 +506,7 @@
                      {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "" }}
                   </div>
                 </td>
-                <td width="10">ml)</td>
+                <td width="10">L)</td>
                 <td width="50"><label-box :isChecked="prescription.mode_id != 5 && prescription.mode_id != 1 && prescription.mode_id != 2 ? true : false" showValue="其他"></label-box></td>
                 <td width="50">
                   <div class="under-line">&nbsp;

src/xt_pages/outpatientCharges/invoiceTemplate/printOne.vue

@@ -141,6 +141,7 @@ export default {
         let params = {
             order_id: this.paramsObj.order_id,
             patient_id: this.paramsObj.patient_id,
+            number: this.paramsObj.number,
         }
         this.getInvoice(params)
         // var data = new Date();
@@ -192,7 +193,7 @@ export default {
             }
 
             var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
-            n += "00";  
+            n += "00";
 
             var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
 
@@ -217,6 +218,7 @@ export default {
                 let params = {
                     order_id: val.order_id,
                     patient_id: val.patient_id,
+                    number: val.number,
                 }
                 this.getInvoice(params)
 

src/xt_pages/outpatientCharges/summary.vue

@@ -809,6 +809,7 @@
         let paramsObj = {
           order_id: obj.id,
           patient_id: obj.patient_id,
+          number:obj.mdtrt_id,
           name: obj.patient.name,
           age: obj.age,
           gend: obj.gend,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -301,7 +301,7 @@
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
-                                            <template slot-scope="scope">{{ scope.row.retail_price }}</template>
+                                            <template slot-scope="scope">{{ scope.row.min_price }}</template>
                                         </el-table-column>
                                     </el-table>
                                     <!-- <div>{{3*(2/3)}}</div> -->