11月14日 库存扣减更新

src/api/supply.js

@@ -175,3 +175,27 @@ export function updateGoodReturn(data, warehouse_out_id, start_time, rate_of_con
     data: data
   })
 }
+
+export function MofyGoodOrder(params) {
+  return request({
+    url: '/api/supply/mofygoodorder',
+    method: 'get',
+    params: params
+  })
+}
+
+export function UpdateSupplyWahouseingInfo(params) {
+  return request({
+    url: '/api/supply/updatesupplywarehousing',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteGoodOrder(id, params) {
+  return request({
+    url: '/api/supply/deletegoodorder?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/data/components/addDrugs.vue

@@ -342,7 +342,7 @@
                             <el-input v-model="form.social_security_directory_code" style="width:160px"></el-input>
                         </el-form-item>
 
-
+                      
 
                         <el-form-item label="备案日期:">
                             <el-date-picker
@@ -353,6 +353,19 @@
                                     placeholder="选择日期时间">
                             </el-date-picker>
                         </el-form-item>
+                      
+                        <!-- <el-form-item label="是否零用:">
+
+                            <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择">
+                                <el-option
+                                        v-for="(item,index) in userList"
+                                        :key="index"
+                                        :label="item.name"
+                                        :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item> -->
+                      
 
                         <el-form-item label="药品备注:">
                             <el-input v-model="form.drug_remark" style="width:160px"></el-input>
@@ -582,6 +595,7 @@
           prescribing_number_unit:"",
           total:"",
           specification_name:"",
+          is_user:2,
         },
 
         rules: {
@@ -632,7 +646,14 @@
         dosageShow:false,
         unitList:[],
         minNumberShow:false,
-        packingUnit:[]
+        packingUnit:[],
+        userList: [{
+          id: '1',
+          name: '是'
+        }, {
+          id: '2',
+          name: '否'
+        }],
       }
     },
     props: {
@@ -897,6 +918,7 @@
         form['min_price'] = this.form.min_price
         form['prescribing_number_unit'] = this.form.prescribing_number_unit
         form['specification_name'] = this.form.specification_name
+        form['is_user'] = this.form.is_user
         return form
       },
       getlist() {

src/xt_pages/data/components/drugs.vue

@@ -324,6 +324,7 @@
           min_price:'',
           drug_day:"",//默认开药天数,
           total:"",
+          is_user:"",
         },
         tempFormValue: {
           drug_name: '',//药品名称
@@ -383,7 +384,7 @@
           packing_price:"",//包装零售价
           drug_day:"",//默认开药天数
           total:"",
-
+          is_user:"",
         },
 
         current_id: 0,
@@ -629,6 +630,14 @@
 
               }
 
+              // if(this.formValue.is_user <= 0){
+
+              //   this.formValue.is_user = ''
+              // } else{
+              //   this.formValue.is_user = this.formValue.is_user.toString()
+              // }
+
+
               if(this.formValue.is_charge_predict <= 0){
 
                 this.formValue.is_charge_predict = ''

src/xt_pages/supply/components/editGoodOrder.vue

@@ -49,8 +49,8 @@
     <div>
         <el-button size="small" type="primary" @click="updateGoodOrder">保存</el-button>
         <el-button size="small" type="primary"  @click="toClick" v-show="showThree">生成采购退货单</el-button>
-        <el-button size="small" type="primary"  v-show="showOne">审核</el-button>
-        <el-button size="small" type="primary"  v-show="showTwo">反审核</el-button>
+        <el-button size="small" type="primary"  v-show="showOne" @click="checkGoodOrder">审核</el-button>
+        <el-button size="small" type="primary"  v-show="showTwo" @click="MofyGoodOrder">反审核</el-button>
 
        
     </div>
@@ -275,7 +275,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {uParseTime } from '@/utils/tools'
-import {getInitOrder,checkPurchaseOrder,getGoodOrderDetail,updateGoodOrder,getGoodOrderCountList,ModefySupplyWarehousing} from "@/api/supply"
+import {getInitOrder,checkPurchaseOrder,getGoodOrderDetail,updateGoodOrder,getGoodOrderCountList,ModefySupplyWarehousing,MofyGoodOrder,UpdateSupplyWahouseingInfo} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
 components: {
@@ -818,6 +818,124 @@ getTimes(time) {
   },
   toClick(){
     this.$router.push({path:"/good/return/add?id="+this.id})
+  },
+  //反审核
+  MofyGoodOrder(){
+     var id = this.$route.query.id
+     var warehousing_id = this.$route.query.warehousing_id
+     var params = {
+       id:id,
+       warehousing_id:warehousing_id,
+     }
+    MofyGoodOrder(params).then(response=>{
+      if(response.data.state == 1){
+        var msg = response.data.data.msg
+        if(msg == 1){
+          this.$message.success("反审核成功!")
+        }
+        if(msg == 2){
+          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 ids =""
+        // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
+        if(goodOrder.length == 0){
+          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
+               }
+             }
+          }
+        }
+
+        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比较数量大小,如果采购单的数量大于采购订单的数据
+                    if(purcaseOrder[i].count < newArr[j].count){
+                      arr.push(purcaseOrder[i].project_id)
+                    }
+
+                }
+              }
+            }
+            //如果total的长度等于0,怎修改该订单的状态为全部入库
+        
+            if(arr.length > 0){
+              //修改采购订单的状态为全部入库
+              this.UpdateSupplyWahouseingInfo()
+            }
+          }
+        }
+        
+      }
+    })
+  },
+  UpdateSupplyWahouseingInfo(){
+     var params = {
+       warehousing_id:this.$route.query.warehousing_id,
+     }
+    UpdateSupplyWahouseingInfo(params).then(response =>{
+       if(response.data.state == 1){
+         var msg = response.data.data.msg
+       }
+    })
   }
 },
 created(){

src/xt_pages/supply/goodOrderQuery.vue

@@ -149,7 +149,7 @@
                 icon="el-icon-delete"
                 size="small"
                 type="danger"
-                @click="toClickOne(scope.row)"
+                @click="toDelete(scope.row)"
               >删除
               </el-button>
           </template>
@@ -175,7 +175,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import {getAllSupply,getAllGoodOrderList} from "@/api/supply"
+import {getAllSupply,getAllGoodOrderList,deleteGoodOrder} from "@/api/supply"
 import {uParseTime } from '@/utils/tools'
 export default {
   name: "stockIn",
@@ -337,8 +337,37 @@ export default {
       
      },
      toClick(val){
+       
        this.$router.push({path:"/good/order/edit?id="+val.id+"&warehousing_id="+val.warehousing_id})
-     }
+     },
+     toDelete(val,index){
+       console.log("val323223233223",val)
+       if(val.is_check == 1){
+         this.$message.error("已审核单据，不能删除!")
+         return false
+       }
+       if(val.cancelOut.length >0 ){
+         this.$message.error("已关联单据，不能删除!")
+         return false
+       }
+       this.$confirm('确认删除吗?', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          deleteGoodOrder(val.id).then(response => {
+            if (response.data.state == 1) {
+                var msg = response.data.data.msg
+                this.tableList.splice(index, 1);
+                this.$message.success("删除成功")
+            } else {
+                this.$message.error("删除失败")
+            }
+          })
+        })
+        .catch(() => {
+        }) 
+      }
   },
   created() {
     var now = new Date(); //当前日期