数据

src/store/modules/globalConfig.js

@@ -584,6 +584,51 @@ const global_config = {
         sodium: 1,
         calcium: 1,
         bicarbonate: 1
+      },
+      26: {
+        id: 26,
+        name: 'CVVH',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      27: {
+        id: 27,
+        name: 'CVVHD',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      28: {
+        id: 28,
+        name: 'CVVHDF',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
       }
     },
     anticoagulants_confit: { // 抗凝剂

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -232,6 +232,17 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
+    var start_time =  window.sessionStorage.getItem('start_time_one')
+    var end_time =  window.sessionStorage.getItem('end_time_one')
+    console.log("start_time",start_time,end_time)
+    if(start_time !=null){
+      this.start_time = start_time
+    }
+    if(end_time!=null){
+      this.end_time = end_time
+    }
+    window.sessionStorage.removeItem('start_time_one')
+    window.sessionStorage.removeItem('end_time_one')  
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
@@ -273,6 +284,8 @@ export default {
   },
   methods: {
     PrintAction: function() {
+      window.sessionStorage.setItem('start_time_one',this.start_time)
+      window.sessionStorage.setItem('end_time_one',this.end_time)
       this.$router.push({
         path: "/stock/print",
         query: {
@@ -280,7 +293,7 @@ export default {
           start_time: this.start_time,
           end_time: this.end_time,
           limit:this.limit,
-          page:this.page
+          page:this.page,
         }
       });
     },
@@ -339,6 +352,7 @@ export default {
         type: this.type,
         keywords: this.searchKey
       };
+      console.log("param2323232222332",params)
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
@@ -369,7 +383,7 @@ export default {
         order_type: this.order_type,
         dealer: this.dealer_id
       };
-      
+      console.log("Params23232233223232332",Params)
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
@@ -388,11 +402,11 @@ export default {
             this.cancelStockDate.push(obj);
             
           }
-          console.log("2322323323232323223322323")
+         
           this.tableDataList = response.data.data.list
          
           var listgroup = response.data.data.listgroup
-          console.log("hh2322322332",listgroup)
+        
 
           this.cancelStockDate.push({
             order_number: "合计",
@@ -411,7 +425,7 @@ export default {
           }
         }
         this.tableList = listgroup
-        console.log("退库列表",this.tableList)
+       
         }
       });
     },
@@ -469,6 +483,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.start_time = "";
       } else {
+       
         this.GetCancelStock();
       }
     },
@@ -478,6 +493,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
+       
         this.GetCancelStock();
       }
     },

src/xt_pages/stock/detail/print.vue

@@ -52,7 +52,8 @@
              
               <td style="line-height: 50px">
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
-                <span v-if="type == 2"> {{getStockCount(item.good_id) }}</span>
+                <!-- <span v-if="type == 2"> {{getStockCount(item.good_id) }}</span> -->
+                <span v-if="type == 2">{{item.count}}</span>
                 <span v-if="type == 4"> {{ item.count }}</span>
               </td>
               <td style="line-height: 50px">
@@ -77,14 +78,19 @@
           </table>
           <table class="print-table" border="1">
             <tr>
-              <td style="line-height: 50px" colspan="6" width="550">合计</td>
-              <td width="80" style="line-height: 50px" >
+              <td style="line-height: 50px"  width="50">合计</td>
+              <td style="line-height: 50px"  width="200"></td>
+              <td style="line-height: 50px"  width="200"></td>
+              <td style="line-height: 50px"  width="80"></td>
+              <td style="line-height: 50px"  width="50"></td>
+              <td style="line-height: 50px"   width="80"></td>
+              <td style="line-height: 50px"  width="80">
                 <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span> 
                 <span v-if="type == 2">{{getWareOutTotal().toFixed(2)}}</span> 
                 <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span> 
               </td>
-              <td width="80" style="line-height: 50px">
-
+              <td style="line-height: 50px" width="80">
+               
               </td>
             </tr>
           </table> 
@@ -151,7 +157,7 @@
         if (this.type == 1){
           return "入库日期: "+this.start_time +"~"+this.end_time
         }else if(this.type == 2){
-          return "退货日期: "+this.start_time +"~"+this.end_time
+          return "出库日期: "+this.start_time +"~"+this.end_time
         }else if(this.type == 3){
           return "出库日期: "+this.start_time +"~"+this.end_time
         }else if(this.type == 4){
@@ -183,77 +189,6 @@
           scanStyles: false
         })
       },
