8月15日

src/api/drug/drug.js

@@ -491,3 +491,19 @@ export function getInventoryModeList(params) {
     params: params
   })
 }
+
+export function getStorehouseList(params) {
+  return request({
+    url: '/api/drug/getstorehouselist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getGoodNewQuery(params) {
+  return request({
+    url: '/api/drug/getgoodnewquery',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2663,12 +2663,12 @@
         }
 
 
-        for(let i = 0; i < this.prescriptions.length; i++){
-          if (this.prescriptions[i].order_status == 2 || this.prescriptions[i].order_status == 4) {
-            this.$message.error('处方中包含已收费处方或者包含已经上传的处方,无法新增')
-            return
-          }
-        }
+        // for(let i = 0; i < this.prescriptions.length; i++){
+        //   if (this.prescriptions[i].order_status == 2 || this.prescriptions[i].order_status == 4) {
+        //     this.$message.error('处方中包含已收费处方或者包含已经上传的处方,无法新增')
+        //     return
+        //   }
+        // }
 
 
 

src/xt_pages/stock/detail/print.vue

@@ -54,7 +54,7 @@
                   <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583">{{getStockCount(item.good_id) }}</span>
                    <span  v-if="org_id == 10265 || org_id == 10215">{{getMySelfCount(item.good_id) }}</span>
                    <span v-if="org_id == 10210 || org_id == 9671 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{getWarehouseOut(item.good_id)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191">{{getStockCount(item.good_id) }}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191">{{getStockCount(item.good_id) }}</span>
                 </span>
 
                 <span v-if="type == 4"> {{ item.count }}</span>

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -163,8 +163,9 @@
                   <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 == 4">损坏</span>
                   <span v-if="scope.row.type == 5">不计入报损分析</span>
+                  <span v-if="scope.row.type == 7">有效期到期</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -261,8 +262,9 @@ export default {
               {id:1,name:"到期退货"},
               {id:2,name:"异常退货"},
               {id:3,name:"退货"},
-              {id:4,name:"人为损坏"},
+              {id:4,name:"损坏"},
               {id:5,name:"不计入报损分析"},
+              {id:7,name:"有效期到期"}
             ],
             goodList:[],
             drug_name:"",

src/xt_pages/stock/drugs/inventory.vue

@@ -214,8 +214,9 @@ export default {
               {id:1,name:"到期退货"},
               {id:2,name:"异常退货"},
               {id:3,name:"退货"},
-              {id:4,name:"人为损坏"},
+              {id:4,name:"损坏"},
               {id:5,name:"不计入报损分析"},
+              {id:7,name:"有效期到期"},
             ],
             activeNames: [0,1,2,3,4,5,6,7,8,9,10],
             showTable:false,

src/xt_pages/stock/inventory.vue

@@ -210,8 +210,9 @@ export default {
           {id:1,name:"到期退货"},
           {id:2,name:"异常退货"},
           {id:3,name:"退货"},
-          {id:4,name:"人为损坏"},
+          {id:4,name:"损坏"},
           {id:5,name:"不计入报损分析"},
+          {id:7,name:"有效期到期"},
          ],
          activeNames: [0,1,2,3,4,5,6,7,8,9,10],
          showTable:false,

src/xt_pages/stock/inventoryDetails.vue

@@ -83,8 +83,9 @@
                 <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 ==4">损坏</span>
                 <span v-if="scope.row.inventory_type ==5">不计入报损分析</span>
+                <span v-if="scope.row.inventory_type ==7">有效期到期</span>
                </template>
             </el-table-column>
           

src/xt_pages/stock/query/goodNewQuery.vue

@@ -15,16 +15,18 @@
             </el-option>
           </el-select>
           <span>库存预警:</span>
-          <el-select v-model="good_id" style="width:250px;margin-right:10px;" placeholder="请选择"
+          <el-select v-model="good_type" style="width:250px;margin-right:10px;" placeholder="请选择"
           filterable
            @change="changeGoodName">
             <el-option
               v-for="item in goodList"
               :key="item.id"
-              :label="item.good_name"
+              :label="item.name"
               :value="item.id">
             </el-option>
           </el-select>
+          <el-input v-model="keyword" style="width:200px" placeholder="请输入耗材名称或生产厂商" ></el-input>
+          <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
         </div>
 
@@ -40,73 +42,123 @@
           >
             <el-table-column label="耗材类型" align="center">
               <template slot-scope="scope">
-                
-            </template>
+                {{getGoodTypeName(scope.row.good_type_id)}}
+              </template>
             </el-table-column>
             <el-table-column label="耗材名称" align="center">
               <template slot-scope="scope">
-               
+                 {{scope.row.good_name}}
               </template>
             </el-table-column>
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
-                  
+                  {{scope.row.specification_name}}
                 </template>
             </el-table-column>
             <el-table-column label="生产厂商" align="center">
-                <template slot-scope="scope">
-                 
-                </template>
+              <template slot-scope="scope">
+                  {{getManufacturName(scope.row.manufacturer)}}
+              </template>
             </el-table-column>
             <el-table-column label="国家编码" align="center">
               <template slot-scope="scope">
-               
+                {{scope.row.social_security_directory_code}}
               </template>
             </el-table-column>
             <el-table-column label="仓库名称" align="center">
               <template slot-scope="scope">
-             
+                <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center" >
+                    {{getHouseName(item.storehouse_id)}}
+                  </td>
+                </tr>
               </template>
             </el-table-column>
         
-    
             <el-table-column label="入库量" align="center">
               <template slot-scope="scope">
-                
-              </template>
+                <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+                  <td style="border-right: none; border-inline-end: none;text-align: center">
+                  {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;
+                  </td>
+                </tr>
+               </template>
             </el-table-column>
-
+          
             <el-table-column label="出库量" align="center">
               <template slot-scope="scope">
-                
-              </template>
+                <span v-if="org_id == 3907 || org_id == 9583">{{ getAutoCount(scope.row.id) + getOutCount(scope.row.id) }}</span>
+                <span v-if="org_id!=3907 && org_id!=9583">
+                  <tr style="background: none" v-for="(item,index) in scope.row.warehouse_out_info" :key="index">
+                    <td style="border-right: none; border-inline-end: none;text-align: center">
+                      <span style="color:blue" @click="d"> {{getWareOutInfoCount(scope.row.warehouse_out_info,item.storehouse_id)}}</span>&nbsp;
+                    </td>
+                  </tr>
+              </span>
+             </template>
             </el-table-column>
 
             <el-table-column label="退库数量" align="center">
               <template slot-scope="scope">
-                
+                  <tr style="background: none" v-for="(item,index) in scope.row.cancel_stock_info" :key="index">
+                    <td style="border-right: none; border-inline-end: none;text-align: center">
+                      {{getCancelCountInfo(scope.row.cancel_stock_info,item.storehouse_id)}}&nbsp; 
+                    </td>
+                  </tr>
+
               </template>
             </el-table-column>
 
              <el-table-column label="实际出库" align="center">
               <template slot-scope="scope">
-                
-              </template>
+                <span v-if="org_id == 3907 || org_id == 9583">{{ getAutoCount(scope.row.id) + getOutCount(scope.row.id) }}</span>
+                <span v-if="org_id!=3907 && org_id!=9583">
+                  <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+                    <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id) - getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;
+                    </td>
+                  </tr>
+               </span>
+             </template>
             </el-table-column>
 
             <el-table-column label="剩余库存" align="center">
               <template slot-scope="scope">
-                
+                <span v-if="org_id == 3907 || org_id == 9583">
+                  {{
+                    getWareInfo(scope.row.xt_warehouse_info) -
+                    getAutoCount(scope.row.id) -
+                    getOutCount(scope.row.id) +
+                    getCancelCount(scope.row.id)
+                    }}
+                </span>
+                <span v-if="org_id!=3907 && org_id!=9583">
+                  <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+                    <td style="border-right: none; border-inline-end: none;text-align: center">
+                    {{getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;&nbsp;
+                    </td>
+                  </tr>
+                </span>
               </template>
             </el-table-column>
 
             <el-table-column label="总库存量" align="center">
               <template slot-scope="scope">
-                
-              </template>
+                <span v-if="org_id == 3907 || org_id == 9583">
+                    {{
+                    getWareInfo(scope.row.xt_warehouse_info) -
+                    getAutoCount(scope.row.id) -
+                    getOutCount(scope.row.id) +
+                    getCancelCount(scope.row.id)
+                    }}
+                </span>
+                <span v-if="org_id != 3907 && org_id != 9583">
+                    {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
+                </span>
+               </template>
             </el-table-column>
            
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" width="200px">
              
               <template slot-scope="scope">
                 <el-button
@@ -123,25 +175,55 @@
                 </el-button>
                </template>
             </el-table-column>
-
           </el-table>
+           <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+            </el-pagination>
      </div>
 
   </div>
 </template>
 <script>
+import { getStorehouseList,getGoodNewQuery } from "@/api/drug/drug"
+import {
+  getStockDrugCount
+} from "@/api/stock";
 export default {
 
   data(){
     return{
      tableList:[],
-     goodList:[],
+     goodList:[
+      {id:1,name:"全部耗材"},
+      {id:2,name:"库存预警"},
+     ],
      houseList:[],
      storehouse_id:0,
-     good_id:0,
+     good_type:1,
      multipleSelection: [],
      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
      manufacturerList:[],
+     limit:10,
+     page:1,
+     total:0,
+     keyword:"",
+     goodTypeList:[],
+     start_time:"",
+     end_time:"",
+     countList:[],
+     outCountList:[],
+     autoCountList:[],
+     cancelCountList:[],
+     org_id:this.$store.getters.xt_user.org_id,
     }
   
   },
@@ -179,6 +261,278 @@ export default {
       // window.sessionStorage.setItem('end_time',this.end_time)
       this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.id+"&manufacturer="+manufacturer_name+"&packing_unit="+val.packing_unit+"&overCount="+overCount})
     },
+
+    getStorehouseList(){
+      getStorehouseList().then(response=>{
+         if(response.data.state == 1){
+           var houseList = response.data.data.list
+           var obj = {id:0,storehouse_name:"全部"}
+           this.houseList.push(obj)
+           for(let i=0;i<houseList.length;i++){
+             this.houseList.push(houseList[i])
+           }
+           this.manufacturerList = response.data.data.manufacturerList
+           this.goodTypeList = response.data.data.goodTypeList
+         }
+      })
+    },
+    getlist(){
+        var params = {
+          storehouse_id:this.storehouse_id,
+          good_type:this.good_type,
+          keyword:this.keyword,
+          page:this.page,
+          limit:this.limit,
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+      getGoodNewQuery(params).then(response=>{
+         if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("list2332233232323232w",list)
+            
+            if(list.length > 0){
+              var arr = []
+              for(let i=0;i<list.length;i++){
+                if(list[i].xt_warehouse_info.length > 0){
+                  arr.push(list[i])
+                }
+              }
+              this.tableList = arr
+            }
+            this.total = response.data.data.total
+           
+         }
+      })
+    },
+    getManufacturName(id){
+      var manufacturer_name = ""
+      for(let i=0;i<this.manufacturerList.length;i++){
+        if(id == this.manufacturerList[i].id){
+           manufacturer_name = this.manufacturerList[i].manufacturer_name
+        }
+      }
+      return manufacturer_name
+    },
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getlist()
+     
+
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist()
+    },
+   seach(){
+    this.getlist()
+   },
+   getGoodTypeName(id){
+     var type_name = ""
+     for(let i=0;i<this.goodTypeList.length;i++){
+       if(id == this.goodTypeList[i].id){
+         type_name = this.goodTypeList[i].type_name
+       }
+     }
+     return type_name
+   },
+   getHouseName(id){
+     var storehouse_name = ""
+     for(let i=0;i<this.houseList.length;i++){
+       if(id == this.houseList[i].id){
+         storehouse_name = this.houseList[i].storehouse_name
+       }
+     }
+     return storehouse_name
+   },
+   getWareInfoCount(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].warehousing_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getStockDrugCount(){
+        var params ={
+           keywords: this.keywords,
+           start_time:this.start_time,
+           end_time:this.end_time,
+        }
+      getStockDrugCount(params).then(response=>{
+         if(response.data.state == 1){
+           var outlist = response.data.data.outList
+           this.outCountList = outlist
+           var autoCount = response.data.data.autoCount
+           this.autoCountList = autoCount
+           var totalCount = response.data.data.totalCount
+           this.cancelCountList = totalCount
+         }
+      })
+    },
+    getWareInfoCountOne(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].stock_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getOutCount(id){
+      var count = 0
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCountInfo(cancel_stock_info,storehouse_id){
+     var count = 0 
+     if(cancel_stock_info.length >0){
+        for(let i=0;i<cancel_stock_info.length;i++){
+          if(storehouse_id ==  cancel_stock_info[i].storehouse_id){
+              count += cancel_stock_info[i].count
+          }
+        }
+     }
+     return count
+   },
+   getWareOutInfoCount(warehouse_out_info,storehouse_id){
+     var count = 0
+     if(warehouse_out_info.length > 0){
+       for(let i=0;i<warehouse_out_info.length;i++){
+         if(storehouse_id == warehouse_out_info[i].storehouse_id){
+            count +=warehouse_out_info[i].count
+         }
+       }
+     }
+     return count
+   },
+   getInCount(id){
+      var count= 0
+     for(let i=0;i<this.countList.length;i++){
+      if(id == this.countList[i].good_id){
+          count = this.countList[i].count
+      }
+     }
+     return count
+    },
+    getOutCount(id){
+      var count = 0
+      for(let i=0;i<this.outCountList.length;i++){
+         if(id == this.outCountList[i].good_id){
+           count = this.outCountList[i].count
+         }
+      }
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getStockCount(id){
+     var stock_count = 0
+     for(let i=0;i<this.countList.length;i++){
+       if(id == this.countList[i].good_id){
+         stock_count = this.countList[i].stock_count
+       }
+     }
+     return stock_count
+   },
+   getWareInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+       for(let i=0;i<arr.length;i++){
+         total += parseInt(arr[i].warehousing_count)
+       }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverplus(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getCancelInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].count
+      }
+     }else{
+       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
+   },
+  },
+  created(){
+    this.getStorehouseList()
+    this.getlist()
+    this.getStockDrugCount()
   }
 }
 </script>

src/xt_pages/stock/stockDamaged.vue

@@ -366,8 +366,9 @@
                   <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 == 4">损坏</span> 
                   <span v-if="scope.row.inventory_type == 5">不计入报损分析</span> 
+                  <span v-if="scope.row.inventory_type == 7">有效期到期</span> 
                 </template>
               </el-table-column>
             </el-table>
@@ -451,8 +452,9 @@ export default {
               {id:1,name:"到期退货"},
               {id:2,name:"异常退货"},
               {id:3,name:"退货"},
-              {id:4,name:"人为损坏"},
+              {id:4,name:"损坏"},
               {id:5,name:"不计入报损分析"},
+              {id:7,name:"有效期到期"},
             ],
             goodList:[],
             good_name:"",

src/xt_pages/stock/stockQuery.vue

@@ -141,7 +141,6 @@
         </el-table-column>
        <el-table-column label="入库数量" align="center">
          <template slot-scope="scope">
-
             <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
                {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;

src/xt_pages/user/doctorAdvice.vue

@@ -2044,7 +2044,7 @@ export default {
       adviceTypeArr: [
         { value: 0, label: "全部" },
         { value: 1, label: "长期" },
-        { value: 3, label: "临时" },
+        { value: 2, label: "临时" },
         { value: 4, label: "普通医嘱" },
       ],
       adviceTypeOptions: [
@@ -3473,7 +3473,7 @@ export default {
     },
 
     selectAdvice(selection, row) {
-      console.log("row322232322323",row)
+      console.log("row322232322323",this.adviceType)
       if (this.adviceType != 3) {
         this.lstableData = [];
       } else if (this.adviceType != 1) {
@@ -3531,6 +3531,7 @@ export default {
           });
         }, 1);
       } else if (this.adviceType == 3 || this.adviceType == 2 || this.adviceType == 4) {
+        console.log("lstableData",this.lstableData)
         if (this.lstableData.length == 0) {
           this.$message.error("请勾选需要打印的医嘱!");
           return false;
@@ -4377,6 +4378,7 @@ export default {
     },
     // 获取勾选中的行
     getPrintInfo(ids) {
+      console.log("ids",ids)
       console.log("23332332323232",this.adviceType,"33333333",this.stopType)
 
       getPrintInfo({ids:ids},this.adviceType,this.stopType).then(response => {
@@ -4669,9 +4671,11 @@ export default {
       const group = [];
       const grouptwo = [];
       const ids = [];
+      console.log("multipleSelection",this.multipleSelection)
       for (const i in this.multipleSelection) {
         arr.push(this.multipleSelection[i]);
         group.push(this.multipleSelection[i].groupno);
+       
       }
       grouptwo.push(this.getdata(group));
       // console.log('组号', group)