Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/drug/drug.js

@@ -731,7 +731,7 @@ export function getSelfDrugWarehouseInfoById(id,params){
 export function ModifySelfDrugWarehouse(data,patient_id,warehousing_time,warehousing_id){
  
   return request({
-    url:"/api/drug/modifyselfdrugwarehouse?patient_id="+patient_id+"warehousing_time="+warehousing_time+"&warehousing_id="+warehousing_id,
+    url:"/api/drug/modifyselfdrugwarehouse?patient_id="+patient_id+"&warehousing_time="+warehousing_time+"&warehousing_id="+warehousing_id,
     method:"post",
     data:data,
   })
@@ -827,4 +827,57 @@ export function getSelfDrugQuery(params){
     method:"get",
     params:params
   })
+}
+
+export function checkSelfOutDrugQuery(params){
+  
+  return request({
+    url:"/api/drug/checkselfdrugoutquery",
+    method:"Get",
+    params:params
+  })
+}
+
+export function returnCheckSelfOutDrugQuery(params){
+  
+   return request({
+    url:"/api/drug/returncheckselfoutdrugquery",
+    method:"get",
+    params:params,
+   })
+}
+
+export function returnSelfCheckWarehouse(params){
+ 
+  return request({
+    url:"/api/drug/returnselfcheckwarehouse",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getSelfDrugFlow(params){
+  return request({
+    url:"/api/drug/getselfdrugflow",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getSelfDrugBatchNumberList(params){
+ 
+  return request({
+    url:"/api/drug/getselfdrugbatchnumberlist",
+    method:"Get",
+    params:params
+  })
+}
+
+export function getAllSelfDrugWarehouse(params){
+  
+  return request({
+    url:"/api/drug/getallselfdrugwarehouse",
+    method:"get",
+    params:params,
+  })
 }

src/router/modules/selfPreparedMedicine.js

@@ -74,6 +74,24 @@ export default {
       hidden: true,
       is_menu: false,
     },
+
+    {
+      path: '/stock/selfwarehouse/selfdrugflow',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/selfDrugFlow'),
+      name: 'selfdrugflow',
+      meta: { title: '自备药流水', noCache: true },
+      hidden: true,
+      is_menu: false,
+    },
+
+    {
+      path: '/stock/selfwarehouse/selfdrugbatchnumber',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/selfDrugBatchNumber'),
+      name: 'selfdrugflow',
+      meta: { title: '自备药批次', noCache: true },
+      hidden: true,
+      is_menu: false,
+    },
     
     {
       path: '/stock/selfPreparedMedicineIndex',

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -400,7 +400,7 @@
                         血管通路：
                         <div
                           class="under_line"
-                          style="width: 200px; text-align: center"
+                          style="width: 280px; text-align: center"
                         >
                           {{
                             record.assessment_before_dislysis &&
@@ -408,15 +408,10 @@
                               .blood_access_part_id
                               ? record.assessment_before_dislysis
                                   .blood_access_part_id
-                              : 0
+                              :  ""
                           }}
                           {{
-                            record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis
-                              .blood_access_part_opera_name
-                              ? record.assessment_before_dislysis
-                                  .blood_access_part_opera_name
-                              : ""
+                            bloodAccessParOperaName(record.assessment_before_dislysis.blood_access_part_opera_id)
                           }}
                         </div>
                       </div>
@@ -3014,7 +3009,7 @@
                         实际超滤量：
                         <div
                           class="under_line"
-                          style="width: 100px; text-align: center"
+                          style="width: 80px; text-align: center"
                         >
                           {{
                             record.assessment_after_dislysis &&
@@ -3798,10 +3793,12 @@ export default {
     };
   },
   created() {
+   
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
     );
+    this.bloodAccessParOpera = bloodAccessParOpera
     this.way_arr = getDataConfig("hemodialysis", "way");
     this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");
     this.appetite_arr = getDataConfig("hemodialysis", "appetite");
@@ -4427,6 +4424,12 @@ export default {
       }
       return displace_liqui_part_name;
     },
+    bloodAccessParOperaName(id) {
+      if (id in this.bloodAccessParOpera) {
+        return this.bloodAccessParOpera[id].name;
+      }
+      return "";
+    },
   },
 };
 </script>

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

@@ -13,8 +13,9 @@
            
             <span style="position: absolute;left: 20%;top: 3%">
               透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
-            
             </span>
+
+          
            
             <span style="position: absolute;left: 30%;top: 3%">
               干体重：{{predialysis&&predialysis.dry_weight?predialysis.dry_weight:""}}kg
@@ -23,22 +24,28 @@
               衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:""}}kg
             </span> -->
             <span style="position: absolute;left:38%;top: 3%">
-              上次透后体重：{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg
+              上次透后体重：
+               <span v-if="this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10702">{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg</span> 
+               <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span> 
             </span>
 
-            <span style="position: absolute;left:50%;top: 3%">
+            <span style="position: absolute;left:51%;top: 3%">
               4小时超滤量上限（5%）：
               <span v-if="predialysis!=null && ((predialysis.dry_weight)*0.05) >0 "></span> {{(predialysis.dry_weight*0.05).toFixed(2)}}
               kg
             </span>
-            <span style="position: absolute;left: 70%;top: 3%">
+            <span style="position: absolute;left: 70%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
               透前血压:  {{predialysis&&predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:""  }} / {{ predialysis&&predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:"" }} mmHg
             </span>
 
-            <!-- <span style="position: absolute;left: 20%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702">
-              透前体重：{{predialysis&&(predialysis.weight_before - predialysis.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
+            <span style="position: absolute;left: 70%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id==0||this.$store.getters.xt_user.template_info.org_id==10702">
+             衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:"" }} kg
+            </span>
+
+            <span style="position: absolute;left: 80%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id ==10702">
+              体重增长：{{predialysis&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
             
-            </span> -->
+            </span>
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
                     ref="dialysisPrescription"

src/xt_pages/outpatientCharges/summary.vue

@@ -145,7 +145,7 @@
           <!--          </el-button-->
           <!--          >-->
 
-          <el-button size="small" type="primary" @click="export_detail_three" v-if="$store.getters.xt_user.org_id == 10265">报表下载12</el-button>
+          <el-button size="small" type="primary" @click="export_detail_three" v-if="$store.getters.xt_user.org_id == 10265 || $store.getters.xt_user.org_id == 0">报表下载12</el-button>
           <el-button size="small" type="primary" @click="accounts_click()">门诊结账</el-button>
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
@@ -626,7 +626,7 @@
                   <td>{{item.number}}</td>
                   <td>{{item.certno}}</td>
                   <td>{{item.psn_name}}</td>
-                  <td>{{item.age}}</td>
+                  <td>{{item.patient.age}}</td>
                   <td v-if="item.gend == 1">男</td>
                   <td v-if="item.gend != 1">女</td>
                   <td>{{item.medfee_sumamt}}</td>
@@ -1658,7 +1658,7 @@ export default {
       let params = {
         start_time: this.start_time,
         end_time: this.end_time,
-        org_id: this.$store.getters.xt_user.org_id,
+        org_id: 10265,
       }
       getHisDataThree(params).then((response) => {
         if (response.data.state == 0) {

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -73,11 +73,10 @@
           {{ scope.row.index }}
         </template>
       </el-table-column>
-<!--      <el-table-column align="center" label="处方日期">-->
-<!--        <template slot-scope="scope">{{-->
-<!--          getTime(scope.row.record_date)-->
-<!--        }}</template>-->
-<!--      </el-table-column>-->
+     <el-table-column align="center" label="处方日期">
+        <template slot-scope="scope">
+          {{getTime(scope.row.record_date)}}</template>
+      </el-table-column>
       <el-table-column align="center" label="费用编码">
         <template slot-scope="scope">
           {{ scope.row.number }}

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -73,13 +73,13 @@
           {{ scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column align="center" label="处方日期">
+      <!-- <el-table-column align="center" label="处方日期">
         <template slot-scope="scope">
           <span v-if="scope.row.record_date > 0"
             >{{ getTimes(scope.row.record_date) }}
           </span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column align="center" label="费用分类">
         <template slot-scope="scope">
           <span v-if="scope.row.type == 1">

src/xt_pages/stock/selfPreparedMedicine/addWarehouseInfo.vue

@@ -760,7 +760,7 @@
             const params = {
               stockIn: this.recordInfo.recordData,
             };
-            console.log("params=---------------",params)
+          
             postSelfDrugWarehouse(
               params,
               this.patient_id,
@@ -969,29 +969,7 @@
            }
         })
       },
-      toReturnCheck(){
-         const loading = this.$loading({
-          lock: true,
-          text: "Loading",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.7)",
-        });
-          var params = {
-            warehousing_id:this.warehousing_id,
-          }
-        toReturnCheckWarehousing(params).then(response=>{
-           if(response.data.state == 1){
-            var list = response.data.data.list
-             this.$message.success("反审核成功!")
-             this.showCheck = true
-             this.showReturnCheck = false
-             loading.close()
-           }else{
-            this.$message.error("反审核失败!")
-            loading.close()
-           }
-        })
-      },
+    
       changeUnit(val,index){
     
       },

src/xt_pages/stock/selfPreparedMedicine/addWarehouseOut.vue

@@ -351,7 +351,7 @@
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
   import { getAllDrugList, postSearchDrugList } from "@/api/data";
-    import { getallPatientList,postSearchSelfDrugList,postSelfDrugWarehouseOut,getSelfDrugBatchNumber} from "@/api/drug/drug"
+  import { getallPatientList,postSearchSelfDrugList,postSelfDrugWarehouseOut,getSelfDrugBatchNumber,checkSelfOutDrugQuery} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },
     name: "stockIn",
@@ -1162,7 +1162,35 @@
         }
         return total;
       },
-    
+      toCheck(){
+         var params = {
+            warehouse_out_id:this.warehouse_out_id,
+            patient_id:this.patient_id,
+         }
+        checkSelfOutDrugQuery(params).then(response=>{
+          if(response.data.state ==1){
+            var warehousingOutInfoList = response.data.data.warehousingOutInfoList
+              var msg =response.data.data.msg
+              if(msg == 1){
+                this.$message.success("审核成功!")
+                this.showCheck = false
+                this.showReturnCheck = true
+                this.$router.back(-1)
+              }
+              if(msg == 2){
+                var drug_name = response.data.data.drug_name
+                var dose = response.data.data.dose
+                var dose_unit = response.data.data.dose_unit
+                var min_number = response.data.data.min_number
+                var min_unit = response.data.data.min_unit
+                var max_unit = response.data.data.max_unit
+                var str = drug_name +" " +dose +dose_unit +"*" + min_number + min_unit +"/" + max_unit;
+                this.$message.error(str+"库存不足，审核失败!")
+              }
+              loading.close()
+          }
+        })
+      }
     
     },
     created() {

src/xt_pages/stock/selfPreparedMedicine/editWarehouseInfo.vue

@@ -23,6 +23,14 @@
             class="filter-item"
             >审核</el-button
           >
+
+          <el-button
+            size="small"
+            type="primary"
+           v-if="is_check == 1 && parseInt(this.$route.query.is_sys) == 0"
+            @click="toReturnCheck()"
+            class="filter-item"
+            >反审核</el-button>
         </div>
       </div>
       <div class="app-container" v-loading="loading">
@@ -340,13 +348,11 @@
   import { uParseTime } from "@/utils/tools";
   import {
     GetAllDrugInfoByID,
-    toCheckWarehousingInfo,
-    toReturnCheckWarehousing,
   } from "@/api/drug/drug_stock";
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
   import { getAllDrugList } from "@/api/data";
-  import { getallPatientList,postSearchSelfDrugList,ModifySelfDrugWarehouse,getSelfDrugWarehouseInfoById,deleteSelfWarehouseInfo} from "@/api/drug/drug"
+  import { getallPatientList,postSearchSelfDrugList,ModifySelfDrugWarehouse,getSelfDrugWarehouseInfoById,deleteSelfWarehouseInfo,toCheckSelfWarehousingInfo,returnSelfCheckWarehouse} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },
     name: "stockIn",
@@ -468,6 +474,8 @@
         showReturnCheck:false,
         patientList:[],
         id:0,
+        is_check:0,
+        is_sys:0,
       };
     },
     methods: {
@@ -739,6 +747,9 @@
               stockIn: this.recordInfo.recordData,
             };
             console.log("params=---------------",params)
+            console.log("patinet_id-----------",this.patient_id)
+            console.log("warehousing_time-----------",this.warehousing_time)
+            console.log("warehousing_id--------------",this.warehousing_id)
             ModifySelfDrugWarehouse(
               params,
               this.patient_id,
@@ -752,6 +763,8 @@
               } else {
                 this.loading = false;
                 this.$message.success("保存成功");
+                this.showCheck = true
+                this.showReturnCheck = false
                 this.listLoading = false;
                 var list = response.data.data.list
                 var manufacturerList = response.data.data.manufacturerList
@@ -795,8 +808,7 @@
                 this.recordInfo.recordData = []
                 console.log("list========================",list)
                 this.recordInfo.recordData = list
-                this.showCheck = true
-                this.showReturnCheck = false
+               
               }
             });
           } else {
@@ -929,8 +941,10 @@
         });
          var params = {
            warehousing_id:this.warehousing_id,
+           patient_id:this.patient_id
          }