-      getDialysisRecord() {
-        this.loading = true
-        
-        getPrintStockGood(this.queryParams).then(response => {
-          if (response.data.state == 1) {
-            var stockTotal = response.data.data.stockTotal
-          
-            this.stockTotal = stockTotal
-           
-            var info = response.data.data.info
-           
-            this.wareOutInfo = info
-            var org_id = response.data.data.orgid
-          
-            this.org_id = org_id
-
-            var informationlist = response.data.data.infomationList
-           
-            this.informationList = informationlist
-            this.stockDatas = []
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              if (this.type == 1) {
-                if (response.data.data.list[i].query_warehousing_info.length > 0) {
-                  this.stockDatas.push(response.data.data.list[i])
-                }
-                console.log("入库打印数据源",this.stockDatas)
-              } else if (this.type == 2) {
-                if (response.data.data.list[i].query_sales_return_info.length > 0) {
-                  this.stockDatas.push(response.data.data.list[i])
-                }
-
-              } else if (this.type == 3) {
-                
-                if (response.data.data.list[i].query_warehouseout_info.length > 0) {
-                  this.stockDatas.push(response.data.data.list[i])
-                }
-               
-                console.log("出库打印数据源",this.stockDatas)
-
-                
-              } else if (this.type == 4) {
-                if (response.data.data.list[i].query_cancel_stock_info.length > 0) {
-                  this.stockDatas.push(response.data.data.list[i])
-                }
-              }
-
-            }
-            var obj =  null
-            for(let i = 0; i <this.stockDatas.length;i++){
-              obj = this.stockDatas[i]
-            }
-           console.log("9999999",this.stockDatas)
-           
-           var newArr =  this.unique(this.stockDatas)
-           console.log("耗材出库去重",newArr)
-
-           this.stockDatas = newArr
-            // if (this.stockDatas.length < 50) {
-            //   var nl = 50 - this.stockDatas.length
-            //   for (let index = 0; index < nl; index++) {
-            //     this.stockDatas.push([])
-            //   }
-            // }
-            this.loading = false
-          } else {
-            this.loading = false
-            this.$message.error('请求数据失败')
-            return false
-          }
-        })
-      }, 
       calCount(stock) {
       
         let total = 0
@@ -420,6 +355,7 @@
         return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
      },
      getGoodDetailPrintList(){
+        console.log("param232323232322332",this.queryParams)
       getGoodDetailPrintList(this.queryParams).then(response=>{
          if(response.data.state == 1){
            var list = response.data.data.list
@@ -461,10 +397,7 @@
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
       this.goodUnit = this.$store.getters.good_unit
-
-      // this.getDialysisRecord()
       this.getGoodDetailPrintList()
-      // this.getStockDetail()
     }
 
   }

src/xt_pages/stock/detail/stockInDetail.vue

@@ -240,7 +240,6 @@ export default {
       (nowDay < 10 ? "0" + nowDay : nowDay);
     var start_time =  window.sessionStorage.getItem('start_time')
     var end_time =  window.sessionStorage.getItem('end_time')
-    console.log("start_time",start_time,end_time)
     if(start_time !=null){
       this.start_time = start_time
     }
@@ -365,7 +364,6 @@ export default {
           return false;
         } else {
           this.total = response.data.data.total;
-          console.log("hhhhhhshsss",response.data.data.list)
           var total_price = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableList.push(response.data.data.list[i])
@@ -418,7 +416,6 @@ export default {
         } else {
           this.total = response.data.data.total;
           var total_price = 0
-          console.log("收据3233232",response.data.data.list)
           for (let i = 0; i < response.data.data.list.length; i++) {
             total_price += parseInt(response.data.data.list[i].warehousing_count) * response.data.data.list[i].price
             this.tableList.push(response.data.data.list[i])
@@ -463,7 +460,6 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
           var alen = this.adminUserOptions.length;
@@ -489,12 +485,13 @@ export default {
       // this.getPrintStockGood()
     },
     startTimeChange(val) {
+
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
       if (time > 0) {
         this.$message.error("结束时间不能小于开始时间");
         this.start_time = "";
       } else {
-         window.sessionStorage.removeItem('start_time')
+       
         this.GetCancelStock();
        
       }
@@ -505,7 +502,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-        window.sessionStorage.removeItem('end_time')
+       
         this.GetCancelStock();
       }
     },
@@ -692,7 +689,7 @@ export default {
                this.tableList.push(list[i])
              }
           }
-          console.log("数据源头2222222222",this.tableList)
+      
         }
      })
    },
@@ -773,14 +770,14 @@ export default {
           this.tableInfo[i].index = i+1  
           this.tableInfo[i].total_price = (this.tableInfo[i].warehousing_count * this.tableInfo[i].price).toFixed(2) 
         }
-        console.log("总共条数555",this.tableInfo)   
+
         import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','进货价','总价','备注']
         const filterVal = ['index','good_name', 'specification_name', 'packing_unit','warehousing_count','price','total_price','remark']
