6.27

src/router/index.js

@@ -158,10 +158,10 @@ var _asy_router_map = [
   dialysis,
   stock,
   drugs,
-  selfPreparedMedicine,  //自备药管理模块
-  wareHouseManage,  //仓库管理模块
-  DepositManagement, //押金管理模块
-  inventoryTransfer,    //库存调拨模块
+  selfPreparedMedicine, // 自备药管理模块
+  wareHouseManage, // 仓库管理模块
+  DepositManagement, // 押金管理模块
+  inventoryTransfer, // 库存调拨模块
   PatientDispensing, // 患者发药模块
   DrugDispensing, // 药房管理模块
   DispensingDetails, // 药房管理模块

src/store/modules/globalConfig.js

@@ -676,7 +676,7 @@ const global_config = {
         bicarbonate: 1
       },
       32: {
-        id: 31,
+        id: 32,
         name: 'HDP',
         dialysis_duration: 1,
         replacement_way: 1,

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -262,11 +262,11 @@
 import drugPrint from "./print/drugPrint.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getTodayAdviceList,getPharmacyBaseDrug,updatePharmacyBaseDrug,SaveSetting,getPharmacyConfig,getUserdDrugList } from "@/api/his/advice";
-import {
-  waitingdrug,
-  issueddrugs,
-  getpharmacycontent
-} from "@/api/pharmacy"
+// import {
+//   waitingdrug,
+//   issueddrugs,
+//   getpharmacycontent
+// } from "@/api/pharmacy"
 const moment = require('moment')
 export default {
   components: {

src/xt_pages/stock/detail/print.vue

@@ -10,7 +10,7 @@
         <div class="dialysis-print-order">
           <div class="order-yy-name">{{orgname}}</div>
           <div class="order-title" v-if="type == 1">入库单</div>
-        
+
           <div class="order-title" v-if="type == 2">出库单</div>
           <div class="order-title" v-if="type == 4">退库单</div>
 
@@ -27,11 +27,11 @@
               <td style="line-height: 50px" width="200">规格型号</td>
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height: 50px" width="50">单位</td>
-            
+
               <td style="line-height:50px" width="80">
-                <span v-if="type == 1">进货价</span> 
-                <span v-if="type == 2">出货价</span> 
-                <span v-if="type == 4">退库价</span> 
+                <span v-if="type == 1">进货价</span>
+                <span v-if="type == 2">出货价</span>
+                <span v-if="type == 4">退库价</span>
               </td>
               <td style="line-height: 50px" width="80">总价</td>
               <td style="line-height: 50px" width="80">备 注</td>
@@ -47,15 +47,16 @@
               <td style="line-height: 50px">
                 {{item.specification_name}}
               </td>
-             
+
               <td style="line-height: 50px">
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
-                <span v-if="type == 2"> 
-                  <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!=3907&&org_id!=10265&&org_id!=10285&&org_id!=9583&&org_id!=10215">{{getStockCount(item.good_id) }}</span>
+                <span v-if="type == 2">
+                  <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">{{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">{{getStockCount(item.good_id) }}</span>
                 </span>
-               
+
                 <span v-if="type == 4"> {{ item.count }}</span>
               </td>
               <td style="line-height: 50px">
@@ -63,11 +64,11 @@
               </td>
               <td style="line-height:50px">
                 <span v-if="type == 1"> {{ item.price }}</span>
-                <span v-if="type == 2"> 
-                  <span v-if="org_id == 9919">{{ item.buy_price }}</span>  
+                <span v-if="type == 2">
+                  <span v-if="org_id == 9919">{{ item.buy_price }}</span>
                   <span v-else>
-                    {{ item.packing_price }} 
-                  </span>  
+                    {{ item.packing_price }}
+                  </span>
                 </span>
                  <span v-if="type == 4"> {{ item.price }}</span>
               </td>
@@ -77,8 +78,9 @@
                   <span v-if="org_id == 3907 || org_id ==9919">
                      {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}}
                   </span>
-                  <span v-if="org_id == 10265 || org_id == 10215">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919&&org_id!=10215">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
+                  <span v-if="org_id == 10265 || org_id == 10215 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191 ">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
+                   <span v-if="org_id == 10210 || org_id == 9671 ">{{(getWarehouseOut(item.good_id)*item.packing_price).toFixed(2)}}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265&&org_id!=9919&&org_id!=10215&&org_id!=9671 && org_id!=10188 && org_id!=10217 && org_id!= 9956 && org_id!=10191">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2)}}</span>
                 </span>
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
               </td>
@@ -97,19 +99,19 @@
               <td style="line-height: 50px"  width="50"></td>
               <td style="line-height: 50px"   width="80"></td>
               <td style="line-height: 50px"  width="80">
-                <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span> 
+                <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span>
                 <span v-if="type == 2">
                   <span v-if="org_id == 3907 || org_id == 9919">{{getWareOutTotalOne().toFixed(2)}}</span>
                   <span v-if="org_id == 10265 || org_id == 10215">{{getWareOutTotalSix().toFixed(2)}}</span>
                   <span v-if="org_id!=3907 && org_id!=9919 && org_id!=10265 && org_id!=10215"> {{getWareOutTotal().toFixed(2)}}</span>
-                 </span> 
-                <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span> 
+                 </span>
+                <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span>
               </td>
               <td style="line-height: 50px" width="80">
-               
+
               </td>
             </tr>
-          </table> 
+          </table>
 
           <div style="display:flex;margin-top:20px;float:right;">
             <div style="width:50px;">审批：</div><div style="width:100px;"></div>
@@ -165,7 +167,8 @@
         stockTotal:[],
         wareOutInfo:[],
         org_id:this.$store.getters.xt_user.org.id,
-        informationList:[]
+        informationList:[],
+        wareOutList:[],
       }
     },
     methods: {
@@ -206,7 +209,7 @@
         })
       },
       calCount(stock) {
-      
+
         let total = 0
         var array = []
         if (this.type == 1) {
@@ -306,7 +309,7 @@
       },
 
      getStockCount(id){
-       
+
        var count = ""
        for(let i=0;i<this.stockTotal.length;i++){
           if(id == this.stockTotal[i].good_id){
@@ -329,19 +332,19 @@
        for(let i=0;i<this.informationList.length;i++){
         for(let j=0;j<this.wareOutInfo.length;j++){
            if(this.informationList[i].id == this.wareOutInfo[j].good_id){
-             this.wareOutInfo[j].buy_price =  this.informationList[i].buy_price 
+             this.wareOutInfo[j].buy_price =  this.informationList[i].buy_price
            }
         }
        }
-      
+
        for(let j=0;j<this.wareOutInfo.length;j++){
          if(id == this.wareOutInfo[j].good_id){
             sum += (this.wareOutInfo[j].buy_price * this.wareOutInfo[j].count).toFixed(2)
          }
        }
-       
+
        return sum
-       
+
      },
      getReailPrice(id){
        var price = 0
@@ -379,8 +382,8 @@
            this.stockDatas = list
            var stockTotal = response.data.data.stockTotal
           this.stockTotal = stockTotal
-           
-           
+
+
          }
       })
      },
