518合并代码

src/xt_pages/hospitalStation/components/deskRecord.vue

@@ -792,7 +792,7 @@ export default {
     this.first_dialysis_date = this.getTime(
       this.patientInfo.first_dialysis_date
     );
-
+    console.log("this.23323232322332233223",this.case_history)
     this.primary_disease = this.case_history.primary_disease
     this.confirm_failure_date = this.case_history.confirm_failure_date
     this.drug_allergy_history = this.case_history.drug_allergy_history
@@ -849,7 +849,14 @@ export default {
           this.case_history.diagnose = "";
         }
         this.form.id = this.case_history.id;
-
+        this.primary_disease = this.case_history.primary_disease
+        this.confirm_failure_date = this.case_history.confirm_failure_date
+        this.drug_allergy_history = this.case_history.drug_allergy_history
+        this.physical_examination = this.case_history.physical_examination
+        this.special_inspection = this.case_history.special_inspection
+        this.lab_apparatus = this.case_history.lab_apparatus
+       
+      
         this.watchSign++;
       },
     },

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -792,7 +792,7 @@ export default {
     this.first_dialysis_date = this.getTime(
       this.patientInfo.first_dialysis_date
     );
-
+   
     this.primary_disease = this.case_history.primary_disease
     this.confirm_failure_date = this.case_history.confirm_failure_date
     this.drug_allergy_history = this.case_history.drug_allergy_history
@@ -849,7 +849,12 @@ export default {
           this.case_history.diagnose = "";
         }
         this.form.id = this.case_history.id;
-
+        this.primary_disease = this.case_history.primary_disease
+        this.confirm_failure_date = this.case_history.confirm_failure_date
+        this.drug_allergy_history = this.case_history.drug_allergy_history
+        this.physical_examination = this.case_history.physical_examination
+        this.special_inspection = this.case_history.special_inspection
+        this.lab_apparatus = this.case_history.lab_apparatus
         this.watchSign++;
       },
     },

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

@@ -161,20 +161,22 @@
           <template slot-scope="scope">
            <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span> 
            <span v-else>
-             <span v-if="scope.row.price >0">
-                <span v-if="scope.row.count >= scope.row.min_number">
-                 {{((scope.row.price * scope.row.count)/scope.row.min_number).toFixed(2)}}
+             <!-- <span v-if="scope.row.price >0">
+                <span v-if="scope.row.count_unit == scope.row.min_unit">
+                  {{(scope.row.price * scope.row.count).toFixed(2)}}
                 </span>  
-                <span v-else>{{(scope.row.price * scope.row.count).toFixed(2)}}</span>
+                <span v-if="scope.row.count_unit == scope.row.max_unit">{{(scope.row.price * scope.row.count * scope.row.min_number).toFixed(2)}}</span>
               </span>
              <span v-if="scope.row.price  == 0">
-               <span v-if="scope.row.count >=scope.row.min_number">
-                 {{((getPrice(scope.row.drug_id)* scope.row.count)/scope.row.min_number).toFixed(2)}}
+               <span v-if="scope.row.count_unit  == scope.row.min_unit">
+                 {{((getPrice(scope.row.drug_id)* scope.row.count)).toFixed(2)}}
                </span> 
-               <span v-else>{{(getPrice(scope.row.drug_id)* scope.row.count).toFixed(2)}}</span>
-             </span>
+               <span v-if="scope.row.count_unit == scope.row.max_unit">
+                 {{(getPrice(scope.row.drug_id)* scope.row.count * scope.row.min_number).toFixed(2)}}
+              </span>
+             </span> -->
+             {{scope.row.total_price}}
            </span>
-            <!-- {{scope.row.total_price}} -->
           </template>
         </el-table-column>
       </el-table>
@@ -433,13 +435,31 @@ export default {
                total_price += order[i].count * order[i].last_price
              }else{
                if(order[i].price > 0){
-                 order[i].total_price = order[i].count * order[i].price
-                 total_price += order[i].count * order[i].price
+                 if(order[i].count_unit == order[i].min_unit){
+                   order[i].total_price = order[i].count * order[i].price
+                  total_price += order[i].total_price
+                 }
+                 if(order[i].count_unit == order[i].max_unit){
+                   order[i].total_price += order[i].count * order[i].price * order[i].min_number
+                   total_price += order[i].total_price
+                 }
+                
                }
                if(order[i].price ==0 ){
-                  order[i].total_price = order[i].count * this.getPrice(order[i].drug_id)
-                  total_price += order[i].count * this.getPrice(order[i].drug_id)
-                  order[i].price = this.getPrice(order[i].drug_id)
+                 if(order[i].count_unit == order[i].min_unit){
+                    order[i].total_price = order[i].count * this.getPrice(order[i].drug_id)
+                   // total_price += order[i].count * this.getPrice(order[i].drug_id)
+                   total_price +=order[i].total_price
+                    order[i].price = this.getPrice(order[i].drug_id)
+                 }
+                
+                if(order[i].count_unit == order[i].max_unit){
+                   order[i].total_price += order[i].count * this.getPrice(order[i].drug_id) * order[i].min_number
+                   //total_price += order[i].count * this.getPrice(order[i].drug_id)
+                   order[i].total_price+=order[i].total_price
+                   order[i].price = this.getPrice(order[i].drug_id)
+                }
+                 
                } 
                
              }
