11月7日 库存扣减更新

src/api/drug/drug.js

@@ -476,3 +476,11 @@ export function saveInentoryList(data) {
   })
 }
 
+export function getDamagedByDrugId(params) {
+  return request({
+    url: '/api/drug/getdamagebydrugid',
+    method: 'get',
+    params: params
+  })
+}
+

src/api/stock.js

@@ -946,3 +946,27 @@ export function getWarehouseTotal(params) {
     params: params
   })
 }
+
+export function getGoodInventoryWarehouseList(params) {
+  return request({
+    url: '/api/stock/getgoodinventorywarehouselist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function saveStockInentoryList(data) {
+  return request({
+    url: '/api/stock/savestockinentorylist',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getDamageDetailByGoodId(params) {
+  return request({
+    url: '/api/sotck/getdamagedetailbygoodid',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/drugs.js

@@ -44,12 +44,12 @@ export default {
       is_menu: false,
       meta: { title: 'drugModifyPricePrint', noCache: true }
     },
-    {
-      path: '/stock/drugs/drugDamaged',
-      component: () => import('@/xt_pages/stock/drugs/drugDamaged'),
-      name: 'drugDamaged',
-      meta: { title: 'drugDamaged', noCache: true }
-    },
+    // {
+    //   path: '/stock/drugs/drugDamaged',
+    //   component: () => import('@/xt_pages/stock/drugs/drugDamaged'),
+    //   name: 'drugDamaged',
+    //   meta: { title: 'drugDamaged', noCache: true }
+    // },
     {
       path: '/stock/drugs/drugDamagePrint',
       component: () => import('@/xt_pages/stock/drugs/drugDamagePrint'),

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -935,6 +935,7 @@
             return false
           } else {
             this.drugs = response.data.data.drugs
+            console.log("所有药品信息",this.drugs)
             this.allDrugs = response.data.data.drugs
             this.advices_template = response.data.data.advices_template
 

src/xt_pages/management/home.vue

@@ -4425,6 +4425,7 @@ export default {
         if (this.userform.user_total == ""){
           this.userform.user_total = 0
         }
+        this.userform.user_total = parseInt(this.userform.user_total)
 
         console.log("user_form",this.userform)
       
@@ -4458,25 +4459,6 @@ export default {
       toLink() {
         window.location.href = this.guaForm.images
       },
-      // changStartTime(val) {
-      //   this.userform.starttime = val
-      // },
-      // changeEndTime(val) {
-      //   this.userform.endtime = val
-      //   console.log('val', val)
-      //   console.log('开始时间', this.userform.starttime)
-      //   console.log('呵呵', this.formatDuring(val))
-      // },
-      // formatDuring(mss) {
-      //   const days = parseInt(mss / (1000 * 60 * 60 * 24)) // 得到天数
-      //   const hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)) // 得到小时
-      //   const minutes = parseInt((mss % (1000 * 60 * 60)) / (1000 * 60)) // 得到分钟数
-      //   const seconds = (mss % (1000 * 60)) / 1000 // 得到秒数
-      //   const str1 = hours < 10 ? ('0' + hours) : hours
-      //   console.log('str1', str1)
-      //   const str2 = minutes < 10 ? ('0' + minutes) : minutes
-      //   return str1 + ':' + str2
-      // },
       // 获取签名
       getAllOrganization() {
         getAllOrganization().then(response => {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -281,17 +281,17 @@
                                         </el-table-column>
                                         <el-table-column label="规格" width="60">
                                             <template slot-scope="scope">
-                                                <!-- {{ scope.row.drug_spec }} -->
                                                 <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                                {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}
-                                                <!--/ {{-->
-                                                <!--scope.row.total * (scope.row.dose / scope.row.min_number)}}-->
-                                                <!--{{(scope.row.total * (scope.row.dose /-->
-                                                <!--scope.row.min_number))?scope.row.max_unit:''}}-->
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138">
+                                               <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span> 
+                                               <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
+                                              </span>
+                                              <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span> 
+                                             
                                             </template>
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
@@ -382,7 +382,12 @@
                                             <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
-                                            <template slot-scope="scope">{{ scope.row.total }}</template>
+                                            <template slot-scope="scope">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138">
+                                                   {{scope.row.stock_count}}
+                                              </span>
+                                              <span v-else> {{ scope.row.total }}</span>
+                                            </template>
                                         </el-table-column>
                                         <el-table-column label="单价" width="40">
                                             <template slot-scope="scope">{{ scope.row.price }}</template>
@@ -501,6 +506,7 @@
       record_date: String,
       search_keyword: '',
       month_prescriptions: Array,
+      org_id:Number,
       isloading: false,
       loading: false,
       other_sick: {
@@ -2926,6 +2932,7 @@
         getHisProject().then(response => {
           if (response.data.state == 1) {
             var project = response.data.data.project
+            console.log("项目列表",project)
             for (let i = 0; i < project.length; i++) {
               let obj = {
                 id: project[i].id,
@@ -2943,14 +2950,23 @@
                 total: project[i].total,
                 is_special_diseases: project[i].disease_directory,
                 project: project[i],
+                stock_count:0,
               }
 
               this.tabProject.push(obj)
             }
 
             var good_info = response.data.data.good_info
-
+          
+ 
             for (let i = 0; i < good_info.length; i++) {
+               good_info[i].stock_count = 0
+              if(good_info[i].good_stock_in.length >0 ){
+                for(let j=0;j<good_info[i].good_stock_in.length;j++){
+                   good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
+                }
+              }
+               console.log("耗材列表2323232322332",good_info)
               let obj = {
                 id: good_info[i].id,
                 project_name: good_info[i].good_name,
@@ -2967,6 +2983,7 @@
                 total: good_info[i].total,
                 is_special_diseases: good_info[i].is_special_diseases,
                 good_info: good_info[i],
+                stock_count:good_info[i].stock_count,
               }
               this.tabProject.push(obj)
             }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -155,6 +155,7 @@
                                    v-on:month="changeMonth"
                                    v-on:day="changeDay"
                                    :month_prescriptions="month_prescriptions"
+                                   :org_id="org_id"
                                    ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                                    :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
                                    v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
@@ -423,7 +424,8 @@
 
         all_his_patients: [],
         checkVisible: false,
-        current_tab: 'day'
+        current_tab: 'day',
+        org_id:0,
       }
     },
     methods: {
@@ -1011,6 +1013,7 @@
         this.month_prescriptions.push(p1)
         this.month_prescriptions.push(p2)
 
+
       },
 
       // setMonthPrescription(month_prescriptions){
@@ -1179,7 +1182,18 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            this.drugs = response.data.data.drugs
+            var drugs = response.data.data.drugs
+            for(let i=0;i<drugs.length;i++){
+                drugs[i].count = 0
+              if(drugs[i].stock_in.length > 0){
+                 for(let j=0;j<drugs[i].stock_in.length;j++){
+                    drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
+                 }
+              }
+            }
+            this.drugs = drugs
+            console.log("五一劳动节2332323322332",this.drugs)
+          
             this.allDrugs = response.data.data.drugs
             this.advices_template = response.data.data.advices_template
 
@@ -4609,7 +4623,8 @@
       // this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
       let tableHeight = document.body.clientHeight - 263
       this.tableHeight = tableHeight
-
+      this.org_id = this.$store.getters.xt_user.template_info.org_id 
+     
     },
 
     mounted() {

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -53,44 +53,6 @@
             value-format="yyyy-MM-dd"
           ></el-date-picker>
         </div>
-
-        <!-- <div class="cell clearfix">
-          <label class="title"><span class="name">经销商</span> : </label>
-          <el-select
-            size="small"
-            v-model="form.dealer"
-            filterable
-            placeholder="请选择经销商"
-            @change="changeDealer"
-          >
-            <el-option
-              v-for="(option, index) in dealer"
-              :key="index"
-              :label="option.dealer_name"
-              :value="option.id"
-            >
-            </el-option>
-          </el-select>
-        </div> -->
-
-        <!-- <div class="cell clearfix">
-          <label class="title"><span class="name">厂商</span> : </label>
-          <el-select
-            size="small"
-            v-model="form.manufacturer"
-            filterable
-            placeholder="请选择厂商"
-            @change="changeManufacturer"
-          >
-            <el-option
-              v-for="(option, index) in manufacturer"
-              :key="index"
-              :label="option.manufacturer_name"
-              :value="option.id"
-            >
-            </el-option>
-          </el-select>
-        </div> -->
       </div>
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
@@ -612,7 +574,7 @@ export default {
             cancelStock: this.recordInfo.recordData
           };
           console.log("params2222",params,this.return_time)
-        
+          
           postDrugCancelStock(
             params,
             this.return_time,
@@ -637,6 +599,7 @@ export default {
               if(response.data.data.msg == 2){
                 this.$message.error("退库数量大于出库数量")
               }
+             
             }
           });
         } else {
@@ -694,7 +657,16 @@ export default {
         this.currentIndex = val
       },
       handleSelect(val){
-         console.log("val23232",val)
+         var arr = []
+         for(let i=0;i<this.recordInfo.recordData.length;i++){
+            arr.push(this.recordInfo.recordData[i].drug_id)
+         }
+         var str = arr.join(",")
+         console.log("str",str)
+         if(str.indexOf(val.id)!=-1){
+            this.$message.error("该药品已存在列表中")
+            return
+         }
          this.getDrugBatchNumber(val.id)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -270,7 +270,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteDrugCancelStockInfo, editDrugCancelStockInfo, getDrugCancelStockConfig, getDrugCancelStockInfo,GetAllDrugInfoByID,GetAllConfig,getDrugBatchNumber  } from '@/api/drug/drug_stock'
+  import { deleteDrugCancelStockInfo, editDrugCancelStockInfo, getDrugCancelStockInfo,GetAllDrugInfoByID,GetAllConfig,getDrugBatchNumber  } from '@/api/drug/drug_stock'
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
   import {postSearchDrugList} from "@/api/data"
@@ -528,7 +528,8 @@
 
       back() {
         this.$router.go(-1)
-      }, submit() {
+      },
+     submit() {
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
@@ -538,8 +539,7 @@
                 return
               }
             }
-            console.log("hhhhh3223",this.recordInfo.recordData)
-            console.log("900000000",this.numberList)
+
             for(let i=0;i<this.recordInfo.recordData.length;i++){
               for(let j=0;j<this.numberList.length;j++){
                  if(this.recordInfo.recordData[i].batch_number == this.numberList[j].id){
@@ -554,7 +554,7 @@
               'cancelStock': this.recordInfo.recordData
             }
             console.log("232323223",this.recordInfo.recordData)
-           
+            
             editDrugCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -565,10 +565,10 @@
                    this.$router.back(-1)
                 }
                 if(response.data.data.msg == 2){
-                   this.$message.error("退库数量大于入库数量")
+                   this.$message.error("该批次退库数量大于入库数量,请更改批次")
                 }
                 if(response.data.data.msg == 4){
-                  this.$message.error("退库数量大于出库数量")
+                  this.$message.error("该批次退库数量大于出库数量,请更改批次")
                 }
               
               }
@@ -577,10 +577,12 @@
             return false
           }
         })
-      }, GetOrderDetail: function(order_id) {
+      },
+       GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }
+
         getDrugCancelStockInfo(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -663,6 +665,16 @@
         this.currentIndex = val
       },
       handleSelect(val){
+         var arr = []
+         for(let i=0;i<this.recordInfo.recordData.length;i++){
+            arr.push(this.recordInfo.recordData[i].drug_id)
+         }
+         var str = arr.join(",")
+         console.log("str",str)
+         if(str.indexOf(val.id)!=-1){
+            this.$message.error("该药品已存在列表中")
+            return
+         }
          this.getDrugBatchNumber(val.id)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -1,8 +1,5 @@
 <template>
   <div class="main-contain">
-    <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
-    </div>
     <div class="app-container">
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
@@ -11,7 +8,7 @@
                 style="width: 200px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder="请输入单据编号或操作人姓名"
+                placeholder="请输入药品名称"
                 />
                 <el-button
                 size="small"
@@ -58,12 +55,12 @@
             </el-table-column>
             <el-table-column prop="name" label="总报损数量" align="center">
                <template slot-scope="scope">
-                  {{scope.row.count}}
+                  {{getTotalCount(scope.row.drug_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
                 </template>
             </el-table-column>
             <el-table-column prop="name" label="总报损金额" align="center">
                <template slot-scope="scope">
-                  {{scope.row.count}}
+                  {{getTotalPrice(scope.row.drug_id,scope.row.min_price)}}
                 </template>
             </el-table-column>
             <el-table-column prop="name" label="操作人" align="center">
@@ -73,8 +70,7 @@
             </el-table-column>
             <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>
+                  <el-button type="primary" size="small" @click="clickDetai(scope.row.drug_id)">查看详情</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -89,12 +85,91 @@
             :total="total">
         </el-pagination>
     </div>
+
+    <el-dialog
+      title="盘点批次详情"
+      :visible.sync="dialogVisible"
+      width="80%">
+      <span>
+        <el-form>
+          <el-row>
+            <el-col>
+              <el-form-item label="入库单号:">
+                 <el-input v-model ="form.warehouseing_order" style="width:200px"></el-input>
+              </el-form-item>
+              <el-form-item label="原因:">
+                  <el-select v-model="form.type" placeholder="请选择">
+                      <el-option
+                        v-for="item in reasonList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                      </el-option>
+                  </el-select>
+              </el-form-item>
+              <el-button type="primary" @click="toQuery">查询</el-button>
+            </el-col>
+          </el-row>
+          <el-row>
+            <div>&nbsp;&nbsp;{{drug_name}}  &nbsp;&nbsp;总损耗数量: {{getDamagedCount(total_count)}}    &nbsp;&nbsp;总报损金额:{{(total_count * min_price).toFixed(2)}}</div>
+          </el-row>
+          <el-row>
+            <el-table
+              :data="goodList"
+              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="name" label="入库单号" width="180" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.warehousing_order}}
+                </template>
+              </el-table-column>
+              <el-table-column prop="address" label="损耗数量" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.last_stock_max_number>0">{{scope.row.last_stock_max_number}}{{scope.row.warehousing_unit}}</span>
+                   <span v-if="scope.row.last_stock_min_number>0">{{scope.row.last_stock_min_number}}{{scope.row.min_unit}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="address" label="药损比" align="center">
+                  <template slot-scope="scope">
+                    {{getDrugDamageRadio(scope.row.count)}}%
+                  </template>
+              </el-table-column>
+              <el-table-column prop="address" label="报损金额" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.XtBaseDrug.min_price!=0">{{scope.row.XtBaseDrug.min_price}} </span> 
+                </template>
+              </el-table-column>
+
+              <el-table-column prop="address" label="盘点原因" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.type == 0">默认</span> 
+                  <span v-if="scope.row.type == 1">到期退货</span> 
+                  <span v-if="scope.row.type == 2">异常退货</span> 
+                  <span v-if="scope.row.type == 3">退货</span> 
+                  <span v-if="scope.row.type == 4">人为损坏</span> 
+                  <span v-if="scope.row.type == 5">不计入报损分析</span> 
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-row>
+        </el-form>
+      </span>
+      <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 BreadCrumb from "../../components/bread-crumb";
-import { getDrugDamageList } from "@/api/drug/drug"
+import { getDrugDamageList,getDamagedByDrugId } from "@/api/drug/drug"
 import { uParseTime } from '@/utils/tools'
 import { getDataConfig } from '@/utils/data'
 export default {
@@ -167,6 +242,23 @@ export default {
             numberList:[],
             index:0,
             unitList:[],
+            datamageList:[],
+            reasonList:[
+              {id:0,name:"默认"},
+              {id:1,name:"到期退货"},
+              {id:2,name:"异常退货"},
+              {id:3,name:"退货"},
+              {id:4,name:"人为损坏"},
+              {id:5,name:"不计入报损分析"},
+            ],
+            goodList:[],
+            drug_name:"",
+            total_count:0,
+            min_number:0,
+            max_unit:"",
+            min_unit:"",
+            min_price:0,
+            drug_id:0,
         }
     },
     methods:{
@@ -208,6 +300,7 @@ export default {
              this.doctorList = response.data.data.doctorList
              var datamagelist = response.data.data.damagelist
              console.log("hhh233223",datamagelist)
+             this.datamageList = datamagelist
            }
         })
       },
@@ -225,6 +318,115 @@ export default {
      },
      changeEndTime(){
 
+     },
+     getTotalCount(drugid,max_unit,min_unit,min_number){
+        
+        var total = 0
+        var str = ""
+        var str_min = ""
+        for(let i=0;i<this.datamageList.length;i++){
+          if(drugid == this.datamageList[i].drug_id){
+             total +=this.datamageList[i].count
+          }
+        }
+        if(parseInt(total/min_number)!=0){
+          str = parseInt(total/min_number) + max_unit
+        }
+        if((total%min_number)!=0){
+          str_min = total%min_number + min_unit
+        }
+        return str+str_min
+     },
+     getTotalPrice(drugid,minprice){
+        var total = 0 
+        for(let i=0;i<this.datamageList.length;i++){
+          if(drugid == this.datamageList[i].drug_id){
+            total+=this.datamageList[i].count
+          }
+        }
+        return (total*minprice).toFixed(2)
+     },
+     clickDetai(drugid){
+        this.drug_id = drugid
+         var params = {
+           drug_id:drugid,
+           warehouseing_order:this.form.warehousing_order,
+           type:this.form.type,
+         }
+        this.dialogVisible = true
+        getDamagedByDrugId(params).then(response=>{
+           if(response.data.state ==1){
+             var list =  response.data.data.list
+             for(let i=0;i<list.length;i++){
+               list[i].min_number = 0
+               list[i].min_number == list[i].XtBaseDrug.min_number
+               list[i].total = 0
+             }
+             console.log("list232232332",list)
+
+             for(let i=0;i<list.length;i++){
+               this.drug_name = list[0].drug_name
+               list[i].total = list[i].count
+             }
+             var total = 0
+             for(let i=0;i<list.length;i++){
+               total += list[i].total
+               this.min_number = list[0].XtBaseDrug.min_number
+               this.max_unit = list[0].XtBaseDrug.max_unit
+               this.min_unit = list[0].XtBaseDrug.min_unit
+               this.min_price = list[0].XtBaseDrug.min_price
+             }
+             this.total_count = total
+             this.goodList = list
+           }
+        })
+     },
+     getDamagedCount(total){
+     
+      var str = ""
+      var min_str = ""
+      if(total< this.min_number){
+        str = ""
+        min_str = total + this.min_unit
+      }
+     if(total >= this.min_number){
+        if(parseInt(total/this.min_number)!=0){
+            str = parseInt(total/this.min_number)+ this.max_unit
+        }
+       if((total%this.min_number)!=0){
+          min_str =  total%this.min_number + this.min_unit
+        }
+      }
+      return str + min_str
+     },
+    getDamagedCountOne(total){
+     
+      var str = ""
+      var min_str = ""
+      if(total< this.min_number){
+        str = ""
+        min_str = total 
+      }
+     if(total >= this.min_number){
+        if(parseInt(total/this.min_number)!=0){
+            str = parseInt(total/this.min_number)
+        }
+       if((total%this.min_number)!=0){
+          min_str =  total%this.min_number
+        }
+      }
+      return str + min_str
+     },
+     toQuery(){
+       this.clickDetai(this.drug_id)
+     },
+     getDrugDamageRadio(count){
+
+       var total_count =  this.getDamagedCountOne(this.total_count)
+       var all_count = 0
+       all_count =  total_count * this.min_number
+      
+       return (count / all_count).toFixed(2)*100
      }
     },
     created(){

src/xt_pages/stock/drugs/drugInventory.vue

@@ -4,16 +4,16 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
     <div class="app-container" style="height: calc(100vh - 118px);overflow: hidden;">
-        <el-tabs v-model="activeName" style="height: 100%;display: flex;flex-direction: column;">
-            <el-tab-pane label="药品盘点" name="first">
+        <el-tabs v-model="activeName" style="height: 100%;display: flex;flex-direction: column;" @tab-click="handleClick">
+            <el-tab-pane label="药品盘点" name="first" v-if="first" >
                 <drug-inventory></drug-inventory>
             </el-tab-pane>
-            <el-tab-pane label="盘点列表" name="second">
-                <inventory-details></inventory-details>
+            <el-tab-pane label="盘点列表" name="second" v-if="second">
+                <inventory-details ref="child"></inventory-details>
             </el-tab-pane>
 
-            <el-tab-pane label="报损列表" name="three">
-                <drug-damaged></drug-damaged>
+            <el-tab-pane label="报损列表" name="three" v-if="three">
+                <drug-damaged ref="childOne"></drug-damaged>
             </el-tab-pane>
         </el-tabs>
     </div>
@@ -42,13 +42,24 @@ export default {
                 { path: false, name: "药品管理" },
                 { path: false, name: "药品盘点" }
             ],
-            activeName:'first'
+            activeName:'first',
+            first:true,
+            second:true,
+            three:true,
         }
     },
     methods:{
-
+      handleClick(){
+        if(this.activeName == "second"){
+         this.$refs.child.getlist()
+        }
+        if(this.activeName =="three"){
+          this.$refs.childOne.getlist()
+        }
+      }
     },
     created(){
+      console.log("hhh2333223",localStorage.getItem("second")) 
     },
     mounted() {
     },

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -93,13 +93,20 @@
            </template>
         </el-table-column>
 
+        <el-table-column prop="drug_name" label="单位" align="center">
+           <template slot-scope="scope">
+              {{scope.row.max_unit}}
+           </template>
+        </el-table-column>
+
+
        <!-- <el-table-column prop="drug_name" label="剩余量" align="center">
            <template slot-scope="scope">
              {{getCountList(scope.row.BaseDrugLib.min_number,scope.row.DrugWarehouseInfo,scope.row.BaseDrugLib.max_unit,scope.row.BaseDrugLib.min_unit)}}
            </template>
         </el-table-column> -->
        
-        <el-table-column prop="drug_name" label="进货单价" align="center">
+        <el-table-column prop="drug_name" label="单价" align="center">
            <template slot-scope="scope">
               <span>{{scope.row.price}}</span>
            </template>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -225,12 +225,7 @@
               {{scope.row.dose}} {{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="批号" align="center">
-            <template slot-scope="scope">
-              <span v-if="scope.row.batch_number!=''">{{scope.row.batch_number}}</span> 
-             <span v-if="scope.row.batch_number == '0'"></span> 
-            </template>
-          </el-table-column> -->
+         
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
               <!-- <span v-if="scope.row.is_sys ==  0">{{getTotalCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span> -->
@@ -336,17 +331,7 @@
               <span>{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
             </template>
           </el-table-column>
-
-
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>批次号</span>
-            </template>
-            <template slot-scope="scope">
-              <span>{{getDrugBatchNumber(scope.row.drug_id,scope.row.count)}}</span>
-            </template>
-          </el-table-column>
-          
+      
         </el-table>
       </span>
       <span slot="footer" class="dialog-footer">
@@ -399,16 +384,6 @@
               <span>{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
             </template>
           </el-table-column>
-
-         <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>批号</span>
-            </template>
-            <template slot-scope="scope">
-              <span>{{scope.row.batch_number}} </span>
-            </template>
-          </el-table-column>
-
         </el-table>
       </span>
       <span slot="footer" class="dialog-footer">
@@ -947,7 +922,7 @@ export default {
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
-          // console.log("list",list)
+     
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
@@ -1001,7 +976,7 @@ export default {
        if(response.data.state == 1){
         
         this.userList = response.data.data.list
-        // console.log("自动出库数据",this.userList)
+        console.log("自动出库数据",this.userList)
         if(val.is_sys == 1){
         
           this.drugDialogVisible = true
@@ -1243,7 +1218,7 @@ export default {
           }
         }
         all_price = total * price
-        // console.log("total",total,min_price)
+      
         return  all_price
       },
   }

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -116,16 +116,12 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="150">
+          <!-- <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope" >
                   <span>批号</span>
               </template>
                 <template slot-scope="scope">
                   <el-form-item style="padding-top: 20px">
-                    <!-- <el-input
-                      placeholder="请输入批号"
-                      v-model="scope.row.batch_number"
-                    ></el-input> -->
                     <el-select v-model="scope.row.batch_number" filterable placeholder="请选择" @change="changeBatchNumber(scope.row)">
                       <el-option
                         v-for="(item,index) in numberList"
@@ -136,7 +132,7 @@
                     </el-select>
                   </el-form-item>
               </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
@@ -608,7 +604,7 @@ export default {
               var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
               console.log("str22222222",str)
               if(msg == 1){
-                this.$message.error(str + "该批次库存不足")
+                this.$message.error(str + "库存不足")
               }else{
                 this.$message.success("出库成功");
                 this.recordInfo.recordData = [];
@@ -675,7 +671,16 @@ export default {
         this.currentIndex = val
       },
       handleSelect(val){
-        console.log("val2222222",val)
+        var arr = []
+         for(let i=0;i<this.recordInfo.recordData.length;i++){
+            arr.push(this.recordInfo.recordData[i].drug_id)
+         }
+         var str = arr.join(",")
+         console.log("str",str)
+         if(str.indexOf(val.id)!=-1){
+            this.$message.error("该药品已存在列表中")
+            return
+         }
          this.getDrugBatchNumber(val.id)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -84,17 +84,12 @@
               </el-form-item>
             </template>
           </el-table-column>
-         <el-table-column align="center" width="150">
+         <!-- <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope" >
                   <span>批号</span>
               </template>
                 <template slot-scope="scope">
                   <el-form-item style="padding-top: 20px">
-                    <!-- <el-input
-                     :disabled="drug_show"
-                      placeholder="请输入批号"
-                      v-model="scope.row.batch_number"
-                    ></el-input> -->
                     <el-select v-model="scope.row.batch_number" filterable placeholder="请选择">
                       <el-option
                         v-for="(item,index) in numberList"
@@ -105,7 +100,7 @@
                     </el-select>
                   </el-form-item>
               </template>
-          </el-table-column>
+          </el-table-column> -->
            <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
@@ -266,7 +261,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteDrugWarehouseOutInfo, editDrugWarehouseoutInfo, getDrugSalesReturnConfig, getDrugWarehouseOutInfo,GetAllConfig,GetAllDrugInfoByID,getDrugBatchNumber } from '@/api/drug/drug_stock'
+  import { deleteDrugWarehouseOutInfo, editDrugWarehouseoutInfo, getDrugWarehouseOutInfo,GetAllConfig,GetAllDrugInfoByID,getDrugBatchNumber } from '@/api/drug/drug_stock'
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
   import {postSearchDrugList } from "@/api/data"
@@ -424,7 +419,7 @@
         return name;
       },
       specificationName: function(drug_id) {
-        console.log(this.goodInfo)
+      
         let name = "";
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == drug_id) {
@@ -550,7 +545,8 @@
 
       back() {
         this.$router.go(-1)
-      }, submit() {
+      }, 
+      submit() {
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
@@ -560,7 +556,6 @@
                 return;
               }
             }
-            console.log("经销商",this.dealerList)
             for(let i=0;i<this.recordInfo.recordData.length;i++){
               if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
@@ -590,8 +585,8 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-            console.log("params----",params)
-            
+          
+          
             editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -599,19 +594,13 @@
               } else {
                 var msg = response.data.data.msg
                 var drug_name =  response.data.data.drug_name
-                console.log("drug_name",drug_name)
                 var dose = response.data.data.dose
-                console.log("dose",dose)
                 var dose_unit = response.data.data.dose_unit
-                console.log("dose_unit",dose_unit)
                 var min_number = response.data.data.min_number
-                console.log("min_number",min_number)
                 var min_unit =  response.data.data.min_unit
-                console.log("min_unit",min_unit)
                 var max_unit =  response.data.data.max_unit
-                console.log("max_unit",max_unit)
                 var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
-                console.log("str22222222",str)
+               
               if(msg == 1){
                 this.$message.error(str + "库存不足,请入库")
               }else{
@@ -635,7 +624,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-             console.log("出库详情",response.data.data.list)
+            
 
             var manulist = response.data.data.manulist
             this.manufacturerList = manulist
@@ -724,7 +713,7 @@
             searchArray = response.data.data.list;
             
              var list = response.data.data.list
-             console.log("猎豹22222222222",list)
+            
 
              this.drugList = list
              var manufacturerList = response.data.data.manufacturerList
@@ -748,6 +737,16 @@
         this.currentIndex = val
       },
       handleSelect(val){
+         var arr = []
+         for(let i=0;i<this.recordInfo.recordData.length;i++){
+            arr.push(this.recordInfo.recordData[i].drug_id)
+         }
+         var str = arr.join(",")
+
+         if(str.indexOf(val.id)!=-1){
+            this.$message.error("该药品已存在列表中")
+            return
+         }
          this.getDrugBatchNumber(val.id)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
@@ -767,7 +766,7 @@
              }
            }
         }
-        console.log("333333",this.recordInfo.recordData)
+ 
       },
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
@@ -782,7 +781,7 @@
         getDrugBatchNumber(params).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
-             console.log("list2222",list)
+           
              this.numberList = list
            }
         })
@@ -802,7 +801,7 @@
         this.drug_show = true
       }
      this.unitList =  getDataConfig('hemodialysis','units')
-      console.log("单位",this.unitList)
+
     }
 
   }

src/xt_pages/stock/drugs/inventory.vue

@@ -828,11 +828,9 @@ export default {
        return getDataConfig(module, filed_name)
       },  
     changeMaxUnit(val){
-      console.log("val23232",val)
       this.form.warehousing_unit = val
     },
     saveInentoryList(){
-       console.log("数据库323232",this.tableData)
        var arr = []
        for(let i=0;i<this.tableData.length;i++){
          for(let j=0;j<this.tableData[i].child.length;j++){
@@ -851,7 +849,7 @@ export default {
 
          
        }
-      console.log("arrr2323223",arr)
+
        var params = {
          tableData:arr
        }
@@ -859,6 +857,7 @@ export default {
         if(response.data.state == 1){
            var inventory = response.data.data.inventory
            this.$message.success("保存成功")
+           this.tableData = []
         }
       })
     }

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -100,8 +100,8 @@
         <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[5, 10, 50, 100]"
-            :page-size="5"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="10"
             background
             style="margin-top:20px;text-align: right"
             layout="total, sizes, prev, pager, next, jumper"
@@ -185,6 +185,7 @@ export default {
       this.getlist()
     },
     mounted() {
+     
     },
 };
 </script>

src/xt_pages/stock/drugs/query.vue

@@ -113,7 +113,9 @@
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4">
-                <span v-if="scope.row.drug_warehouse_out.length > 0"></span> {{getDrugOutList(scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+                <span> 
+                 {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
+                </span> 
              </span>
              <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
            </template>
@@ -122,7 +124,7 @@
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
                <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4">
-                 {{getDrugChaCount(scope.row.drug_warehouse_info,scope.row.drug_warehouse_out,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
+                {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
                </span>
                
                <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
@@ -171,7 +173,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getAllDrugStockQueryList,getDrugStockList,getDrugCountList } from '@/api/drug/drug_stock'
+  import { getDrugStockList,getDrugCountList } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
 import { min } from 'moment'
@@ -789,6 +791,36 @@ import { min } from 'moment'
            str_min =  cha_count%min_number + min_unit
          }
          return str + str_min
+      },
+      getOutFlush(info,max_unit,min_unit,min_number,cancel_info){
+        
+        var str = ""
+        var str_min = ""
+        //总库存
+        var total = 0
+        var out_count = 0
+        var over_count = 0
+        var cancel_count = 0
+        for(let i=0;i<info.length;i++){
+           total += (info[i].warehousing_count * min_number)
+        }
+        console.log("total232323232332323223",total)
+        for(let j=0;j<info.length;j++){
+           out_count += (info[j].stock_max_number + info[j].stock_min_number)
+        }
+        console.log("剩余库存",out_count)
+        for(let z=0;z<cancel_info.length;z++){
+           cancel_count += cancel_info[z].count
+        }
+        over_count = total - out_count + cancel_count
+        console.log("hh233223232322323232323322332",over_count)
+        if(parseInt(over_count/min_number)!=0){
+            str = parseInt(over_count/min_number)+ max_unit
+         }
+         if(over_count%min_number !=0){
+           str_min =  over_count%min_number + min_unit
+         }
+       return str+str_min
       }
     }
   }

src/xt_pages/stock/inventoryDetails.vue

@@ -2,30 +2,12 @@
     <div>
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
-                <!-- 耗材类别：
-                <el-select v-model="value" size="small" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select> -->
-                <!-- 停用状态：
-                <el-select v-model="value" size="small" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select> -->
                 <el-input
                 size="small"
                 style="width: 200px;margin-left:10px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder="请输入单据编号或操作人姓名"
+                placeholder="请输入耗材名称"
                 />
                 <el-button
                 size="small"
@@ -39,70 +21,54 @@
                 <el-button size="small" type="primary" @click="exportList">导出</el-button>
             </div> -->
         </div>
-        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice" style="width:100%">
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice" >
             <el-table-column type="selection" width="55" align="center"> </el-table-column>
-            <el-table-column prop="date" label="耗材名称"  width="100" align="center">
+            <el-table-column prop="date" label="耗材名称"  width="300" align="center">
                 <template slot-scope="scope">
                   {{scope.row.good_name}}
                 </template>
             </el-table-column>
-            <!-- <el-table-column prop="date" label="类别" width="100">
-            </el-table-column> -->
-            <el-table-column prop="name" label="规格" width="100" align="center">
+            <el-table-column prop="name" label="规格" width="200" align="center">
                <template slot-scope="scope">
                   {{scope.row.specification_name}}
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="单位" width="100" align="center">
-                <template slot-scope="scope">
-                  {{scope.row.warehousing_unit}}
-                </template>
+
+            <el-table-column  prop="name" label="有效日期" width="200" align="center">
+               <template slot-scope="scope">
+                 {{getTime(scope.row.product_date)}}
+               </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.total}}
+                 <span v-if="scope.row.stock_count >0 ">{{scope.row.stock_count}}</span>
                 </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.buy_price}}
+                <span v-if="scope.row.last_stock_count>0">{{scope.row.last_stock_count}}</span> 
              </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.packing_price}}
+                   <span v-if="scope.row.count > scope.row.last_stock_count">盘盈</span>
+                   <span v-if="scope.row.count < scope.row.last_stock_count">盘亏</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="name"  label="零售总价"  width="100" align="center">
-                <template slot-scope="scope">
-                  {{scope.row.total * scope.row.packing_price}}
-                </template>
-            </el-table-column>
-            <!-- <el-table-column prop="name" label="产地"  width="100">
-              {{scope.row.now_g}}
-            </el-table-column> -->
-            <el-table-column  prop="name" label="生产厂商" width="260" align="center">
+           
+            <el-table-column prop="name" label="盘点原因" width="230" align="center">
               <template slot-scope="scope">
-                {{scope.row.manufacturer}}
-             </template>
-            </el-table-column>
-            <el-table-column prop="name" label="实盘点"  width="100" align="center">
-                <template slot-scope="scope">
-                    {{scope.row.count}}
-                </template>
-            </el-table-column>
-            <!-- <el-table-column  prop="name" label="亏损价格" width="100" align="center">
-            </el-table-column> -->
-            <el-table-column prop="name" label="生产日期" width="100" align="center">
-              <template slot-scope="scope">
-               {{getTime(scope.row.expire_date)}}
-               </template>
-            </el-table-column>
-            <el-table-column  prop="name" label="有效日期" width="100" align="center">
-               <template slot-scope="scope">
-                 {{getTime(scope.row.product_date)}}
+                <span v-if="scope.row.inventory_type ==0">默认</span>
+                <span v-if="scope.row.inventory_type ==1">到期退货</span>
+                <span v-if="scope.row.inventory_type ==2">异常退货</span>
+                <span v-if="scope.row.inventory_type ==3">退货</span>
+                <span v-if="scope.row.inventory_type ==4">人为损坏</span>
+                <span v-if="scope.row.inventory_type ==5">不计入报损分析</span>
                </template>
             </el-table-column>
+          
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
@@ -137,6 +103,7 @@ export default {
             limit:10,
             page:1,
             ids:"",
+            damageList:[],
          }
     },
     methods:{
@@ -158,16 +125,19 @@ export default {
             limit:this.limit,
             page:this.page,
           }
+          this.tableData = []
           getInventoryDetailList(params).then(response=>{
              if(response.data.state == 1){
                var list =  response.data.data.list
+               console.log("盘点列表23223232323",list)
+             
                this.tableData = list
                this.total = response.data.data.total
              }
           })
         },
       changePrice(val){  
-        console.log("val2323323322323",val)
+       
         var arr = []
         for(let i=0;i<val.length;i++){
             arr.push(val[i].id)
@@ -210,7 +180,5 @@ export default {
     created(){
       this.getlist()
     },
-    mounted() {
-    },
 };
 </script>

src/xt_pages/stock/stockDamaged.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="main-contain">
-    <div class="position">
+    <!-- <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
-    </div>
+    </div> -->
     <div class="app-container">
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
@@ -11,7 +11,7 @@
                 style="width: 200px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder="请输入单据编号或操作人姓名"
+                placeholder="请输入耗材名称"
                 />
                 <el-button
                 size="small"
@@ -19,7 +19,7 @@
                 type="primary"
                 icon="el-icon-search"
                 @click="search">搜索</el-button>
-                <el-date-picker
+                <!-- <el-date-picker
                 size="small"
                 @change="changeStartTime"
                 v-model="start_time"
@@ -34,27 +34,27 @@
                 type="date"
                 style="margin-left:5px;width:140px;"
                 placeholder="选择日期">
-                </el-date-picker>
+                </el-date-picker> -->
             </div>
-            <div>
+            <!-- <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" @click="exportList">导出</el-button> -->
-            </div>
+                <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary" @click="exportList">导出</el-button>
+            </div> -->
         </div>
         <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
             <el-table-column type="selection" width="55" align="center"> </el-table-column>
-            <el-table-column prop="date" label="报损编码" align="center">
+            <!-- <el-table-column prop="date" label="报损编码" align="center">
                <template  slot-scope="scope">
                 {{scope.row.warehousing_order}}
                </template>    
-            </el-table-column>
-            <el-table-column prop="date" label="报损日期"  align="center">
+            </el-table-column> -->
+            <!-- <el-table-column prop="date" label="报损日期"  align="center">
               <template  slot-scope="scope">
                 {{getTime(scope.row.start_time)}}
                </template>    
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column prop="date" label="耗材名称"  align="center">
               <template  slot-scope="scope">
                 {{scope.row.good_name}}
@@ -65,22 +65,27 @@
                 {{scope.row.specification_name}}
                </template>    
             </el-table-column>
-             <el-table-column prop="date" label="报损数量"  align="center">
+             <el-table-column prop="date" label="总耗损数量"  align="center">
+              <template  slot-scope="scope">
+                {{getDamageCount(scope.row.good_id)}}
+               </template>    
+            </el-table-column>
+            <el-table-column prop="date" label="总报损金额"  align="center">
               <template  slot-scope="scope">
                 {{scope.row.count}}
                </template>    
             </el-table-column>
-            <el-table-column prop="name" label="操作人"  align="center">
+            <el-table-column prop="name" label="操作"  align="center">
               <template  slot-scope="scope">
-                {{scope.row.user_name}}
+                <el-button type="primary" @click="toDamagedDetail(scope.row.good_id)">查看详情</el-button>
                </template>     
             </el-table-column>
-            <el-table-column prop="name" label="审核日期"  align="center">
+            <!-- <el-table-column prop="name" label="审核日期"  align="center">
               <template  slot-scope="scope">
                 {{getTime(scope.row.checker_time)}}
              </template>
-            </el-table-column>
-            <el-table-column prop="name" label="核对人"  align="center">
+            </el-table-column> -->
+            <!-- <el-table-column prop="name" label="核对人"  align="center">
               <template slot-scope="scope">
                 {{getChecker(scope.row.checker)}}
               </template>
@@ -90,13 +95,13 @@
                 <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 label="操作"  align="center"  width="200" >
+            </el-table-column> -->
+            <!-- <el-table-column label="操作"  align="center"  width="200" >
                 <template slot-scope="scope">
                 <el-button type="primary" size="small" @click="editStockDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
                 <el-button type="danger" size="small" @click="deleteStockDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
@@ -295,176 +300,83 @@
         </span>
     </el-dialog>
 
-<!-- 编辑 -->
-      <el-dialog
-        title="编辑报损"
-        :visible.sync="editPriceDialogVisible"
-        width="50%">
-        <span>
-          <el-form  :model="form">
-            <el-row>
-               <el-col>
-                <el-form-item label="耗材名称:">
-                    <el-autocomplete
-                        class="checkSearch"
-                        popper-class="my-autocomplete"
-                        v-model="form.good_name"
-                        :fetch-suggestions="querySearchAsync"
-                        :trigger-on-focus="true"
-                        placeholder="请输入耗材名称"
-                        @select="handleSelect"
-                        @input="changeGoodName(scope.$index)"
-                        style="width:160px;"
-                    >
-                        <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                    <template slot-scope="{ item }">
-                        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
-                    </template>
-                    </el-autocomplete>
-                </el-form-item>
-               <el-form-item label="规格：">
-                 <el-input v-model="form.specification_name" style="width:200px"></el-input>
-               </el-form-item>
-               <el-form-item label="批号">
-                 <el-select v-model="form.number" filterable placeholder="请选择"  @change="chageNumberlist">
-                  <el-option
-                    v-for="(item,index) in numberList"
-                    :key="index"
-                    :label="item.number"
-                    :value="item.number">
-                  </el-option>
-                </el-select>
-              </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.buy_price" style="width:200px" :disabled="true"></el-input>
-              </el-form-item>
-              <el-form-item label="零售价">
-                  <el-input v-model="form.packing_price" style="width:200px" :disabled="true"></el-input>
-              </el-form-item>
-              <el-form-item label="库存">
-                  <el-input v-model="form.total" style="width:200px" :disabled="true"></el-input>
-              </el-form-item>
-              <el-form-item label="产地">
-                  <el-input v-model="form.good_origin_place" style="width:200px" :disabled="true"></el-input>
-              </el-form-item>
-              <el-form-item label="批准文号">
-                  <el-input v-model="form.license_number" style="width:200px" :disabled="true"></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-form-item label="报损数量：">
-                 <el-input v-model="form.count" style="width:200px"></el-input>
-               </el-form-item>
-             </el-col> 
-            </el-row>
-            <el-row>
-             <el-col>
-                <el-form-item label="备注：">
-                    <div style="display:flex;">
-                        <el-input v-model="form.remark"  style="width:200px"></el-input>
-                    </div>
-                </el-form-item>
-              </el-col>  
-            </el-row>
-          </el-form>
-        </span>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="editPriceDialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="upatePrice">保存</el-button>
-        </span>
-    </el-dialog>
-
 
      <el-dialog
-        title="编辑"
-        :visible.sync="modifyPriceDialogVisible"
-        width="50%">
-        <span>
-          <el-form  :model="form">
-            <el-row>
-             <el-col>
-                <el-form-item label="耗材名称:">
-                    <el-autocomplete
-                        class="checkSearch"
-                        popper-class="my-autocomplete"
-                        v-model="form.good_name"
-                        :fetch-suggestions="querySearchAsync"
-                        :trigger-on-focus="true"
-                        placeholder="请输入耗材名称"
-                        @select="handleSelect"
-                        @input="changeGoodName(scope.$index)"
-                        style="width:160px;"
-                    >
-                        <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                    <template slot-scope="{ item }">
-                        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
-                    </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-select v-model="form.number" filterable placeholder="请选择" @change="chageNumberlist">
-                  <el-option
-                    v-for="(item,index) in numberList"
-                    :key="index"
-                    :label="item.number"
-                    :value="item.number">
-                  </el-option>
-                </el-select>
+      title="盘点批次详情"
+      :visible.sync="modifyDialogVisible"
+      width="80%">
+      <span>
+        <el-form>
+          <el-row>
+            <el-col>
+              <el-form-item label="入库单号:">
+                 <el-input v-model ="form.warehouseing_order" style="width:200px"></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 label="原因:">
+                  <el-select v-model="form.type" placeholder="请选择">
+                      <el-option
+                        v-for="item in reasonList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                      </el-option>
+                  </el-select>
               </el-form-item>
-              <el-form-item label="进货价">
-                  <el-input v-model="form.buy_price" style="width:200px" :disabled="true"></el-input>
-              </el-form-item>
-              <el-form-item label="零售价">
-                  <el-input v-model="form.packing_price" style="width:200px" :disabled="true"></el-input>
-              </el-form-item>
-              <el-form-item label="库存">
-                  <el-input v-model="form.total" style="width:200px" :disabled="true"></el-input>
-              </el-form-item>
-              <el-form-item label="产地">
-                  <el-input v-model="form.good_origin_place" style="width:200px" :disabled="true"></el-input>
-              </el-form-item>
-              <el-form-item label="批准文号">
-                  <el-input v-model="form.license_number" style="width:200px" :disabled="true"></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-form-item label="报损数量：">
-                 <el-input v-model="form.count" style="width:200px"></el-input>
-               </el-form-item>
-             </el-col> 
-            </el-row>
-            <el-row>
-             <el-col>
-                <el-form-item label="备注：">
-                    <div style="display:flex;">
-                        <el-input v-model="form.remark"  style="width:200px"></el-input>
-                    </div>
-                </el-form-item>
-              </el-col>  
-            </el-row>
-          </el-form>
-        </span>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="modifyPriceDialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="modifyPrice">保存</el-button>
-        </span>
+              <el-button type="primary" @click="toQuery">查询</el-button>
+            </el-col>
+          </el-row>
+          <el-row>
+            <div>&nbsp;&nbsp; &nbsp;&nbsp;总损耗数量:{{getDamageCount(good_id)}}     &nbsp;&nbsp;总报损金额:{{ (getDamageCount(good_id) * price).toFixed(2) }}</div>
+          </el-row>
+          <el-row>
+            <el-table
+              :data="goodList"
+              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="name" label="入库单号" width="180" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.warehousing_order}}
+                </template>
+              </el-table-column>
+              <el-table-column prop="address" label="损耗数量" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.count}}
+                </template>
+              </el-table-column>
+              <el-table-column prop="address" label="药损比" align="center">
+                  <template slot-scope="scope">
+                    {{(scope.row.count / getDamageCount(scope.row.good_id)).toFixed(2)*100}}%
+                  </template>
+              </el-table-column>
+              <el-table-column prop="address" label="报损金额" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.buy_price}}
+                </template>
+              </el-table-column>
+
+              <el-table-column prop="address" label="盘点原因" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.inventory_type == 0">默认</span> 
+                  <span v-if="scope.row.inventory_type == 1">到期退货</span> 
+                  <span v-if="scope.row.inventory_type == 2">异常退货</span> 
+                  <span v-if="scope.row.inventory_type == 3">退货</span> 
+                  <span v-if="scope.row.inventory_type == 4">人为损坏</span> 
+                  <span v-if="scope.row.inventory_type == 5">不计入报损分析</span> 
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-row>
+        </el-form>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="modifyDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="modifyDialogVisible = false">确 定</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -472,7 +384,7 @@
 <script>
 import BreadCrumb from "../components/bread-crumb";
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,SaveCheckedDamage,getStockDamageDetail,modifyPrice,deleteStockDamage,getStockBatchNumber,getGoodWarehouseList,getWarehouseTotal} from "@/api/stock"
+import { postSearchGoodWarehouseList,saveReportStock,getReportStockList,getStockBatchNumber,getGoodWarehouseList,getWarehouseTotal,getDamageDetailByGoodId} from "@/api/stock"
 export default {
     name: "stockModifyPrice",
     components:{
@@ -531,7 +443,21 @@ export default {
             editPriceDialogVisible:false,
             modifyPriceDialogVisible:false,
             id:0,
-            numberList:[]
+            numberList:[],
+            damageList:[],
+            modifyDialogVisible:false,
+            reasonList:[
+              {id:0,name:"默认"},
+              {id:1,name:"到期退货"},
+              {id:2,name:"异常退货"},
+              {id:3,name:"退货"},
+              {id:4,name:"人为损坏"},
+              {id:5,name:"不计入报损分析"},
+            ],
+            goodList:[],
+            good_name:"",
+            price:0,
+            good_id:0,
         }
     },
     methods:{
@@ -741,176 +667,13 @@ export default {
             this.tableList = list
            var doctorlist = response.data.data.doctorlist
            this.doctorList = doctorlist
+           var damageList =  response.data.data.damageList
+           console.log("datamagelist",damageList)
+          this.damageList = damageList
           }
        })   
       },
