8月15日

src/api/drug/drug.js

@@ -611,3 +611,19 @@ export function getPurchaseNewDrugQuery(params) {
     params: params
   })
 }
+
+export function getGoodOverCount(params) {
+  return request({
+    url: '/api/stock/getgoodovercount',
+    method: 'get',
+    params: params
+
+  })
+}
+export function getDrugOverCount(params) {
+  return request({
+    url: '/api/stock/getdrugovercount',
+    method: 'Get',
+    params: params
+  })
+}

src/api/drug/drug_stock.js

@@ -644,3 +644,4 @@ export function getDrugInitDataList(params) {
     params: params
   })
 }
+

src/router/modules/stock.js

@@ -453,6 +453,14 @@ export default {
       is_menu: false,
       meta: { title: 'purchaseDrugQueryPrint', noCache: true }
     },
+    {
+      path: '/drugs/purchase/new/query/print',
+      component: () => import('@/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint'),
+      name: 'purchaseDrugNewQueryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'purchaseDrugNewQueryPrint', noCache: true }
+    },
     {
       path: '/drugs/expiry/date/query/print',
       component: () => import('@/xt_pages/stock/drugs/components/expiryDateDrugQueryPrint'),

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

@@ -17,6 +17,7 @@
                       format="yyyy-MM-dd"
                       value-format="yyyy-MM-dd"
                       @change="startTimeChange"
+                      :clearable="false"
                     ></el-date-picker> 
                       <span>-</span> 
                       <el-date-picker

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

@@ -18,6 +18,8 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="startTimeChange"
+             :picker-options="pickerOptions"
+             :clearable="false"
            ></el-date-picker>
             <span>-</span>
             <el-date-picker
@@ -32,6 +34,8 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
+              :picker-options="pickerOptions"
+              :clearable="false"
           ></el-date-picker>
           <span style="font-size:14px;color:#606266">药品类型:</span>
           <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
@@ -175,8 +179,8 @@ export default {
      total:0,
      keyword:"",
      drugTypeList:[],
-     start_time:moment().startOf('month').format("YYYY-MM-DD"),
-     end_time:moment().endOf('month').format("YYYY-MM-DD"),
+     start_time:"",
+     end_time:"",
      countList:[],
      outCountList:[],
      autoCountList:[],
@@ -191,6 +195,11 @@ export default {
      good_name:"",
      specification_name:"",
      loading:false,
+     pickerOptions:{ //禁用当前日期之前的日期
+           disabledDate(v) {
+            return v.getTime() < 1667232000000
+          },
+      },
     }
 
   },
@@ -995,6 +1004,8 @@ export default {
    }
   },
    open(){
+    this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    this.end_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
     this.houseList= []
     this.drugTypeList = []
     this.getStorehouseList()

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

@@ -17,7 +17,9 @@
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
             @change="startTimeChange"
+            :clearable="false"
            ></el-date-picker>
             <span>-</span>
             <el-date-picker
@@ -31,7 +33,9 @@
               align="right"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
+              :picker-options="pickerOptions"
               @change="endTimeChange"
+              :clearable="false"
           ></el-date-picker>
           <span style="font-size:14px;color:#606266">药品类型:</span>
           <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
@@ -48,6 +52,7 @@
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
          <div>
+          <el-button  type="primary" @click="toOverCount">调试</el-button>
            <el-button  type="primary" @click="toPrint">打印</el-button>
            <el-button  type="primary" @click="exportList">导出</el-button>
          </div>
@@ -152,7 +157,7 @@
   </div>
 </template>
 <script>
-import { getStorehouseList,getPurchaseNewDrugQuery } from "@/api/drug/drug"
+import { getStorehouseList,getPurchaseNewDrugQuery,getDrugOverCount } from "@/api/drug/drug"
 const moment = require('moment')
 import { uParseTime } from '@/utils/tools'
 export default {
@@ -175,8 +180,8 @@ export default {
      total:0,
      keyword:"",
      drugTypeList:[],
-     start_time:moment().startOf('month').format("YYYY-MM-DD"),
-     end_time:moment().endOf('month').format("YYYY-MM-DD"),
+     start_time:"",
+     end_time:"",
      countList:[],
      outCountList:[],
      autoCountList:[],
@@ -191,6 +196,11 @@ export default {
      good_name:"",
      specification_name:"",
      loading:false,
+     pickerOptions:{ //禁用当前日期之前的日期
+           disabledDate(v) {
+            return v.getTime() < 1667232000000
+          },
+      },
     }
 
   },
@@ -375,21 +385,31 @@ export default {
             console.log("list23323223322332232323322323wode",list)
             for(let i=0;i<list.length;i++){
               list[i].last_price_in = 0
-              list[i].drugIn = this.getDrugWarehouseInfoOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-              list[i].drugInMoney = this.getDrugInMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-              list[i].drugSaleMoney = this.getSaleMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
+              list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
+            //   list[i].drugIn = this.getDrugWarehouseInfoOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
+            //   list[i].drugInMoney = this.getDrugInMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
+            //   list[i].drugSaleMoney = this.getSaleMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
+              list[i].drugInMoney = "/"
+              list[i].drugSaleMoney = "/"
 
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-              list[i].drugAddPrice = this.getdrugAddPrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
-              list[i].drugAddSalePrice = this.drugAddSalePrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+            //   list[i].drugAddPrice = this.getdrugAddPrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+            //   list[i].drugAddSalePrice = this.drugAddSalePrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
+              list[i].drugAddPrice = "/"
+              list[i].drugAddSalePrice = "/"
 
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-              list[i].drugOutPrice = this.getDrugOutPrice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-              list[i].drugOutSalePrice = this.getDrugOutSaleprice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
-
-              list[i].overDrug = this.getDrugWarehouseInfo(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-              list[i].overDrugPrice =  this.getDrugInMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-              list[i].oveDrugSaleMoney =  this.getSaleMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
+            //   list[i].drugOutPrice = this.getDrugOutPrice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
+            //   list[i].drugOutSalePrice = this.getDrugOutSaleprice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
+              list[i].drugOutPrice = "/"
+              list[i].drugOutSalePrice = "/"
+
+            //   list[i].overDrug = this.getDrugWarehouseInfo(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
+            //   list[i].overDrugPrice =  this.getDrugInMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
+            //   list[i].oveDrugSaleMoney =  this.getSaleMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
+             list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
+             list[i].overDrugPrice = "/"
+             list[i].oveDrugSaleMoney = "/"
             }
             this.tableList = list;
             this.total = response.data.data.total
@@ -995,6 +1015,9 @@ export default {
    }
   },
    open(){
+   
+    this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    this.end_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
     this.houseList= []
     this.drugTypeList = []
     this.getStorehouseList()
@@ -1199,7 +1222,7 @@ export default {
 
    },
    toPrint(){
-    this.$router.push({path:"/drugs/purchase/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&good_type="+this.good_type})
+    this.$router.push({path:"/drugs/purchase/new/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&good_type="+this.good_type})
    },
     exportList: function() {
        for(let i=0;i<this.tableList.length;i++){
@@ -1233,6 +1256,63 @@ export default {
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]));
     },
+    GetDrugStartFlow(total,min_number,min_unit,max_unit){
+      var min_str = ""
+      var max_str = ""
+      if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+        }
+      }
+        if(max_str == "" && min_str == ""){
+            return "0"
+        }else{
+            return max_str + min_str;
+        }
+    },
+    GetDrugEndFlow(total,min_number,min_unit,max_unit){
+
+     var min_str = ""
+     var max_str = ""    
+     if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+        }
+      }
+     if(max_str == "" && min_str == ""){
+            return "0"
+        }else{
+            return max_str + min_str;
+       }
+    },
+    toOverCount(){
+      getDrugOverCount().then(response=>{
+        if(response.data.state == 1){
+          var msg = response.data.data.msg
+          this.$message.success("调试成功")
+        }
+      })  
+    }
   }
 }
 </script>

