新分支

src/xt_pages/management/index.vue

@@ -37,7 +37,7 @@
           icon="el-icon-search"
           size="small"
           @click="Auto()"
-          >自动生成</el-button
+          >脚本</el-button
         > -->
       </div>
 

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -961,7 +961,7 @@ export default {
       this.getExportOutOrderDrugList();
     },
     batchDelete() {
-      console.log("232322323", this.selectedTableData);
+     
 
       if (this.selectedTableData.length <= 0) {
         this.$message.error("请选择要删除的记录");
@@ -1215,32 +1215,44 @@ export default {
         if (response.data.state == 1) {
           this.tableShow = true;
           this.tableList = [];
+          //流水详情
           var list = response.data.data.list;
-          console.log("listwowowowoow",list)
+      
           this.warehouseOutList = list
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
+          //详情（xt_drug_automatic_reduce_detail）
           var drugFlowList = response.data.data.drugFlowList;
+          //流水详情
           var drugList = response.data.data.drugList
          
           this.tabList = drugList
+          //按批号分组
           var drugListOne = response.data.data.drugListFlow
-          console.log("drugListOne----------",drugListOne)
+        
           //按批号分组
           var drugListTwo=  response.data.data.drugListOne
-          console.log("drugListTwo9922wo",drugListTwo)
+       
+
+          //出库详情
           var drugoutlist = response.data.data.drugoutlist
+       
           this.outList = drugoutlist
           this.drugOutInfo = drugoutlist
           if (is_sys == 1) {
+             console.log("数据1",drugFlowList)
+             console.log("数据2",drugListOne)
             if (drugFlowList.length > 0) {
               for (let i = 0; i < drugFlowList.length; i++) {
                  drugFlowList[i].childOne = []
                  drugFlowList[i].child = []
-                if (drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.max_unit) {
+                if ((drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.max_unit) && (drugFlowList[i].XtBaseDrug.max_unit!=drugFlowList[i].XtBaseDrug.min_unit)) {
                    drugFlowList[i].count =drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number;
                 }
-                if (drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.min_unit) {
+                if ((drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.min_unit)&& (drugFlowList[i].XtBaseDrug.max_unit!=drugFlowList[i].XtBaseDrug.min_unit) ) {
+                    drugFlowList[i].count = drugFlowList[i].count;
+                }
+                if ((drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.min_unit)&& (drugFlowList[i].XtBaseDrug.max_unit==drugFlowList[i].XtBaseDrug.min_unit) ) {
                     drugFlowList[i].count = drugFlowList[i].count;
                 }
                 for(let j=0;j<drugListOne.length;j++){
@@ -1248,16 +1260,15 @@ export default {
                        drugFlowList[i].childOne.push(drugListOne[j])
                    }
                 }
-                if(drugFlowList[i].drug_id == 1154){
-                    console.log("drugflowlist------",drugFlowList[i].count)
-                }
+               
               }
             }
-          
+            console.log("以色列",drugFlowList)
             this.drugFlowList = drugFlowList;
           }
 
           if (is_sys == 0 || is_sys == 12 || is_sys == 5) {
+            //出库详情
             var flowlist = response.data.data.flowlist;
             this.drugFlowList = [];
             for (let i = 0; i < flowlist.length; i++) {
@@ -1291,6 +1302,8 @@ export default {
                 }
              }
             }
+
+
             if(list[i].is_sys == 0 || list[i].is_sys == 5  || list[i].is_sys == 12){
               for(let j=0;j<drugListTwo.length;j++){
                 if(list[i].drug_id == drugListTwo[j].drug_id){
@@ -1300,13 +1313,16 @@ export default {
             }
           }
 
-     
+        
+        console.log("中故宫人我奶奶万年万年",list)
         if(is_sys == 1 || is_sys == 5){
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
                list[i].childOne[j].over_count_total = this.getOutCountSix(list[i].childOne[j].warehousing_detail_id,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id)
             }
           }
+         
+          console.log("中部listowowowoowowow",list)
 
          for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
@@ -1334,17 +1350,7 @@ export default {
             }
           }
          
-          // for(let i=0;i<list.length;i++){
-          //  for(let j=0;j<list[i].child.length;j++){
-          //   list[i].child[j].outInfo = []
-          //    for(let z=0;z<this.drugOutInfo.length;z++){
-          //      if(list[i].child[j].warehousing_detail_id == this.drugOutInfo[z].warehouse_info_id&&list[i].child[j].drug_id == this.drugOutInfo[z].drug_id){
-          //        list[i].child[j].outInfo.push(this.drugOutInfo[z])
-          //      }
-          //    }
-          //  }
-          // }
-          // console.log("list23322332233wo",list)
+          console.log("listowowowowo",list)
           this.tableList = list;
         }
 
@@ -1379,11 +1385,11 @@ export default {
         drug_id: val.drug_id,
         record_time: val.sys_record_time,
       };
-      //  console.log("使用明细",params)
+
       getAutoDrugDetail(params).then((response) => {
         if (response.data.state == 1) {
           this.userList = response.data.data.list;
-          // console.log("自动出库数据", this.userList);
+         
           if (val.is_sys == 1) {
             this.drugDialogVisible = true;
           }
@@ -1391,10 +1397,10 @@ export default {
             this.drugDialogVisibleTwo = true;
           }
           var userListOne = response.data.data.outList;
-          //  console.log("手动出库2232332",userListOne)
+        
           this.userListOne = userListOne;
           var batchNumber = response.data.data.batchNumber;
-          //  console.log("出库详情",batchNumber)
+        
           this.batchNumberList = batchNumber;
         }
       });
@@ -1419,16 +1425,16 @@ export default {
       getDrugCountList(params).then((response) => {
         if (response.data.state == 1) {
           var countlist = response.data.data.countList;
-          // console.log("入库数据",countlist)
+        
           this.countList = countlist;
           var outcountlist = response.data.data.outCountList;
-          // console.log("出库数据",outcountlist)
+        
           this.outCountList = outcountlist;
           var aucountlist = response.data.data.auCountList;
-          // console.log("自动数据",aucountlist)
+         
           this.autoCountList = aucountlist;
           var minCount = response.data.data.minCount;
-          // console.log("minCount",minCount)
+          
           this.minCount = minCount;
           var info = response.data.data.info;
           for (let i = 0; i < info.length; i++) {
@@ -1436,7 +1442,7 @@ export default {
               info[i].count = info[i].count * info[i].min_number;
             }
           }
-          // console.log("info2222222",info)
+          
           this.drugOutList = info;
         }
       });
@@ -1664,7 +1670,7 @@ export default {
           "remark",
         ];
 
-        // console.log("table",this.exportList)
+      
 
         const data = this.formatJson(filterVal, this.exportList);
         excel.export_json_to_excel({
@@ -1731,6 +1737,7 @@ export default {
       var total = 0
       var max_str = ""
       var min_str = ""
+
       for(let j=0;j<this.outList.length;j++){
         if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
            arr.push(this.outList[j])
@@ -1830,12 +1837,12 @@ export default {
       return max_str + min_str;
     },
     getOutCountOne(batch_number,max_unit,min_unit,min_number,drug_id){
-      console.log("drug_id-----",drug_id)
+    
       var arr = []
       var total = 0
       var max_str = ""
       var min_str = ""
-      console.log("tablelost----",this.tabList)
+    
       for(let j=0;j<this.tabList.length;j++){
       
         if(batch_number == this.tabList[j].batch_number && drug_id == this.tabList[j].drug_id){
@@ -1962,7 +1969,7 @@ export default {
       if(max_unit == min_unit){
          all_price = max_str * price + min_str * price
       }
-      console.log("all_pricewowo",all_price)
+     
       if(all_price > 0){
         return all_price.toFixed(2)
       }else{
@@ -2213,7 +2220,7 @@ export default {
       var max_str = ""
       var min_str = ""
   
-     console.log("total",total)
+  
       if (total < min_number) {
         min_str = total + min_unit;
       }