数据

src/api/drug/drug.js

@@ -459,3 +459,11 @@ export function SaveDrugProofInventory(params) {
     params: params
   })
 }
+
+export function getDrugWarehouseInfoTotal(params) {
+  return request({
+    url: '/api/drug/getdrugwarehouseinfototal',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -41,8 +41,8 @@
             <div>
                 <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
                 <el-button size="small" type="primary" @click="toCheck">核对</el-button>
-                <el-button size="small" type="primary" @click="print">打印</el-button>
-                <el-button size="small" type="primary">导出</el-button>
+                <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary">导出</el-button> -->
             </div>
         </div>
         <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">
@@ -57,6 +57,16 @@
                   {{getTime(scope.row.start_time)}}
                 </template>
             </el-table-column>
+            <el-table-column prop="name" label="药品名称" align="center">
+               <template slot-scope="scope">
+                  {{scope.row.drug_name}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="name" label="规格" align="center">
+               <template slot-scope="scope">
+                  {{scope.row.specification_name}}
+                </template>
+            </el-table-column>
             <el-table-column prop="name" label="报损数量" align="center">
                <template slot-scope="scope">
                   {{scope.row.count}}
@@ -83,7 +93,7 @@
                 <span v-if="scope.row.checker_status == 2">未核对</span>
               </template>   
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" width="200">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" @click="moDrugDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
                   <el-button type="danger" size="small" @click="deleteDrugDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
@@ -102,12 +112,12 @@
         </el-pagination>
     </div>
     <el-dialog
-        title="库房报损"
+        title="药品报损"
         :visible.sync="dialogVisible"
         width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
             <el-form-item label="药品ID">
-                <el-input v-model="form.drug_id"></el-input>
+                <el-input v-model="form.drug_id" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="药品名称">
               <el-autocomplete
@@ -119,7 +129,7 @@
                   placeholder="请输入药品名称"
                   @select="handleSelect"
                   @input="changeGoodName(scope.$index)"
-                  style="width:160px;"
+                  style="width:260px;"
                   >
                   <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -140,36 +150,28 @@
             </el-form-item>
          
             <el-form-item label="单位">
-                <el-input v-model="form.warehousing_unit"></el-input>
-              <!-- <el-select v-model="scope.row.warehousing_unit" filterable placeholder="请选择单位" style="width:80px">
-                <el-option
-                  v-for="(option, index) in unitList"
-                  :key="index"
-                  :label="option.name"
-                  :value="option.name">
-                </el-option>
-              </el-select> -->
+                <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="进货价">
-                <el-input v-model="form.last_price"></el-input>
+                <el-input v-model="form.last_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="零售价">
-                <el-input v-model="form.retail_price"></el-input>
+                <el-input v-model="form.retail_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="报损数量">
                 <el-input v-model="form.count"></el-input>
             </el-form-item>
             <el-form-item label="库存">
-                <el-input v-model="form.total" :disabled="true"></el-input>
+                <el-input v-model="form.total" :disabled="true" ></el-input>
             </el-form-item>
             <el-form-item label="产地">
-                <el-input v-model="form.drug_origin_place"></el-input>
+                <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="批准文号">
-                <el-input v-model="form.number"></el-input>
+                <el-input v-model="form.number" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商">
-                <el-input v-model="form.manufacturer"></el-input>
+                <el-input v-model="form.manufacturer" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="备注">
                 <div style="display:flex;">
@@ -214,11 +216,7 @@
                 {{scope.row.retail_price}}
               </template>
             </el-table-column>
-            <!-- <el-table-column prop="name" label="新零售价" width="100" align="center">
-                <template slot-scope="scope">
-                {{scope.row.new_price}}
-               </template>
-            </el-table-column> -->
+        
             <el-table-column  prop="name"  label="生产厂商"  width="100" align="center">
               <template slot-scope="scope">
                 {{scope.row.manufacturer}}
@@ -245,7 +243,7 @@
             label="操作">
                 <template slot-scope="scope">
                     <el-button type="text" size="small" @click="toDel(scope.$index)">删除</el-button>
-                    <el-button type="text" size="small" @click="toEdit(scope.row)">编辑</el-button>
+                    <el-button type="text" size="small" @click="toEdit(scope.row,scope.$index)">编辑</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -257,7 +255,7 @@
    
 
     <el-dialog
-        title="耗材盘点核对"
+        title="药品盘点核对"
         :visible.sync="checkDialogVisible"
         width="30%"
         >
@@ -305,7 +303,7 @@
         width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
             <el-form-item label="药品ID">
-                <el-input v-model="form.drug_id"></el-input>
+                <el-input v-model="form.drug_id" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="药品名称">
             <el-autocomplete
@@ -325,37 +323,46 @@
                 </template>
                 </el-autocomplete>  
             </el-form-item>
-            <!-- <el-form-item label="规格">
-                <el-input v-model="form.name"></el-input>
-            </el-form-item> -->
+            <el-form-item label="批次">
+               <el-select v-model="form.batch_number" filterable placeholder="请选择" @change="changeNumber">
+                  <el-option
+                    v-for="(item,index) in numberList"
+                    :key="index"
+                    :label="item.batch_number"
+                    :value="item.id">
+                  </el-option>
+               </el-select>
+            </el-form-item>
+            <el-form-item label="规格">
+                <el-input v-model="form.specification_name" :disabled="true"></el-input>
+            </el-form-item>
             <el-form-item label="单位">
-                <el-input v-model="form.warehousing_unit"></el-input>
+                <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="进货价">
-                <el-input v-model="form.last_price"></el-input>
+                <el-input v-model="form.last_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="零售价">
-                <el-input v-model="form.retail_price"></el-input>
+                <el-input v-model="form.retail_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="报损数量">
                 <el-input v-model="form.count"></el-input>
             </el-form-item>
             <el-form-item label="库存">
-                <el-input v-model="form.total"></el-input>
+                <el-input v-model="form.total" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="产地">
-                <el-input v-model="form.drug_origin_place"></el-input>
+                <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="批准文号">
-                <el-input v-model="form.number"></el-input>
+                <el-input v-model="form.number" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商">
-                <el-input v-model="form.manufacturer"></el-input>
+                <el-input v-model="form.manufacturer" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="备注">
                 <div style="display:flex;">
                     <el-input v-model="form.remark"></el-input>
-                    <el-button style="margin-left:5px;" type="primary" @click="addPrice">添加</el-button>
                 </div>
             </el-form-item>
         </el-form>
@@ -373,7 +380,7 @@
         width="1200px">
         <el-form :model="form" class="modifyDialog" label-width="120px">
             <el-form-item label="药品ID">
-                <el-input v-model="form.drug_id"></el-input>
+                <el-input v-model="form.drug_id" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="药品名称">
             <el-autocomplete
@@ -397,33 +404,32 @@
                 <el-input v-model="form.name"></el-input>
             </el-form-item> -->
             <el-form-item label="单位">
-                <el-input v-model="form.warehousing_unit"></el-input>
+                <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="进货价">
-                <el-input v-model="form.last_price"></el-input>
+                <el-input v-model="form.last_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="零售价">
-                <el-input v-model="form.retail_price"></el-input>
+                <el-input v-model="form.retail_price" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="报损数量">
                 <el-input v-model="form.count"></el-input>
             </el-form-item>
             <el-form-item label="库存">
-                <el-input v-model="form.total"></el-input>
+                <el-input v-model="form.total" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="产地">
-                <el-input v-model="form.drug_origin_place"></el-input>
+                <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="批准文号">
-                <el-input v-model="form.number"></el-input>
+                <el-input v-model="form.number" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="生产厂商">
-                <el-input v-model="form.manufacturer"></el-input>
+                <el-input v-model="form.manufacturer" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="备注">
                 <div style="display:flex;">
                     <el-input v-model="form.remark"></el-input>
-                    <el-button style="margin-left:5px;" type="primary" @click="addPrice">添加</el-button>
                 </div>
             </el-form-item>
         </el-form>
@@ -439,7 +445,7 @@
 
 <script>
 import BreadCrumb from "../../components/bread-crumb";
-import { postSearchDrugWarehouseList,saveDrugDamage,getDrugDamageList,SaveDrugDamagePrice,getDrugDamageDetail,modifyDrugDamage,deleteDrugDamage,getDrugWarehouseInfoList } from "@/api/drug/drug"
+import { postSearchDrugWarehouseList,saveDrugDamage,getDrugDamageList,SaveDrugDamagePrice,getDrugDamageDetail,modifyDrugDamage,deleteDrugDamage,getDrugWarehouseInfoList,getDrugWarehouseInfoTotal } from "@/api/drug/drug"
 import { getDrugBatchNumber } from  "@/api/drug/drug_stock"
 import { uParseTime } from '@/utils/tools'
 export default {
@@ -488,6 +494,8 @@ export default {
                 warehouse_info_id:"",
                 expiry_date:"",
                 product_date:"",
+                stock_max_number:"",
+                stock_min_number:"",
             },
             drugList:[],
             manufacturerList:[],
@@ -508,11 +516,12 @@ export default {
             modifyDialogVisible:false,
             id:"",
             numberList:[],
+            index:0,
         }
     },
     methods:{
         search(){
-
+          this.getlist()
         },
         print(){
           if(this.ids == ""){
@@ -596,14 +605,17 @@ export default {
                 this.form.dealer = val.dealer
                 this.form.manufacturer = val.manufacturer
                 this.form.remark = val.remark
-                this.form.warehousing_unit = val.max_unit  
-                this.form.total = this.getTotal(total,val.max_unit,val.min_unit,val.min_number)
-                this.form.batch_number = val.batch_number
+                this.form.warehousing_unit = val.max_unit 
+                this.form.total = "" 
+                // this.form.total = this.getTotal(total,val.max_unit,val.min_unit,val.min_number)
+                // this.form.batch_number = val.batch_number
                 this.form.last_price = val.last_price
                 this.form.expiry_date = val.expiry_date
                 this.form.product_date = val.product_date
                 this.form.specification_name =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
                 this.form.drug_origin_place = val.drug_origin_place
+                this.form.batch_number = ""
+                this.form.total = ""
              }
            }) 
         },
@@ -629,6 +641,7 @@ export default {
         changeNumber(val){
           console.log("val",val)
           this.form.warehousing_info_id = val
+          this.getDrugWarehouseInfoTotal(val)
         },
         getDrugBatchNumber(id){
             var params = {
@@ -653,6 +666,19 @@ export default {
          }
         },
         addPrice(){
+          console.log("批次号",this.form.batch_number)
+          if(this.form.drug_name == ""){
+             this.$message.error("请输入药品名称")
+             return
+          }
+          if(this.form.batch_number == ""){
+            this.$message.error("请选择批次号")
+            return false
+          }
+          if(this.form.count == ""){
+             this.$message.error("请输入报损数量")
+             return false
+          }
           var obj = {
             drug_id:this.form.drug_id,
             drug_name:this.form.drug_name,
@@ -674,7 +700,10 @@ export default {
             specification_name:this.form.specification_name,
             drug_origin_place:this.form.drug_origin_place,
             warehousing_info_id:this.form.warehousing_info_id,
-            batch_number:this.form.batch_number
+            batch_number:this.form.batch_number,
+            stock_max_number:this.form.stock_max_number,
+            stock_min_number:this.form.stock_min_number,
+            total:this.form.total,
           } 
           this.tableData.push(obj)   
           this.form.drug_name = ""
@@ -694,15 +723,25 @@ export default {
           this.form.product_date = ""
           this.form.specification_name = ""
           this.form.drug_origin_place = "" 
+          this.form.total = ""
         },
         saveDrugDamage(){
-          console.log("hhhh",this.tableData)
-          console.log("oooo",this.numberList)
+        
           for(let i=0;i<this.tableData.length;i++){
               this.tableData[i].retail_price = this.tableData[i].retail_price.toString()
               this.tableData[i].last_price = this.tableData[i].last_price.toString()
               this.tableData[i].new_price = this.tableData[i].new_price.toString()
               this.tableData[i].count =  parseInt(this.tableData[i].count)
+              if(this.tableData[i].stock_max_number == ""){
+                this.tableData[i].stock_max_number = 0
+              }else{
+                this.tableData[i].stock_max_number = parseInt(this.tableData[i].stock_max_number)
+              }
+              if(this.tableData[i].stock_min_number == ""){
+                this.tableData[i].stock_min_number = 0
+              }else{
+                this.tableData[i].stock_min_number = parseInt(this.tableData[i].stock_min_number)
+              }
               if(this.tableData[i].expiry_date == undefined){
                 this.tableData[i].expiry_date  = 0
               }else{
@@ -723,7 +762,7 @@ export default {
             tableData:this.tableData,
           }
           console.log("parasm222",params)
- 
+   
         saveDrugDamage(params).then(response=>{
             if(response.data.state == 1){
             var msg =  response.data.data.msg
@@ -741,6 +780,7 @@ export default {
           page:this.page, 
           start_time:this.start_time,
           end_time:this.end_time,
+          keyword:this.searchKey,
         }
         getDrugDamageList(params).then(response=>{
            if(response.data.state == 1){
@@ -798,7 +838,8 @@ export default {
      toDel(index){
        this.tableList.splice(index,1)
      },
-     toEdit(val){
+     toEdit(val,index){
+       this.index = index
        this.form.drug_name = val.drug_name
        this.form.drug_origin_place = val.drug_origin_place
        this.form.last_price = val.last_price
@@ -810,6 +851,10 @@ export default {
        this.form.remark = val.remark
        this.form.id = val.id
        this.form.count = val.count
+       this.form.specification_name = val.specification_name
+       this.form.warehousing_unit = val.warehousing_unit
+       this.form.stock_max_number = val.stock_max_number
+       this.form.stock_min_number = val.stock_min_number,
        this.editDialogVisible = true
      },
      EditDrugDamage(){
@@ -823,6 +868,24 @@ export default {
             this.tableData[i].retail_price = this.form.retail_price
             this.tableData[i].remark = this.form.remark
             this.tableData[i].count = this.form.count
+            this.tableData[i].stock_max_number = this.form.stock_max_number
+            this.tableData[i].stock_min_number = this.form.stock_min_number
+            this.tableData[i].manufacturer = this.form.manufacturer
+            this.tableData[i].dealer = this.form.dealer
+          }
+          if(this.index == i){
+            this.tableData[i].drug_name = this.form.drug_name
+            this.tableData[i].drug_origin_place = this.form.drug_origin_place
+            this.tableData[i].last_price = this.form.last_price
+            this.tableData[i].new_price = this.form.new_price
+            this.tableData[i].number = this.form.number
+            this.tableData[i].retail_price = this.form.retail_price
+            this.tableData[i].remark = this.form.remark
+            this.tableData[i].count = this.form.count
+            this.tableData[i].stock_max_number = this.form.stock_max_number
+            this.tableData[i].stock_min_number = this.form.stock_min_number
+            this.tableData[i].manufacturer = this.form.manufacturer
+            this.tableData[i].dealer = this.form.dealer
           }
        }
        this.editDialogVisible = false
@@ -844,6 +907,7 @@ export default {
        getDrugDamageDetail(id).then(response=>{
          if(response.data.state ==1){
            var detail = response.data.data.detail
+           console.log("系准给",detail)
            this.form.drug_id = detail.drug_id
            this.form.drug_name = detail.drug_name
            this.form.drug_origin_place = detail.drug_origin_place
@@ -855,12 +919,26 @@ export default {
            this.form.remark = detail.remark
            this.form.count = detail.count
            this.id = detail.id
-           this.form.warehousing_unit = detail.warehouseing_unit
+           this.form.warehousing_unit = detail.warehousing_unit
+           this.form.stock_max_number = detail.stock_max_number
+           this.form.stock_min_number = detail.stock_min_number
+           this.form.total = detail.total
+           this.form.warehousing_info_id = detail.warehousing_info_id
            this.modifyDialogVisible = true
          }
        })
      },
      modifyDrugDamage(){
+       if(this.form.stock_max_number == ""){
+         this.form.stock_max_number = 0
+       }else{
+         this.form.stock_max_number = parseInt(this.form.stock_max_number)
+       }
+       if(this.form.stock_min_number == ""){
+         this.form.stock_min_number = 0
+       }else{
+         this.form.stock_min_number = parseInt(this.form.stock_min_number)
+       }
          var params = {
            drug_id:this.form.drug_id,
            drug_name:this.form.drug_name,
@@ -874,6 +952,9 @@ export default {
            count:parseInt(this.form.count),
            warehousing_unit:this.form.warehousing_unit,
            id:this.id,
+           total:this.form.total,
+           stock_max_number:this.form.stock_max_number,
+           stock_min_number:this.form.stock_min_number,
          }
        modifyDrugDamage(params).then(response=>{
           if(response.data.state == 1){
@@ -916,6 +997,27 @@ export default {
      changeEndTime(val){
        this.end_time = this.getTime(val)
        this.getlist()
+     },
+     getDrugWarehouseInfoTotal(val){
+        var params = {
+          id:val,
+        }
+      getDrugWarehouseInfoTotal(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           console.log("list",list)
+          //  this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit + list.stock_min_number + list.XtBaseDrug.min_unit
+          if(list.stock_max_number > 0){
+            this.form.total = list.stock_max_number + list.XtBaseDrug.max_unit
+            this.form.stock_max_number = list.stock_max_number
+          }
+          if(list.stock_min_number >0 ){
+            this.form.total = list.stock_min_number + list.XtBaseDrug.min_unit
+            this.form.stock_min_number = list.stock_min_number
+          }
+          
+         }
+      })
      }
     },
     created(){

src/xt_pages/stock/drugs/inventory.vue

@@ -100,12 +100,12 @@
         >
         </el-pagination>
         <el-dialog
-        title="库房调价"
+        title="药品盘点"
         :visible.sync="dialogVisible"
         width="1200px">
             <el-form :model="form" class="modifyDialog" label-width="120px">
-                <el-form-item label="耗材ID">
-                    <el-input v-model="form.drug_id"></el-input>
+                <el-form-item label="药品ID">
+                    <el-input v-model="form.drug_id" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="药品名称">
                   <el-autocomplete
@@ -139,13 +139,13 @@
                     <el-input v-model="form.specification_name" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="单位">
-                    <el-input v-model="form.warehousing_unit"></el-input>
+                    <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="进货价">
-                    <el-input v-model="form.last_price"></el-input>
+                    <el-input v-model="form.last_price" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="零售价">
-                    <el-input v-model="form.retail_price"></el-input>
+                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="盘点数量">
                     <el-input v-model="form.count"></el-input>
@@ -154,13 +154,13 @@
                     <el-input v-model="form.total" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="产地">
-                    <el-input v-model="form.drug_origin_place"></el-input>
+                    <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="批准文号">
-                    <el-input v-model="form.number"></el-input>
+                    <el-input v-model="form.number" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="生产厂商">
-                    <el-input v-model="form.manufacturer"></el-input>
+                    <el-input v-model="form.manufacturer" :disabled="true"></el-input>
                 </el-form-item>
                 <el-form-item label="备注">
                     <div style="display:flex;">