8月15日

src/api/drug/drug.js

@@ -507,3 +507,27 @@ export function getGoodNewQuery(params) {
     params: params
   })
 }
+
+export function getGoodWarehouseOutInfoById(params) {
+  return request({
+    url: '/api/drug/getgoodwarehouseoutinfobyid',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getGoodPatientList(params) {
+  return request({
+    url: '/api/good/getgoodpatientlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getWarehouseOutDetailByPatientId(params) {
+  return request({
+    url: '/api/good/getwarehouseoutdetailbypatientid',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -3130,6 +3130,9 @@ export default {
 
           if (temp.length > 0) {
             for (let b = 0; b < temp.length; b++) {
+              if(temp[b].max_unit == temp[b].min_unit){
+                temp[b].retail_price = temp[b].min_price
+              }
               let temp_index = b + 1
               let obj = {
                 advice_id: 0,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3089,7 +3089,7 @@
             var temp2 = this.deepClone(this.teamList)
 
             var temp3 = this.deepClone(templateDrugs)
-
+           console.log("我的23323232232323232323哈哈哈哈哈哈",temp)
             if (temp3.length > 0) {
               for (let b = 0; b < temp3.length; b++) {
                 let obj = {
@@ -3125,6 +3125,9 @@
 
             if (temp.length > 0) {
               for (let b = 0; b < temp.length; b++) {
+                if(temp[b].max_unit == temp[b].min_unit){
+                  temp[b].retail_price = temp[b].min_price
+                }
                 let temp_index = b + 1
                 let obj = {
                   advice_id: 0,

src/xt_pages/stock/drugs/query.vue

@@ -1262,7 +1262,7 @@ export default {
       var min_str = "";
       var total = 0;
       var newarr = arr;
-      console.log("这是什sfsdfsf么！！！！！",storehouse_id)
+      
       if (newarr.length > 0) {
         for (let i = 0; i < newarr.length; i++) {
           if (newarr[i].storehouse_id == storehouse_id) {
@@ -1285,7 +1285,7 @@ export default {
           min_str = (total % min_number) + min_unit;
         }
       }
-      console.log("这是什么！！！！！",max_str + min_str)
+      
       return max_str + min_str;
     },
     getOutFlushNight(

src/xt_pages/stock/query/goodNewQuery.vue

@@ -91,7 +91,7 @@
                 <span v-if="org_id!=3907 && org_id!=9583">
                   <tr style="background: none" v-for="(item,index) in scope.row.warehouse_out_info" :key="index">
                     <td style="border-right: none; border-inline-end: none;text-align: center">
-                      <span style="color:blue" @click="d"> {{getWareOutInfoCount(scope.row.warehouse_out_info,item.storehouse_id)}}</span>&nbsp;
+                      <span style="color:#0099FF" @click="toDialogClick(scope.row.id,scope.row.good_name,scope.row.specification_name)"> {{getWareOutInfoCount(scope.row.warehouse_out_info,item.storehouse_id)}}</span>&nbsp;
                     </td>
                   </tr>
               </span>
@@ -190,13 +190,112 @@
             </el-pagination>
      </div>
 
+
+
+    <el-dialog
+      title="出库详情"
+      :visible.sync="dialogVisible"
+      width="70%">
+      <span>
+        耗材名称:{{good_name}}
+        规格&单位:{{specification_name}}
+        查询日期:
+          <el-date-picker
+            size="small"
+            v-model="start_first_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 150px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startFirstTimeChange"
+           ></el-date-picker> 
+            <span>-</span> 
+            <el-date-picker
+              size="small"
+              v-model="end_first_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 150px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="endEndTimeChange"
+          ></el-date-picker>
+      </span>
+      <el-divider></el-divider>
+       <el-table
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266'
+          }"
+          :data="tableData"
+          :class="signAndWeighBoxPatients"
+          border
+          >
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.warehouse_out_order_number}}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{getTime(scope.row.ctime)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="出库数量" align="center">
+              <template slot-scope="scope">
+                {{scope.row.count}}
+              </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">
+              {{getName(scope.row.patient_id)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center">
+            <template slot-scope="scope">
+              {{scope.row.remark}}
+            </template>
+          </el-table-column>
+       </el-table>
+       <el-pagination
+            @size-change="handleSizeChangeOne"
+            @current-change="handleCurrentChangeOne"
+            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="totalone"
+          >
+            </el-pagination>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 <script>
-import { getStorehouseList,getGoodNewQuery } from "@/api/drug/drug"
+import { getStorehouseList,getGoodNewQuery,getGoodWarehouseOutInfoById } from "@/api/drug/drug"
 import {
   getStockDrugCount
 } from "@/api/stock";
+import { uParseTime } from '@/utils/tools'
 export default {
 
   data(){
@@ -215,6 +314,9 @@ export default {
      limit:10,
      page:1,
      total:0,
+     limitone:10,
+     pageone:1,
+     totalone:0,
      keyword:"",
      goodTypeList:[],
      start_time:"",
@@ -224,6 +326,14 @@ export default {
      autoCountList:[],
      cancelCountList:[],
      org_id:this.$store.getters.xt_user.org_id,
+     dialogVisible:false,
+     start_first_time:"",
+     end_first_time:"",
+     tableData:[],
+     good_id:0,
+     patientList:[],
+     good_name:"",
+     specification_name:""
     }
   
   },
@@ -249,7 +359,9 @@ export default {
       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 = ""
+      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
@@ -273,6 +385,7 @@ export default {
            }
            this.manufacturerList = response.data.data.manufacturerList
            this.goodTypeList = response.data.data.goodTypeList
+           this.patientList = response.data.data.patientList
          }
       })
     },
@@ -317,13 +430,19 @@ export default {
     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)
+    },
+    handleCurrentChangeOne(val) {
+      this.pageone = val;
+      this.toDialogClick(this.good_id,this.good_name,this.specification_name)
+    },
    seach(){
     this.getlist()
    },
@@ -528,6 +647,53 @@ export default {
      }
      return total
    },
+   toDialogClick(id,good_name,specification_name){
+    this.good_id = id
+    this.good_name = good_name
+    this.specification_name = specification_name
+     var params = {
+       good_id:id,
+       limit:this.limitone,
+       page:this.pageone,
+       start_first_time:this.start_first_time,
+       end_first_time:this.end_first_time,
+     }
+     getGoodWarehouseOutInfoById(params).then(response=>{
+       if(response.data.state == 1){
+         var list = response.data.data.list
+         console.log("list23233233232w",list)
+         this.tableData = list
+         this.totalone = response.data.data.total
+         this.dialogVisible = true
+       }
+     })
+   
+   },
+   startFirstTimeChange(){
+    
+   },
+   endEndTimeChange(){
+
+   },
+  getTime(val) {
+    if(val < 0){
+      return ""
+    }
+   if(val == ""){
+     return ""
+   }else {
+    return uParseTime(val, '{y}-{m}-{d}')
+   }
+   },
+  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
+  }
   },
   created(){
     this.getStorehouseList()

src/xt_pages/stock/query/patientQuery.vue

@@ -1,7 +1,398 @@
 <template>
-  <div class="main-contain">
-     <div class="app-container ">
-       患者查询 库存查询喔喔喔
-     </div>
-  </div>
-</template>
+    <div class="main-contain">
+        <div class="app-container">
+         <el-container>
+               <div style="width:27%">
+                <el-row>
+                   时间:
+                    <el-date-picker
+                      size="small"
+                      v-model="start_time"
+                      prefix-icon="el-icon-date"
+                      :editable="false"
+                      style="width:160px;"
+                      type="date"
+                      placeholder="选择日期时间"
+                      align="right"
+                      format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      @change="startTimeChange"
+                    ></el-date-picker> 
+                      <span>-</span> 
+                      <el-date-picker
+                        size="small"
+                        v-model="end_time"
+                        prefix-icon="el-icon-date"
+                        :editable="false"
+                        style="width:160px;"
+                        type="date"
+                        placeholder="选择日期时间"
+                        align="right"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        @change="endTimeChange"
+                    ></el-date-picker>
+                </el-row>
+                <el-row></el-row>
+                 <el-row>
+                   <el-col :span="24">
+                      <el-input style="width:200px;margin-top:10px;margin-bottom:10px" placeholder="请输入患者姓名" v-model="keyword"></el-input>&nbsp;<el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+                   </el-col>
+                  </el-row>
+
+                  <el-row>
+                      <el-table
+                          ref="singleTable"
+                          :data="patientList"
+                          highlight-current-row
+                           border
+                          @current-change="handleCurrentChange"
+                           height="440"
+                           :row-style="{ color: '#303133' }"
+                          :header-cell-style="{
+                            backgroundColor: 'rgb(245, 247, 250)',
+                            color: '#606266'
+                          }"
+                        >
+                     <el-table-column
+                       prop="date"
+                       label="序号"
+                      align="center"
+                      >
+                      <template slot-scope="scope">
+                        {{scope.$index + 1}}
+                      </template>
+                    </el-table-column>
+                     <el-table-column
+                       prop="name"
+                      label="姓名"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.name}}
+                      </template>
+                     </el-table-column>
+
+                     </el-table>
+                  </el-row>
+               </div>
+
+                 <el-main>
+                  <div class="main newMain">
+                      
+                        
+                  <el-tabs>
+
+                   <el-tab-pane label="患者使用列表">
+                   
+                     <el-table
+                          :data="tableList"
+                          highlight-current-row
+                           border
+                           height="440"
+                           :row-style="{ color: '#303133' }"
+                          :header-cell-style="{
+                            backgroundColor: 'rgb(245, 247, 250)',
+                            color: '#606266'
+                          }"
+                        >
+                     <el-table-column
+                       prop="date"
+                       label="名称"
+                      align="center"
+                      >
+                      <template slot-scope="scope">
+                        {{scope.row.GoodInfo.good_name}}
+                      </template>
+                    </el-table-column>
+                     <el-table-column
+                       prop="name"
+                      label="生产厂家"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{getManufacturName(scope.row.manufacturer)}}
+                      </template>
+                     </el-table-column>
+                      <el-table-column
+                       prop="name"
+                      label="规格&单位"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.GoodInfo.specification_name}}
+                      </template>
+                     </el-table-column>
+                      <el-table-column
+                       prop="name"
+                      label="数量"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.count}}
+                      </template>
+                     </el-table-column>
+
+                     </el-table>
+                    </el-tab-pane>
+                   </el-tabs>
+                </div>
+             </el-main>
+          </el-container>
+        </el-container>
+      </el-container>
+      </div>
+    </div>
+
+</template>
+<script>
+import { getGoodPatientList,getWarehouseOutDetailByPatientId } from "@/api/drug/drug"
+export default {
+  data(){
+    return{
+      zoneList:[],
+      zone_id:0,
+      tableData:[],
+      DeviceTypeType:[],
+      device_type:"",
+      forms:{},
+      start_time:"",
+      end_time:"",
+      patientList:[],
+      tableList:[],
+      keyword:"",
+      manufacturerList:[],
+      patient_id:0,
+      patient:{},
+    }
+  },
+  methods:{
+    startTimeChange(){
+      this.handleCurrentChange(this.patient)
+    },
+    endTimeChange(){
+      this.handleCurrentChange(this.patient)
+    },
+    getlist(){
+        var params = {
+          keyword:this.keyword,
+        }
+      getGoodPatientList(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.patientList = list
+          this.$refs.singleTable.setCurrentRow(this.patientList[0]);
+          this.handleCurrentChange(this.patientList[0])
+        }
+      })
+    },
+   onSearch(){
+     this.getlist()
+   },
+   handleCurrentChange(val){
+       this.patient = val
+       var params = {
+         patient_id:val.id,
+         start_time:this.start_time,
+         end_time:this.end_time,
+       }
+     getWarehouseOutDetailByPatientId(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.manufacturerList = response.data.data.manufacturerList
+          this.tableList = list
+        }
+     })
+   },
+   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
+   }
+  },
+  created(){
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+     this.getlist()
+  },
+  
+}
+</script>
+
+
+   
+<style lang="scss" scoped>
+    .zone{
+      //  margin-left: 30px;
+      //  text-align: left;
+       width: 70px;
+       display: inline-block;
+       color:#606266;
+    }
+    .disinfect{
+      position: relative;
+      .newButton{
+        // position: absolute;
+        // right: 2%;
+        // top:4px;
+        // z-index: 9;
+        margin-bottom: 10px;
+    margin-left: 90%;
+      }
+    }
+    .disinfectOne{
+      position: relative;
+      .newButtonOne{
+        position: absolute;
+         right: 0;
+         top: -10;
+         z-index: 18;
+      }
+    }
+    .but{
+      width: 200px;
+      height: 50px;
+      // border: solid 1px red;
+      margin-left: 77%;
+    }
+    .clearn{
+      width: 460px;
+      height: 50px;
+      // border:solid 1px red;
+      margin-left:650px;
+    }
+
+  .zClass{
+    width: 200px;
+    height: 200px;
+    // border:solid 1px red;
+    margin-left: 450px;
+    margin-top: 200px;
+  }
+  .warn{
+    color: red;
+    font-size: 14px;
+    width: 100%;
+    display: inline-block;
+    margin-left: 96px;
+  }
+
+  .userbutton{
+       margin-bottom: 10px;
+    margin-left: 82%
+  }
+
+</style>
+<style lang="scss">
+   .a{
+     margin-bottom: 10px;
+      margin-top: 6px;
+
+   }
+
+   .b{
+    .el-button{
+      margin-left: 90%;
+      margin-bottom: 10px;
+    }
+   }
+
+   .stoppage{
+     .el-form-item__label{
+       width:190px;
+     }
+   }
+   .st{
+     .el-form-item__label{
+       width:-10px;
+     }
+   }
+   .main{
+     position: relative;
+     .newButtonOne{
+       position:absolute;
+       right: 0;
+       z-index: 2;
+     }
+   }
+
+    .elbutton{
+      // border: solid 1px red;
+      height: 50px;
+      width: 400px;
+      margin-left: 650px;
+    }
+  // .el-form-item__label {
+  //   width: 130px;
+  //   font-size: 14px;
+  // }
+  .el-form-item__error {
+    margin-left: 130px;
+  }
+
+ .el-upload-list__item-name {
+    color: #606266;
+    display: block;
+    margin-right: 40px;
+    overflow: hidden;
+    padding-left: 4px;
+    text-overflow: ellipsis;
+    transition: color .3s;
+    white-space: nowrap;
+}
+.el-main{
+  padding-top: 0px;
+}
+.newMain{
+  .el-form-item__label{
+    width: 104px;
+  }
+}
+.newDisinfectOne{
+  .el-input--prefix .el-input__inner{
+    padding-left: 15px
+  }
+}
+.stoppage{
+  .el-form-item__label{
+    width: 18%;
+  }
+}
+.newItem{
+  .el-form-item__label{
+    width: 130px;
+  }
+}
+.formItem{
+  .el-form-item__label{
+    width: 104px;
+    line-height: 30px;
+  }
+}
+.newname{
+  .el-form-item__label{
+    width: 60px;
+  }
+}
+::-webkit-scrollbar{
+  height: 20px;
+}
+</style>

src/xt_pages/stock/stockBatchNumber.vue

@@ -38,7 +38,8 @@
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
           ></el-date-picker>
-  
+          
+          
       </div>
       
        <el-table
@@ -92,6 +93,11 @@
              <span v-if="scope.row.packing_price > 0"> {{scope.row.packing_price}}</span>
            </template>
         </el-table-column>
+        <!-- <el-table-column prop="drug_name" label="该批次剩余库存" align="center">
+           <template slot-scope="scope">
+             <span> {{scope.row.stock_count}}</span>
+           </template>
+        </el-table-column> -->
         <el-table-column prop="drug_name" label="备注" align="center">
            <template slot-scope="scope">
              <span>{{scope.row.remark}}</span>