修改华侨医院

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -376,7 +376,7 @@
                         <check-box text="提前" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'dialysis_process', 2)"></check-box>
                         <div class="inline_block">
                           <div class="under_line" style="width: 30px;">
-                            {{record.assessment_after_dislysis&&record.assessment_after_dislysis.dialysis_process==2&&record.assessment_after_dislysis.actual_treatment_hour?record.assessment_after_dislysis.actual_treatment_hour:''}}
+                            {{record.assessment_after_dislysis&&record.assessment_after_dislysis.dialysis_process==2&&record.assessment_after_dislysis.in_advance_minute?record.assessment_after_dislysis.in_advance_minute:''}}
                           </div>
                           min
                         </div>
@@ -753,7 +753,7 @@
                     <div class="inline_block">
                       &emsp;实际超滤量:
                       <div class="under_line" style="width: 100px;">
-                        {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:'/'}}
+                        {{record.prescription&&record.prescription.ultrafiltration?record.prescription.ultrafiltration:'/'}}
                       </div>
                       L
                     </div>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -63,9 +63,9 @@
                   </div>
                   <div class="inline_block" style="margin-left: 30px;">
                     透析机编号：
-                    <div class="under_line" style="width: 100px;">{{''}}</div>
+                    <div class="under_line" style="width: 100px;">{{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:''}}</div>
                     型号
-                    <div class="under_line" style="width: 100px;">{{''}}</div>
+                    <div class="under_line" style="width: 100px;">{{predialysis&&predialysis.machine_type.length > 0 ?predialysis.machine_type:''}}</div>
                   </div>
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:19px;">
@@ -412,7 +412,7 @@
                   <div class="inline_block" style="margin-left: 30px;">
                     实际超滤量：
                     <div class="under_line" style="width: 50px;">
-                      {{prescription.ultrafiltration?prescription.ultrafiltration:'/'}}
+                      {{afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:'/'}}
                     </div>
                     L
                   </div>

src/xt_pages/stock/config/goodInfo.vue

@@ -9,15 +9,16 @@
                       :isCreated="goodInfo.goodInfoDialog.isCreated" v-on:dialog-comfirm="goodInfoDialogComfirm"
                       v-on:dialog-cancle="goodInfoDialogCancle"></good-info-dailog>
 
+    <div class="cell clearfix" style="float: right">
+      <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="showInfoDialog">新增</el-button>
+    </div>
 
     <div class="cell clearfix">
       <el-input size="small" style="width: 400px;" class="filter-item" v-model="keywords"
                 placeholder="商品编码/规格名称"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
     </div>
-    <div class="cell clearfix" style="float: right">
-      <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="showInfoDialog">新增</el-button>
-    </div>
+
 
     <el-row :gutter="15">
       <el-col>

src/xt_pages/stock/config/goodType.vue

@@ -6,15 +6,18 @@
                       :visibility="goodType.goodTypeDialog.isVisibility"
                       :isCreated="goodType.goodTypeDialog.isCreated" v-on:dialog-comfirm="goodTypeDialogComfirm"
                       v-on:dialog-cancle="goodTypeDialogCancle"></good-type-dialog>
+
+    <div class="cell clearfix" style="float: right">
+      <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="showDialog">新增</el-button>
+    </div>
+
     <div class="cell clearfix">
       <el-input size="small" style="width: 400px;" class="filter-item" v-model="keywords"
                 placeholder="类型编码/类型名称"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
 
     </div>
-    <div class="cell clearfix" style="float: right">
-      <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="showDialog">新增</el-button>
-    </div>
+
     <el-row :gutter="15">
       <el-col>
 

src/xt_pages/stock/detail/print.vue

@@ -210,7 +210,6 @@
         return total
 
       }, calTotal(stock) {
-        console.log(stock)
 
         var array = []
         if (this.type == 1) {
@@ -223,7 +222,7 @@
         for (let i = 0; i < array.length; i++) {
           total_price = total_price + array[i].total_price
         }
-        return total_price
+        return  Math.floor(total_price * 100) / 100
       }, calTotalPrice() {
 
         var amountPrice = 0
@@ -243,9 +242,26 @@
               total_price = total_price + obj.query_warehouseout_info[a].total_price
             }
           }
-          amountPrice = amountPrice + total_price
+
+          amountPrice = amountPrice +  Math.floor(total_price* 100) / 100
+        }
+        return Math.floor(amountPrice* 100) / 100
+      }, getTotal: function(price, total) {
+        var m = 0, r1, r2
+        var s1 = price.toString()
+        var s2 = total.toString()
+        try {
+          m += s1.split('.')[1].length
+        } catch (e) {
+
+        }
+        try {
+        } catch (e) {
+          m += s2.split('.')[1].length
         }
-        return amountPrice
+        r1 = Number(price.toString().replace('.', ''))
+        r2 = Number(total.toString().replace('.', ''))
+        return r1 * r2 / Math.pow(10, m)
       }
     },
     created() {