11月14日 库存扣减更新

src/xt_pages/stock/detail/stockOutDetail.vue

       },
 
     exportList(){
+       console.log("哈哈哈",this.tableOut)
+      
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name
         this.tableOut[i].specification_name = this.tableOut[i].specification_name
         this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
-        if(this.orgId == 9919 || this.orgId == 9671){
+        if(this.orgId == 9919){
           this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
         }else{
-          this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].packing_price).toFixed(2)
+          this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].retail_price).toFixed(2)
         }
-      
         this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
        }
        import('@/vendor/Export2Excel').then(excel => {
           this.tableDataList[i].time = this.getTime(this.tableDataList[i].WarehouseOut.warehouse_out_time)
           this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].WarehouseOut.creater)
           this.tableDataList[i].out_count = this.tableDataList[i].count
-          if(this.orgId == 9919 || this.orgId == 9671){
+          if(this.orgId == 9919){
              this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].GoodInfo.buy_price).toFixed(2)
              total += this.tableDataList[i].count * this.tableDataList[i].buy_price
           }else{
          
         }
         obj.total_price = total.toFixed(2)
+      
         this.tableDataList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','出货价','数量','总价']

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

              this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].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].price)
+              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
-              this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price) 
+              this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price) 
            }
         }
        console.log("列表数据333333333",this.tablePrint)
-      
+       
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','price','total_price','remark']
+       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','min_price','total_price','remark']
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tablePrint.length;i++){
          obj.total_price += this.tablePrint[i].total

src/xt_pages/supply/components/addPurchaseOrder.vue

       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      return total_count;
+      if(total_count > 0){
+        return total_count;
+      }else{
+        return ""
+      }
+    
     },
     calculate: function (val) {
       if (isNaN(val)) {

src/xt_pages/supply/components/editGoodReturn.vue

           if(msg == 2){
             var good_name = response.data.data.good_name
             var specification_name = response.data.data.specification_name
-            var str = good_name +"*" + specification_name +"无库存,请入库"
-             this.$message.error(str)
+            var str = good_name +"*" + specification_name +"库存不足"+"审核失败"
+            this.$message.error(str)
+
+          }
+          if(msg == 3){
+              var drug_name =  response.data.data.drug_name
+              var dose = response.data.data.dose
+              var dose_unit = response.data.data.dose_unit
+              var min_number = response.data.data.min_number
+              var min_unit =  response.data.data.min_unit
+              var max_unit =  response.data.data.max_unit
+              var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
+              this.$message.error(str + "库存不足")+"审核失败"
           }
           
         }