-        toCheckWarehousingInfo(params).then(response=>{
+         console.log("praams------",params)
+        toCheckSelfWarehousingInfo(params).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
              this.$message.success("审核成功!")
@@ -953,8 +967,9 @@
         });
           var params = {
             warehousing_id:this.warehousing_id,
+            patient_id:this.patient_id,
           }
-        toReturnCheckWarehousing(params).then(response=>{
+        returnSelfCheckWarehouse(params).then(response=>{
            if(response.data.state == 1){
             var list = response.data.data.list
              this.$message.success("反审核成功!")
@@ -967,18 +982,21 @@
            }
         })
       },
-      changeUnit(val,index){
-    
-      },
-       
-
       //新
       getSelfDrugWarehouseInfoById(id){
         getSelfDrugWarehouseInfoById(id).then(response=>{
            if(response.data.state == 1){
              var info = response.data.data.info
+             if(info.is_check == 2){
+               this.showCheck = true
+               this.showReturnCheck = false
+             }
+             if(info.is_check == 1){
+                this.showCheck = false
+                this.showReturnCheck = true
+             }
              this.patient_id = info.patient_id
-             this.warehousing_time  =this.getTime(info.record_date)
+             this.warehousing_time  =this.getTimeOne(info.record_date)
              this.manufacturerList = response.data.data.manufacturerList
              this.dealerList = response.data.data.dealerList
              this.drugTypeList = response.data.data.drugTypeList
@@ -990,9 +1008,9 @@
              tempObj["drug_name"] = info.drug.drug_name;
              tempObj["max_unit"] = info.max_unit;
              tempObj["min_unit"] = info.min_unit,
-             tempObj["product_date"] = this.getTime(info.product_date);
-             tempObj["expiry_date"] = this.getTime(info.expiry_date);
-             tempObj["warehousing_count"] = info.warehousing_count;
+             tempObj["product_date"] = this.getTimeOne(info.product_date);
+             tempObj["expiry_date"] = this.getTimeOne(info.expiry_date);
+             tempObj["warehousing_count"] = info.warehousing_count.toString();
              tempObj["remark"] = info.remark;
              tempObj["dealer"] =this.getDealer(info.dealer) 
              tempObj["manufacturer"] = this.getManufacturer(info.manufacturer);
@@ -1033,14 +1051,16 @@
             }
             return name
       },
+      
     },
     created() {
       var id =  this.$route.query.id
       var is_sys = this.$route.query.is_sys
+      this.is_sys = is_sys
+      console.log("is_check-=------------------------------------",is_sys)
       var is_check = this.$route.query.is_check
-      console.log("id",id)
-      console.log("is_sys",is_sys)
-      console.log("is_check",is_check)
+      console.log("is_check-=------------------------------------",is_check)
+      this.is_check= is_check
       this.drugTypeList = getDictionaryDataConfig("system", "drug_type");
       this.getallPatientList() 
       this.getSelfDrugWarehouseInfoById(id)

src/xt_pages/stock/selfPreparedMedicine/editWarehouseOut.vue

@@ -23,6 +23,15 @@
             class="filter-item"
             >审核</el-button
           >
+
+          <el-button
+          size="small"
+          type="primary"
+          v-if="is_check == 1 && parseInt(this.$route.query.is_sys) == 0"
+          @click="toReturnCheck"
+          class="filter-item"
+          >反 审 核</el-button
+        >
        
         </div>
       </div>
@@ -346,12 +355,11 @@
   import {
     GetAllConfig,
     GetAllDrugInfoByID,
-    postDrugWarehouse,
   } from "@/api/drug/drug_stock";
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
   import { getAllDrugList, postSearchDrugList } from "@/api/data";
-    import { getallPatientList,postSearchSelfDrugList,modifySelfDrugWarehouseOut,getSelfDrugBatchNumber,getSelfDrugWarehouseOutById} from "@/api/drug/drug"
+  import { getallPatientList,postSearchSelfDrugList,modifySelfDrugWarehouseOut,getSelfDrugBatchNumber,getSelfDrugWarehouseOutById,checkSelfOutDrugQuery,returnCheckSelfOutDrugQuery} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },
     name: "stockIn",
@@ -1237,6 +1245,56 @@
             }
             return name
       },
