Merge remote-tracking branch 'origin/20220812' into 20220812

src/views/layout/Layout.vue

@@ -12,10 +12,10 @@
           <i class="iconfont icon-s_bingli navIcon"></i>
           <p>电子病历</p>
         </div>
-        <div v-if="medicianshow" :class="index == 7 ? 'navOne navActive' : 'navOne'" @click="clickActive(7,'药房管理')">
+        <!-- <div v-if="medicianshow" :class="index == 7 ? 'navOne navActive' : 'navOne'" @click="clickActive(7,'药房管理')">
           <i class="iconfont icon-shangcheng-1 navIcon"></i>
           <p>药房管理</p>
-        </div>
+        </div> -->
         <div v-if="touxiShow" :class="index == 2 ? 'navOne navActive' : 'navOne'" @click="clickActive(2,'透析管理')">
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
@@ -139,7 +139,7 @@ export default {
     let caigou = ['supplyManage','supplyList'];
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];
     let kuyishopping = ['kuyiShopping'];
-    let medician = ['PatientDispensing','DrugDispensing','DispensingDetails','MedicianManagement']
+    let medician = ['PatientDispensing','DrugDispensing','DispensingDetails','stockDrugs']
     let menzhenArr = [];
     let bingliArr = [];
     let touxiArr = [];

src/views/layout/components/Sidebar/index.vue

