11月14日 库存扣减更新

src/api/supply.js

@@ -160,7 +160,6 @@ export function getAllGoodReturnOrderList(params) {
   })
 }
 
-
 export function getSupplierId(params) {
   return request({
     url: '/api/supply/getsupplycode',
@@ -185,7 +184,6 @@ export function getGoodReturnDetail(id, params) {
   })
 }
 
-
 export function getexporthistory(params) {
   return request({
     url: '/api/supply/getsupplylist',
@@ -267,7 +265,7 @@ export function savesupply(data) {
 }
 
 export function updatesupply(data) {
-  console.log(data,'oopo')
+  console.log(data, 'oopo')
   return request({
     url: '/api/supply/updatesupply',
     method: 'post',
@@ -275,6 +273,13 @@ export function updatesupply(data) {
   })
 }
 
+export function checkGoodOrderById(id, params) {
+  return request({
+    url: '/api/supply/checkgoodorderbyid?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
 
 // export function getsupplytype(params) {
 //   return request({
@@ -284,5 +289,26 @@ export function updatesupply(data) {
 //   })
 // }
 
+export function checkReturnOrder(params) {
+  return request({
+    url: '/api/supply/checkreturnorder',
+    method: 'Get',
+    params: params
+  })
+}
 
+export function deletePurchOder(params) {
+  return request({
+    url: '/api/supply/deletepurchaseorder',
+    method: 'get',
+    params: params
+  })
+}
 
+export function deleteGoodOrderById(params) {
+  return request({
+    url: '/api/supply/deletegoodorderbyid',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/supply/components/addGoodOrder.vue

@@ -71,9 +71,7 @@
             v-show="showTwo"
             >保存</el-button
           >
-          <el-button size="small" type="primary" @click="checkPurchaseOrder"
-            >审核</el-button
-          >
+          <el-button size="small" type="primary" @click="checkGoodOrder" >审核</el-button>
         </div>
       </div>
 
@@ -449,6 +447,7 @@ import {
   getPurchaseOrderInfo,
   addGoodOrder,
   updateGoodOrder,
+  checkGoodOrderById
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -817,13 +816,12 @@ export default {
     count_arrearage() {
       this.payment = this.total_price - this.arrearage;
     },
-    checkPurchaseOrder(id, index) {
+    checkPurchaseOrder() {
       this.$confirm("是否审核?", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {
+      }).then(() => {
           checkPurchaseOrder(this.id).then((response) => {
             if (response.data.state == 1) {
               var info = response.data.data.info;
@@ -949,8 +947,6 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           };
-          console.log("stockIN2323322332322323", params);
-
           addGoodOrder(
             params,
             this.supplier_name,
@@ -1102,6 +1098,14 @@ export default {
         }
       });
     },
+    checkGoodOrder(){
+      checkGoodOrderById(this.warese_out_id).then(response=>{
+         if(response.data.state == 1){
+           var out = response.data.data.out
+           this.$message.success("审核成功!")
+         }
+      })
+    }
   },
   created() {
     const tempObj = {};

src/xt_pages/supply/components/addGoodReturn.vue

@@ -614,6 +614,11 @@ export default {
       tempObj["project_id"] = 0;
       tempObj["supply_unit"] = "";
       tempObj["order_number"] = ""
+      tempObj["supply_batch_number"] = ""
+      tempObj["supply_product_date"] = ""
+      tempObj["supply_expiry_date"] = ""
+      tempObj["warehousing_id"] =0
+      tempObj["warehouse_info_id"] =0
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -802,15 +807,12 @@ export default {
             orderInfo[i].supply_unit = orderInfo[i].supply_unit;
             orderInfo[i].order_number = orderInfo[i].order_number;
             orderInfo[i].good_number = orderInfo[i].good_number;
-            orderInfo[i].supply_total_price = (
-              orderInfo[i].count * orderInfo[i].price
-            ).toFixed(2);
-            orderInfo[i].supply_expiry_date = this.getTimes(
-              orderInfo[i].supply_expiry_date
-            );
-            orderInfo[i].supply_product_date = this.getTimes(
-              orderInfo[i].supply_product_date
-            );
+            orderInfo[i].supply_total_price = ( orderInfo[i].count * orderInfo[i].price).toFixed(2);
+            orderInfo[i].supply_expiry_date = orderInfo[i].supply_expiry_date;
+            orderInfo[i].supply_product_date = orderInfo[i].supply_product_date;
+            orderInfo[i].supply_batch_number = orderInfo[i].supply_batch_number
+            orderInfo[i].warehousing_id = orderInfo[i].warehousing_id
+            orderInfo[i].warehouse_info_id = orderInfo[i].warehouse_info_id
             if (orderInfo[i].is_source == 1) {
               for (let j = 0; j < drugList.length; j++) {
                 if (orderInfo[i].project_id == drugList[j].id) {
@@ -865,6 +867,7 @@ export default {
                 this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name;
               }
             }
+          } 
            var params = {
             stockIn:this.recordInfo.tableList,
             return_marke:this.return_remark,
@@ -929,7 +932,7 @@ export default {
                 }
              }
            })
-          }
+          
         }
       })
     }
@@ -954,6 +957,11 @@ export default {
     tempObj["project_id"] = 0;
     tempObj["supply_unit"] = "";
     tempObj["order_number"] = ""
+    tempObj["supply_batch_number"] = ""
+    tempObj["supply_product_date"] = ""
+    tempObj["supply_expiry_date"] = ""
+    tempObj["warehousing_id"] =0
+    tempObj["warehouse_info_id"] =0
     this.recordInfo.tableList.push(tempObj);
     console.log("即哪里地方2",this.recordInfo.tableList)
     this.getInitOrder();

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -211,19 +211,19 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="购货单价" align="center" width="140px">
+          <el-table-column label="采购单价" align="center" width="140px">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.supply_price"
                 style="width: 80px"
                 :disabled="disabled"
-                 placeholder="请输入购货单价"
+                 placeholder="请输入采购单价"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
 
-          <el-table-column label="购货金额" align="center" width="120px">
+          <el-table-column label="采购金额" align="center" width="120px">
             <template slot-scope="scope">
               {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
             </template>
@@ -369,8 +369,8 @@ export default {
     return {
       Reviewed:false,
       crumbs: [
-        { path: false, name: "购货订单" },
-        { path: "/spply/query", name: "新增购货订单" },
+        { path: false, name: "采购订单" },
+        { path: "/spply/query", name: "新增采购订单" },
       ],
       showTwo: true,
       showOne: false,

src/xt_pages/supply/components/editGoodOrder.vue

@@ -448,6 +448,7 @@ import {
   MofyGoodOrder,
   UpdateSupplyWahouseingInfo,
   getSupplyWarehouseOutById,
+  deleteGoodOrderById
 } from "@/api/supply";
 
 export default {
@@ -711,12 +712,39 @@ export default {
       tempObj["good_number"] = "";
       this.recordInfo.tableList.push(tempObj);
     },
-    handleDelete: function (index, row) {
-      if (this.recordInfo.tableList.length <= 1) {
+    handleDelete: function (index, row) { 
+      if(this.is_check == 1){
+        this.$message.error("已审核单据，不能删除!")
+        return false
+      }
+      if(row.id == 0){
+        if (this.recordInfo.tableList.length <= 1) {
         this.$message.error("只有一条记录的时候无法删除");
         return;
       } else {
         this.recordInfo.tableList.splice(index, 1);
+       }
+      }else{
+         const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除吗?', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deleteGoodOrderById(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('删除成功')
+
+                this.recordInfo.tableList.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+        })
       }
     },
 
@@ -931,19 +959,10 @@ export default {
           var params = {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
-          };
-          updateGoodOrder(
-            params,
-            this.supplier_name,
-            start,
-            this.arrearage,
-            this.payment,
-            warehose_out_id,
-            this.number,
-            this.rate_of_concession,
-            this.discount_amount,
-            this.good_number
-          ).then((response) => {
+          }
+          console.log("param23322332323",params)
+        
+          updateGoodOrder(params,this.supplier_name,start,this.arrearage,this.payment,warehose_out_id,this.number,this.rate_of_concession,this.discount_amount,this.good_number).then((response) => {
             if (response.data.state == 1) {
               this.loading = false;
               this.$message.success("保存成功!");
@@ -1076,17 +1095,18 @@ export default {
       getSupplyWarehouseOutById(id).then((response) => {
         if (response.data.state == 1) {
           var cancelList = response.data.data.cancelList;
-          console.log("cancelList23232232323323223", cancelList);
+          console.log("退库单", cancelList);
            var drugList = response.data.data.drugList;
-          console.log("drugList233223232323232", drugList);
+          console.log("药品列表", drugList);
           var cancelOrderList = response.data.data.cancelOrderList;
-          console.log("cancelOrderList2323322322332", cancelOrderList);
+          console.log("退库单详情", cancelOrderList);
           var ids =""
           if(cancelList.length == 0){
             this.$router.push({ path: "/good/return/add?id=" + this.id+"&ids="+ids });
           }
           if (cancelList.length > 0) {
             var outList = response.data.data.outList;
+            console.log("购货单2322323",outList)
             for(let i=0;i<outList.length;i++){
               if(outList[i].is_source == 1){
                 for(let j=0;j<drugList.length;j++){
@@ -1103,13 +1123,17 @@ export default {
             for(let i=0;i<cancelOrderList.length;i++){
              if(cancelOrderList[i].is_source == 1){
                 for(let j=0;j<drugList.length;j++){
-                  if(cancelOrderList[i].supply_unit == drugList[j].max_unit){
-                    cancelOrderList[i].count = cancelOrderList[i].count * drugList[j].min_number
+                  if(cancelOrderList[i].project_id == drugList[j].id){
+                    if(cancelOrderList[i].supply_unit == drugList[j].max_unit){
+                      cancelOrderList[i].count = cancelOrderList[i].count * drugList[j].min_number
+                    }
                   }
                  }
                }
             }
-            
+
+            console.log("数据变了后23323233",outList)
+           
             let objInfo = {};
             if(cancelOrderList.length >0){
               cancelOrderList.forEach((item, index) => {
@@ -1123,15 +1147,22 @@ export default {
                 }
               });
               let newArr = Object.values(objInfo)
-
-              console.log("outList2332232332", outList)
+              console.log("最好的输3233232323323223", newArr)
+              console.log("数据变了后23323233",cancelOrderList)
               for (let i = 0; i < cancelOrderList.length; i++) {
                 for (let j = 0; j < newArr.length; j++) {
                   if (cancelOrderList[i].project_id == newArr[j].project_id) {
                     newArr[j].child.push(cancelOrderList[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;
@@ -1143,7 +1174,7 @@ export default {
                   if (outList[i].project_id == newArr[j].project_id) {
                     //根据商品ID比较数量大小,把数量不足的商品ID储存,表示退货单的数量未满足采购单的数据，可以继续生成退货单
                     if (outList[i].count > newArr[j].count) {
-                      arr.push(outList[i].project_id);
+                       arr.push(outList[i].project_id);
                     }
                   }
                 }
@@ -1151,16 +1182,16 @@ export default {
               //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
 
               if (arr.length == 0) {
-                this.$message.error("该订单已全部生成采购单，请知悉!");
-                return;
+                this.$message.error("该订单已全部生成退库单，请知悉!");
+                return 
               }
-
-              if (total != cancelOrderList.length) {
+              console.log("arr23323232232323",arr)
+              if (arr.length > 0) {
                 str = arr.join(",");
                 this.$router.push({ path: "/good/return/edit?id=" + id + "&ids=" + str});
               }
              }
-            }
+         
           }
          }
         }

src/xt_pages/supply/components/editGoodReturn.vue

@@ -60,7 +60,7 @@
         </div>
         <div>
           <el-button size="small" type="primary" @click="updateGoodReturn">保存</el-button>
-          <el-button size="small" type="primary" @click="updatePurchaseOrder">审核</el-button>
+          <el-button size="small" type="primary" @click="checkReturnOrder">审核</el-button>
         </div>
       </div>
 
@@ -337,7 +337,8 @@ import { uParseTime } from "@/utils/tools";
 import {
   getInitOrder,
   getGoodReturnDetail,
-  updateGoodReturn
+  updateGoodReturn,
+  checkReturnOrder
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -399,6 +400,7 @@ export default {
       is_check: 0,
       dialogVisible: false,
       return_remark:"",
+      warehouse_out_id:0,
     };
   },
   methods: {
@@ -577,6 +579,11 @@ export default {
       tempObj["is_total"] = 1;
       tempObj["project_id"] = 0;
       tempObj["supply_unit"] = "";
+      tempObj["supply_batch_number"] = ""
+      tempObj["supply_product_date"] = ""
+      tempObj["supply_expiry_date"] = ""
+      tempObj["warehousing_id"] =0
+      tempObj["warehouse_info_id"] =0
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -734,6 +741,7 @@ export default {
         if(response.data.state == 1){
           var out = response.data.data.cancelDetail
           console.log("out23322323232323",out)
+          this.warehouse_out_id = out.warehouse_out_id
           this.is_check = out.is_check
           this.id = out.id
           this.supplier_name = out.supplier_id
@@ -757,8 +765,8 @@ export default {
               orderInfo[i].order_number =  orderInfo[i].order_number
               orderInfo[i].good_number = orderInfo[i].good_number
               orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2)
-              orderInfo[i].supply_expiry_date = this.getTimes(orderInfo[i].supply_expiry_date)
-              orderInfo[i].supply_product_date = this.getTimes(orderInfo[i].supply_product_date)
+              orderInfo[i].supply_expiry_date =  orderInfo[i].supply_expiry_date
+              orderInfo[i].supply_product_date = orderInfo[i].supply_product_date
             if(orderInfo[i].is_source == 1){
               for(let j=0;j<drugList.length;j++){
                   if( orderInfo[i].project_id == drugList[j].id){
@@ -830,6 +838,15 @@ export default {
           })
         }
       })
+    },
+    checkReturnOrder(){
+     var params = {
+       warehouse_out_id:this.warehouse_out_id,
+       id:this.id,
+     }
+     checkReturnOrder(params).then(response=>{
+
+     })
     }
   },
   created() {
@@ -850,6 +867,11 @@ export default {
     tempObj["is_total"] = 1;
     tempObj["project_id"] = 0;
     tempObj["supply_unit"] = "";
+    tempObj["supply_batch_number"] = ""
+    tempObj["supply_product_date"] = ""
+    tempObj["supply_expiry_date"] = ""
+    tempObj["warehousing_id"] =0
+    tempObj["warehouse_info_id"] =0
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
     //获取购货单列表

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -374,6 +374,7 @@ import {
   getAllOrderCountList,
   getGoodOrderList,
   getReturnOrder,
+  deletePurchaseOrder
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -383,8 +384,8 @@ export default {
   },
   data() {
     return {
-      content_2:"购货单",
-      content:"购货订单",
+      content_2:"采购单",
+      content:"采购订单",
       content_1:"已有以下关联数据,不能反审核",
       type:1,
       Reviewed: false,
@@ -630,12 +631,41 @@ export default {
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
-      if (this.recordInfo.tableList.length <= 1) {
-        this.$message.error("只有一条记录的时候无法删除");
-        return;
-      } else {
-        this.recordInfo.tableList.splice(index, 1);
+      if(this.is_check == 1){
+         this.$message.error("已审核单据，不能删除!")
+         return false
       }
+      if(row.id == 0){
+        if (this.recordInfo.tableList.length <= 1) {
+          this.$message.error("只有一条记录的时候无法删除");
+          return;
+        } else {
+          this.recordInfo.tableList.splice(index, 1);
+        }
+      }else{
+          const params = {
+            id: row.id
+          }
+          this.$confirm('确认删除吗?', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            deletePurchaseOrder(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.$message.success('删除成功')
+
+                this.recordInfo.tableList.splice(index, 1)
+              }
+            })
+          }).catch(() => {
+        })
+        
+      }
+      
     },
 
     changeTypeName() {},
@@ -769,8 +799,7 @@ export default {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {
+      }).then(() => {
           checkPurchaseOrder(this.id).then((response) => {
             if (response.data.state == 1) {
               var info = response.data.data.info;
@@ -882,9 +911,7 @@ export default {
           var ids = "";
           // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
           if (goodOrder.length == 0) {
-            this.$router.push({
-              path: "/good/order/add?id=" + id + "&ids=" + ids,
-            });
+            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++) {
@@ -958,7 +985,7 @@ export default {
                 return;
               }
 
-              if (total != goodOrder.length) {
+              if (arr.length >0) {
                 str = arr.join(",");
                 this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + str});
               }

src/xt_pages/supply/goodreturn.vue

@@ -105,29 +105,29 @@
         </el-table-column>
         <el-table-column label="购货金额" align="center" width="200">
           <template slot-scope="scope">
-             <!-- <span v-if="getAllBuyPrice(scope.row.orderInfo)>0">{{getAllBuyPrice(scope.row.orderInfo)}}</span>  -->
+             <span v-if="getAllBuyPrice(scope.row.cancelOrder)>0">{{getAllBuyPrice(scope.row.cancelOrder)}}</span> 
           </template>
         </el-table-column>
         <el-table-column label="优惠后金额" align="center" width="200">
          <template slot-scope="scope">
-           <!-- {{getAllCount(scope.row.orderInfo)}} -->
+          <span v-if="getAllBuyPrice(scope.row.cancelOrder)>0">{{getAllBuyPrice(scope.row.cancelOrder) - scope.row.discount_amount}}</span> 
          </template>
        </el-table-column>
-        <el-table-column label="已退款" align="center" width="200">
+        <!-- <el-table-column label="已退款" align="center" width="200">
          <template slot-scope="scope">
-           <!-- {{getAllCount(scope.row.orderInfo)}} -->
+         
          </template>
-       </el-table-column>
+       </el-table-column> -->
        <el-table-column label="源数量" align="center" width="200">
          <template slot-scope="scope">
            <!-- {{getAllCount(scope.row.orderInfo)}} -->
          </template>
        </el-table-column>
 
-       <el-table-column label="退款状态" align="center" width="200">
+       <el-table-column label="付款状态" align="center" width="200">
          <template slot-scope="scope">
-           <span v-if="scope.row.is_check == 2">未审核</span>
-           <span v-if="scope.row.is_check == 1">已审核</span>
+           <!-- <span v-if="scope.row.is_check == 2">未审核</span>
+           <span v-if="scope.row.is_check == 1">已审核</span> -->
          </template>
        </el-table-column>
       
@@ -228,16 +228,16 @@ export default {
        this.$router.push({path:"/good/return/add"})
      },
      changeTypeName(){
-
+       this.getlist()
      },
      startTimeChange(){
-
+       this.getlist()
      },
      endTimeChange(){
-
+      this.getlist()
      },
      search(){
-
+      this.getlist()
      },
      handleSizeChange(val){
        this.limit = val