+
+      toCheck(){
+         var params = {
+            warehouse_out_id:this.warehouse_out_id,
+            patient_id:this.patient_id,
+         }
+        checkSelfOutDrugQuery(params).then(response=>{
+          if(response.data.state ==1){
+            var warehousingOutInfoList = response.data.data.warehousingOutInfoList
+              var msg =response.data.data.msg
+              if(msg == 1){
+                this.$message.success("审核成功!")
+                this.showCheck = false
+                this.showReturnCheck = true
+                this.$router.back(-1)
+              }
+              if(msg == 2){
+                var drug_name = response.data.data.drug_name
+                var dose = response.data.data.dose
+                var dose_unit = response.data.data.dose_unit
+                var min_number = response.data.data.min_number
+                var min_unit = response.data.data.min_unit
+                var max_unit = response.data.data.max_unit
+                var str = drug_name +" " +dose +dose_unit +"*" + min_number + min_unit +"/" + max_unit;
+                this.$message.error(str+"库存不足，审核失败!")
+              }
+              loading.close()
+          }
+        })
+      },
+      toReturnCheck(){
+         var params = {
+           warehouse_out_id:this.warehouse_out_id,
+           patient_id:this.patient_id,
+         }
+        returnCheckSelfOutDrugQuery(params).then(response=>{
+           if(response.data.state ==1){
+            var out = response.data.data.out
+            this.$message.success("反审核成功!")
+            this.showCheck = true
+            this.showReturnCheck = false
+            loading.close()
+            this.$router.back(-1)
+           }else{
+            this.$message.error(response.data.msg)
+            loading.close()
+            this.$router.back(-1);
+           }
+        })
+      }
     
     
     },

src/xt_pages/stock/selfPreparedMedicine/newDrugQuery.vue