src/xt_pages/stock/query/patientQuery.vue

@@ -19,6 +19,7 @@
                       format="yyyy-MM-dd"
                       value-format="yyyy-MM-dd"
                       @change="startTimeChange"
+                      :clearable="false"
                     ></el-date-picker> 
                       <span>-</span> 
                       <el-date-picker
@@ -32,6 +33,7 @@
                         format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"
                         @change="endTimeChange"
+                        :clearable="false"
                     ></el-date-picker>
                 </el-row>
                 <el-row></el-row>

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -19,6 +19,8 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="startTimeChange"
+            :picker-options="pickerOptions"
+            :clearable="false"
            ></el-date-picker> 
             <span>-</span> 
             <el-date-picker
@@ -33,6 +35,8 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
+              :picker-options="pickerOptions"
+              :clearable="false"
           ></el-date-picker>  
           <span style="font-size:14px;color:#606266">耗材类型:</span>
           <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
@@ -49,6 +53,7 @@
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
          <div>
+          <el-button type="primary" size="small" @click="toOverCount">调试</el-button>
            <el-button type="primary" size="small" @click="toPrint">打印</el-button>
            <el-button type="primary" size="small" @click="exportList">导出</el-button>
          </div>
@@ -153,7 +158,7 @@
   </div>
 </template>
 <script>
