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/dialog/dialysisPrescriptionDialog.vue

@@ -1610,7 +1610,7 @@
           'hemodialysis',
           'dialyzer_perfusion_apparatus'
         )
-        console.log('3333333', this.dialyzerPerfusionApparatus)
+        // console.log('3333333', this.dialyzerPerfusionApparatus)
         this.bloods = getDataConfig(
           'hemodialysis',
           'blood'
@@ -1968,7 +1968,7 @@
         if (his_is_open == 1) {
           this.is_open = 0
         }
-        
+
         if(this.$store.getters.xt_user.org.id == 10101){
           if (this.predialysis.id > 0 && this.predialysis.created_time > 0) {
             var date = new Date(this.predialysis.created_time * 1000)
@@ -2056,7 +2056,7 @@
             }
           }
         }
-        
+
 
         if (pre.anticoagulant == 3) {
           this.dialysisPrescription.anticoagulant = '低分子肝素'
@@ -3513,7 +3513,7 @@
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-        
+
       },
       'dialysisPrescription.anticoagulant_shouji': function() {
         let dialysis_duration_minute = 0

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -364,16 +364,16 @@ export default {
           }
         }
         //附加收费
-        for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-          let obj = {
-            id: month_prescriptions[i].addition[a].item_id,
-            price: month_prescriptions[i].addition[a].price
-
-          }
-          additions_ids.push(obj)
-          addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
-
-        }
+        // for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
+        //   let obj = {
+        //     id: month_prescriptions[i].addition[a].item_id,
+        //     price: month_prescriptions[i].addition[a].price
+        //
+        //   }
+        //   additions_ids.push(obj)
+        //   addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
+        //
+        // }
 
       }
 
@@ -444,23 +444,23 @@ export default {
 
       }
 
-      for (let i = 0; i < additions_ids.length; i++) {
-        let obj = {}
-        let count = 0
-        console.log(addition_month_prescriptions.addition)
-        if (addition_month_prescriptions.addition) {
-          for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
-            if (additions_ids[i].price == addition_month_prescriptions.addition[a].price &&additions_ids[i].id == addition_month_prescriptions.addition[a].item_id) {
-              obj['item_name'] = addition_month_prescriptions.addition[a].item_name
-              count = count + addition_month_prescriptions.addition[a].count
-              obj['price'] = parseFloat(addition_month_prescriptions.addition[a].price)
-            }
-          }
-          obj['count'] = count
-          this.additions.push(obj)
-
-        }
-      }
+      // for (let i = 0; i < additions_ids.length; i++) {
+      //   let obj = {}
+      //   let count = 0
+      //   console.log(addition_month_prescriptions.addition)
+      //   if (addition_month_prescriptions.addition) {
+      //     for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
+      //       if (additions_ids[i].price == addition_month_prescriptions.addition[a].price &&additions_ids[i].id == addition_month_prescriptions.addition[a].item_id) {
+      //         obj['item_name'] = addition_month_prescriptions.addition[a].item_name
+      //         count = count + addition_month_prescriptions.addition[a].count
+      //         obj['price'] = parseFloat(addition_month_prescriptions.addition[a].price)
+      //       }
+      //     }
+      //     obj['count'] = count
+      //     this.additions.push(obj)
+      //
+      //   }
+      // }
 
     },
 

src/xt_pages/stock/drugs/query.vue

@@ -123,6 +123,7 @@
               </span>
            </template>
         </el-table-column>
+        
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">