-     toCheck(){
-      if(this.ids.length <=0){
-         this.$message.error("请勾选核对数据")
-         return
-       }else{
-         this.checkDialogVisible = true
-       }
-     },
-    changePrice(val){
-       var arr = []
-       for(let i=0;i<val.length;i++){
-         arr.push(val[i].id)
-       }
-      var str = arr.join(",")
-      this.ids = str 
-     },
-     SaveCheckedDamage(){
-         var params = {
-            ids:this.ids,
-            check_time:this.getTime(this.check_time),
-            checker:this.checker,
-         }
-       console.log("params",params)
-       SaveCheckedDamage(params).then(response=>{
-         if(response.data.state == 1){
-           this.$message.success("保存成功")
-           var reportprice = response.data.data.reportprice 
-           this.checkDialogVisible = false
-           this.getlist()
-         }
-       })
-     },
-     getChecker(id){
-       var name = ""
-       for(let i=0;i<this.doctorList.length;i++){
-          if(id == this.doctorList[i].admin_user_id){
-             name = this.doctorList[i].user_name
-          }
-       }
-       return name
-     },
-     toDelete(index){
-       this.tableData.splice(index,1)
-     },
-     toEdit(row){
-      console.log("row",row)
-      this.form.good_name = row.good_name
-      this.form.warehousing_unit = row.warehousing_unit
-      this.form.packing_price = row.packing_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.dealer = row.dealer
-      this.form.manufacturer = row.manufacturer
-      this.form.good_origin_place = row.good_origin_place
-      this.form.total = row.total
-      this.form.number = row.number
-      this.form.license_number = row.license_number
-      this.editPriceDialogVisible = true  
-     },
-     upatePrice(){
-       if(this.form.count == ""){
-         this.$message.error("请输入报损数量")
-         return false
-       }
-       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
-            this.tableData[i].packing_price = this.form.packing_price
-            this.tableData[i].count = this.form.count
-            this.tableData[i].remark = this.form.remark
-            this.tableData[i].good_name = this.form.specification_name
-            this.tableData[i].warehousing_unit  = this.form.warehousing_unit
-            this.tableData[i].total = this.form.total
-            this.tableData[i].number = this.form.number
-            this.tableData[i].license_number = this.form.license_number
-            this.tableData[i].manufacturer = this.form.manufacturer
-            this.tableData[i].good_origin_place = this.form.good_origin_place
-         }
-       }
-       this.editPriceDialogVisible = false
-       this.form.good_name = ""
-       this.form.packing_price = ""
-       this.form.count = ""
-       this.form.remark = ""
-     },
-     editStockDamage(id,check_status){
-        if(check_status == 1){
-          this.$message.error("已核对,不能编辑")
-          return
-        }
-       getStockDamageDetail(id).then(response=>{
-         if(response.data.state == 1){
-           var detail = response.data.data.detail
-           console.log("hhhhh32233223",detail)
-           this.form.count = detail.count
-           this.form.good_name = detail.good_name
-           this.form.specification_name = detail.specification_name
-           this.form.total = detail.total
-           this.form.buy_price = detail.buy_price
-           this.form.packing_price = detail.packing_price
-           this.form.good_origin_place = detail.good_origin_place
-           this.form.warehousing_unit = detail.warehousing_unit
-           this.form.manufacturer = detail.manufacturer
-           this.form.dealer = detail.dealer
-           this.form.license_number = detail.license_number
-           this.form.number = detail.number
-           this.id = detail.id
-           this.form.good_id = detail.good_id
-           this.form.warehousing_info_id = detail.warehousing_info_id
-           this.modifyPriceDialogVisible = true
-         }
-       })
-     },
-     modifyPrice(){
-        var params = {
-          count:parseInt(this.form.count),
-          id:this.id,
-          good_name:this.form.good_name,
-          specification_name:this.form.specification_name,
-          number:this.form.number,
-          warehousing_unit:this.form.warehousing_unit,
-          buy_price:this.form.buy_price.toString(),
-          packing_price:this.form.packing_price.toString(),
-          good_origin_place:this.form.good_origin_place,
-          manufacturer:this.form.manufacturer,
-          dealer:this.form.dealer,
-          license_number:this.form.license_number,
-          warehousing_info_id:this.form.warehousing_info_id,
-          good_id:this.form.good_id,
-        }
-        console.log("param2323",params)
-       
-       modifyPrice(params).then(response=>{
-         if(response.data.state ==1){
-           var adjust = response.data.data.adjust
-           this.modifyPriceDialogVisible = false
-           this.$message.success("保存成功")
-           this.getlist()
-         }
-       })
-     },
-     deleteStockDamage(id,check_status,index){
-       if(check_status == 1){
-         this.$message.error("已核对不能编辑")
-         return
-       }
-        this.$confirm('是否删除所选内容?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          let params = {
-            id:id,
-          }
-          deleteStockDamage(params).then(response => {
-            if (response.data.state == 1) {
-              var msg = response.data.data.msg
-              this.$message.success("保存成功")
-              this.tableList.splice(index,1)
-            } 
-          })
-        }).catch(() => {
-          this.loading = false
-        });
-     },
+   
      exportList(){
        
          import('@/vendor/Export2Excel').then(excel => {
@@ -994,6 +757,39 @@ export default {
             this.form.total = list.stock_count
           }
         })
+      },
+      getDamageCount(good_id){
+        var count = 0
+        for(let i=0;i<this.damageList.length;i++){
+          if(good_id == this.damageList[i].good_id){
+             count = this.damageList[i].count
+          }
+        }
+        return count
+      },
+      toDamagedDetail(good_id){
+          var params = {
+            good_id:good_id,
+            warehousing_order:this.form.warehousing_order,
+            type:this.form.type,
+          }
+         getDamageDetailByGoodId(params).then(response=>{
+            if(response.data.state == 1){
+              var list = response.data.data.list
+              console.log("list233232",list)
+              this.modifyDialogVisible = true
+              this.good_name = list[0].good_name
+              this.price = list[0].buy_price
+              this.good_id = list[0].good_id
+              this.goodList = []
+              this.goodList = list
+              this.damageList = []
+              this.damageList = response.data.data.damageList
+            }
+         })
+      },
+      toQuery(){
+        this.toDamagedDetail(this.good_id)
       }
     },
     created(){

src/xt_pages/stock/stockFlow.vue

@@ -65,7 +65,8 @@
              <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 == 5">报损数量</span>
+             <span v-if="scope.row.consumable_type == 10">盘盈</span>
+             <span v-if="scope.row.consumable_type == 11">盘亏</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
@@ -74,7 +75,8 @@
             <span v-if="scope.row.consumable_type == 2">{{scope.row.warehouse_out_order_number}}</span>  
             <span v-if="scope.row.consumable_type == 3">{{scope.row.warehouse_out_order_number}}</span>  
             <span v-if="scope.row.consumable_type == 4">{{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.warehouse_out_order_number}}</span>
+            <span v-if="scope.row.consumable_type == 11">{{scope.row.warehouse_out_order_number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
@@ -102,7 +104,7 @@
        </el-table-column>
 
     
-        <el-table-column prop="drug_name" label="进/出货单价"  align="center">
+        <el-table-column prop="drug_name" label="单价"  align="center">
            <template slot-scope="scope">
              <span>{{scope.row.price}}</span>
            </template>
@@ -214,7 +216,8 @@
           {id:2,name:"手动出库"},
           {id:3,name:"自动出库"},
           {id:4,name:"手动退库"},
-          {id:5,name:"报损数量"},
+          {id:10,name:"盘盈"},
+          {id:11,name:"盘亏"},
         ],
         countList:[],
         outCountList:[],

src/xt_pages/stock/stockInOrderAdd.vue

@@ -735,7 +735,6 @@
         })
       },
       changeGoodName(val){
-        console.log("val",val)
         this.currentIndex = val
       },
       handleSelect(val){

src/xt_pages/stock/stockInOrderEdit.vue

@@ -797,7 +797,6 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
-      console.log("val",val)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
             this.recordInfo.recordData[i].good_type_id = val.id
@@ -823,14 +822,6 @@ export default {
             }
           
           }