-import { getStorehouseList,getNewPurchaseStockQuery } from "@/api/drug/drug"
+import { getStorehouseList,getNewPurchaseStockQuery,getGoodOverCount } from "@/api/drug/drug"
 import {
   getStockDrugCount
 } from "@/api/stock";
@@ -179,8 +184,8 @@ export default {
      total:0,
      keyword:"",
      goodTypeList:[],
-     start_time:moment().startOf('month').format("YYYY-MM-DD"),
-     end_time:moment().endOf('month').format("YYYY-MM-DD"),
+     start_time:"",
+     end_time:"",
      countList:[],
      outCountList:[],
      autoCountList:[],
@@ -197,9 +202,7 @@ export default {
      loading:false,
      pickerOptions:{ //禁用当前日期之前的日期
            disabledDate(v) {
-            //Date.now()是javascript中的内置函数，它返回自1970年1月1日00:00:00 UTC以来经过的毫秒数。
-            console.log("vvvvvvvvvv",v.getTime(), new Date().getTime() - 86400000)
-            return v.getTime() < new Date().getTime() - 86400000;
+            return v.getTime() < 1667232000000
           },
       },
     }
@@ -679,6 +682,8 @@ export default {
     }
    },
    open(){
+    this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    this.end_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
     this.houseList = []
     this.goodTypeList= []
     this.getStorehouseList()
@@ -1009,7 +1014,14 @@ export default {
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
-     
+     toOverCount(){
+       getGoodOverCount().then(response=>{
+         if(response.data.state == 1){
+           var msg = response.data.data.msg
+           this.$message.success("调试成功")
+         }
+       })
+     }
   },
 
 }

src/xt_pages/stock/query/purchaseStockQuery.vue

@@ -19,6 +19,8 @@
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="startTimeChange"
+            :picker-options="pickerOptions"
+            :clearable="false"
            ></el-date-picker> 
             <span>-</span> 
             <el-date-picker
@@ -33,6 +35,8 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
+              :picker-options="pickerOptions"
+              :clearable="false"
           ></el-date-picker>  
           <span style="font-size:14px;color:#606266">耗材类型:</span>
           <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
@@ -179,8 +183,8 @@ export default {
      total:0,
      keyword:"",
      goodTypeList:[],
-     start_time:moment().startOf('month').format("YYYY-MM-DD"),
-     end_time:moment().endOf('month').format("YYYY-MM-DD"),
+     start_time:"",
+     end_time:"",
      countList:[],
      outCountList:[],
      autoCountList:[],
@@ -197,9 +201,7 @@ export default {
      loading:false,
      pickerOptions:{ //禁用当前日期之前的日期
            disabledDate(v) {
-            //Date.now()是javascript中的内置函数，它返回自1970年1月1日00:00:00 UTC以来经过的毫秒数。
-            console.log("vvvvvvvvvv",v.getTime(), new Date().getTime() - 86400000)
-            return v.getTime() < new Date().getTime() - 86400000;
+            return v.getTime() < 1667232000000
           },
       },
     }
@@ -670,6 +672,8 @@ export default {
     }
    },
    open(){
+    this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    this.end_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
     this.houseList = []
     this.goodTypeList= []
     this.getStorehouseList()