@@ -0,0 +1,448 @@
+<template>
+    <div class="main-contain">
+       <div class="app-container" style="padding-left:0px;margin: 0px;"
+          v-loading="loading"
+          element-loading-text="拼命加载中">
+          <el-input v-model="keyword" style="width:200px" placeholder="请输入药品名称" ></el-input>
+          <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
+             <el-table
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{
+                backgroundColor: 'rgb(245, 247, 250)',
+                color: '#606266'
+              }"
+              :data="tableList"
+              :class="signAndWeighBoxPatients"
+              border
+             :cell-class-name="cellStyle"
+            >
+            <el-table-column label="药品名称" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.drug.drug_name }}
+                </template>
+              </el-table-column>
+              <el-table-column label="规格&单位" align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.drug.dose}}{{ scope.row.drug.dose_unit }} * {{ scope.row.drug.min_number }}{{ scope.row.drug.min_unit }} /{{ scope.row.drug.max_unit }}
+                </template>
+              </el-table-column>
+              <el-table-column label="生产厂家" align="center">
+                <template slot-scope="scope">
+                   {{ getManufacturName(scope.row.drug.manufacturer) }}
+                </template>
+              </el-table-column>
+      
+              <el-table-column label="入库数量" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.sum_in_count}} {{scope.row.drug.min_unit }}
+                 </template>
+              </el-table-column>
+            
+              <el-table-column label="出库数量" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.sum_act_out_count}} {{scope.row.drug.min_unit }}
+               </template>
+              </el-table-column>
+  
+              <el-table-column label="退库数量" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.sum_cancel_count}} {{scope.row.drug.min_unit }}
+                </template>
+              </el-table-column>
+  
+               <el-table-column label="实际出库" align="center">
+                <template slot-scope="scope">
+                  <span>
+                    {{scope.row.sum_out_count}} {{scope.row.drug.min_unit }}
+                 </span>
+               </template>
+              </el-table-column>
+  
+              <el-table-column label="剩余库存" align="center">
+                <template slot-scope="scope">
+                  <span>
+                    {{ scope.row.flush_count }} {{scope.row.drug.min_unit }}
+                  </span>
+                </template>
+              </el-table-column>
+  
+          
+             
+              <el-table-column label="操作" align="center" width="200px">
+               
+                <template slot-scope="scope">
+                  <el-button
+                    size="small"
+                    type="primary"
+                    @click="toClick(scope.row)"
+                  >库存流水
+                  </el-button>
+                  <el-button
+                    size="small"
+                    type="primary"
+                    @click="toClickOne(scope.row)"
+                  >批次
+                  </el-button>
+  
+                
+                 </template>
+              </el-table-column>
+            </el-table>
+             <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :page-sizes="[10, 50, 100,200,300,400,500,1000]"
+              :page-size="10"
+              background
+              align="right"
+              style="margin-top:20px;"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total"
+            >
+              </el-pagination>
+       </div>
+  
+  
+  
+   
+  
+  
+   
+  
+    </div>
+  </template>
+  <script>
+  import { getSelfDrugQuery,getGoodWarehouseOutInfoById,toSendGoodInfomation,getCheckGoodBatchList } from "@/api/drug/drug"
+  import {
+    getStockDrugCount
+  } from "@/api/stock";
+  import { uParseTime } from '@/utils/tools'
+  const moment = require('moment')
+  export default {
+  
+    data(){
+      return{
+       tableList:[],
+       goodList:[
+        {id:1,name:"全部耗材"},
+        {id:2,name:"库存预警"},
+        {id:3,name:"库存为零"},
+        {id:4,name:"库存不为零"},
+       ],
+       houseList:[],
+       storehouse_id:0,
+       good_type:1,
+       multipleSelection: [],
+       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+       manufacturerList:[],
+       page:1,
+       total:0,
+       limit:10,
+       pageone:1,
+       totalone:0,
+       keyword:"",
+       goodTypeList:[],
+       start_time:"",
+       end_time:"",
+       countList:[],
+       outCountList:[],
+       autoCountList:[],
+       cancelCountList:[],
+       org_id:this.$store.getters.xt_user.org_id,
+       dialogVisible:false,
+       start_first_time:moment().startOf('month').format("YYYY-MM-DD"),
+       end_first_time:moment().endOf('month').format("YYYY-MM-DD"),
+       tableData:[],
+       good_id:0,
+       patientList:[],
+       good_name:"",
+       specification_name:"",
+       loading:false,
+       warehouseInfoByList:[],
+       cancelStockInfoByList:[],
+       warehouseOutByList:[],
+       flushList:[],
+       type_name:0,
+       storehouseId:0,
+       dealerList:[],
+       checkdialogVisible:false,
+       checkData:[],
+       outData:[],
+       total:0,
+       manufacturerList:[],
+       dealerList:[],
+      }
+    
+    },
+    methods:{
+    
+      changeGoodName(){
+        this.getlist()
+      },
+      toClick(val){
+       
+         var manufacturer_name = ""
+         var specification_name = ""
+         for(let i=0;i<this.manufacturerList.length;i++){
+            if(val.drug.manufacturer == this.manufacturerList[i].id){
+              manufacturer_name = this.manufacturerList[i].manufacturer_name
+            }
+         }
+        specification_name = val.drug.specification_name + "/" + val.drug.packing_unit
+       
+        this.$router.push({path:"/stock/selfwarehouse/selfdrugflow?drug_id="+val.drug_id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.drug.packing_unit+"&overCount="+val.flush_count})
+      },
+      toClickOne(val){
+        var manufacturer_name = ""
+         var specification_name = ""
+         for(let i=0;i<this.manufacturerList.length;i++){
+            if(val.drug.manufacturer == this.manufacturerList[i].id){
+              manufacturer_name = this.manufacturerList[i].manufacturer_name
+            }
+         }
+        specification_name = val.drug.specification_name + "/" + val.drug.packing_unit
+
+        this.$router.push({path:"/stock/selfwarehouse/selfdrugbatchnumber?drug_id="+val.drug_id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.drug.packing_unit+"&overCount="+val.flush_count})
+      },
+    
+      open(){
+       
+        this.getlist()
+      },
+      getlist(){
+          var params = {
+             limit:this.limit,
+             page:this.page,
+             keyword :this.keyword,
+          }
+        getSelfDrugQuery(params).then(response=>{
+           if(response.data.state == 1){
+              var list = response.data.data.list
+              
+              this.tableList =list
+              var total =  response.data.data.total
+              this.total = total
+              this.manufacturerList = response.data.data.manufacturerList
+              this.dealerList =response.data.data.dealerList
+              this.total = response.data.data.total
+              this.loading = false
+             
+             
+           }
+        })
+      },
+      getManufacturName(id){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+             manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+        }
+        return manufacturer_name
+      },
+      getDearName(id){
+        var dear_name = ""
+        for(let i=0;i<this.dealerList.length;i++){
+          if(id == this.dealerList[i].id){
+            dear_name = this.dealerList[i].dealer_name
+          }
+        }
+        return dear_name
+      },
+      handleSizeChange(val) {
+        this.limit = val;
+        this.getlist()
+      },
+      handleCurrentChange(val) {
+        this.page = val;
+        this.getlist()
+      },
+      handleSizeChangeOne(val) {
+        this.limitone = val;
+        this.toDialogClick(this.good_id,this.good_name,this.specification_name,this.storehouseId)
+      },
+      handleCurrentChangeOne(val) {
+        this.pageone = val;
+        this.toDialogClick(this.good_id,this.good_name,this.specification_name,this.storehouseId)
+      },
+     seach(){
+      this.getlist()
+     },
+     startFirstTimeChange(){
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name,this.storehouseId)
+     },
+     endEndTimeChange(){
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name,this.storehouseId)
+     },
+    getTime(val) {
+      if(val < 0){
+        return ""
+      }
+     if(val == ""){
+       return ""
+     }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+     }
+     },
+     getTimeOne(val) {
+      if(val < 0){
+        return ""
+      }
+     if(val == ""){
+       return ""
+     }else {
+      return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
+     }
+     },
+    getName(id){
+      var name = ""
+      for(let i=0;i<this.patientList.length;i++){
+        if(id == this.patientList[i].id){
+          name = this.patientList[i].name
+        }
+      }
+      return name
+    },
+
+     // 合并单元格样式
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      let arr = [5,6, 7, 8, 9,10,11];
+      if (arr.indexOf(columnIndex) > -1) {
+        return "spanClass";
+      }
+     },
+     exportList(){
+        import('@/vendor/Export2Excel').then(excel => {
+        
+          if(this.org_id!=0 && this.org_id!=9956){
+            if(this.tableList!=null && this.tableList.length > 0){
+            for(let i=0;i<this.tableList.length;i++){
+              this.tableList[i].index = i+1
+              this.tableList[i].type_name =  this.getGoodTypeName(this.tableList[i].good_type_id)
+              this.tableList[i].spec = this.tableList[i].specification_name +"/"+ this.tableList[i].packing_unit
+              this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+              this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+              this.tableList[i].stock_in_count = this.GetExportStockInCount(this.tableList[i].xt_good_stock,this.tableList[i].id)
+              this.tableList[i].stock_out_count =this.getExportStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+              this.tableList[i].stock_cancel_count = this.getExportCancelStockInfo(this.tableList[i].xt_good_stock,this.tableList[i].id)
+              this.tableList[i].act_out_count  = this.getExportActStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+              this.tableList[i].over_count = this.getExportOverCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+              this.tableList[i].sum_count =  this.getOverCount(this.tableList[i].xt_warehouse_info) 
+  
+            }
+           }
+           
+  
+           const tHeader = ['序号','耗材类型', '耗材名称', '规格&单位','生产厂商','经销商','批准文号','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
+           const filterVal = ['index','type_name', 'good_name', 'spec','manufacturer_name','dealer_name','number','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
+          
+           const data = this.formatJson(filterVal, this.tableList)
+           
+           excel.export_json_to_excel({
+             header: tHeader,
+             data,
+             filename: '库存查询'
+           })
+            this.downloadLoading = false
+          }
+  
+          if(this.org_id == 0 || this.org_id == 9956){
+           
+            if(this.tableList!=null && this.tableList.length > 0){
+            for(let i=0;i<this.tableList.length;i++){
+              this.tableList[i].index = i+1
+              this.tableList[i].type_name =  this.getGoodTypeName(this.tableList[i].good_type_id)
+              this.tableList[i].spec = this.tableList[i].specification_name +"/"+ this.tableList[i].packing_unit
+              this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+              this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+              this.tableList[i].stock_in_count = this.GetExportStockInCount(this.tableList[i].xt_good_stock,this.tableList[i].id)
+              this.tableList[i].stock_out_count =this.getExportStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+              this.tableList[i].stock_cancel_count = this.getExportCancelStockInfo(this.tableList[i].xt_good_stock,this.tableList[i].id)
+              this.tableList[i].act_out_count  = this.getExportActStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+              this.tableList[i].over_count = this.getExportOverCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+              this.tableList[i].sum_count =  this.getOverCount(this.tableList[i].xt_warehouse_info) 
+  
+            }
+           }
+           
+  
+           const tHeader = ['序号','耗材编码','耗材类型', '耗材名称', '规格&单位','生产厂商','经销商','批准文号','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
+           const filterVal = ['index','good_number','type_name', 'good_name', 'spec','manufacturer_name','dealer_name','number','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
+          
+           const data = this.formatJson(filterVal, this.tableList)
+           
+           excel.export_json_to_excel({
+             header: tHeader,
+             data,
+             filename: '库存查询'
+           })
+            this.downloadLoading = false
+          }
+     
+         })
+        },
+        formatJson(filterVal, jsonData) {
+          return jsonData.map(v => filterVal.map(j => v[j]));
+        },
+        toPrint(){
+          this.$router.push("/good/new/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keyword+"&storehouse_id="+this.storehouse_id+"&page="+this.page+"&limit="+this.limit+"&good_type="+this.good_type)
+        },
+    },
+    created(){
+      this.getlist()
+    
+   
+    }
+  }
+  </script>
+  
+  <style>
+  .app-container{
+    /* padding-left: 0;
+    margin-left: 0; */
+  }
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+  
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+  
+  .count {
+    color: #bd2c00;
+  }
+  
+  .el-table td,
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+  
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
+  
+  /* 合并表格线样式 */
+  .spanClass .cell {
+    padding: 0 !important;
+  }
+  
+  .spanClass .cell tr {
+    display: inline-block;
+    width: 100%;
+  }
+  
+  .spanClass .cell tr td {
+    padding: 10px 0;
+    border-bottom: 1px solid #ebeef5;
+    display: block;
+    width: 100%;
+  }
+  .spanClass .cell tr:last-of-type td {
+    border-bottom: none;
+  }
+  </style>

src/xt_pages/stock/selfPreparedMedicine/selfDrugBatchNumber.vue

@@ -0,0 +1,301 @@
+<template>
+    <div class="main-contain">
+      <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+      </div>
+      <div class="app-container ">
+        <div class="cell clearfix">
+         药品名称:<span>{{getName(this.$route.query.drug_id)}}</span>&nbsp;
+         库存: {{this.$route.query.over_plus}}
+         规格:<span>{{drug.dose}}{{drug.dose_unit}}*{{drug.min_number}}{{drug.min_unit}}/{{drug.max_unit}}</span>&nbsp;
+         厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
+        </div>
+        <div class="cell clearfix">
+          <span>日期查询:</span>
+          <el-date-picker
+              size="small"
+              v-model="start_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 196px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="startTimeChange"
+             ></el-date-picker>-
+              <el-date-picker
+                size="small"
+                v-model="end_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 196px;margin-right:10px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                @change="endTimeChange"
+            ></el-date-picker>
+  
+          <span>出入库方式:</span>
+          <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+              <el-option
+                v-for="(item,index) in stockType"
+                :key="index"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+          </el-select>
+          
+          <!-- <span>
+            <el-button type="primary" size="small" @click="toExprot">导出</el-button>
+  
+            <el-button type="primary" size="small" @click="toTongBu">同步</el-button>
+          </span> -->
+          
+        </div>
+        
+         <el-table
+          :data="tableList"
+          border
+          style="width: 100%">
+          <el-table-column prop="date" label="序号" width="180" align="center">
+             <template  slot-scope="scope">
+                {{scope.$index + 1}}
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_type" label="出入库方式" width="180" align="center">
+             <template slot-scope="scope">
+               <span v-if="scope.row.consumable_type == 1">手动入库</span>
+               <span v-if="scope.row.consumable_type == 2">手动出库</span>
+               <span v-if="scope.row.consumable_type == 3">自动出库</span>
+               <span v-if="scope.row.consumable_type == 4">手动退库</span>
+               <span v-if="scope.row.consumable_type == 7">自动退库</span>
+               <span v-if="scope.row.consumable_type == 5">报损数量</span>
+               <span v-if="scope.row.consumable_type == 10">盘盈</span>
+               <span v-if="scope.row.consumable_type == 11">盘亏</span>
+               <span v-if="scope.row.consumable_type == 12">调拨出库</span>
+               <span v-if="scope.row.consumable_type == 13">调拨入库</span>
+               <span v-if="scope.row.consumable_type == 15">结算出库</span>
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_name" label="入库单据编码" align="center">
+             <template slot-scope="scope">
+               <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
+                <span v-if="scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 12 || scope.row.consumable_type == 15">{{scope.row.warehouse_out_order_number}}</span>
+                <span v-if="scope.row.consumable_type == 4 || scope.row.consumable_type == 7">{{scope.row.cancel_order_number}}</span>
+                <span v-if="scope.row.consumable_type == 5">{{scope.row.warehouse_out_order_number}}</span>
+                <span v-if="scope.row.consumable_type == 10 || scope.row.consumable_type == 11 || scope.row.consumable_type == 13">{{scope.row.warehousing_order}}</span>
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_name" label="入库日期" align="center">
+             <template slot-scope="scope">
+               {{getTime(scope.row.ctime,"{y}-{h}-{d}")}}
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_name" label="操作日期" align="center">
+             <template slot-scope="scope">
+               {{getTime(scope.row.operate_time,"{y}-{h}-{d}")}}
+             </template>
+          </el-table-column>
+        
+          <el-table-column prop="drug_name" label="入库数量&单位" align="center">
+             <template slot-scope="scope">
+                <span v-if="scope.row.consumable_type != 2 &&  scope.row.consumable_type != 3 && scope.row.consumable_type != 5 && scope.row.consumable_type != 7">{{scope.row.count}}{{scope.row.max_unit}}</span>
+                <span v-if="(scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 5 || scope.row.consumable_type == 7) && parseInt(scope.row.count/scope.row.BaseDrugLib.min_number) >0">{{parseInt(scope.row.count/scope.row.BaseDrugLib.min_number)}}{{scope.row.BaseDrugLib.max_unit}}</span>
+                <span v-if="(scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 5 || scope.row.consumable_type == 7) && scope.row.count%scope.row.BaseDrugLib.min_number >0">{{scope.row.count%scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}}</span>
+             </template>
+          </el-table-column>
+  
+       
+        
+           <el-table-column prop="drug_name" label="有效期" align="center">
+             <template slot-scope="scope">
+                {{getTime(scope.row.expire_date,"{y}-{h}-{d}")}}
+              
+             </template>
+          </el-table-column>
+         
+   
+          <el-table-column prop="drug_name" label="剩余库存" align="center">
+             <template slot-scope="scope">
+           
+                 {{ scope.row.over_count }} {{ drug.min_unit }}
+             </template>
+          </el-table-column>
+          <el-table-column prop="remark" label="备注" align="center">
+             <template slot-scope="scope">
+               <span > {{scope.row.remark}}</span>
+             </template>
+          </el-table-column>
+         </el-table>
+         
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[10, 50, 100,500,1000]"
+          :page-size="10"
+          background
+          align="right"
+          style="margin-top:20px;"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+  
+      <setting-dialog
+        ref="dialog"
+      ></setting-dialog>
+  
+    </div>
+  </template>
+
+  <script>
+
+  import { uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getSelfDrugBatchNumberList }  from '@/api/drug/drug'
+  export default {
+    components: {
+      BreadCrumb
+    },
+    data(){
+      return{
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/drugs/stock/query', name: '药品库存查询' },
+          { path:'/drugstock/in/drugstockflow',name:'库存流水'}
+        ],
+        keywords: '',
+        total: 0,
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        end_time: '',
+        page: 1,
+        limit: 10,
+        goodType: [],
+        goodInfo: [],
+        tempArr: [],
+        sameRowArr: [],
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: []
+        },
+        tableData:[],
+        drug_category:0,
+        stock_type:0,
+        drugCategory:[
+          {id:0,name:"全部"}
+        ],
+        drugTypeList:[],
+        tableList:[],
+        manufacturerList:[],
+        list:[],
+        stockType:[
+          {id:0,name:"全部"},
+          {id:1,name:"手动入库"},
+          {id:2,name:"手动出库"},
+          {id:3,name:"自动出库"},
+          {id:4,name:"手动退库"},
+          {id:10,name:"盘盈"},
+          {id:11,name:"盘亏"},
+          {id:12,name:"调拨出库"},
+          {id:13,name:"调拨入库"},
+          {id:15,name:"结算出库"}
+        ],
+        outList:[],
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        drugOutList:[],
+        total:0,
+        houseList:[],
+        patientList:[],
+        drug:{},
+        patients:[]
+      }
+    },
+    created(){
+      this.getlist()
+    },
+    methods:{
+      startTimeChange: function(val) {
+      this.tableList = []
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      
+      if (time > 0) {
+        this.$message.error("开始时间不能大于结束时间");
+        this.start_time = "";
+      } else {
+         
+         this.getlist()
+     
+      }
+    },
+    endTimeChange: function(val) {
+      this.tableList = []
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.getlist()
+      }
+     },
+     changeDrug(val){
+       this.tableList= []
+       this.stock_type = val
+       this.getlist()
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getlist()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getlist()
+      },
+      getlist(){
+        var params = {
+             drug_id:this.$route.query.drug_id,
+             start_time:this.start_time,
+             end_time:this.end_time,
+             page:this.page,
+             limit:this.limit,
+         }
+        getSelfDrugBatchNumberList(params).then(response=>{
+           if(response.data.state ==1){
+              var list = response.data.data.list
+              this.tableList =list
+              var total =  response.data.data.total
+              this.total = total
+              this.drug =response.data.data.drug
+            
+           }
+        })
+      },
+      getName(drug_id){
+        var name = ""
+        if(drug_id == this.drug.id){
+           name = this.drug.drug_name
+        }
+        return name
+     },
+     getTime(val) {
+      if(val < 0){
+          return ""
+      }
+      if(val == ""){
+        return ""
+      }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+      }
+     },
+    
+    }
+  }
+</script>

