数据

src/api/stock.js

@@ -938,3 +938,11 @@ export function proofInventory(params) {
     params: params
   })
 }
+
+export function getWarehouseTotal(params) {
+  return request({
+    url: '/api/stock/getwarehousetotal',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/stock/drugs/drugModifyPrice.vue

@@ -55,28 +55,38 @@
                     {{scope.row.warehousing_order}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="date" label="调价日期" width="200px"  align="center">
+                <el-table-column prop="date" label="调价日期" width="150px"  align="center">
                    <template slot-scope="scope">
                     {{getTime(scope.row.start_time)}}
                   </template>  
                 </el-table-column>
-                 <el-table-column prop="date" label="现价格" width="200px"  align="center">
+                <el-table-column prop="date" label="药品名称" width="200px"  align="center">
+                   <template slot-scope="scope">
+                    {{scope.row.drug_name}}
+                  </template>  
+                </el-table-column>
+                <el-table-column prop="date" label="药品规格" width="100px"  align="center">
+                   <template slot-scope="scope">
+                    {{scope.row.specification_name}}
+                  </template>  
+                </el-table-column>
+                 <el-table-column prop="date" label="现价格" width="100px"  align="center">
                    <template slot-scope="scope">
                     {{scope.row.new_price}}
                   </template>  
                 </el-table-column>
-                <el-table-column prop="name" label="操作人" width="200px"  align="center">
+                <el-table-column prop="name" label="操作人" width="100px"  align="center">
                  <template slot-scope="scope">
                     {{getDoctorName(scope.row.creater)}}
                   </template>  
                 </el-table-column>
-                <el-table-column prop="name" label="状态"  align="center">
+                <el-table-column prop="name" label="状态"  align="center" width="100px">
                   <template slot-scope="scope">
                      <span v-if="scope.row.checker_status == 1">已核对</span>
                      <span v-if="scope.row.checker_status == 2">未核对</span>
                   </template>  
                 </el-table-column>
-                <el-table-column prop="name" label="核对人"  align="center">
+                <el-table-column prop="name" label="核对人"  align="center" width="100px">
                   <template slot-scope="scope">
                     {{getDoctorName(scope.row.checker)}}
                   </template>  
@@ -117,7 +127,7 @@
                     placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
-                    style="width:160px;"
+                    style="width:300px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -126,7 +136,7 @@
                  </el-autocomplete>  
             </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.new_price"></el-input>
@@ -192,9 +202,9 @@
                   {{scope.row.number}}
                 </template>    
             </el-table-column>
-            <el-table-column prop="name" label="供应商" width="100" align="center">
+            <el-table-column prop="name" label="经销商" width="100" align="center">
                 <template slot-scope="scope">
-                  {{scope.row.manufacturer}}
+                  {{scope.row.dealer}}
                 </template>    
             </el-table-column>
             <el-table-column prop="name" label="备注"  width="100" align="center">
@@ -281,7 +291,7 @@
                     placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
-                    style="width:160px;"
+                    style="width:300px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -289,19 +299,25 @@
                   </template>
                  </el-autocomplete>  
               </el-form-item>
+               <el-form-item label="规格:">
+                 <el-input v-model="form.specification_name" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
                <el-form-item label="原价格：">
-                 <el-input v-model="form.retail_price" style="width:200px"></el-input>
+                 <el-input v-model="form.retail_price" style="width:200px" :disabled="true"></el-input>
                </el-form-item>
                <el-form-item label="现价格：">
                     <el-input v-model="form.new_price" style="width:200px"></el-input>
                 </el-form-item>
+                <el-form-item label="生产厂商:">
+                    <el-input v-model="form.manufacturer" style="width:200px" :disabled="true"></el-input>
+                </el-form-item>
+               <el-form-item label="经销商:">
+                    <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
+                </el-form-item>
              </el-col> 
             </el-row>
             <el-row>
              <el-col>
-               <!-- <el-form-item label="调价数量：">
-                    <el-input v-model="form.count"  style="width:200px"></el-input>
-                </el-form-item> -->
                 <el-form-item label="备注：">
                     <div style="display:flex;">
                         <el-input v-model="form.remark"  style="width:200px"></el-input>
@@ -336,7 +352,7 @@
                     placeholder="请输入药品名称"
                     @select="handleSelect"
                     @input="changeGoodName(scope.$index)"
-                    style="width:160px;"
+                    style="width:200px;"
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
@@ -344,19 +360,31 @@
                   </template>
                  </el-autocomplete>  
               </el-form-item>
+               <el-form-item label="规格:">
+                 <el-input v-model="form.specification_name" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
+               <el-form-item label="单位:">
+                 <el-input v-model="form.warehousing_unit" style="width:200px" :disabled="true"></el-input>
+               </el-form-item>
                <el-form-item label="原价格：">
-                 <el-input v-model="form.retail_price" style="width:200px"></el-input>
+                 <el-input v-model="form.retail_price" style="width:200px" :disabled="true"></el-input>
                </el-form-item>
                <el-form-item label="现价格：">
                     <el-input v-model="form.new_price" style="width:200px"></el-input>
                 </el-form-item>
+                <el-form-item label="生产厂商：">
+                    <el-input v-model="form.manufacturer" style="width:200px" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="批准文号：">
+                    <el-input v-model="form.number" style="width:200px" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="经销商：">
+                    <el-input v-model="form.number" style="width:200px" :disabled="true"></el-input>
+                </el-form-item>
              </el-col> 
             </el-row>
             <el-row>
              <el-col>
-               <!-- <el-form-item label="调价数量：">
-                    <el-input v-model="form.count"  style="width:200px"></el-input>
-                </el-form-item> -->
                 <el-form-item label="备注：">
                     <div style="display:flex;">
                         <el-input v-model="form.remark"  style="width:200px"></el-input>
@@ -456,7 +484,16 @@ export default {
            }  
         },
         addPrice(){
+          if(this.form.drug_name == ""){
+            this.$message.error("请输入药品名称")
+            return
+          }
+          if(this.form.new_price == ""){
+            this.$message.error("请输入现价格")
+            return
+          }
           var obj = {
+            id:this.form.id,
             drug_id:this.form.drug_id,
             drug_name:this.form.drug_name,
             warehousing_unit:this.form.warehousing_unit,
@@ -472,7 +509,7 @@ export default {
             last_price:this.form.last_price,
             start_time:this.getTime(new Date()),
             specification_name:this.form.specification_name,
-            } 
+          } 
           this.tableData.push(obj)     
         },
         querySearchAsync(keyword, cb) {
@@ -523,7 +560,11 @@ export default {
             this.form.retail_price = val.retail_price
             this.form.warehousing_order = val.warehousing_order
             this.form.number = val.number
-            this.form.dealer = val.dealer
+            if(val.dealer == 0){
+              this.form.dealer = ""
+            }else{
+               this.form.dealer = val.dealer
+            }
             this.form.manufacturer = val.manufacturer
             this.form.remark = val.remark
             this.form.warehousing_unit = val.max_unit  
@@ -531,6 +572,7 @@ export default {
             this.form.batch_number = val.batch_number
             this.form.last_price = val.last_price
             this.form.specification_name =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
+            this.form.new_price = ""
         },
         getTime(val) {
          if(val < 0){
@@ -635,12 +677,17 @@ export default {
        this.tableData.splice(index,1)
      },
      toEdit(row){
+      console.log("row2222",row)
       this.form.drug_name = row.drug_name
       this.form.retail_price = row.retail_price
       this.form.new_price = row.new_price
-      this.form.count = row.count
       this.form.remark = row.remark
       this.form.id = row.id
+      this.form.specification_name = row.specification_name
+      this.form.last_price = row.last_price
+      this.form.number = row.number
+      this.form.manufacturer = row.manufacturer
+      this.form.dealer = row.dealer
       this.editPriceDialogVisible = true  
      },
      upatePrice(){
@@ -651,6 +698,12 @@ export default {
             this.tableData[i].new_price = this.form.new_price
             this.tableData[i].count = this.form.count
             this.tableData[i].remark = this.form.remark
+         }else{
+           this.tableData[i].drug_name = this.form.drug_name
+           this.tableData[i].retail_price = this.form.retail_price
+           this.tableData[i].new_price - this.form.new_price
+           this.tableData[i].count = this.form.count
+           this.tableData[i].remark = this.form.remark
          }
        }
        this.editPriceDialogVisible = false
@@ -668,12 +721,20 @@ export default {
        getDrugModiftyPrice(id).then(response=>{
           if(response.data.state == 1){
              var detail = response.data.data.detail
+             console.log("detail",detail)
              this.form.drug_name = detail.drug_name
+             this.form.specification_name = detail.specification_name
+             this.form.last_price = detail.last_price
+             this.form.dealer = detail.dealer
+             this.form.manufacturer = detail.manufacturer
              this.form.retail_price = detail.retail_price
              this.form.new_price = detail.new_price
              this.form.count = detail.count
              this.form.remark = detail.remark
              this.id = detail.id
+             this.form.warehousing_unit = detail.warehousing_unit
+             this.form.number = detail.number
+             this.form.drug_id = detail.drug_id
              this.modifyPriceDialogVisible = true
           }
        })
@@ -681,12 +742,18 @@ export default {
      modifyDrugPrice(){
         var params = {
           drug_name:this.form.drug_name,
+          specification_name:this.form.specification_name,
+          warehousing_unit:this.form.warehousing_unit,
           retail_price:this.form.retail_price.toString(),
           new_price:this.form.new_price.toString(),
+          manufacturer:this.form.manufacturer,
+          number:this.form.number,
           count:parseInt(this.form.count),
           remark:this.form.remark,
-          id:this.id
+          id:this.id,
+          drug_id:this.form.drug_id,
         }
+      
       modifyDrugPrice(params).then(response=>{
          if(response.data.state == 1){
            var adjustPrice = response.data.data.adjustPrice

src/xt_pages/stock/drugs/inventory.vue

@@ -594,6 +594,7 @@ export default {
          handleSelect(val){
            console.log("val233223232332",val)
            this.getDrugBatchNumber(val.drug_id)
+           
             var params = {
               id:val.drug_id
             }

src/xt_pages/stock/inventory.vue

@@ -60,6 +60,16 @@
               <template slot-scope="scope" >
                 {{getTime(scope.row.start_time)}}
               </template>  
+            </el-table-column>
+            <el-table-column  prop="date" label="耗材名称" align="center">
+              <template slot-scope="scope" >
+                {{scope.row.good_name}}
+              </template>  
+            </el-table-column>
+            <el-table-column  prop="date" label="耗材规格" align="center">
+              <template slot-scope="scope" >
+                {{scope.row.specification_name}}
+              </template>  
             </el-table-column>
              <el-table-column  prop="date" label="盘点数量" align="center">
               <template slot-scope="scope" >
@@ -151,7 +161,7 @@
                         v-for="(item,index) in numberList"
                         :key="index"
                         :label="item.number"
-                        :value="item.number">
+                        :value="item.id">
                       </el-option>
                   </el-select>
                 </el-form-item>
@@ -338,7 +348,7 @@
                         v-for="(item,index) in numberList"
                         :key="index"
                         :label="item.number"
-                        :value="item.number">
+                        :value="item.id">
                       </el-option>
                   </el-select>
                 </el-form-item>
@@ -428,7 +438,7 @@
                         v-for="(item,index) in numberList"
                         :key="index"
                         :label="item.number"
-                        :value="item.number">
+                        :value="item.id">
                       </el-option>
                   </el-select>
                 </el-form-item>
@@ -536,7 +546,7 @@
 
 <script> 
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory,getStockBatchNumber,getGoodWarehouseList,proofInventory } from "@/api/stock"
+import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory,getStockBatchNumber,getGoodWarehouseList,proofInventory,getWarehouseTotal } from "@/api/stock"
 export default {
     name: "inventory",
     data() {
@@ -641,23 +651,28 @@ export default {
           this.currentIndex = val
         },
          handleSelect(val){
-            console.log("val232323223",val)
             this.getStockBatchNumber(val.good_id)
-            this.getGoodWarehouseList(val.good_id)
+            // this.getGoodWarehouseList(val.good_id)
             this.form.id = val.id
             this.form.good_id = val.good_id,
             this.form.good_name = val.good_name
             this.form.packing_price = val.packing_price
             this.form.warehousing_order = val.warehousing_order
             this.form.license_number = val.license_number
-            this.form.dealer = val.dealer
+            if(val.dealer == ""){
+              this.form.dealer = ""
+            }else{
+              this.form.dealer = val.dealer
+            }
             this.form.manufacturer = val.manufacturer
             this.form.specification_name = val.specification_name
             this.form.remark = val.remark
             this.form.buy_price = val.buy_price
             this.form.warehousing_unit = val.packing_unit  
-            this.form.total = val.total
-            this.form.number = val.number
+            this.form.total = ""
+            this.form.number = ""
+            // this.form.total = val.total
+            // this.form.number = val.number
             this.form.expiry_date = val.expiry_date
             this.form.product_date = val.product_date
         },
@@ -699,7 +714,18 @@ export default {
              this.$message.error("请输入盘点数量")
              return
            }
+           var number = ""
+           for(let i=0;i<this.numberList.length;i++){
+             if(this.form.number == this.numberList[i].id){
+                number = this.numberList[i].number
+             }
+           }
+           if(number == ""){
+             this.$message.error("请选择批次")
+             return
+           }
            var obj = {
+            id:this.form.id,
             good_id:this.form.good_id,
             good_name:this.form.good_name,
             specification_name:this.form.specification_name,
@@ -716,11 +742,11 @@ export default {
             start_time:this.getTime(new Date()),
             product_date:this.form.product_date,
             expiry_date:this.form.expiry_date,
-            number:this.form.number,
+            number:number,
             warehousing_info_id:0,
             total:this.form.total,
-
            } 
+           console.log("比阿哥",this.tableData)
            this.tableData.push(obj)
         },
       saveInventory(){
@@ -741,6 +767,12 @@ export default {
           if(this.tableData[i].dealer == 0){
             this.tableData[i].dealer = ""
           }
+          if(this.tableData[i].packing_price == 0){
+            this.tableData[i].packing_price = ""
+          }
+          if(this.tableData[i].buy_price == 0){
+            this.tableData[i].buy_price = ""
+          }
         }
         var params = {
          tableData:this.tableData,
@@ -763,7 +795,10 @@ export default {
            this.form.count = ""
            this.form.remark = ""
            this.form.number = ""
+           this.form.total = ""
+           this.form.warehousing_unit = ""
            this.dialogVisible = false
+           
            this.getlist()
          }
        })
@@ -853,6 +888,8 @@ export default {
       this.editPriceDialogVisible = true  
      },
      upateInventory(){
+       console.log("hhhhhh",this.form.id)
+       console.log("999",this.tableData)
        for(let i=0;i<this.tableData.length;i++){
          if(this.form.id == this.tableData[i].id){
             this.tableData[i].good_name = this.form.good_name
@@ -866,11 +903,23 @@ export default {
             this.tableData[i].manufacturer = this.form.manufacturer
             this.tableData[i].count = this.form.count
             this.tableData[i].remark = this.form.remark
+         }else{
+           this.tableData[i].id = this.form.id
+           this.tableData[i].good_name = this.form.good_name
+           this.tableData[i].packing_price = this.form.packing_price
+           this.tableData[i].buy_price = this.form.buy_price
+           this.tableData[i].specification_name = this.form.specification_name
+           this.tableData[i].warehousing_unit = this.form.warehousing_unit
+           this.tableData[i].number = this.form.number
+           this.tableData[i].good_origin_place = this.form.good_origin_place
+           this.tableData[i].dealer = this.form.dealer
+           this.tableData[i].manufacturer = this.form.manufacturer
+           this.tableData[i].count = this.form.count
+           this.tableData[i].remark = this.form.remark
          }
        }
        this.editPriceDialogVisible = false
        this.form.good_name = ""
-      //  this.form.packing_price = ""
        this.form.count = ""
        this.form.remark = ""
      },
@@ -1063,12 +1112,20 @@ export default {
        this.getlist()
      },
     changeNumber(val){
-      
-     for(let i=0;i<this.numberList.length;i++){
-       if(val == this.numberList[i].number){
-         this.form.warehousing_info_id = this.numberList[i].id
-       }
-     }
+     this.getWarehouseTotal(val)
+     this.form.warehousing_info_id = val
+     },
+    getWarehouseTotal(id){
+        var params = {
+          id:id,
+        }
+      getWarehouseTotal(params).then(response=>{
+         if(response.data.state == 1){
+           var list =  response.data.data.list
+           console.log("档期批次库促",list)
+           this.form.total = list.stock_count
+         }
+      })
     }
     },
     created(){