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/template/DialysisPrintOrderFortyThree.vue

@@ -976,7 +976,7 @@ export default {
         // console.log('透后体重', this.afterdialysis)
         this.lastafterdialysis = response.data.data.assessmentAfterDislysis
         this.operators = response.data.data.operators
-        console.log('operators', this.operators)
+        // console.log('operators', this.operators)
         this.dialysisOrder =
           response.data.data.dialysisOrder === null
             ? null

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -495,65 +495,65 @@
         }
       },
       changePrescribingNumber(scope) {
-        //  var max_number = 0 
-        //  if(scope.row.prescribing_number_unit == scope.row.drug.max_unit){
-        //     max_number = parseInt(scope.row.prescribing_number) * scope.row.drug.min_number 
-        //  }
-        //  if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-        //    max_number = parseInt(scope.row.prescribing_number)
-        //  }
-        //  console.log("修改的数量",max_number)
-        //  //查询该药品库存
-        //  if(this.drugList.length > 0){
-        //     var stock_number = 0
-        //     for(let i=0;i<this.drugList.length;i++){
-        //       if(scope.row.id == this.drugList[i].id){
-        //          for(let j=0;j<this.drugList[i].stock_in.length;j++){
-        //             stock_number += this.drugList[i].stock_in[j].stock_max_number * this.drugList[i].min_number + this.drugList[i].stock_in[j].stock_min_number
-        //          }
-        //       }
-        //     }
-        //     console.log("库存数量",stock_number)
-        //  }
-        // if(scope.row.advice_id > 0){
-        //   //获取该药品上一次出库的的数量
-        //   getHisDoctorAdviceInfo(scope.row.advice_id).then(response=>{
-        //     if(response.data.state == 1){
-        //        var out_count  = 0
-        //        var adviceList = response.data.data.advice
-        //        if(adviceList.prescribing_number_unit == adviceList.drug.max_number){
-        //            out_count = adviceList.prescribing_number * adviceList.drug.min_number
-        //        }
-        //        if(adviceList.prescribing_number_unit == adviceList.drug.min_unit){
-        //           out_count = adviceList.prescribing_number
-        //        }
+         var max_number = 0 
+         if(scope.row.prescribing_number_unit == scope.row.drug.max_unit){
+            max_number = parseInt(scope.row.prescribing_number) * scope.row.drug.min_number 
+         }
+         if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+           max_number = parseInt(scope.row.prescribing_number)
+         }
+         console.log("修改的数量",max_number)
+         //查询该药品库存
+         if(this.drugList.length > 0){
+            var stock_number = 0
+            for(let i=0;i<this.drugList.length;i++){
+              if(scope.row.id == this.drugList[i].id){
+                 for(let j=0;j<this.drugList[i].stock_in.length;j++){
+                    stock_number += this.drugList[i].stock_in[j].stock_max_number * this.drugList[i].min_number + this.drugList[i].stock_in[j].stock_min_number
+                 }
+              }
+            }
+            console.log("库存数量",stock_number)
+         }
+        if(scope.row.advice_id > 0){
+          //获取该药品上一次出库的的数量
+          getHisDoctorAdviceInfo(scope.row.advice_id).then(response=>{
+            if(response.data.state == 1){
+               var out_count  = 0
+               var adviceList = response.data.data.advice
+               if(adviceList.prescribing_number_unit == adviceList.drug.max_number){
+                   out_count = adviceList.prescribing_number * adviceList.drug.min_number
+               }
+               if(adviceList.prescribing_number_unit == adviceList.drug.min_unit){
+                  out_count = adviceList.prescribing_number
+               }
                
-        //        //如果更改的数量大于修改之前的数量
-        //        if(max_number > out_count){
-        //          if((max_number - out_count)>stock_number){
-        //            this.$message.error(scope.row.drug_name + '库存不足')
-        //          }
-        //        }
-        //     }
-        //   })
-        // }
-
-        // if(scope.row.advice_id == 0){
-        //    if(max_number > stock_number){
-        //     this.$message.error(scope.row.drug_name + '库存不足')
-        //    }
-        // }
-        
+               //如果更改的数量大于修改之前的数量
+               if(max_number > out_count){
+                 if((max_number - out_count)>stock_number){
+                   this.$message.error(scope.row.drug_name + '库存不足')
+                 }
+               }
+            }
+          })
+        }
 
-        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          if (parseInt(scope.row.prescribing_number) > scope.row.drug.total) {
+        if(scope.row.advice_id == 0){
+           if(max_number > stock_number){
             this.$message.error(scope.row.drug_name + '库存不足')
-          }
-        } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
+           }
         }
+        
+
+        // if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+        //   if (parseInt(scope.row.prescribing_number) > scope.row.drug.total) {
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        // } else {
+        //   if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+        //     this.$message.error(scope.row.drug_name + '库存不足')
+        //   }
+        // }
       },
       getProjectSingleDose(scope) {
         this.prescription.project[scope.$index].total = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.number_days ? scope.row.number_days : 1)

src/xt_pages/stock/drugs/query.vue

@@ -839,11 +839,11 @@ import { min } from 'moment'
            out_count += (info[j].stock_max_number + info[j].stock_min_number)
         }
        
-        for(let z=0;z<cancel_info.length;z++){
-           cancel_count += cancel_info[z].count
-        }
-        over_count = total - out_count + cancel_count
-    
+        // for(let z=0;z<cancel_info.length;z++){
+        //    cancel_count += cancel_info[z].count
+        // }
+       // over_count = total - out_count + cancel_count
+         over_count = total - out_count 
         if(parseInt(over_count/min_number)!=0){
             str = parseInt(over_count/min_number)+ max_unit
          }

src/xt_pages/stock/stockQuery.vue

@@ -109,8 +109,11 @@
        <el-table-column label="出库数量" align="center" v-if="showOne">
          <template slot-scope="scope">
           <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164">
-            <span>
+            <!-- <span>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
+            </span> -->
+             <span>
+              {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info)}}
             </span>
           </span>
           <span v-else>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>