src/xt_pages/stock/selfPreparedMedicine/selfDrugFlow.vue

@@ -0,0 +1,313 @@
+<template>
+    <div class="main-contain">
+      <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+      </div>
+      <div class="app-container ">
+        <div class="cell clearfix">
+         药品名称:<span>{{getName(this.$route.query.drug_id)}}</span>&nbsp;
+         库存: {{this.$route.query.over_plus}}
+         规格:<span>{{drug.dose}}{{drug.dose_unit}}*{{drug.min_number}}{{drug.min_unit}}/{{drug.max_unit}}</span>&nbsp;
+         厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
+        </div>
+        <div class="cell clearfix">
+          <span>日期查询:</span>
+          <el-date-picker
+              size="small"
+              v-model="start_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 196px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="startTimeChange"
+             ></el-date-picker>-
+              <el-date-picker
+                size="small"
+                v-model="end_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 196px;margin-right:10px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                @change="endTimeChange"
+            ></el-date-picker>
+  
+          <span>出入库方式:</span>
+          <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+              <el-option
+                v-for="(item,index) in stockType"
+                :key="index"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+          </el-select>
+          
+          <!-- <span>
+            <el-button type="primary" size="small" @click="toExprot">导出</el-button>
+  
+            <el-button type="primary" size="small" @click="toTongBu">同步</el-button>
+          </span> -->
+          
+        </div>
+        
+         <el-table
+          :data="tableList"
+          border
+          style="width: 100%">
+          <el-table-column prop="date" label="序号" width="180" align="center">
+             <template  slot-scope="scope">
+                {{scope.$index + 1}}
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_type" label="出入库方式" width="180" align="center">
+             <template slot-scope="scope">
+               <span v-if="scope.row.consumable_type == 1">手动入库</span>
+               <span v-if="scope.row.consumable_type == 2">手动出库</span>
+               <span v-if="scope.row.consumable_type == 3">自动出库</span>
+               <span v-if="scope.row.consumable_type == 4">手动退库</span>
+               <span v-if="scope.row.consumable_type == 7">自动退库</span>
+               <span v-if="scope.row.consumable_type == 5">报损数量</span>
+               <span v-if="scope.row.consumable_type == 10">盘盈</span>
+               <span v-if="scope.row.consumable_type == 11">盘亏</span>
+               <span v-if="scope.row.consumable_type == 12">调拨出库</span>
+               <span v-if="scope.row.consumable_type == 13">调拨入库</span>
+               <span v-if="scope.row.consumable_type == 15">结算出库</span>
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
+             <template slot-scope="scope">
+               <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
+                <span v-if="scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 12 || scope.row.consumable_type == 15">{{scope.row.warehouse_out_order_number}}</span>
+                <span v-if="scope.row.consumable_type == 4 || scope.row.consumable_type == 7">{{scope.row.cancel_order_number}}</span>
+                <span v-if="scope.row.consumable_type == 5">{{scope.row.warehouse_out_order_number}}</span>
+                <span v-if="scope.row.consumable_type == 10 || scope.row.consumable_type == 11 || scope.row.consumable_type == 13">{{scope.row.warehousing_order}}</span>
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_name" label="出库日期" align="center">
+             <template slot-scope="scope">
+               {{getTime(scope.row.ctime,"{y}-{h}-{d}")}}
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_name" label="操作日期" align="center">
+             <template slot-scope="scope">
+               {{getTime(scope.row.operate_time,"{y}-{h}-{d}")}}
+             </template>
+          </el-table-column>
+        
+          <el-table-column prop="drug_name" label="数量&单位" align="center">
+             <template slot-scope="scope">
+                <span v-if="scope.row.consumable_type != 2 &&  scope.row.consumable_type != 3 && scope.row.consumable_type != 5 && scope.row.consumable_type != 7">{{scope.row.count}}{{scope.row.max_unit}}</span>
+                <span v-if="(scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 5 || scope.row.consumable_type == 7) && parseInt(scope.row.count/scope.row.BaseDrugLib.min_number) >0">{{parseInt(scope.row.count/scope.row.BaseDrugLib.min_number)}}{{scope.row.BaseDrugLib.max_unit}}</span>
+                <span v-if="(scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 5 || scope.row.consumable_type == 7) && scope.row.count%scope.row.BaseDrugLib.min_number >0">{{scope.row.count%scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}}</span>
+             </template>
+          </el-table-column>
+  
+       
+        
+           <el-table-column prop="drug_name" label="有效期" align="center">
+             <template slot-scope="scope">
+                {{getTime(scope.row.expire_date,"{y}-{h}-{d}")}}
+              
+             </template>
+          </el-table-column>
+         
+          <el-table-column prop="drug_name" label="使用人" align="center">
+             <template slot-scope="scope">
+               <span > {{getPatientName(scope.row.patient_id)}}</span>
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_name" label="剩余库存" align="center">
+             <template slot-scope="scope">
+               <!-- <span > {{getDrugCount(scope.row.over_count,scope.row.BaseDrugLib.max_unit,scope.row.BaseDrugLib.min_unit,scope.row.BaseDrugLib.min_number)}}</span> -->
+                 {{ scope.row.over_count }} {{ drug.min_unit }}
+             </template>
+          </el-table-column>
+          <el-table-column prop="remark" label="备注" align="center">
+             <template slot-scope="scope">
+               <span > {{scope.row.remark}}</span>
+             </template>
+          </el-table-column>
+         </el-table>
+         
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[10, 50, 100,500,1000]"
+          :page-size="10"
+          background
+          align="right"
+          style="margin-top:20px;"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+  
+      <setting-dialog
+        ref="dialog"
+      ></setting-dialog>
+  
+    </div>
+  </template>
+
+  <script>
+
+  import { uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getSelfDrugFlow }  from '@/api/drug/drug'
+  export default {
+    components: {
+      BreadCrumb
+    },
+    data(){
+      return{
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/drugs/stock/query', name: '药品库存查询' },
+          { path:'/drugstock/in/drugstockflow',name:'库存流水'}
+        ],
+        keywords: '',
+        total: 0,
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        end_time: '',
+        page: 1,
+        limit: 10,
+        goodType: [],
+        goodInfo: [],
+        tempArr: [],
+        sameRowArr: [],
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: []
+        },
+        tableData:[],
+        drug_category:0,
+        stock_type:0,
+        drugCategory:[
+          {id:0,name:"全部"}
+        ],
+        drugTypeList:[],
+        tableList:[],
+        manufacturerList:[],
+        list:[],
+        stockType:[
+          {id:0,name:"全部"},
+          {id:1,name:"手动入库"},
+          {id:2,name:"手动出库"},
+          {id:3,name:"自动出库"},
+          {id:4,name:"手动退库"},
+          {id:10,name:"盘盈"},
+          {id:11,name:"盘亏"},
+          {id:12,name:"调拨出库"},
+          {id:13,name:"调拨入库"},
+          {id:15,name:"结算出库"}
+        ],
+        outList:[],
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        drugOutList:[],
+        total:0,
+        houseList:[],
+        patientList:[],
+        drug:{},
+        patients:[]
+      }
+    },
+    created(){
+      this.getlist()
+    },
+    methods:{
+      startTimeChange: function(val) {
+      this.tableList = []
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      
+      if (time > 0) {
+        this.$message.error("开始时间不能大于结束时间");
+        this.start_time = "";
+      } else {
+         
+         this.getlist()
+     
+      }
+    },
+    endTimeChange: function(val) {
+      this.tableList = []
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.getlist()
+      }
+     },
+     changeDrug(val){
+       this.tableList= []
+       this.stock_type = val
+       this.getlist()
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getlist()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getlist()
+      },
+      getlist(){
+        var params = {
+             drug_id:this.$route.query.drug_id,
+             start_time:this.start_time,
+             end_time:this.end_time,
+             page:this.page,
+             limit:this.limit,
+         }
+        getSelfDrugFlow(params).then(response=>{
+           if(response.data.state ==1){
+              var list = response.data.data.list
+              this.tableList =list
+              var total =  response.data.data.total
+              this.total = total
+              this.drug =response.data.data.drug
+              this.patients= response.data.data.patients
+           }
+        })
+      },
+      getName(drug_id){
+        var name = ""
+        if(drug_id == this.drug.id){
+           name = this.drug.drug_name
+        }
+        return name
+     },
+     getTime(val) {
+      if(val < 0){
+          return ""
+      }
+      if(val == ""){
+        return ""
+      }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+      }
+     },
+     getPatientName(id){
+       var name = ""
+       for(let i=0;i<this.patientList.length;i++){
+          if(id == this.patientList[i].id){
+              name = this.patientList[i].name
+          }
+       }
+       return name
+     },
+    }
+  }
+</script>

