Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

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

@@ -225,9 +225,19 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
      var start = window.sessionStorage.getItem('start_in_time')
-     this.start_time = start
-     var end =  window.sessionStorage.getItem('end_in_time')
-     this.end_time = end
+     console.log("start23323232322323",start)
+      var end =  window.sessionStorage.getItem('end_in_time')
+     if(start!= "null"){
+        console.log("hh232h23h32h3232322323")
+        this.start_time = start
+     }
+     
+    
+     if(end != "null"){
+       
+        this.end_time = end
+     }
+   
     this.GetConfigInfo()
     this.fetchAllAdminUsers()
     //获取入库单数据
@@ -440,7 +450,7 @@ export default {
         end_time:this.end_time,
         order_type:this.order_type,
       }
-
+     console.log("药品入库232323223",params)
      getDrugWarehouseInfoPrint(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list

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

@@ -234,11 +234,12 @@ export default {
       (nowDay < 10 ? "0" + nowDay : nowDay);
     var start = window.sessionStorage.getItem('start_out_time')
     console.log("start",start)
-    if(start!=null){
+     var end =  window.sessionStorage.getItem('end_out_time')
+    if(start!="null"){
        this.start_time = start   
     }
-    if(end!=null){
-      var end =  window.sessionStorage.getItem('end_out_time')
+    if(end!="null"){
+     
       this.end_time = end
     }
     

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -1011,13 +1011,20 @@ export default {
            var list = response.data.data.list
            console.log("list",list)
          
-          if(list.stock_max_number >0 ){
-            this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit
+          var max_total = 0
+          var min_total = 0
+          for(let i=0;i<list.length;i++){
+            max_total += list[i].stock_max_number
+            min_total +=list[i].stock_min_number
           }
-          if(list.stock_min_number > 0){
-            this.form.total =  this.form.total + list.stock_min_number + list.XtBaseDrug.min_unit 
+          
+          if(max_total >0 ){
+            this.form.total = max_total + list[0].XtBaseDrug.max_unit
           }
-          // this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit + list.stock_min_number + list.XtBaseDrug.min_unit
+          if(min_total > 0){
+            this.form.total =  this.form.total + min_total + list[0].XtBaseDrug.min_unit 
+          }
+          console.log("hh232332232323",this.form.total)
          }
       })
      },

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -45,13 +45,15 @@
                   {{getCount(item.child,item.max_unit,item.min_unit,item.min_number)}}
               </td>
               <td style="line-height:50px">
-                  {{item.price}}
+                  {{item.min_price}}
                   <!-- {{getPrice(item.drug_id)}} -->
               </td>
               <td style="line-height:50px">
                   <!-- {{(item.count * getPrice(item.drug_id)).toFixed(2)}} -->
                   <!-- {{item.count*item.price}} -->
-                <span>{{getTotalPrice(item.child,item.max_unit,item.min_number,item.min_price)}}</span>
+                <!-- <span>{{getTotalPrice(item.child,item.max_unit,item.min_number,item.min_price)}}</span> -->
+               
+                <span>{{(getCountOne(item.child,item.max_unit,item.min_unit,item.min_number)*item.min_price).toFixed(2)}}</span>
               </td>
               <td style="line-height: 50px">
                  {{item.remark}}
@@ -161,67 +163,67 @@
         }
         return name
       },
-      getlist(){
-        var params = {
-        start_time:this.start_time,
-        end_time:this.end_time,
-        order_type:this.order_type,
-        manufacturer_id:this.manufacturer_id,
-        keyword:this.searchKey,
-        limit:this.limit,
-        page:this.page,
-       }
-       console.log("出库数据22222",params)
-      getDrugOutDetail(params).then(response=>{
-        if(response.data.state == 1){
-          var drugInOrder = response.data.data.order
-          console.log("出库数据22",drugInOrder)
-          let objInfo = {}
-          drugInOrder.forEach((item,index)=>{
-             let { drug_id } = item
-             if(!objInfo[drug_id]){
-               objInfo[drug_id] = {
-                 drug_id,
-                 child:[],
-                 drug_name:item.drug_name,
-                 drug_spec:item.drug_spec,
-                 min_unit:item.min_unit,
-                 count:0,
-                 last_price:item.XtBaseDrug.last_price,
-                 remark:item.remark,
-                 total_price:"",
-                 dose:item.dose,
-                 dose_unit:item.dose_unit,
-                 min_number:item.min_number,
-                 max_unit:item.max_unit,
+      // getlist(){
+      //   var params = {
+      //   start_time:this.start_time,
+      //   end_time:this.end_time,
+      //   order_type:this.order_type,
+      //   manufacturer_id:this.manufacturer_id,
+      //   keyword:this.searchKey,
+      //   limit:this.limit,
+      //   page:this.page,
+      //  }
+      //  console.log("出库数据22222",params)
+      // getDrugOutDetail(params).then(response=>{
+      //   if(response.data.state == 1){
+      //     var drugInOrder = response.data.data.order
+      //     console.log("出库数据22",drugInOrder)
+      //     let objInfo = {}
+      //     drugInOrder.forEach((item,index)=>{
+      //        let { drug_id } = item
+      //        if(!objInfo[drug_id]){
+      //          objInfo[drug_id] = {
+      //            drug_id,
+      //            child:[],
+      //            drug_name:item.drug_name,
+      //            drug_spec:item.drug_spec,
+      //            min_unit:item.min_unit,
+      //            count:0,
+      //            last_price:item.XtBaseDrug.last_price,
+      //            remark:item.remark,
+      //            total_price:"",
+      //            dose:item.dose,
+      //            dose_unit:item.dose_unit,
+      //            min_number:item.min_number,
+      //            max_unit:item.max_unit,
                 
-               }
-             }
-          })
-          let list = Object.values(objInfo);
-          console.log("list2334444",list)
-          for(let i=0;i<drugInOrder.length;i++){
-            list.map(item=>{
-              if(drugInOrder[i].drug_id == item.drug_id){
-                 item.child.push(drugInOrder[i])
-              }
-            })
-          }
+      //          }
+      //        }
+      //     })
+      //     let list = Object.values(objInfo);
+      //     console.log("list2334444",list)
+      //     for(let i=0;i<drugInOrder.length;i++){
+      //       list.map(item=>{
+      //         if(drugInOrder[i].drug_id == item.drug_id){
+      //            item.child.push(drugInOrder[i])
+      //         }
+      //       })
+      //     }
           
-          console.log("药品出库明细",list)
-          for(let i=0;i<list.length;i++){
-            for(let j=0;j<list[i].child.length;j++){
-              if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
-                list[i].count += list[i].child[j].count
-              }
-            }
-          }
-          console.log("药品出库明细",list)
-          this.cancelStockDate = list
+      //     console.log("药品出库明细",list)
+      //     for(let i=0;i<list.length;i++){
+      //       for(let j=0;j<list[i].child.length;j++){
+      //         if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
+      //           list[i].count += list[i].child[j].count
+      //         }
+      //       }
+      //     }
+      //     console.log("药品出库明细",list)
+      //     this.cancelStockDate = list
         
-        }
-      })  
-      },
+      //   }
+      // })  
+      // },
       getTotal(){
          var total = 0
          for(let i=0;i<this.cancelStockDate.length;i++){
@@ -341,6 +343,26 @@
         }
         return str + min_str
       },