-        console.log("hhhhhhhh",this.tableInfo)
+
         
         const data = this.formatJson(filterVal, this.tableInfo)
-        console.log("data222222222",data)
+
       
           excel.export_json_to_excel({
             header: tHeader,
@@ -791,7 +788,7 @@ export default {
         })
       },
       exportListDetal(){
-        console.log("l可悲2233",this.tableDataList)
+       
         var obj = {index:"合计",total_price:0}
         var total = 0
         for(let i=0;i<this.tableDataList.length;i++){
@@ -809,12 +806,12 @@ export default {
         import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','进货价','数量','总价']
         const filterVal = ['index','warehousing_order', 'good_type_name', 'good_name','specification_name','time','user_name','price','warehousing_count','total_price']
-        console.log("hhhhhhhh",this.tableDataList)
+       
       
         
         const data = this.formatJson(filterVal, this.tableDataList)
-        console.log("data222222222",data)
-        return
+       
+       
           excel.export_json_to_excel({
             header: tHeader,
             data,
@@ -844,7 +841,7 @@ export default {
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          console.log("入库详情单",list)
+          // console.log("入库详情单",list)
           this.tableInfo = list
         }
       })

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -70,46 +70,6 @@
       </div>
     </div>
 
-    
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">单据类型</span> : </label>
-      <el-select
-        size="small"
-        v-model="order_type"
-        clearable
-        placeholder="单据类型"
-        @change="changeType"
-      >
-        <el-option
-          v-for="item in orderTypeArr"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">其它</span> : </label>
-      <el-select
-        size="small"
-        v-model="manufacturer_id"
-        clearable
-        placeholder="厂商"
-        @change="changeManufacturer"
-      >
-        <el-option
-          v-for="item in manufacturer"
-          :key="item.id"
-          :label="item.manufacturer_name"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="cancelStockDate"
@@ -207,7 +167,7 @@ import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood,getGo
 
 export default {
   name: "stockOutDetail",
-
+  
   created() {
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
@@ -229,13 +189,22 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
+    var start_time =  window.sessionStorage.getItem('start')
+    var end_time =  window.sessionStorage.getItem('end')
+    if(start_time !=null){
+      this.start_time = start_time
+    }
+    if(end_time!=null){
+      this.end_time = end_time
+    }
+    window.sessionStorage.removeItem('start')
+    window.sessionStorage.removeItem('end')  
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
     var org_id = this.$store.getters.xt_user.org.id
     this.orgId = org_id
-    console.log("机构信息",org_id)
     this.getGoodDetailPrintList()
     
   },
@@ -283,13 +252,12 @@ export default {
       this.order_type = val;
       this.GetCancelStock();
       this.getGoodDetailPrintList()
-      // this.getPrintStockGood()
+      
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.GetCancelStock();
-      // this.getPrintStockGood()
-       this.getGoodDetailPrintList()
+      this.getGoodDetailPrintList()
     },
     getTypeName: function(row) {
       let name = "";
@@ -382,7 +350,6 @@ export default {
         order_type: this.order_type,
         dealer: this.dealer_id
       };
-      console.log("parasm334444444",Params)
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
@@ -410,7 +377,7 @@ export default {
               warehouse_out_time: 0
             }
           });
-
+          
         }
       });
     },
@@ -439,7 +406,6 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
           var alen = this.adminUserOptions.length;
@@ -470,6 +436,8 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.start_time = "";
       } else {
+        window.sessionStorage.removeItem('start')
+        this.cancelStockDate = []
         this.GetCancelStock();
         this.getGoodDetailPrintList()
        
@@ -481,6 +449,8 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
+        window.sessionStorage.removeItem('end')
+        this.cancelStockDate = []
         this.GetCancelStock();
         this.getGoodDetailPrintList()
       }
@@ -641,6 +611,8 @@ export default {
       }
     },
     PrintAction: function() {
+      window.sessionStorage.setItem('start',this.start_time)
+      window.sessionStorage.setItem('end',this.end_time)
       this.$router.push({
         path: "/stock/print",
         query: {
@@ -648,7 +620,7 @@ export default {
           start_time: this.start_time,
           end_time: this.end_time,
           limit:this.limit,
-          page:this.page
+          page:this.page,
         }
       });
     },
@@ -658,21 +630,18 @@ export default {
         end_time:this.end_time,
         type:3,
       }
-      console.log("params",params)
       getPrintStockGood(params).then(response=>{
           if(response.data.state == 1){
             var stockTotal =  response.data.data.stockTotal
-            console.log("stockTotal",stockTotal)
+          
             this.stockTotal = stockTotal
             var list =  response.data.data.list
-            console.log("导出数据",list)
             this.tableList = []
             for(let i=0;i<list.length;i++){
               if (list[i].query_warehouseout_info.length > 0) {
                 this.tableList.push(list[i])
               }
             }
-           console.log("耗材出库表格数据",this.tableList)
           }
       })
     },
