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/batch_print/batch_print_order_forty.vue

@@ -522,11 +522,11 @@
                                 <td width="10">钙</td>
                                 <td width="10">(</td>
                                 <td width="280">
-                                <label-box :isChecked="record.prescription.dialysate_formulation_name ? record.prescription.dialysate_formulation_name.indexOf('1.25') > -1 ? true : false : false" showValue="1.25"></label-box>
+                                <label-box :isChecked="record.prescription.dialysate_formulation ? dialysateFormulationName(record.prescription.dialysate_formulation).indexOf('1.25') > -1 ? true : false : false" showValue="1.25"></label-box>
                                 &nbsp;
-                                <label-box :isChecked="record.prescription.dialysate_formulation_name ? record.prescription.dialysate_formulation_name.indexOf('1.5') > -1 ? true : false : false" showValue="1.5"></label-box>
+                                <label-box :isChecked="record.prescription.dialysate_formulation ? dialysateFormulationName(record.prescription.dialysate_formulation).indexOf('1.5') > -1 ? true : false : false" showValue="1.5"></label-box>
                                 &nbsp;
-                                <label-box :isChecked="record.prescription.dialysate_formulation_name ? record.prescription.dialysate_formulation_name.indexOf('1.75') > -1 ? true : false : false" showValue="1.75（mmol/L）"></label-box>
+                                <label-box :isChecked="record.prescription.dialysate_formulation ? dialysateFormulationName(record.prescription.dialysate_formulation).indexOf('1.75') > -1 ? true : false : false" showValue="1.75（mmol/L）"></label-box>
                                 &nbsp;
                                 </td>
                                 <td width="10">)</td>