11月14日 库存扣减更新

src/api/supply.js

@@ -111,3 +111,27 @@ export function getPurchaseOrderInfo(id, ids, params) {
     params: params
   })
 }
+
+export function getGoodOrderList(id, params) {
+  return request({
+    url: '/api/supply/getgoodorderlist?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function getReturnOrder(id, params) {
+  return request({
+    url: '/api/supply/getreturnorder?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function getGoodOrderCountList(id, warehousing_id, params) {
+  return request({
+    url: '/api/supply/getgoodordercountlist?id=' + id + '&warehousing_id=' + warehousing_id,
+    method: 'get',
+    params: params
+  })
+}

src/views/layout/Layout.vue

@@ -16,10 +16,10 @@
           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-        <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
+        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>采购管理</p>
-        </div> -->
+        </div>
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/supply/components/addGoodOrder.vue

@@ -183,8 +183,7 @@
     </el-table-column>
     <el-table-column label="生产厂家" align="center" width="200px">
         <template slot-scope="scope">
-        <!-- <el-input v-model="scope.row.supply_manufacturer" style="width:160px" :disabled="true"></el-input> -->
-         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂商" :disabled="disabled">
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
                 <el-option
                   v-for="(option, index) in manufactuerList"
                   :key="index"
@@ -198,13 +197,13 @@
 
     <el-table-column label="批准文号" align="center" width="200px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_license_number" style="width:160px" :disabled="disabled"></el-input>
+        <el-input v-model="scope.row.supply_license_number" style="width:160px" :disabled="true"></el-input>
         </template>
     </el-table-column>
 
      <el-table-column label="关联采购订单号" align="center" width="200px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.order_number" style="width:160px" :disabled="disabled"></el-input>
+        <el-input v-model="scope.row.order_number" style="width:160px" :disabled="true"></el-input>
         </template>
     </el-table-column>
 

src/xt_pages/supply/components/editGoodOrder.vue

@@ -49,7 +49,7 @@
     </div>
     <div>
         <el-button size="small" type="primary" @click="updateGoodOrder">修改</el-button>
-        <el-button size="small" type="primary"  @click="checkPurchaseOrder">审核</el-button>
+        <el-button size="small" type="primary"  @click="checkGoodOrder">审核</el-button>
 
        
     </div>
@@ -182,8 +182,7 @@
     </el-table-column>
     <el-table-column label="生产厂家" align="center" width="200px">
         <template slot-scope="scope">
-        <!-- <el-input v-model="scope.row.supply_manufacturer" style="width:160px" :disabled="true"></el-input> -->
-         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂商" :disabled="disabled">
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
                 <el-option
                   v-for="(option, index) in manufactuerList"
                   :key="index"
@@ -197,7 +196,7 @@
 
     <el-table-column label="批准文号" align="center" width="200px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_license_number" style="width:160px" :disabled="disabled"></el-input>
+        <el-input v-model="scope.row.supply_license_number" style="width:160px" :disabled="true"></el-input>
         </template>
     </el-table-column>
 
@@ -267,7 +266,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {uParseTime } from '@/utils/tools'
-import {getInitOrder,checkPurchaseOrder,getGoodOrderDetail,updateGoodOrder} from "@/api/supply"
+import {getInitOrder,checkPurchaseOrder,getGoodOrderDetail,updateGoodOrder,getGoodOrderCountList} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
 components: {
@@ -689,6 +688,102 @@ getTimes(time) {
          })
         }
     })
+  },
+  checkGoodOrder(){
+    var id = this.$route.query.id
+    var warehousing_id = this.$route.query.warehousing_id
+    getGoodOrderCountList(id,warehousing_id).then(response=>{
+      if(response.data.state == 1){
+        this.$message.success("审核成功!")
+        var purcaseOrder = response.data.data.purcaseOrder
+        console.log("采购订单",purcaseOrder)
+        
+        var goodOrder = response.data.data.goodOrder
+        console.log("采购单",goodOrder)
+        var drugList = response.data.data.drugList
+        console.log("druglist23323223",drugList)
+        var is_warehouse = 0
+        for(let i=0;i<purcaseOrder.length;i++){
+          for(let j=0;j<drugList.length;j++){
+             if(purcaseOrder[i].is_source == 1){
+               if(purcaseOrder[i].supply_unit == drugList[j].max_unit){
+                  purcaseOrder[i].count = purcaseOrder[i].count * drugList[j].min_number
+               }
+             }
+          }
+        }
+
+        for(let i=0;i<goodOrder.length;i++){
+          for(let j=0;j<drugList.length;j++){
+            if(goodOrder[i].is_source == 1){
+              if(goodOrder[i].supply_unit == drugList[j].max_unit){
+                 goodOrder[i].count = goodOrder[i].count * drugList[j].min_number
+              }
+            }
+          }
+        }
+        
+        let objInfo = {}
+        if (goodOrder.length >0){
+          goodOrder.forEach((item,index)=>{
+            let { project_id } = item
+            if(!objInfo[project_id]){
+              objInfo[project_id] = {
+                project_id,
+                child:[],
+                count:0,
+              }
+            }
+          })
+          let newArr = Object.values(objInfo);
+        
+          for(let i=0;i<goodOrder.length;i++){
+            for(let j=0;j<newArr.length;j++){
+              if(goodOrder[i].project_id == newArr[j].project_id){
+                newArr[j].child.push(goodOrder[i])
+              }
+            }
+          }
+          console.log("newAr2332232323",newArr)
+        
+          for(let i=0;i<newArr.length;i++){
+           for(let j=0;j<newArr[i].child.length;j++){
+             newArr[i].count += newArr[i].child[j].count
+           }
+          }
+
+          var arr = []
+          var total = 0
+          var str = ""
+         
+          //如果采购单有数据，则需要比较数量
+          if(newArr.length > 0){
+            for(let i=0;i<purcaseOrder.length;i++){
+              for(let j=0;j<newArr.length;j++){
+                if(purcaseOrder[i].project_id == newArr[j].project_id){
+                    //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据,部分入库
+                    if(purcaseOrder[i].count > newArr[j].count){
+                      arr.push(purcaseOrder[i].project_id)
+                    }
+                }
+              } 
+            }
+            //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成,全部入库
+          
+            if(arr.length == 0){
+              this.$message.error("该订单已全部生成采购单，请知悉!")
+              return
+            }
+            
+
+            if(total!=goodOrder.length){
+              str = arr.join(",")
+              this.$router.push({path:"/good/order/add?id="+id+"&ids="+str})
+            }
+          }
+        }
+      }
+    })
   }
 },
 created(){

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -48,11 +48,11 @@
 
     </div>
     <div>
-        <el-button size="small" type="primary" @click="toAdd">生成购货单</el-button>
+        <el-button size="small" type="primary" @click="toAdd" v-show="showOne">生成购货单</el-button>
         <el-button size="small" type="primary" @click="updatePurchaseOrder">修改</el-button>
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
-        <el-button size="small" type="primary" v-if="is_check == 2" @click="checkPurchaseOrder">审核</el-button>
-        <el-button size="small" type="primary" v-if="is_check == 1" @click="checkPurchaseOrder">反审核</el-button>
+        <el-button size="small" type="primary" v-if="is_check == 2" @click="checkPurchaseOrder" v-show="showTwo">审核</el-button>
+        <el-button size="small" type="primary" v-if="is_check == 1" @click="checkReturnOrder" v-show="showThree">反审核</el-button>
        
     </div>
     </div>
@@ -209,24 +209,27 @@
     </div>
 </div>
 
-  <!-- <el-dialog
-  title="提示"
+  <el-dialog
+  title="系统提示"
   :visible.sync="dialogVisible"
-  width="30%"
-  :before-close="handleClose">
-  <span>这是一段信息</span>
+  width="30%">
+  <span>
+    购货订单{{number}}已有以下关联数据,不能反审核
+    <div v-for="(item,index) in orderList" :key="index">
+        <li>购货单{{item.good_number}}</li> <a @click="toClick(item.id)">点击查看</a>
+    </div>
+  </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> -->
+  </el-dialog>
 </div>
 </template>
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {uParseTime } from '@/utils/tools'
-import {getInitOrder,updatePurchaseOrder,checkPurchaseOrder,getPurchaseOrderDetail,getAllOrderCountList} from "@/api/supply"
+import {getInitOrder,updatePurchaseOrder,checkPurchaseOrder,getPurchaseOrderDetail,getAllOrderCountList,getGoodOrderList,getReturnOrder} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
 components: {
@@ -284,6 +287,10 @@ return {
    is_check:0,
    dialogVisible:false,
    total_price:0,
+   showOne:true,
+   showTwo:true,
+   showThree:false,
+   orderList:[],
   };
 },
 methods:{
@@ -554,6 +561,9 @@ getTimes(time) {
           var info = response.data.data.info
           this.disabled = true
           this.$message.success("审核成功!")
+          this.showOne = true
+          this.showTwo = false
+          this.showThree = true
           this.getPurchaseOrderDetail()
         } 
      })