src/xt_pages/stock/selfPreparedMedicine/selfDrugQuery.vue

@@ -0,0 +1,141 @@
+<template>
+    <div class="main-contain">
+      <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+       
+      </div>
+       <div class="app-container ">
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+              <el-tab-pane label="库存查询" name="first">
+                <new-drug-query></new-drug-query>
+              </el-tab-pane>
+            
+              <el-tab-pane label="患者查询" name="sencode">
+                  <patient-drug-query ref="mychildtwo"></patient-drug-query>
+              </el-tab-pane>
+          </el-tabs>
+       </div>
+    </div>
+  </template>
+  
+  <script>
+  import BreadCrumb from "@/xt_pages/components/bread-crumb";
+  import newDrugQuery from "@/xt_pages/stock/selfPreparedMedicine/newDrugQuery"
+  import patientDrugQuery from  "@/xt_pages/stock/selfPreparedMedicine/patientDrugQuery"
+  export default {
+    name: "stockNewQuery",
+    
+    components: {
+      BreadCrumb,
+      newDrugQuery,
+      patientDrugQuery
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: "库存管理" },
+          { path: "/stock/query", name: "库存查询" }
+        ],
+        multipleSelection: [],
+        signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+        activeName: 'first',
+        org_id:0,
+      };
+    },
+    methods:{
+      handleClick(val){
+        if(val.name == "first"){
+          this.$refs.mychild.open()
+        }
+        if(val.name == "second"){
+         this.$refs.mychildtwo.open()
+        }   
+       
+      }
+    },
+    created(){
+      this.org_id = this.$store.getters.xt_user.template_info.org_id
+    }
+  };
+  </script>
+  
+  <style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+  
+    .border {
+      border-bottom: 1px #dcdfe6 solid;
+      margin: 0px 0 20px 0;
+    }
+  }
+  
+  /deep/ .el-tabs .el-tabs__header{
+    margin: 0;
+  }
+  
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    margin: 0 0 10px 0;
+  }
+  
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+  </style>
+  
+  <style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+  
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+  
+  .count {
+    color: #bd2c00;
+  }
+  .el-table td,
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
+  
+  /* 合并表格线样式 */
+  
+  .spanClass .cell {
+    padding: 0 !important;
+  }
+  
+  .spanClass .cell tr {
+    display: inline-block;
+    width: 100%;
+    /* height: 44px; */
+  }
+  
+  .spanClass .cell tr td {
+    padding: 10px 0;
+    border-bottom: 1px solid #ebeef5;
+    display: block;
+    width: 100%;
+    min-height: 44px;
+  }
+  .spanClass .cell tr:last-of-type td{
+    border-bottom: none;
+  }
+  
+  </style>
+  