@@ -458,7 +478,7 @@ export default {
             order[i].total_price = order[i].total_price.toFixed(2)
           }
        
-         
+          console.log("233223322323322332232323",order)
           this.tableData = order
            let objInfo = {}
           order.forEach((item,index)=>{
@@ -524,7 +544,7 @@ export default {
            for(let i=0;i<list.length;i++){
               list[i].total_price = list[i].count * list[i].price
             }
-        
+          
           this.tableList = list 
           var total = response.data.data.total
           this.total = total
@@ -611,7 +631,7 @@ export default {
             this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
             this.tableData[i].time = this.getTime(this.tableData[i].ctime)
             this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
-            if(this.org_id == 9671 || this.org_id == 9919){
+            if(this.org_id == 9919){
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
               if(this.tableData[i].count >=this.tableData[i].min_number){
                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)/this.tableData[i].min_number
@@ -621,12 +641,12 @@ export default {
               
             }else{
               this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
-                if(this.tableData[i].count >=this.tableData[i].min_number){
-                  this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)/this.tableData[i].min_number
-              }else{
-                  this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+              if(this.tableData[i].count_unit == this.tableData[i].min_unit){
+                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+              }
+              if(this.tableData[i].count_unit == this.tableData[i].max_unit){
+                this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
               }
-             
             }
          }
        }
@@ -678,7 +698,7 @@ export default {
             var list = response.data.data.list
           
             let objInfo = {}
-            if(this.org_id == 9671 || this.org_id == 9919){
+            if(this.org_id == 9919){
               list.forEach((item,index)=>{
               let { drug_id } = item
               if(!objInfo[drug_id]){

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -227,7 +227,6 @@
 
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
-              <!-- <span v-if="scope.row.is_sys ==  0">{{getTotalCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span> -->
               <span> {{getTotalCountOne(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
             </template>
           </el-table-column>
@@ -236,7 +235,7 @@
               <span>{{getXuserName(scope.row.admin_user_id)}} </span>  
             </template>
           </el-table-column>
-          <el-table-column label="出货单价" align="center">
+          <el-table-column label="单价" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.price > 0"> {{scope.row.price}}</span>
               <span v-if="scope.row.price == 0"> {{scope.row.retail_price}}</span>
@@ -249,8 +248,8 @@
           </el-table-column> -->
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.price > 0">{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price).toFixed(2)}}</span>
-              <span v-if="scope.row.price == 0">{{getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price).toFixed(2)}}</span>
+              <span v-if="scope.row.price > 0">{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number).toFixed(2)}}</span>
+              <span v-if="scope.row.price == 0">{{getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number).toFixed(2)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
@@ -980,7 +979,7 @@ export default {
             }
            }
         
-            this.drugFlowList = drugFlowList
+          this.drugFlowList = drugFlowList
          }
          if(is_sys == 0 || is_sys == 12){
             var flowlist = response.data.data.flowlist
@@ -1005,8 +1004,8 @@ export default {
               list[i].number = ""
            }
          }
-        
          this.tableList = list
+         console.log("单价23323232323232232332232323233223",this.tableList)
         }
      })
    },
@@ -1240,7 +1239,7 @@ export default {
             }
           }
         }
-        const tHeader = ['药品名称','药品类型','规格&单位', '批号','出库数量','出货单价','拆零零售价','总价','生产厂家','生产日期','有效日期','经销商','批准文号','备注']
+        const tHeader = ['药品名称','药品类型','规格&单位', '批号','出库数量','单价','拆零零售价','总价','生产厂家','生产日期','有效日期','经销商','批准文号','备注']
         const filterVal = ['drug_name','drug_type','unit','batch_number', 'count','price','retail_price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
 
         // console.log("table",this.exportList)
@@ -1257,7 +1256,8 @@ export default {
      formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]));
      },
-      getAllPriceOne(drug_id,price,min_price){
+      getAllPriceOne(drug_id,price,min_price,max_unit,count_unit,min_number){
+        console.log("drugfalowlist22332233232",this.drugFlowList)
         var total = 0
         var all_price = 0
         for(let i=0;i<this.drugFlowList.length;i++){
@@ -1265,6 +1265,9 @@ export default {
               total += this.drugFlowList[i].count
           }
         }
+        if(max_unit == count_unit){
+          total = total * min_number
+        }
         all_price = total * price
 
         return  all_price