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

@@ -521,7 +521,7 @@
                                 <td width="80">透析液配方:</td>
                                 <td width="10">钙</td>
                                 <td width="10">(</td>
-                                <td width="250">
+                                <td width="260">
                                 <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>
                                 &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>

src/xt_pages/user/inspection.vue

@@ -313,7 +313,7 @@ export default {
             index2 = index
           }
           if(it.item_name == '转铁蛋白饱和度(计算)'){
-            it.value = (parseFloat(this.form.formItem[index1].value) / parseFloat(this.form.formItem[index2].value)) * 10
+            it.value = (parseFloat(this.form.formItem[index1].value) / parseFloat(this.form.formItem[index2].value)) * 100
           }
         })
       }