11月14日 库存扣减更新

src/xt_pages/supply/components/addGoodOrder.vue

@@ -749,6 +749,8 @@ export default {
       tempObj["supply_expiry_date"] = "";
       tempObj["manufacturer_id"] = "";
       tempObj["min_price"] = ""
+      tempObj["warehouse_info_id"] = 0
+      tempObj["warehousing_id"] = 0
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -1021,6 +1023,8 @@ export default {
                 orderInfo[i].project_id = orderInfo[i].project_id;
                 orderInfo[i].supply_unit = orderInfo[i].supply_unit;
                 orderInfo[i].order_number = orderInfo[i].order_number;
+                orderInfo[i].warehouse_info_id = orderInfo[i].warehouse_info_id
+                orderInfo[i].warehousing_id = orderInfo[i].warehousing_id
                 orderInfo[i].supply_total_price = (
                   orderInfo[i].count * orderInfo[i].price
                 ).toFixed(2);
@@ -1103,7 +1107,7 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remake,
           };
-         
+          console.log("param232332",params)
           updateGoodOrder(
             params,
             this.supplier_name,
@@ -1498,6 +1502,8 @@ export default {
     tempObj["supply_expiry_date"] = "";
     tempObj["manufacturer_id"] = "";
     tempObj["min_price"] = ""
+    tempObj["warehouse_info_id"] = 0
+    tempObj["warehousing_id"] = 0
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
     if (parseInt(this.$route.query.id) > 0) {

src/xt_pages/supply/components/editGoodOrder.vue

@@ -1106,6 +1106,7 @@ export default {
             if (response.data.state == 1) {
               this.loading = false;
               this.$message.success("保存成功!");
+              this.getGoodOrderDetail()
             }
           });
         }

src/xt_pages/supply/components/editGoodReturn.vue

@@ -1005,7 +1005,17 @@ export default {
         if (response.data.state == 1) {
           this.loading = false;
           var msg = response.data.data.msg;
-          this.$message.success("审核成功!");
+         
+          if(msg == 1){
+           this.$message.success("审核成功!");
+          }
+          if(msg == 2){
+            var good_name = response.data.data.good_name
+            var specification_name = response.data.data.specification_name
+            var str = good_name +"*" + specification_name +"无库存,请入库"
+             this.$message.error(str)
+          }
+          
         }
       });
     },

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -787,6 +787,7 @@ export default {
               this.loading = false;
               var warehousingInfo = response.data.data.warehousingInfo;
               this.$message.success("保存成功!");
+              this.getPurchaseOrderDetail()
             }
           });
         }

src/xt_pages/supply/goodOrderQuery.vue

@@ -330,7 +330,7 @@ export default {
        }
        if(all_price >0){
 
-         return (all_price - all_price * (paycount/100)).toFixed(2)
+         return (all_price - paycount).toFixed(2)
        }
       
      },

src/xt_pages/supply/goodreturn.vue

@@ -110,7 +110,7 @@
         </el-table-column>
         <el-table-column label="优惠后金额" align="center" width="200">
          <template slot-scope="scope">
-          <span v-if="getAllBuyPrice(scope.row.cancelOrder)>0">{{getAllBuyPrice(scope.row.cancelOrder) - scope.row.discount_amount}}</span> 
+          <span v-if="getAllBuyPrice(scope.row.cancelOrder)>0">{{getAllBuyPriceOne(scope.row.cancelOrder,scope.row.discount_amount)}}</span> 
          </template>
        </el-table-column>
         <!-- <el-table-column label="已退款" align="center" width="200">
@@ -311,8 +311,20 @@ export default {
             buy_price += (arr[i].count * arr[i].price)
           }
        }
+
        return buy_price.toFixed(2)
      },
+     getAllBuyPriceOne(arr,discount_amount){
+      
+       var buy_price = 0
+       if(arr!=undefined && arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            buy_price += (parseInt(arr[i].count) * arr[i].price)
+          }
+       }
+        console.log("discount233232232323",discount_amount)
+       return (buy_price-discount_amount).toFixed(2)
+     },
      getAllCount(arr){
        var count = ""
         if(arr!=undefined && arr.length > 0){