@@ -390,7 +393,7 @@
         if(response.data.state == 1){
           var total =   response.data.data.total
           var list = response.data.data.list
-          this.stockDatas = list
+          this.wareOutList = list
         }
       })
      },
@@ -431,12 +434,33 @@
        }
        return total
      },
+    //  getPrintStockGood(){
+
+    //   getPrintStockGood(this.queryParams).then(response=>{
+    //       if(response.data.state == 1){
+    //         var list =  response.data.data.list
+    //         console.log("list23323232323232",list)
+    //         this.stockDatas = list
+
+    //       }
+    //   })
+    // },
+    getWarehouseOut(good_id){
+      var total = 0
+      for(let i=0;i<this.wareOutList.length;i++){
+         if(this.wareOutList[i].good_id == good_id){
+            total += this.wareOutList[i].count
+         }
+      }
+      return total
+    }
     },
     created() {
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
       this.goodUnit = this.$store.getters.good_unit
       this.getGoodDetailPrintList()
+      this.getStockDetail()
     }
 
   }

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -265,6 +265,7 @@ export default {
       tableDataList:[],
       storehouse_id:0,
       houseList:[],
+      wareOutList:[],
     };
   },
   methods: {
@@ -391,6 +392,7 @@ export default {
           for(let i=0;i<response.data.data.houseList.length;i++){
            this.houseList.push(response.data.data.houseList[i])
           }
+          this.wareOutList =  response.data.data.list
           var total = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
@@ -778,15 +780,31 @@ export default {
           this.tableOut[i].total_price = (this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 10215){
           this.tableOut[i].total_price = (this.getMySelfCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10210){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 9671){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 9956){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10217){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10191){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10188){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
 
-        if(this.orgId  == 10265 || this.orgId ==10215 ){
+        if(this.orgId  == 10265 || this.orgId ==10215){
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        if(this.orgId!=10265 && this.orgId !=10215){
+        if(this.orgId == 10210 || this.orgId == 9671 || this.orgId == 10210 || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
+          this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
+          console.log("out_count232233232332",this.tableOut[i].out_count)
+        }
+        if(this.orgId!=10265 && this.orgId !=10215 && this.orgId!=10210&&this.orgId!=9671){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
        }
@@ -821,12 +839,12 @@ export default {
           if(this.orgId == 9919){
              this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].GoodInfo.buy_price).toFixed(2)
              total += this.tableDataList[i].count * this.tableDataList[i].buy_price
-          }else{
+          }
+          if(this.orgId != 9919){
             this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].price).toFixed(2)
             total += this.tableDataList[i].count * this.tableDataList[i].price
           }
 
-
         }
         obj.total_price = total.toFixed(2)
 
@@ -926,7 +944,16 @@ export default {
      changeHouseList(){
        this.houseList = []
        this.GetCancelStock()
-     }
+     },
+     getWarehouseOut(good_id){
+      var total = 0
+      for(let i=0;i<this.wareOutList.length;i++){
+         if(this.wareOutList[i].good_id == good_id){
+            total += this.wareOutList[i].count
+         }
+      }
+      return total
+    }
   }
 };
 </script>