-         
-         if(val.xt_warehouse_info !=null &&  val.xt_warehouse_info.length > 0){
-           
-          for(let j=0;j<val.xt_warehouse_info.length;j++){
-              this.numberList.push(val.xt_warehouse_info[j])
-            }
-            this.recordInfo.recordData[i].number = val.xt_warehouse_info[0].number
-          }
         }
      
     }

src/xt_pages/stock/stockInventory.vue

@@ -4,12 +4,15 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
     <div class="app-container">
-        <el-tabs v-model="activeName">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="耗材盘点" name="first">
                 <inventory></inventory>
             </el-tab-pane>
-            <el-tab-pane label="盘点明细" name="second">
-                <inventory-details></inventory-details>
+            <el-tab-pane label="盘点列表" name="second">
+                <inventory-details ref="child"></inventory-details>
+            </el-tab-pane>
+            <el-tab-pane label="报损列表" name="three">
+                <stockDamaged ref="childOne"></stockDamaged>
             </el-tab-pane>
         </el-tabs>
         
@@ -23,13 +26,14 @@
 import BreadCrumb from "../components/bread-crumb";
 import inventory from './inventory.vue'
 import inventoryDetails from './inventoryDetails.vue'
-
+import stockDamaged from "./stockDamaged.vue"
 export default {
     name: "stockModifyPrice",
     components:{
         BreadCrumb,
         inventory,
-        inventoryDetails
+        inventoryDetails,
+        stockDamaged
     },
     data() {
         return{
@@ -42,7 +46,14 @@ export default {
         }
     },
     methods:{
-
+      handleClick(){
+        if(this.activeName == "second"){
+         this.$refs.child.getlist()
+        }
+        if(this.activeName =="three"){
+          this.$refs.childOne.getlist()
+        }
+      }
     },
     created(){
     },

src/xt_pages/stock/stockOutOrder.vue

@@ -185,21 +185,13 @@
               {{ scope.row.good_name }}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="耗材类型" align="center">
-            <template slot-scope="scope">
-              {{  getTypeName(scope.row.good_type_id)}}
-            </template>
-          </el-table-column> -->
+        
           <el-table-column label="规格&单位" align="center">
             <template slot-scope="scope">
               {{ scope.row.specification_name}} / {{scope.row.packing_unit}}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="批号" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.number}}