src/xt_pages/stock/selfPreparedMedicine/warehouseInfo.vue

@@ -15,7 +15,7 @@
 
     <div class="app-container">
       <div class="cell clearfix">
-        <label class="title"><span class="name">患者</span> :</label>
+        <!-- <label class="title"><span class="name">患者</span> :</label>
         <el-select
           size="small"
           v-model="patient_id"
@@ -31,13 +31,13 @@
             :value="option.id"
           >
           </el-option>
-        </el-select>
+        </el-select> -->
         <el-input
           size="small"
           style="width: 200px"
           v-model.trim="searchKey"
           class="filter-item"
-          placeholder="单据编码/制单人/药品名称"
+          placeholder="入库单号"
         />
         <el-button
           size="small"
@@ -117,7 +117,7 @@
             size="small"
             v-model="check_type"
             filterable
-            placeholder="请选择仓库"
+            placeholder="请选择"
             style="width: 200px"
             @change="changeCheckType"
           >
@@ -191,6 +191,7 @@
 
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
+           
             {{ getManufacturer(scope.row.manufacturer) }}
           </template>
         </el-table-column>
@@ -207,6 +208,13 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="审核状态" align="center">
+          <template slot-scope="scope">
+             <span v-if="scope.row.is_check ==1">已审核</span>
+             <span v-if="scope.row.is_check ==2">未审核</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
              {{ scope.row.remark }}
