hah阿凡达

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

@@ -770,6 +770,8 @@ export default {
     if(this.lastTreat!=null){
       if(this.receiveTreatmentAsses.condition ==1){
         this.receiveTreatmentAsses.admission_number = this.lastTreat.admission_number
+        this.receiveTreatmentAsses.his_bed = this.lastTreat.his_bed
+        this.receiveTreatmentAsses.his_department = this.lastTreat.his_department
       }
     
     }
@@ -789,6 +791,18 @@ export default {
     // console.log("风险", this.precaution_arr);
     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
+
+    if(this.$store.getters.user.template_info.org_id == 10293){
+        this.receiveTreatmentAsses.way =1
+        this.receiveTreatmentAsses.consciousness =2
+        this.receiveTreatmentAsses.appetite =2
+        this.receiveTreatmentAsses.posture= 1
+        this.receiveTreatmentAsses.danger_level=2
+        this.receiveTreatmentAsses.precaution = 3
+        var arr = [3,4]
+        this.precautionTwo.push(...arr)
+        this.receiveTreatmentAsses.precaution = this.precautionTwo      
+  }
   },
  
 };

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -210,7 +210,7 @@
            {{getStorehouseName(scope.row.storehouse_id)}}
           </template>
         </el-table-column>
-        <el-table-column label="出货价" align="center">
+        <el-table-column label="出库价" align="center">
           <template slot-scope="scope">
            <span v-if="org_id == 9919">{{scope.row.last_price}} </span>
            <span v-else>
@@ -591,7 +591,11 @@ export default {
              if(this.org_id == 9919){
                order[i].total_price = order[i].count * order[i].last_price
                total_price += order[i].count * order[i].last_price
-             }else{
+             }else if(this.org_id == 0){
+                order[i].total_price = order[i].total_price
+             }else if(this.org_id == 10721){
+              order[i].total_price = order[i].total_price
+             } else{
                if(order[i].price > 0){
                   order[i].total_price = 0
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
@@ -601,7 +605,7 @@ export default {
                    if(order[i].is_sys == 0){
                      order[i].total_price += order[i].count * order[i].price
                    }else{
-                    
+                     
                      order[i].total_price += order[i].count * order[i].price * order[i].min_number
                    }
                  }
@@ -752,8 +756,7 @@ export default {
     },
 
      exportList(){
-        
-        
+         
        
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
@@ -770,7 +773,12 @@ export default {
              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
              this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)/this.tablePrint[i].min_number
             
-           }else{
+           }else if(this.org_id == 10721){
+            this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
+            this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
+            this.tablePrint[i].total_price =  ((parseInt((this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child))))*this.tablePrint[i].price).toFixed(2)
+            this.tablePrint[i].total = this.getTotalPriceTwo(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
+           } else{
               this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
               this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
               this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
@@ -785,7 +793,7 @@ export default {
         
         console.log("wowowoowowowowo",this.tablePrint)
         
-       
+      
       
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号','生产厂商','进销商', '单位','数量','单价','总价','出库时间','备注']
@@ -866,8 +874,15 @@ export default {
                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
               }
 
-            }else{
+            }else if(this.org_id == 10721){
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+              this.tableData[i].total_price = this.tableData[i].total_price
+            }else if(this.org_id == 0){
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+              this.tableData[i].total_price = this.tableData[i].total_price
+            } else{
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+
               if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
                  this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
               }
@@ -1184,6 +1199,7 @@ export default {
         }
         return str + min_str
       },
+      
       getTotalPrice(arr,max_unit,min_number,min_price){
         console.log("arrwoowowow",arr)
       
@@ -1217,6 +1233,14 @@ export default {
 
         return total*min_price
       },
+      getTotalPriceTwo(arr,max_unit,min_number,min_price){
+        var total = 0
+        for(let j=0;j<arr.length;j++){
+          total +=arr[j].count
+        }
+
+        return total*min_price
+      },
       getCountSix(drug_id,val){
 
         var count = 0

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -319,6 +319,7 @@
         var str = ""
         var min_str = ""
         for(let i=0;i<arr.length;i++){
+          console.log("arr-----",arr)
           arr[i].total_count = 0
           if(arr[i].count_unit == max_unit){
             arr[i].total_count = parseInt(arr[i].count) * min_number