数据

src/xt_pages/data/druguseTemplate.vue

@@ -1818,10 +1818,12 @@
       },
       handleSelect1(){
        this.templateForm.drug_id =  val.id
+       this.templateForm.way = 1
       },
       handleSelect(val){
         console.log("val23232",val)
         this.templateForm.drug_id =  val.id
+        this.templateForm.way = 1
       },
       submitTemplate(formName) {
 
@@ -2379,6 +2381,7 @@
           }).join(',')
           this.templateForm.way = 1
         }
+        this.templateForm.way = 1
         console.log("编辑模板",this.templateForm)
       
         // 编辑创建医嘱模版

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

@@ -1315,10 +1315,13 @@
 
               if(msg == 2){
                 this.$message.error("库存不足,请入库")
-                return
+                this.execTimeDialogVisible = false
+                return false
               }
               if(msg == 3){
                 this.$message.error("无库存,请入库")
+                this.execTimeDialogVisible = false
+                return false
               }
               
             }

src/xt_pages/stock/cancelStockOrder.vue

@@ -296,7 +296,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 10,
+      limit: 5,
       checked: false,
       total: 0,
       pageTotal: 0,
@@ -480,7 +480,7 @@ export default {
         ids: idStr
       };
 
-      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+      this.$confirm("确认删除退库单记录?", "删除退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -539,7 +539,7 @@ export default {
       const params = {
         ids: idStr
       };
-      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+      this.$confirm("确认删除退库单记录?", "删除退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -589,6 +589,9 @@ export default {
               if(msg == 4){
                this.$message.error("该批次退库数量大于入库数量")
              }
+             if(msg == 5){
+              this.$message.error("该批次退库数量大于入库数量")
+             }
              if(msg == 3){
                this.$notify({
                 title: "成功",

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -545,7 +545,10 @@
                 if(msg == 2){
                   this.$message.error("退库数量大于出库数量")
                 }
-                  if(msg == 4){
+                if(msg == 4){
+                  this.$message.error("该批次退库数量大于入库数量")
+                }
+                 if(msg == 5){
                   this.$message.error("该批次退库数量大于入库数量")
                 }
                 if(msg == 3){

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -547,7 +547,7 @@ export default {
       const params = {
         ids: idStr
       };
-      this.$confirm("确认删除出库退库单记录?", "删除出库退库单记录", {
+      this.$confirm("确认删除退库单记录?", "删除退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -525,7 +525,8 @@ export default {
       outList:[],
       userListOne:[],
       exportList:[],
-      batchNumberList:[]
+      batchNumberList:[],
+      drugFlowList:[],
     };
   },
   methods: {
@@ -954,16 +955,13 @@ export default {
           var list =  response.data.data.list
           console.log("list2323232",list)
           var outList = response.data.data.outList
-          // for(let i=0;i<outList.length;i++){
-          //     //如果都是最大单位,把最数量转为最小数量
-          //    if(outList[i].count_unit == outList[i].max_unit){
-          //       outList[i].count = outList[i].min_number * outList[i].count 
-          //    }
-          // }
           this.outList = outList
          console.log("outList222",outList)
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
+         var drugFlowList = response.data.data.drugFlowList
+         this.drugFlowList = drugFlowList
+         console.log("23232323232323",drugFlowList)
          for(let i=0;i<list.length;i++){
            if(list[i].batch_number == "0" || list[i].batch_number == 0){
               list[i].batch_number = ""
@@ -1081,57 +1079,84 @@ export default {
          return str + min_str
       },
       getTotalCountOne(id,min_number,max_unit,min_unit){
-       
-        for(let i=0;i<this.outList.length;i++){
-          if(this.outList[i].count_unit == this.outList[i].max_unit){
-            this.outList[i].total_count = this.outList[i].count * this.outList[i].min_number
-          }
-
-         if(this.outList[i].count_unit == this.outList[i].min_unit){
-            this.outList[i].total_count = this.outList[i].count
+        var arr = []
+        for(let i=0;i<this.drugFlowList.length;i++){
+          if(id == this.drugFlowList[i].drug_id){
+             arr.push(this.drugFlowList[i])
           }
-       
         }
-        console.log("我的",this.outList)
-          let dataInfo = {};
-          this.outList.forEach((item, index) => {
-            let { drug_id } = item;
-            if (!dataInfo[drug_id]) {
-              dataInfo[drug_id] = {
-                drug_id,
-                child: [],
-                total:0,
-              };
-            }
-          });
-        let list = Object.values(dataInfo);
-        console.log("drug_id22222",list)
-        for(let i=0;i<list.length;i++){
-          for(let j=0;j<this.outList.length;j++){
-            if(list[i].drug_id == this.outList[j].drug_id){
-              list[i].child.push(this.outList[j])
-            }
+        var total = 0
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].max_unit == max_unit){
+             arr[i].count = arr[i].count * arr[i].min_number
           }
+          if(arr[i].max_unit == min_unit){
+            arr[i].count = arr[i].count
+          }
+          total += arr[i].count
         }
-       var total = 0
-       for(let i=0;i<list.length;i++){
-        for(let j=0;j<list[i].child.length;j++){
-           if(id == list[i].child[j].drug_id){
-             total+= list[i].child[j].total_count
-           }
-        }
-       }
+
+        var str = ""
+        var min_str = ""
+        
+        str = parseInt(total/min_number)+ max_unit
+        min_str =  total%min_number + min_unit
+
+        return str + min_str 
+
+      },
+    //   getTotalCountOne(id,min_number,max_unit,min_unit){
+       
+    //     for(let i=0;i<this.outList.length;i++){
+    //       if(this.outList[i].count_unit == this.outList[i].max_unit){
+    //         this.outList[i].total_count = this.outList[i].count * this.outList[i].min_number
+    //       }
+
+    //      if(this.outList[i].count_unit == this.outList[i].min_unit){
+    //         this.outList[i].total_count = this.outList[i].count
+    //       }
+       
+    //     }
+    //     console.log("我的",this.outList)
+    //       let dataInfo = {};
+    //       this.outList.forEach((item, index) => {
+    //         let { drug_id } = item;
+    //         if (!dataInfo[drug_id]) {
+    //           dataInfo[drug_id] = {
+    //             drug_id,
+    //             child: [],
+    //             total:0,
+    //           };
+    //         }
+    //       });
+    //     let list = Object.values(dataInfo);
+    //     console.log("drug_id22222",list)
+    //     for(let i=0;i<list.length;i++){
+    //       for(let j=0;j<this.outList.length;j++){
+    //         if(list[i].drug_id == this.outList[j].drug_id){
+    //           list[i].child.push(this.outList[j])
+    //         }
+    //       }
+    //     }
+    //    var total = 0
+    //    for(let i=0;i<list.length;i++){
+    //     for(let j=0;j<list[i].child.length;j++){
+    //        if(id == list[i].child[j].drug_id){
+    //          total+= list[i].child[j].total_count
+    //        }
+    //     }
+    //    }
       
-      var str = ""
-      var min_str = ""
+    //   var str = ""
+    //   var min_str = ""
       
-      str = parseInt(total/min_number)+ max_unit
-      min_str =  total%min_number + min_unit
+    //   str = parseInt(total/min_number)+ max_unit
+    //   min_str =  total%min_number + min_unit
 
-     return str + min_str
+    //  return str + min_str
       
        
-     },
+    //  },
       getAllPrice(drug_id,price,min_price){
          var strprice = 0
          var minstrprice = 0

src/xt_pages/stock/stockBatchNumber.vue

@@ -150,7 +150,7 @@
       return {
         crumbs: [
           { path: false, name: '库存管理' },
-          { path: '/stock/drugs/stock/query', name: '药品库存查询' },
+          { path: '/stock/drugs/stock/query', name: '耗材库存查询' },
           { path:'/drugstock/in/drugstockflow',name:'库存流水'}
         ],
         keywords: '',