@@ -274,10 +282,9 @@ import {
   exportDrugList,
 
 } from "@/api/drug/drug_stock";
-import { getAllDrugList } from "@/api/data";
 import { getDictionaryDataConfig } from "@/utils/data";
 import BreadCrumb from "../../components/bread-crumb";
-  import { getallPatientList,getAllSelfDrugWarehouseInfoList,deleteSelfWarehouseInfo} from "@/api/drug/drug"
+import { getallPatientList,getAllSelfDrugWarehouseInfoList,deleteSelfWarehouseInfo,getAllSelfDrugWarehouse} from "@/api/drug/drug"
 export default {
   name: "drugStockInOrder",
   components: { BreadCrumb },
@@ -311,6 +318,7 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
 
+    this.getAllSelfDrugWarehouse()  
     this.getallPatientList() 
 
     this.getAllSelfDrugWarehouseInfoList()
@@ -368,14 +376,25 @@ export default {
       patient_id:0,
       patientList:[],
       tableList:[],
-      manufacturerList:[],
       dealerList:[],
       drugTypeList:[],
     };
   },
 
   methods: {
-    
+    getAllSelfDrugWarehouse(){
+      var params = {
+          keyword:this.searchKey,
+          start_time:this.start_time,
+          end_time:this.end_time,
+          check_type:this.check_type,
+          limit:this.limit,
+          page:this.page,
+        }
+      getAllSelfDrugWarehouse(params).then(response=>{
+
+      })
+    },
     getAllSelfDrugWarehouseInfoList(){
         var params = {
           keyword:this.searchKey,
@@ -384,9 +403,9 @@ export default {
         getAllSelfDrugWarehouseInfoList(params).then(response=>{
           if(response.data.state ==1){
             var infoList  =  response.data.data.infoList
-            console.log("infolist22222222222222",infoList)
             this.tableList = infoList
             this.manufacturerList = response.data.data.manufacturerList
+            console.log("infolist22222222222222",this.manufacturerList)
             this.dealerList = response.data.data.dealerList
             this.drugTypeList = response.data.data.drugTypeList
 
@@ -517,39 +536,18 @@ export default {
     },
     handleSearch(id) {
       this.WarehouseInfo.warehouseInfoDate = [];
-      this.GetOrderDetail(id);
       this.dialogVisible = true;
     },
-    GetOrderDetail(order_id) {
-      const params = {
-        id: order_id,
-      };
-
-      this.WarehouseInfo.warehouseInfoDate = [];
-      getDrugWarehouseInfoList(params).then((response) => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          var obj = {total_count:0,is_total:1}
-          for (let i = 0; i < response.data.data.info.length; i++) {
-            response.data.data.info[i].is_total = 0
-            this.showOne = true;
-            this.WarehouseInfo.warehouseInfoDate.push(
-              response.data.data.info[i]
-            );
-            obj.total_count += (response.data.data.info[i].warehousing_count *response.data.data.info[i].price)
-          }
-          this.WarehouseInfo.warehouseInfoDate.push(obj)
-        
-          this.WarehouseInfo.warehouse = response.data.data.warehousing;
-          this.getAllDrugList();
-        }
-      });
-    },
     handleDelete: function (index, row) {
-
-        this.$confirm('确定删除' + row.name + row.sub_name + '方案吗？', '提示', {
+        if(row.is_check ==1){
+          this.$message.error("该药品已经审核,不能删除!")
+          return false
+        }
+        if(row.is_sys ==1){
+          this.$message.error("该药瓶自动入库,不能删除!")
+          return false
+        }
+        this.$confirm('确定删除吗？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -650,7 +648,7 @@ export default {
         .catch(() => {});
     },
     handleCurrentChangeOne(val) {
-      this.GetOrderDetail(val.id);
+     
     },
     getTime(val) {
       if (val < 0) {
@@ -671,18 +669,12 @@ export default {
       }
       return name;
     },
-    getAllDrugList() {
-      getAllDrugList().then((response) => {
-        if (response.data.state == 1) {
-          var manufacturerList = response.data.data.manufacturerList;
-          this.manufacturerList = manufacturerList;
-          this.dealerList = response.data.data.dealerList;
-        }
-      });
-    },
+    
     getManufacturer(id) {
       var name = "";
+      console.log("manufacturerList-=------",this.manufacturerList)
       for (let i = 0; i < this.manufacturerList.length; i++) {
+
         if (id == this.manufacturerList[i].id) {
           name = this.manufacturerList[i].manufacturer_name;
         }
@@ -734,9 +726,6 @@ export default {
       });
     },
 
-    lili(){
-      console.log("exportList",this.exportList)
-    },
     toExport() {
       if (this.order_id == "") {
         this.$message.error("请勾选入库单");
@@ -853,7 +842,6 @@ export default {
         getallPatientList().then(response=>{
           if(response.data.state ==1){
             var patient = response.data.data.patient
-            console.log("patient====",patient)
             this.patientList = []
             var obj = {id:0,name:"全部"}
             this.patientList.push(obj)
@@ -872,15 +860,6 @@ export default {
         }
         return name
       },
-      getManufacturer(id){
-         var manufacturer_name = ""
-         for(let i=0;i<this.manufacturerList.length;i++){
-           if(id == this.manufacturerList[i].id){
-            manufacturer_name = this.manufacturerList[i].manufacturer_name
-           }
-         }
-         return
-      },
       getDealerName(id){
         var dealer_name = ""
         for(let i=0;i<this.dealerList.length;i++){

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))