+      getCountOne(arr,max_unit,min_unit,min_number){
+        console.log("arr2332332233232",arr)
+        var total = 0
+        var str = ""
+        var min_str = ""
+        for(let i=0;i<arr.length;i++){
+          arr[i].total_count = 0
+          if(arr[i].count_unit == max_unit){
+            arr[i].total_count = parseInt(arr[i].count) * min_number
+          }else{
+            arr[i].total_count = parseInt(arr[i].count)
+          }
+
+        }
+        for(let i=0;i<arr.length;i++){
+          total+= parseInt(arr[i].total_count)
+        }
+       console.log("total233223232323",total,min_number)
+        return total
+      },
       getTotalPrice(arr,max_unit,min_number,min_price){
         
         var total = 0

src/xt_pages/stock/drugs/inventory.vue

@@ -780,6 +780,9 @@ export default {
             this.$message.error("请输入盘点数量")
             return
           }
+          if(this.form.min_count == ""){
+            this.form.min_count = 0
+          }
           var obj = {
             drug_id:this.form.drug_id,
             drug_name:this.form.drug_name,
@@ -790,7 +793,6 @@ export default {
             retail_price:this.form.retail_price.toString(),
             manufacturer:this.form.manufacturer,
             drug_origin_place:this.form.drug_origin_place,
-            number:this.form.number,
             remark:this.form.remark,
             new_price:this.form.new_price.toString(),
             warehousing_order:this.form.warehousing_order,
@@ -1183,11 +1185,18 @@ export default {
            var list = response.data.data.list
            console.log("list",list)
           
-          if(list.stock_max_number >0 ){
-            this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit
+          var max_total = 0
+          var min_total = 0
+          for(let i=0;i<list.length;i++){
+            max_total += list[i].stock_max_number
+            min_total +=list[i].stock_min_number
+          }
+          
+          if(max_total >0 ){
+            this.form.total = max_total + list[0].XtBaseDrug.max_unit
           }
-          if(list.stock_min_number > 0){
-            this.form.total =  this.form.total + list.stock_min_number + list.XtBaseDrug.min_unit 
+          if(min_total > 0){
+            this.form.total =  this.form.total + min_total + list[0].XtBaseDrug.min_unit 
           }
          }
       })