@@ -767,7 +736,6 @@ export default {
       },
 
     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
@@ -781,7 +749,6 @@ export default {
        const filterVal = ['index','good_name', 'specification_name', 'packing_unit','out_count','packing_price','total_price','remark']
 
        const data = this.formatJson(filterVal, this.tableOut)
-       console.log("data",data)
        
         excel.export_json_to_excel({
            header: tHeader,
@@ -813,7 +780,7 @@ export default {
        const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','time','user_name','price','out_count','total_price']
 
        const data = this.formatJson(filterVal, this.tableDataList)
-       console.log("data",data)
+ 
       
         excel.export_json_to_excel({
            header: tHeader,
@@ -849,10 +816,10 @@ export default {
           end_time:this.end_time,
           type:2,
         }
+      this.tableOut = []
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          console.log("出库单详单",list)
           this.tableOut = list
           var stockTotal = response.data.data.stockTotal
           this.stockTotal = stockTotal

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

@@ -228,7 +228,16 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-  
+    
+    var start = window.sessionStorage.getItem('start_cancel_time')
+    if(start!=null){
+     this.start_time = start
+    }
+    if(end!=null){
+      var end =  window.sessionStorage.getItem('end_cancel_time')
+      this.end_time = end
+    }
+    
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.getlist()
@@ -268,6 +277,8 @@ export default {
   },
   methods: {
     PrintAction() {
+        window.sessionStorage.setItem('start_cancel_time',this.start_time)
+        window.sessionStorage.setItem('end_cancel_time',this.end_time)
         this.$router.push("/stock/drugcanceldetaiprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     changeType: function(val) {
@@ -375,7 +386,6 @@ export default {
          if(response.data.state == 1){
            var order =  response.data.data.order
            var list = response.data.data.orderPrint
-           console.log("lsit232332",list)
            for(let i=0;i<list.length;i++){
              list[i].child = []
             for(let j=0;j<order.length;j++){
@@ -385,7 +395,6 @@ export default {
             }
            }
            this.tableDataList = list
-           console.log("hh2323223",this.tableDataList)
            var total_price = 0
           for(let i=0;i<order.length;i++){
              order[i].specification_name  = order[i].dose + order[i].dose_unit + "*" + order[i].min_number +  order[i].min_unit + "/" + order[i].max_unit
@@ -448,9 +457,7 @@ export default {
         const filterVal = ['index','order_number','drug_name', 'unit', 'drug_type','ctime','user_name','total_count','price','total_price']
         
         const data = this.formatJson(filterVal, this.tableDataList)
-        console.log("data",data)
-        console.log("表格玩2323",this.tableDataList)
-        
+
         excel.export_json_to_excel({
             header: tHeader,
             data,
@@ -492,7 +499,6 @@ export default {
        const filterVal = ['index','order_number','drugtype','drug_name', 'unit', 'time','user_name','price','count','total_price']
        
        const data = this.formatJson(filterVal, this.tableList)
-       console.log("data",data)
        
        excel.export_json_to_excel({
            header: tHeader,

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

@@ -149,19 +149,10 @@
 
         <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
-           <!-- {{scope.row.drug_spec}} -->
            {{scope.row.specification_name}}
-           <!-- {{scope.row.dose}}{{scope.row.dose_unit}} * {{scope.row.min_number}}{{scope.row.min_unit}} / {{scope.row.max_unit}} -->
           </template>
         </el-table-column>
 
-        <!-- <el-table-column label="单据类型" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.type == 1">药品入库单</span>
-            <span v-if="scope.row.type == 2">其他</span>
-          </template>
-        </el-table-column> -->
-
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
             <span>{{getTime(scope.row.ctime)}}</span>
@@ -233,6 +224,10 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (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
     this.GetConfigInfo()
     this.fetchAllAdminUsers()
     //获取入库单数据
@@ -305,10 +300,8 @@ export default {
    
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
-          console.log("医生护士",this.adminUserOptions)
         }
       });
     },
@@ -380,7 +373,6 @@ export default {
       getDrugIndetail(params).then(response=>{
         if(response.data.state == 1){
           var drugInOrder = response.data.data.detail
-          console.log("drug3434444",drugInOrder)
           var total_price = 0
           for(let i=0;i<drugInOrder.length;i++){
              drugInOrder[i].specification_name  = drugInOrder[i].dose + drugInOrder[i].dose_unit + "*" + drugInOrder[i].min_number +  drugInOrder[i].min_unit + "/" + drugInOrder[i].max_unit
@@ -394,7 +386,6 @@ export default {
             ctime:"",
             total_price:total_price.toFixed(2),
           });
-          console.log("hh23232323323223232332",drugInOrder)
           this.cancelStockDate = drugInOrder
            let objInfo = {}
           drugInOrder.forEach((item,index)=>{
@@ -418,7 +409,6 @@ export default {
              }
           })
           let list = Object.values(objInfo);
-          console.log("list22333333",list)
          for(let i=0;i<drugInOrder.length;i++){
             list.map(item=>{
               if(drugInOrder[i].drug_id == item.drug_id){
@@ -426,7 +416,6 @@ export default {
               }
             })
           }
-          console.log("list2334444",list)
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].child.length;j++){
               if(list[i].child[j].warehousing_count!=null || list[i].child[j].warehousing_count != "" || list[i].child[j].warehousing_count!=0){
@@ -438,7 +427,6 @@ export default {
           for(let i=0;i<list.length;i++){
             list[i].total_price = list[i].warehousing_count * list[i].price  
           }
-          console.log("list666666666",list)
          
           this.tableList = list
           var total = response.data.data.total
@@ -452,16 +440,18 @@ export default {
         end_time:this.end_time,
         order_type:this.order_type,
       }
-      console.log("params2222",params)
+
      getDrugWarehouseInfoPrint(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("入库单详情",list)
+          
             this.tabelePrintList = list
           }   
       })
     },
     PrintAction(){
+      window.sessionStorage.setItem('start_in_time',this.start_time)
+      window.sessionStorage.setItem('end_in_time',this.end_time)
       this.$router.push("/stock/drugprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     select(){
@@ -487,7 +477,6 @@ export default {
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
        const filterVal = ['index','drug_name', 'unit', 'min_unit','warehousing_count','price','total_price','remark']
-       console.log("表格22222222",this.tabelePrintList)
        let obj = {'index':'合计','total_price':0}
        for(let i=0;i<this.tabelePrintList.length;i++){
          obj.total_price += this.tabelePrintList[i].price * this.tabelePrintList[i].warehousing_count
@@ -498,7 +487,6 @@ export default {
        obj.total_price = obj.total_price.toFixed(2)
        this.tabelePrintList.push(obj)
        const data = this.formatJson(filterVal, this.tabelePrintList)
-       console.log("data",data)
        
         excel.export_json_to_excel({
            header: tHeader,
@@ -516,7 +504,7 @@ export default {
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','操作时间','制单人','进货价','数量','总价']
        const filterVal = ['index','warehousing_order','drugtype','drug_name', 'specification_name','time','user_name','price','warehousing_count','total']
-       console.log(" ba323223323223",this.cancelStockDate.length)
+
        var newArr = []
        newArr = this.cancelStockDate
        let obj = {'index':'合计','total':0}
@@ -543,7 +531,6 @@ export default {
        obj.total = obj.total.toFixed(2)
        newArr.push(obj)
        const data = this.formatJson(filterVal, newArr)
-       console.log("data",data)
        
         excel.export_json_to_excel({
            header: tHeader,
@@ -553,7 +540,8 @@ export default {
           this.downloadLoading = false
         })
 
-     }
+     },
+    
   }
 };
 </script>

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

@@ -232,6 +232,16 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
+    var start = window.sessionStorage.getItem('start_out_time')
+    console.log("start",start)
+    if(start!=null){
+       this.start_time = start   
+    }
+    if(end!=null){
+      var end =  window.sessionStorage.getItem('end_out_time')
+      this.end_time = end
+    }
+    
     this.getDrugOutOrderPrint()
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
@@ -296,6 +306,7 @@ export default {
     },
     search: function() {
       this.getlist()
+      this.getDrugOutOrderPrint()
     },
 
     getXuserName(id) {
@@ -347,6 +358,7 @@ export default {
         this.start_time = "";
       } else {
          this.getlist()
+         this.getDrugOutOrderPrint()
       }
     },
     endTimeChange(val) {
@@ -356,6 +368,7 @@ export default {
         this.end_time = "";
       } else {
         this.getlist()
+        this.getDrugOutOrderPrint()
       }
     },
     getTimestamp(time) {
@@ -387,6 +400,8 @@ export default {
       }
     },
     PrintAction: function() {
+       window.sessionStorage.setItem('start_out_time',this.start_time)
+       window.sessionStorage.setItem('end_out_time',this.end_time)
        this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     getlist(){
@@ -400,6 +415,8 @@ export default {
          limit:this.limit,
       }  
       getDrugOutDetail(params).then(response=>{
+        this.tableData = []
+        this.tableList = []
         if(response.data.state == 1){
           var order = response.data.data.order
           console.log("出库数据",order)

src/xt_pages/stock/drugs/drugCancelDetailPrint.vue

@@ -22,7 +22,8 @@
               <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height:50px" width="80">单价</td>
-              <td style="line-height: 50px" width="">备 注</td>
+              <td style="line-height:50px" width="80">总价</td>
+              <td style="line-height: 50px" width="80">备 注</td>
             </tr>
 
             <tr v-for="(item,index) in cancelStockDate" :key="item.id">
@@ -46,7 +47,9 @@
               <td style="line-height:50px">
                   {{item.price}}
               </td>
-             
+              <td style="line-height:50px">
+                  {{(item.price * item.count).toFixed(2)}}
+              </td>
               <td style="line-height: 50px">
                  {{item.remark}}
               </td>
@@ -56,9 +59,14 @@
           <table class="print-table" border="1" >
             <tbody>
             <tr>
-              <td width="633" style="line-height: 50px">合计</td>
-              <td width="80" style="line-height: 50px">{{getTotal().toFixed(2)}}</td>
-              <td></td>
+              <td style="line-height: 50px" width="50">合计</td>
+              <td style="line-height: 50px" width="250"></td>
+              <td style="line-height: 50px" width="250"></td>
+              <td style="line-height: 50px" width="50"></td>
+              <td style="line-height: 50px" width="80"></td>
+              <td style="line-height: 50px" width="80"></td>
+              <td style="line-height:50px" width="80">{{getTotal().toFixed(2)}}</td>
+              <td style="line-height: 50px" width="80"></td>
             </tr>
 
             </tbody>

src/xt_pages/stock/drugs/drugIndex.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="app-container">
       <div class="service-box">
-        <el-tabs v-model="activeName">
+        <el-tabs v-model="activeName" @tab-click="handleClick"> 
           <el-tab-pane label="入库明细" name="first">
             <drug-in-order></drug-in-order>
           </el-tab-pane>
@@ -48,5 +48,16 @@ export default {
 
       }
     },
+    methods: {
+      handleClick(tab, event) {
+        window.sessionStorage.setItem('drug_active',this.activeName)
+      }
+    },
+    created(){
+      var active_name =  window.sessionStorage.getItem('drug_active')
+      if(active_name!=null){
+        this.activeName = active_name
+      }
+    }
 }
 </script>

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -23,7 +23,7 @@
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height:50px" width="80">单价</td>
               <td style="line-height:50px" width="80">总价</td>
-              <td style="line-height: 50px" width="">备 注</td>
+              <td style="line-height: 50px" width="80">备 注</td>
             </tr>
 
             <tr v-for="(item,index) in cancelStockDate" :key="item.id">
@@ -51,7 +51,7 @@
               <td style="line-height:50px">
                   <!-- {{(item.count * getPrice(item.drug_id)).toFixed(2)}} -->
                   <!-- {{item.count*item.price}} -->
-                <span ></span>   {{getTotalPrice(item.child,item.max_unit,item.min_number,item.min_price)}}
+                <span>{{getTotalPrice(item.child,item.max_unit,item.min_number,item.min_price)}}</span>
               </td>
               <td style="line-height: 50px">
                  {{item.remark}}
@@ -208,15 +208,15 @@
             })
           }
           
-          console.log("list22333333",list)
-            for(let i=0;i<list.length;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("list666666666",list)
+          console.log("药品出库明细",list)
           this.cancelStockDate = list
         
         }
@@ -310,18 +310,23 @@
         })
       },
       getCount(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].count = arr[i].count * min_number
+            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+= arr[i].count
+          total+= parseInt(arr[i].total_count)
         }
-
+       console.log("total233223232323",total,min_number)
        if(total<min_number){
            str = ""
            min_str = total + min_unit
@@ -337,26 +342,26 @@
         return str + min_str
       },
       getTotalPrice(arr,max_unit,min_number,min_price){
+        
         var total = 0
         for(let i=0;i<arr.length;i++){
+          arr[i].all_count = 0
           if(arr[i].count_unit == max_unit){
-            arr[i].count = arr[i].count * min_number
+            arr[i].all_count = parseInt(arr[i].count) * min_number
           }else{
-            arr[i].count = arr[i].count
+            arr[i].all_count = parseInt(arr[i].count)
           }
         }  
         for(let j=0;j<arr.length;j++){
-          total +=arr[j].count
+          total += parseInt(arr[j].all_count)
         }
-       
+        console.log("totla",total)
         return (total*min_price).toFixed(2)
       }
     },
     created() {
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
-      // this.getlist()
-      // this.getBaseDrugLibList()
       this.getDrugOutOrderPrint()
     }
 

src/xt_pages/stock/drugs/drugPrint.vue

@@ -23,7 +23,7 @@
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height:50px" width="80">单价</td>
               <td style="line-height:50px" width="80">总价</td>
-              <td style="line-height: 50px" width="">备 注</td>
+              <td style="line-height: 50px" width="80">备 注</td>
             </tr>
 
             <tr v-for="(item,index) in cancelStockDate" :key="item.id">
@@ -59,9 +59,14 @@
           <table class="print-table" border="1">
             <tbody>
             <tr>
-              <td width="633" style="line-height: 50px">合计</td>
-              <td width="80" style="line-height: 50px">{{getTotal().toFixed(2)}}</td>
-              <td></td>
+              <td style="line-height: 50px" width="50">合计</td>
+              <td style="line-height: 50px" width="250"></td>
+              <td style="line-height: 50px" width="250"></td>
+              <td style="line-height: 50px" width="50"></td>
+              <td style="line-height: 50px" width="80"></td>
+              <td style="line-height: 50px" width="80"></td>
+              <td style="line-height: 50px" width="80">{{getTotal().toFixed(2)}}</td>
+              <td style="line-height: 50px" width="80"></td>
             </tr>
 
             </tbody>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -665,7 +665,7 @@ export default {
       this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys})
     },
     handleSearch(val){
-       console.log("val23233232",val)
+      //  console.log("val23233232",val)
        this.getInitializtion()
        this.getSinleOrderDetail(val.id,val.warehouse_out_time,val.is_sys)
        this.list = []
@@ -948,7 +948,7 @@ export default {
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
-          console.log("list",list)
+          // console.log("list",list)
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
@@ -997,12 +997,12 @@ export default {
        drug_id:val.drug_id,
        record_time:val.sys_record_time,
      }
-     console.log("使用明细",params)
+    //  console.log("使用明细",params)
      getAutoDrugDetail(params).then(response=>{
        if(response.data.state == 1){
         
         this.userList = response.data.data.list
-        console.log("自动出库数据",this.userList)
+        // console.log("自动出库数据",this.userList)
         if(val.is_sys == 1){
         
           this.drugDialogVisible = true
@@ -1012,10 +1012,10 @@ export default {
           this.drugDialogVisibleTwo = true
         }
          var userListOne = response.data.data.outList
-         console.log("手动出库2232332",userListOne)
+        //  console.log("手动出库2232332",userListOne)
          this.userListOne = userListOne
          var  batchNumber = response.data.data.batchNumber
-         console.log("出库详情",batchNumber)
+        //  console.log("出库详情",batchNumber)
          this.batchNumberList = batchNumber
        }
      })
@@ -1185,6 +1185,12 @@ export default {
           return
         }
         for(let i=0;i<this.exportList.length;i++){
+          if(this.exportList[i].dealer == 0){
+            this.exportList[i].dealer = ""
+          }
+          if(this.exportList[i].manufacturer == 0){
+             this.exportList[i].manufacturer = ""
+          }
           this.exportList[i].unit = this.exportList[i].dose + this.exportList[i].dose_unit + "*" + this.exportList[i].min_number + this.exportList[i].min_unit + "/"+this.exportList[i].max_unit
 
           this.exportList[i].total_price = (this.exportList[i].count * this.exportList[i].price).toFixed(2)
@@ -1215,7 +1221,7 @@ export default {
         const tHeader = ['药品名称','药品类型','规格&单位', '批号','出库数量','出货单价','拆零零售价','总价','生产厂家','生产日期','有效日期','经销商','批准文号','备注']
         const filterVal = ['drug_name','drug_type','unit','batch_number', 'count','price','min_price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
 
-        console.log("table",this.exportList)
+        // console.log("table",this.exportList)
          
         const data = this.formatJson(filterVal, this.exportList)
         excel.export_json_to_excel({
@@ -1238,7 +1244,7 @@ export default {
           }
         }
         all_price = total * price
-        console.log("total",total,min_price)
+        // console.log("total",total,min_price)
         return  all_price
       },
   }

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -22,10 +22,10 @@
               <td style="line-height: 50px" width="80">出货数量</td>
               <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height:50px" width="80">出库价格</td>
-              <td style="line-height: 50px" width="">总价</td>
-              <td style="line-height: 50px" width="">批号</td>
-              <td style="line-height: 50px" width="">生产日期</td>
-              <td style="line-height: 50px" width="">有效日期</td>
+              <td style="line-height: 50px" width="80">总价</td>
+              <td style="line-height: 50px" width="80">批号</td>
+              <td style="line-height: 50px" width="80">生产日期</td>
+              <td style="line-height: 50px" width="80">有效日期</td>
             </tr>
 
             <tr v-for="(item,i) in it.child" :key="i">

src/xt_pages/stock/stockDamaged.vue

@@ -472,7 +472,7 @@
 <script>
 import BreadCrumb from "../components/bread-crumb";
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,SaveCheckedDamage,getStockDamageDetail,modifyPrice,deleteStockDamage,getStockBatchNumber,getGoodWarehouseList} from "@/api/stock"
+import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,SaveCheckedDamage,getStockDamageDetail,modifyPrice,deleteStockDamage,getStockBatchNumber,getGoodWarehouseList,getWarehouseTotal} from "@/api/stock"
 export default {
     name: "stockModifyPrice",
     components:{
@@ -598,7 +598,6 @@ export default {
         handleSelect(val){
           //获取当前耗材的批号
           this.getStockBatchNumber(val.good_id)
-          this.getGoodWarehouseList(val.good_id)
           this.form.id = val.id
           this.form.good_id = val.good_id,
           this.form.good_name = val.good_name
@@ -615,7 +614,6 @@ export default {
           this.form.remark = val.remark
           this.form.buy_price = val.buy_price
           this.form.warehousing_unit = val.packing_unit  
-          this.form.total = val.total
           this.form.new_price = val.new_price
           this.form.expiry_date = val.expiry_date
           this.form.product_date = val.product_date
@@ -977,12 +975,26 @@ export default {
      },
      chageNumberlist(val){
        console.log("val2323322",val)
+       
        for(let i=0;i<this.numberList.length;i++){
          if(this.numberList[i].number == val){
             this.form.warehousing_info_id = this.numberList[i].id
          }
        }
-     }
+       this.getWarehouseTotal(this.form.warehousing_info_id)
+     },
+      getWarehouseTotal(id){
+          var params = {
+            id:id,
+          }
+        getWarehouseTotal(params).then(response=>{
+          if(response.data.state == 1){
+            var list =  response.data.data.list
+            console.log("档期批次库促",list)
+            this.form.total = list.stock_count
+          }
+        })
+      }
     },
     created(){
         // var nowDate = new Date();

src/xt_pages/stock/stockDetailIndex.vue

@@ -5,19 +5,19 @@
     </div>
     <div class="app-container">
       <div class="service-box">
-        <el-tabs v-model="activeName">
-          <el-tab-pane label="入库明细" name="first">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="入库明细" name="1">
             <stock-in-detail></stock-in-detail>
           </el-tab-pane>
           <!-- <el-tab-pane label="退货明细">
             <sales-return-detail></sales-return-detail>
 
           </el-tab-pane> -->
-          <el-tab-pane label="出库明细">
+          <el-tab-pane label="出库明细" name="2">
             <stock-out-detail></stock-out-detail>
 
           </el-tab-pane>
-          <el-tab-pane label="退库明细">
+          <el-tab-pane label="退库明细" name="3">
            <cancel-stock-detail></cancel-stock-detail>
           </el-tab-pane>
 
@@ -50,14 +50,22 @@
           { path: false, name: '库存管理' },
           { path: '/stock/detail', name: '出入库明细查询' }
         ],
-        activeName: 'first'
+        activeName: '1'
 
       }
     },
     methods: {
       handleClick(tab, event) {
-        console.log(tab, event, this.activeName)
+        window.sessionStorage.setItem('active_Name',this.activeName)
       }
+    },
+    created(){
+      
+      var active_name =  window.sessionStorage.getItem('active_Name')
+      if(active_name!=null){
+        this.activeName = active_name
+      }
+     
     }
   }
 </script>

src/xt_pages/stock/stockInOrder.vue

@@ -1502,8 +1502,6 @@ export default {
         return
       }
       import('@/vendor/Export2Excel').then(excel => {
-        console.log(this.goodType)
-        console.log(this.exportList)
       for(let i=0;i<this.exportList.length;i++){
         for(let j=0;j<this.goodType.length;j++){
            if(this.exportList[i].good_type_id == this.goodType[j].id){
@@ -1516,6 +1514,9 @@ export default {
         if(this.exportList[i].manufacturer == 0){
            this.exportList[i].manufacturer = ""
         }
+        if(this.exportList[i].good_type_id == 0){
+          this.exportList[i].good_type_id = ""
+        }
       }
     
       const tHeader = ['耗材名称','耗材类型', '规格&单位','批号','入库数量','进货价','总价','生产厂家','生产日期','有效期','经销商','批准文号','备注']

src/xt_pages/stock/stockOutOrder.vue

@@ -1634,6 +1634,9 @@ export default {
           if(this.exportList[i].manufacturer == 0){
             this.exportList[i].manufacturer = ""
           }
+          if(this.exportList[i].good_type_id == 0){
+             this.exportList[i].good_type_id = ""
+          }
         }
         console.log("hhhh323223",this.goodType)