-            </template>
-          </el-table-column> -->
+         
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}{{scope.row.packing_unit}}</span> 
@@ -414,15 +406,7 @@
              {{scope.row.count}}
             </template>
           </el-table-column>
-          <el-table-column min-width="35" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>批次号</span>
-            </template>
-            <template slot-scope="scope">
-               <!-- {{scope.row.number}} -->
-               {{getBatchNumber(scope.row.patient_id,scope.row.good_id)}}
-            </template>
-          </el-table-column>
+      
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
               <span>使用时间</span>
@@ -629,14 +613,6 @@
 
             </template>
           </el-table-column>
-         <el-table-column min-width="70" align="center">
-            <template slot="header" slot-scope="scope">
-              <span>批次号</span>
-            </template>
-            <template slot-scope="scope">
-               <span v-if="scope.row.is_total ==0">{{scope.row.number}}</span>
-            </template>
-          </el-table-column>
         </el-table>
       </el-row>
     </div>
@@ -1078,7 +1054,6 @@ export default {
 
     handleSearch(val){
       this.tableList = []
-    
       this.editdialogVisibleThree = false
       this.GetOrderDetailOne(val.id)
       this.GetTotalCount(val.warehouse_out_time)
@@ -1091,28 +1066,19 @@ export default {
         getOrderDetailByOrderId(params).then(response=>{
             if(response.data.state == 1){
               this.tableShow = true
-              var info = response.data.data.list
-              console.log("list22222222",info)
-              var list = response.data.data.info
-              for(let i=0;i<info.length;i++){
-                for(let j=0;j<list.length;j++){
-                  if(info[i].good_id == list[j].good_id){
-                     list[j].count = info[i].count
-                  }
-                }
-              }
+              var list = response.data.data.list          
               console.log("info2232323",list)
               this.tableList = []
               for(let i=0;i<list.length;i++){
-                if(list[i].dealer == 0){
-                  list[i].dealer = ""
-                }
-                if(list[i].manufacturer == 0){
-                  list[i].manufacturer = ""
-                }  
-                list[i].good_name = list[i].info.good_name
-                list[i].specification_name = list[i].info.specification_name
-                list[i].packing_unit = list[i].info.packing_unit
+                // if(list[i].dealer == 0){
+                //   list[i].dealer = ""
+                // }
+                // if(list[i].manufacturer == 0){
+                //   list[i].manufacturer = ""
+                // }  
+                // list[i].good_name = list[i].info.good_name
+                // list[i].specification_name = list[i].info.specification_name
+                // list[i].packing_unit = list[i].info.packing_unit
                 this.tableList.push(list[i])
               }
              

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -118,14 +118,14 @@
             </template>
           </el-table-column>
           
-          <el-table-column  width="150" align="center">
+          <!-- <el-table-column  width="150" align="center">
              <template slot="header" slot-scope="scope">
               <span>批号<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <el-form-item  
                 :rules="tableRules.number">
-                <el-select v-model="scope.row.number" filterable placeholder="请选择" @change="changeNumberList(scope.row)">
+                <el-select v-model="scope.row.number" filterable placeholder="请选择" @change="changeNumberList(scope.row,scope.$index)">
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
@@ -135,7 +135,7 @@
                 </el-select>
               </el-form-item>
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -296,7 +296,7 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import { getSalesReturnConfig, postWarehouseOut,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getStockBatchNumber } from "@/api/stock";
+import {  postWarehouseOut,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getStockBatchNumber } from "@/api/stock";
 
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
@@ -327,7 +327,7 @@ export default {
       tableRules: {
         price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
         count: [{ required: true, message: "数量不能为空", trigge: "blur" }],
-        number:[{ required: true, message: "批号不能为空",trigge:"blur"}],
+        // number:[{ required: true, message: "批号不能为空",trigge:"blur"}],
       },
       ruleForm: {
         manufacturer: [
@@ -463,6 +463,7 @@ export default {
       tempObj["product_date"] = ""
       tempObj["license_number"] = ""
       tempObj["warehouse_info_id"] = 0
+     
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -590,7 +591,6 @@ export default {
            
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
           }
-          console.log("批次好",this.numberList)
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             for(let j=0;j<this.manufacturerList.length;j++){
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
@@ -612,8 +612,7 @@ export default {
           const params = {
             stockOut: this.recordInfo.recordData
           };
-          console.log("2323223223",this.recordInfo.recordData);
-     
+ 
           postWarehouseOut(
             params,
             this.warehouse_out_time,
@@ -622,15 +621,14 @@ export default {
             this.type
           ).then(response => {
             if (response.data.state == 0) {
-              // this.$message.error(response.data.msg);
               this.$message.error("库存不足")
               return false;
             } else {
                var msg = response.data.data.msg
                var good_name = response.data.data.good_name
                var specification_name = response.data.data.specification_name
-               var str = good_name +"*" + specification_name +"该批次无库存,请入库"
-               console.log("msg222222222",msg)
+               var str = good_name +"*" + specification_name +"无库存,请入库"
+             
                if(msg == 1){
                   this.$message.error(str)
                }
@@ -694,7 +692,18 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
-       console.log("val2222222222",val)
+       
+        var arr = []
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+           arr.push(this.recordInfo.recordData[i].good_id)
+        }
+       
+        var str = arr.join(",")
+        console.log("str",str,"good_id",val.id)
+        if(str.indexOf(val.id)!=-1){
+          this.$message.error("该耗材已存在列表中")
+          return
+        }
         //获取当前耗材的批号
         this.getStockBatchNumber(val.id)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
@@ -739,11 +748,14 @@ export default {
     getDataConfig(module, filed_name) {
       return getDataConfig(module, filed_name)
     },
-    changeNumberList(val){
-       console.log("val232332323223232332",val)
+    changeNumberList(val,index){
+
        for(let i=0;i<this.recordInfo.recordData.length;i++){
-         if(val.good_id == this.recordInfo.recordData[i].good_id){
-            this.recordInfo.recordData[i].warehouse_info_id = val.number
+        //  if(val.good_id == this.recordInfo.recordData[i].good_id){
+        //     this.recordInfo.recordData[i].warehouse_info_id = val.number
+        //  }
+         if(index == i){
+          this.recordInfo.recordData[i].warehouse_info_id = val.number
          }
        }  
       console.log("表格",this.recordInfo.recordData)

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -98,31 +98,30 @@
             </template>
           </el-table-column>
 
-          <el-table-column width="140" align="center">
+          <!-- <el-table-column width="140" align="center">
             <template slot="header" slot-scope="scope">
               <span>批号<span style="color: red"></span></span>
             </template>
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
-                <!-- <el-input placeholder="请输入批号" v-model="scope.row.number"  :disabled="stockShow"></el-input> -->
-               <el-select v-model="scope.row.number" filterable placeholder="请选择" :disabled="stockTrue">
+               <el-select v-model="scope.row.number" filterable placeholder="请选择" :disabled="stockTrue" @change="changeNumberList(scope.row,scope.$index)">
                   <el-option
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.number"
-                    :value="item.number">
+                    :value="item.id">
                   </el-option>
                 </el-select>
               </el-form-item>
             </template>
-          </el-table-column>
+          </el-table-column> -->
          
           <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>单价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+         
               <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
                             style="padding-top: 17px">
                 <el-input type="number" v-model="scope.row.price"  :disabled="stockShow"></el-input>
@@ -252,7 +251,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteWarehouseOutInfo, editWarehouseoutInfo, getSalesReturnConfig, getWarehouseOutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getSingleOutOrderDetail,getStockBatchNumber } from '@/api/stock'
+  import { deleteWarehouseOutInfo, editWarehouseoutInfo,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getSingleOutOrderDetail,getStockBatchNumber } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
   import StockInDialog from './Dialog/stockInDialog'
 
@@ -401,6 +400,7 @@
         return name;
       }, 
       handleEdit: function(index, row) {
+        console.log("hhh2322332323",this.recordInfo.recordData)
         this.stockTrue = false
         if(this.stockShow == true){
          this.$message.error("自动出库数据无法编辑")
@@ -526,6 +526,7 @@
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
+            console.log("2332232323232323",array)
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
                 this.$message.error('商品类型不能为空')
@@ -558,14 +559,22 @@
                     this.recordInfo.recordData[i].dealer = this.dealerList[z].id
                 }
               }
+
+            for(let y=0;y<this.numberList.length;y++){
+               if(this.recordInfo.recordData[i].number == this.numberList[y].id){
+                   this.recordInfo.recordData[i].number = this.numberList[y].number
+               }
+             }
             }
             const params = {
-              'stockOut': this.recordInfo.recordData
+              'warehouse_out_time':this.warehouse_out_time,
+              'stockOut': this.recordInfo.recordData,
+              "warehout_id":parseInt(this.$route.query.id),
             }
            
             console.log("stockout",params,this.$route.query.id)
-            
-            editWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
+            var warehout_id = parseInt(this.$route.query.id)
+            editWarehouseoutInfo(params, this.warehouse_out_time, warehout_id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
@@ -579,6 +588,15 @@
                   this.$message.error("该耗材无库存,请入库")
                 }
 
+                 var msg = response.data.data.msg
+                  var good_name = response.data.data.good_name
+                  var specification_name = response.data.data.specification_name
+                  var str = good_name +"*" + specification_name +"无库存,请入库"
+                
+                  if(msg == 7){
+                      this.$message.error(str)
+                  }
+
                 if(response.data.data.msg == 6){
                   this.$message.error("该耗材的退库数量大于入库数量,无法出库,请新增出库另一个批次")
                 }
@@ -636,7 +654,16 @@
       this.currentIndex = val
     },
     handleSelect(val){
-       console.log("val22222",val)
+        var arr = []
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+           arr.push(this.recordInfo.recordData[i].good_id)
+        }
+        var str = arr.join(",")
+        console.log("str",str,"good_id",val.id)
+        if(str.indexOf(val.id)!=-1){
+          this.$message.error("该耗材已存在列表中")
+          return
+        }
         this.getStockBatchNumber(val.id)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
@@ -647,6 +674,7 @@
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].license_number = ""
+            this.recordInfo.recordData[i].warehouse_info_id = 0
             if(val.packing_price == 0){
                this.recordInfo.recordData[i].price = ""
             }else{
@@ -716,8 +744,17 @@
             console.log("list2243444",list)
             this.numberList = list
           }
-      })
-      }
+       })
+      },
+     changeNumberList(val,index){
+       console.log("val232332323223232332",val,index)
+       for(let i=0;i<this.recordInfo.recordData.length;i++){
+         if(index == i){
+            this.recordInfo.recordData[i].warehouse_info_id = val.number
+         }
+       }  
+      console.log("表格",this.recordInfo.recordData)
+     }
     },
     created() {
       var nowDate = new Date();

src/xt_pages/stock/stockQuery.vue

@@ -103,19 +103,24 @@
         </el-table-column>
        <el-table-column label="入库数量" align="center">
          <template slot-scope="scope">
-          
-          <span v-if="getWareInfo(scope.row.xt_warehouse_info)>0">{{getWareInfo(scope.row.xt_warehouse_info)}}{{scope.row.packing_unit}}</span>
+           <span v-if="getWareInfo(scope.row.xt_warehouse_info)>0">{{getWareInfo(scope.row.xt_warehouse_info)}}{{scope.row.packing_unit}}</span>
          </template>
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-            {{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}}
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4">
+            <span>
+              {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
+            </span>
+          </span>
+          <span v-else>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span> 
          </template>
        </el-table-column>
 
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
-          <span v-if="getWareInfo(scope.row.xt_warehouse_info) > 0">{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span> 
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
+          <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span> 
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" width="260px">
@@ -152,12 +157,9 @@
 </template>
 
 <script>
-import { uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {
-  GetAllGoodInfo,
   GetAllGoodType,
-  getAllStockQueryList,
   getAllStockList,
   getStockDrugCount
 } from "@/api/stock";
@@ -165,34 +167,19 @@ import {
 export default {
   name: "stockIn",
   created() {
+    this.org_id =  this.$store.getters.xt_user.org_id
+
     var start_time =  window.sessionStorage.getItem('start_time')
     var end_time =  window.sessionStorage.getItem('end_time')
-    console.log("start_time",start_time,end_time)
+   
     if(start_time !=null){
       this.start_time = start_time
     }
     if(end_time!=null){
       this.end_time = end_time
     }
-   
     window.sessionStorage.removeItem('start_time')
     window.sessionStorage.removeItem('end_time')
-    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.GetAllGoodInfo();
     this.GetAllGoodType();
     this.getlist()
     this.getStockDrugCount()
@@ -229,69 +216,12 @@ export default {
       countList:[],
       outCountList:[],
       autoCountList:[],
-      cancelCountList:[]
+      cancelCountList:[],
+      org_id:0,
     };
   },
   methods: {
-    GetAllStockQuery: function() {
-      console.log(this.keywords);
-      const Params = {
-        page: this.page,
-        limit: this.limit,
-        keyword: this.keywords,
-        start_time:this.start_time,
-        end_time:this.end_time,
-        type_name:this.type_name,
-      };
-
-      this.WarehouseInfo.loading = true;
-      this.WarehouseInfo.warehouseInfoDate = [];
-      getAllStockQueryList(Params).then(response => {
-        if (response.data.state == 0) {
-          this.WarehouseInfo.loading = false;
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          this.WarehouseInfo.loading = false;
-          this.total = response.data.data.total;
-          for (let i = 0; i < response.data.data.list.length; i++) {
-           this.WarehouseInfo.warehouseInfoDate.push( response.data.data.list[i]);
-          }
-        }
-        console.log("数据源头",this.WarehouseInfo.warehouseInfoDate)
-
-         for(let i=0;i<this.WarehouseInfo.warehouseInfoDate.length;i++){
-            this.WarehouseInfo.warehouseInfoDate[i].type_name = this.WarehouseInfo.warehouseInfoDate[i].type.type_name
-
-            this.WarehouseInfo.warehouseInfoDate[i].stockInCount = this.stockInCount(this.WarehouseInfo.warehouseInfoDate[i])
-
-            this.WarehouseInfo.warehouseInfoDate[i].salesReturnCount = this.salesReturnCount(this.WarehouseInfo.warehouseInfoDate[i])
-
-            this.WarehouseInfo.warehouseInfoDate[i].realCount = this.stockInCount(this.WarehouseInfo.warehouseInfoDate[i]) -  this.salesReturnCount(this.WarehouseInfo.warehouseInfoDate[i])
-
-            this.WarehouseInfo.warehouseInfoDate[i].stockOutCount = this.stockOutCount(this.WarehouseInfo.warehouseInfoDate[i])
-
-            this.WarehouseInfo.warehouseInfoDate[i].cancelStockCount = this.cancelStockCount(this.WarehouseInfo.warehouseInfoDate[i])
-
-            this.WarehouseInfo.warehouseInfoDate[i].realOutCount =  this.stockOutCount(this.WarehouseInfo.warehouseInfoDate[i]) -  this.cancelStockCount(this.WarehouseInfo.warehouseInfoDate[i])
-
-            this.WarehouseInfo.warehouseInfoDate[i].overplus = this.stockInCount(this.WarehouseInfo.warehouseInfoDate[i]) -this.salesReturnCount(this.WarehouseInfo.warehouseInfoDate[i]) - this.stockOutCount(this.WarehouseInfo.warehouseInfoDate[i]) + this.cancelStockCount(this.WarehouseInfo.warehouseInfoDate[i])
-
-            if(this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info.length>0){
-              this.WarehouseInfo.warehouseInfoDate[i].price = this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info[0].price
-              this.WarehouseInfo.warehouseInfoDate[i].all_price = (this.stockInCount(this.WarehouseInfo.warehouseInfoDate[i]) * this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info[0].price).toFixed(2)
-            }else{
-             this.WarehouseInfo.warehouseInfoDate[i].price = ""
-             this.WarehouseInfo.warehouseInfoDate[i].all_price = ""
-            }
-
-
-         }
-
-       
-      });
-    },
-
+  
     GetAllGoodType: function() {
       GetAllGoodType().then(response => {
         if (response.data.state == 0) {
@@ -307,8 +237,6 @@ export default {
             this.goodType.push(response.data.data.goodType[i]);
             this.types.push(response.data.data.goodType[i])
           }
-
-          console.log("商品类型",this.types)
         }
       });
     },
@@ -329,24 +257,21 @@ export default {
     },
     handleSizeChange(val) {
       this.limit = val;
-
       this.getlist()
       this.getStockDrugCount()
       
     },
     handleCurrentChange(val) {
       this.page = val;
-       this.getlist()
-        this.getStockDrugCount()
+      this.getlist()
+      this.getStockDrugCount()
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;
     },
     startTimeChange: function(val) {
       window.sessionStorage.removeItem('start_time')
-     
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
-      console.log("ime2222",time)
       if (time > 0) {
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
@@ -360,7 +285,6 @@ export default {
     endTimeChange: function(val) {
       window.sessionStorage.removeItem('end_time')
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
-      console.log("ime2222",time)
       if (time < 0) {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
@@ -400,10 +324,6 @@ export default {
       }
       return total;
     },
-    showStockInDetailDialog: function(val) {},
-    showSaleReturnDetailDialog: function() {},
-    showStockOutDetailDialog: function() {},
-    showCancelStockDetailDialog: function() {},
     search: function() {
       this.getlist()
       this.getStockDrugCount()
@@ -421,9 +341,7 @@ export default {
            this.tableList[i].unit = this.tableList[i].specification_name + "/" + this.tableList[i].packing_unit
            this.tableList[i].prodect_name = this.getManufacture(this.tableList[i].manufacturer)
            this.tableList[i].inCount =  this.getWareInfo(this.tableList[i].xt_warehouse_info)
-          this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
-          // this.tableList[i].outCount = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverplus(this.tableList[i].xt_warehouse_info) - this.getCancelInfo(this.tableList[i].cancel_stock_info)
-          // this.tableList[i].overplus = this.getOverplus(this.tableList[i].xt_warehouse_info)
+           this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
           if(this.getWareInfo(this.tableList[i].xt_warehouse_info) > 0){
             this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
           }else{
@@ -431,7 +349,6 @@ export default {
           }
           
          }
-         console.log("table",this.tableList)
          const data = this.formatJson(filterVal, this.tableList)
          excel.export_json_to_excel({
            header: tHeader,
@@ -454,18 +371,17 @@ export default {
 
       },
 
-      getUnit(id){
-
-        var name = ""
-        for(let i=0;i<this.$store.getters.good_unit.length;i++){
-           if(id == this.$store.getters.good_unit[i].id){
-              name = this.$store.getters.good_unit[i].name
-           }
-        }
-        return name
-      },
+    getUnit(id){
+      var name = ""
+      for(let i=0;i<this.$store.getters.good_unit.length;i++){
+          if(id == this.$store.getters.good_unit[i].id){
+            name = this.$store.getters.good_unit[i].name
+          }
+      }
+      return name
+    },
 
-      getTimestamp(time) {
+    getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
@@ -478,7 +394,7 @@ export default {
       }
       return name
     },
-    getlist(){
+  getlist(){
       const params = {
         page: this.page,
         limit: this.limit,
@@ -487,17 +403,15 @@ export default {
         end_time:this.end_time,
         type:this.type_name,
       };
-     console.log("params",params)
-      getAllStockList(params).then(response=>{
+    getAllStockList(params).then(response=>{
          if(response.data.state == 1){
           var list = response.data.data.list
-          console.log("list22222",list)
+          console.log("总库存数量",list)
           this.tableList = list
           var total = response.data.data.total
-          console.log("total",total)
           this.total = total
-           var manufacturerList = response.data.data.manufacturerList
-           this.manufacturerList = manufacturerList
+          var manufacturerList = response.data.data.manufacturerList
+          this.manufacturerList = manufacturerList
          }
       })
     },
@@ -546,15 +460,14 @@ export default {
         }
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
-         
            var outlist = response.data.data.outList
-           console.log("出库数量",outlist)
+          //  console.log("出库数量",outlist)
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
-           console.log("autoCount",autoCount)
+          //  console.log("autoCount",autoCount)
            this.autoCountList = autoCount
            var totalCount = response.data.data.totalCount
-           console.log("totalcount",totalCount)
+          //  console.log("totalcount",totalCount)
            this.cancelCountList = totalCount
          }
       })
@@ -636,6 +549,26 @@ export default {
        total = ""
      }
      return total
+   },
+   getOverFlushInfo(arr){
+     var total = 0
+     if(arr.length >0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }
+     return total
+   },
+   getCancelSotckInfo(arr){
+     console.log("2332323232322332",arr)
+     var cancle_toal = 0
+     if(arr.length >0){
+      for(let z=0;z<arr.length;z++){
+        cancle_toal += arr[z].count
+      }
+     }
+     console.log("total",cancle_toal)
+     return cancle_toal
    }
   }
 };

src/xt_pages/user/patients.vue

@@ -407,6 +407,7 @@
             <span>{{ scope.row.created_time | parseTime('{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
+        
         <el-table-column label="转归" align="center">
           <template slot-scope="scope">
             <span>{{ LapsetoInfo(scope.row) }}</span>