@@ -103,7 +103,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '药房管理'){
-          let nameArr = ['PatientDispensing','DrugDispensing','DispensingDetails','MedicianManagement']
+          let nameArr = ['PatientDispensing','DrugDispensing','DispensingDetails','stockDrugs']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = [];
           this.permission_routers.map(item => {

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -530,6 +530,10 @@ export default {
   }
 }
 
+.el-input__inner{
+  padding-right: 15px;
+}
+
 /deep/ .el-table--scrollable-x .el-table__body-wrapper {
   overflow: auto;
 }

src/xt_pages/Pharmacy/print/drugPrint.vue

@@ -9,7 +9,7 @@
       >打印</el-button
     >
     <div id="dialysis-print-box-1" class="dialysis-print-box-1">
-      <div class="list_title" style="border-bottom:none;"><div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">{{org_name}}医院 领药单</div></div>
+      <div class="list_title" style="border-bottom:none;"><div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">{{org_name}} 领药单</div></div>
       <div class="list_title">
         <div>药品名称：{{name}}</div>
         <div>规格：{{specifications}}</div>
@@ -152,11 +152,12 @@ export default {
       this.printJson({
         title: `
         <div>
-        <div style="width: 940px;text-align:center;font-size:16px;font-weight:bold;">${this.org_name}医院 领药单</div>
+        <div style="width: 940px;text-align:center;font-size:16px;font-weight:bold;">${this.org_name} 领药单</div>
         <div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;font-size:14px;">
         <div style="width: 230px;padding: 10px 0;">药品名称：${this.name}</div>
         <div style="width: 230px;padding: 10px 0;">规格：${this.specifications}</div>
         <div style="width: 230px;padding: 10px 0;">发药状态：${this.state_name}</div>
+        <div style="width: 230px;padding: 10px 0;">日期：</div>
         </div>`, // 打印出来的标题
         data: this.tableData, // 需要打印的数据
         serial: true, // 是否需要打印序列号

src/xt_pages/Pharmacy/print/patientPrint.vue

@@ -9,7 +9,7 @@
       >打印</el-button
     >
     <div id="dialysis-print-box-1" class="dialysis-print-box-1">
-       <div class="list_title" style="border-bottom:none;"><div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">{{org_name}}医院 发药单</div></div>
+       <div class="list_title" style="border-bottom:none;"><div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">{{org_name}} 发药单</div></div>
       <div class="list_title">
         <div>患者名称：{{name}}</div>
         <div>发药状态：{{state}}</div>
@@ -23,7 +23,7 @@
         max-height="450"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
       >
-        <el-table-column type="index" prop="index" label="序号" width="60">
+        <el-table-column type="index" prop="index" label="序号" width="60" align="center">
         </el-table-column>
         <el-table-column prop="name" label="名称" width="160">
           <template slot-scope="scope" >
@@ -140,9 +140,13 @@ export default {
       //     scanStyles: false,
       //   });
       this.printJson({
-        title: `<div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;">
-        <div style="width: 230px;padding: 10px 0;">患者名称：${this.name}</div>
-        <div style="width: 230px;padding: 10px 0;">发药状态：${this.state}</div>
+        title: `
+        <div>
+        <div style="width: 940px;text-align:center;font-size:16px;font-weight:bold;">${this.org_name} 发药单</div>
+        <div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;font-size:14px;">
+        <div style="width: 310px;padding: 10px 0;">患者名称：${this.name}</div>
+        <div style="width: 320px;padding: 10px 0;">发药状态：${this.state}</div>
+        <div style="width: 310px;padding: 10px 0;">日期：</div>
         </div>`, // 打印出来的标题
         data: this.tableData, // 需要打印的数据
         serial: true, // 是否需要打印序列号
@@ -221,7 +225,7 @@ export default {
   margin: 30px auto;
 
   div {
-    width: 230px;
+    width: 320px;
     padding: 10px 0;
   }
 }

src/xt_pages/stock/query/goodNewQuery.vue

@@ -1,7 +1,185 @@
 <template>
   <div class="main-contain">
      <div class="app-container ">
-         库存查询喔喔喔
+        <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+         <div>
+          <span>仓库:</span>
+          <el-select v-model="storehouse_id" style="width:200px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeStorehouseName">
+            <el-option
+              v-for="item in houseList"
+              :key="item.id"
+              :label="item.storehouse_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <span>库存预警:</span>
+          <el-select v-model="good_id" style="width:250px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeGoodName">
+            <el-option
+              v-for="item in goodList"
+              :key="item.id"
+              :label="item.good_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+         </div>
+        </div>
+
+           <el-table
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+            :data="tableList"
+            :class="signAndWeighBoxPatients"
+            border
+          >
+            <el-table-column label="耗材类型" align="center">
+              <template slot-scope="scope">
+                
+            </template>
+            </el-table-column>
+            <el-table-column label="耗材名称" align="center">
+              <template slot-scope="scope">
+               
+              </template>
+            </el-table-column>
+            <el-table-column label="规格&单位" align="center">
+                <template slot-scope="scope">
+                  
+                </template>
+            </el-table-column>
+            <el-table-column label="生产厂商" align="center">
+                <template slot-scope="scope">
+                 
+                </template>
+            </el-table-column>
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+               
+              </template>
+            </el-table-column>
+            <el-table-column label="仓库名称" align="center">
+              <template slot-scope="scope">
+             
+              </template>
+            </el-table-column>
+        
+    
+            <el-table-column label="入库量" align="center">
+              <template slot-scope="scope">
+                
+              </template>
+            </el-table-column>
+
+            <el-table-column label="出库量" align="center">
+              <template slot-scope="scope">
+                
+              </template>
+            </el-table-column>
+
+            <el-table-column label="退库数量" align="center">
+              <template slot-scope="scope">
+                
+              </template>
+            </el-table-column>
+
+             <el-table-column label="实际出库" align="center">
+              <template slot-scope="scope">
+                
+              </template>
+            </el-table-column>
+
+            <el-table-column label="剩余库存" align="center">
+              <template slot-scope="scope">
+                
+              </template>
+            </el-table-column>
+
+            <el-table-column label="总库存量" align="center">
+              <template slot-scope="scope">
+                
+              </template>
+            </el-table-column>
+           
+            <el-table-column label="操作" align="center">
+             
+              <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>
      </div>
+
   </div>
-</template>
+</template>
+<script>
+export default {
+
+  data(){
+    return{
+     tableList:[],
+     goodList:[],
+     houseList:[],
+     storehouse_id:0,
+     good_id:0,
+     multipleSelection: [],
+     signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+     manufacturerList:[],
+    }
+  
+  },
+  methods:{
+    changeStorehouseName(){
+
+    },
+    changeGoodName(){
+
+    },
+    toClick(val){
+       var manufacturer_name = ""
+       var specification_name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+          if(val.manufacturer == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+       }
+      specification_name = val.specification_name + "/" + val.packing_unit
+      var overCount  = this.getOverplus(val.xt_warehouse_info)
+      // window.sessionStorage.setItem('start_time',this.start_time)
+      // window.sessionStorage.setItem('end_time',this.end_time)
+      this.$router.push({path:"/stock/in/stockflow?id="+val.id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
+    },
+    toClickOne(val){
+      var manufacturer_name = ""
+      for(let i=0;i<this.manufacturerList.length;i++){
+          if(val.manufacturer == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+       }
+      specification_name = val.specification_name + "/" + val.packing_unit
+      var overCount  = this.getOverplus(val.xt_warehouse_info)
+      // window.sessionStorage.setItem('start_time',this.start_time)
+      // window.sessionStorage.setItem('end_time',this.end_time)
+      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
+    },
+  }
+}
+</script>
+