@@ -575,9 +585,15 @@ getTimes(time) {
         var orderInfo = response.data.data.orderInfo
         if(info.is_check == 2){
            this.disabled = false
+           this.showOne = false
+           this.showTwo = true
+           this.showThree = false
         }
         if(info.is_check == 1){
            this.disabled = true
+           this.showOne = true
+           this.showTwo = false
+           this.showThree = true
         }
         console.log("drugli323322332",this.drugList)
         var drugList = response.data.data.baseList
@@ -627,42 +643,95 @@ getTimes(time) {
       if(response.data.state == 1){
         var purcaseOrder = response.data.data.purcaseOrder
         console.log("采购订单",purcaseOrder)
+        
         var goodOrder = response.data.data.goodOrder
         console.log("采购单",goodOrder)
-        var arr = []
-        var total = 0
-        var str = ""
+        var drugList = response.data.data.drugList
+        console.log("druglist23323223",drugList)
+        var ids =""
         // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
         if(goodOrder.length == 0){
-          this.$router.push({path:"/good/order/add?id="+id+"&ids="+str})
+          this.$router.push({path:"/good/order/add?id="+id+"&ids="+ids})
+        } 
+        for(let i=0;i<purcaseOrder.length;i++){
+          for(let j=0;j<drugList.length;j++){
+             if(purcaseOrder[i].is_source == 1){
+               if(purcaseOrder[i].supply_unit == drugList[j].max_unit){
+                  purcaseOrder[i].count = purcaseOrder[i].count * drugList[j].min_number
+               }
+             }
+          }
         }
-        //如果采购单有数据，则需要比较数量
-        if(goodOrder.length > 0){
-          for(let i=0;i<purcaseOrder.length;i++){
-            for(let j=0;j<goodOrder.length;j++){
-              if(purcaseOrder[i].project_id == goodOrder[j].project_id){
-                  //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据，可以继续生成采购单
-                  if(purcaseOrder[i].count > goodOrder[j].count){
-                     arr.push(purcaseOrder[i].project_id)
-                  }
 
+        for(let i=0;i<goodOrder.length;i++){
+          for(let j=0;j<drugList.length;j++){
+            if(goodOrder[i].is_source == 1){
+              if(goodOrder[i].supply_unit == drugList[j].max_unit){
+                 goodOrder[i].count = goodOrder[i].count * drugList[j].min_number
               }
             }
           }
-          //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
-         
-          if(arr.length == 0){
-            this.$message.error("该订单已全部生成采购单，请知悉!")
+        }
+        
+        let objInfo = {}
+        if (goodOrder.length >0){
+          goodOrder.forEach((item,index)=>{
+            let { project_id } = item
+            if(!objInfo[project_id]){
+              objInfo[project_id] = {
+                project_id,
+                child:[],
+                count:0,
+              }
+            }
+          })
+          let newArr = Object.values(objInfo);
+        
+          for(let i=0;i<goodOrder.length;i++){
+            for(let j=0;j<newArr.length;j++){
+              if(goodOrder[i].project_id == newArr[j].project_id){
+                newArr[j].child.push(goodOrder[i])
+              }
+            }
           }
+          console.log("newAr2332232323",newArr)
+        
+          for(let i=0;i<newArr.length;i++){
+           for(let j=0;j<newArr[i].child.length;j++){
+             newArr[i].count += newArr[i].child[j].count
+           }
+          }
+
+          var arr = []
+          var total = 0
+          var str = ""
+         
+          //如果采购单有数据，则需要比较数量
+          if(newArr.length > 0){
+            for(let i=0;i<purcaseOrder.length;i++){
+              for(let j=0;j<newArr.length;j++){
+                if(purcaseOrder[i].project_id == newArr[j].project_id){
+                    //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据，可以继续生成采购单
+                    if(purcaseOrder[i].count > newArr[j].count){
+                      arr.push(purcaseOrder[i].project_id)
+                    }
+                }
+              }
+            }
+            //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
           
+            if(arr.length == 0){
+              this.$message.error("该订单已全部生成采购单，请知悉!")
+              return
+            }
+            
 
-          if(total!=goodOrder.length){
-             str = arr.join(",")
-            this.$router.push({path:"/good/order/add?id="+id+"&ids="+str})
+            if(total!=goodOrder.length){
+              str = arr.join(",")
+              this.$router.push({path:"/good/order/add?id="+id+"&ids="+str})
+            }
           }
         }
-       
-       
       }
     })
     
@@ -671,6 +740,40 @@ getTimes(time) {
     if(this.rate_of_concession >0){
      this.discount_amount = (this.rate_of_concession/100*this.total_price).toFixed(2)
     } 
+  },
+  checkReturnOrder(){
+    var id = this.$route.query.id
+    //获取购货订单号
+    getGoodOrderList(id).then(response=>{
+      if(response.data.state == 1){
+        var list = response.data.data.list
+        this.orderList = list
+        //如果长度大于0,有购货单不能反审核
+        if(list.length >0){
+          this.dialogVisible = true
+        }
+        if(list.length == 0){
+          this.getReturnOrder()
+          this.showOne = false
+          this.showTwo = true
+          this.showThree = false
+        }
+      }
+    })
+  },
+  getReturnOrder(){
+     var id = this.$route.query.id
+    getReturnOrder(id).then(response=>{
+      if(response.data.state == 1){
+        var msg = response.data.data.msg
+        this.disabled = false
+        this.$message.success("反审核成功!")
+        this.getPurchaseOrderDetail()
+      }
+    })
+  },
+  toClick(id){
+    this.$router.push("/good/order/edit?id="+id)
   }
 },
 created(){

src/xt_pages/supply/goodOrderQuery.vue

@@ -142,7 +142,7 @@
                 icon="el-icon-edit-outline"
                 size="small"
                 type="primary"
-                @click="toClick(scope.row.id)"
+                @click="toClick(scope.row)"
               >编辑
               </el-button>
               <el-button
@@ -315,8 +315,9 @@ export default {
        }
        return count
      },
-     toClick(id){
-       this.$router.push({path:"/good/order/edit?id="+id})
+     toClick(val){
+       console.log("val3232232323",val)
+       this.$router.push({path:"/good/order/edit?id="+val.id+"&warehousing_id="+val.warehousing_id})
      }
   },
   created() {