11月14日 库存扣减更新

src/xt_pages/supply/components/addGoodOrder.vue

@@ -73,6 +73,13 @@
             v-show="showTwo"
             >保存</el-button
           >
+          <el-button
+            size="small"
+            type="primary"
+            @click="toPrint"
+            v-show="showSix"
+            >打印</el-button
+          >
           <el-button size="small" type="primary" @click="checkGoodOrder" v-if="is_check == 2" >审核</el-button>
           <el-button size="small" type="primary" @click="MofyGoodOrder" v-if="is_check == 1">反审核</el-button>
           <el-button size="small" type="primary" @click="toClick" v-if="is_check == 1" >生成采购退货单</el-button>
@@ -497,6 +504,7 @@ export default {
       ],
       showTwo: true,
       showOne: false,
+      showSix:false,
       recordInfo: {
         tableList: [],
       },
@@ -1024,6 +1032,7 @@ export default {
               this.$message.success("保存成功!");
               this.showOne = false;
               this.showTwo = true;
+              this.showSix = true
               var orderInfo = response.data.data.list;
               var warehouseOut = response.data.data.warehouseOut;
               this.is_check = 2
@@ -1147,6 +1156,7 @@ export default {
             if (response.data.state == 1) {
               this.loading = false;
               this.$message.success("保存成功!");
+              
             }
           });
         }
@@ -1167,6 +1177,7 @@ export default {
           this.showOne = false;
           this.showTwo = true;
           this.showThree = true;
+          this.showSix = true
           this.loading = false
           var purcaseOrder = response.data.data.purcaseOrder;
           var goodOrder = response.data.data.goodOrder;

src/xt_pages/supply/components/addGoodReturn.vue

@@ -796,9 +796,7 @@ export default {
   getAllPrice() {
       var total_price = 0;
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
-        total_price +=
-          this.recordInfo.tableList[i].supply_price *
-          this.recordInfo.tableList[i].supply_count;
+        total_price += this.recordInfo.tableList[i].supply_price *this.recordInfo.tableList[i].supply_count - (this.recordInfo.tableList[i].supply_price**this.recordInfo.tableList[i].supply_count*(this.recordInfo.tableList[i].deposit_rate/100));
       }
       this.total_price = total_price;
       // this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
@@ -932,20 +930,27 @@ export default {
                   orderInfo[i].max_unit =drugList[j].max_unit
                   orderInfo[i].min_unit =drugList[j].min_unit
                 }
-
+                
+                orderInfo[i].count = this.getWarehoseInfoSix(orderInfo[i].drug_warehouse_info,orderInfo[i].drug.max_unit,orderInfo[i].drug.min_unit,orderInfo[i].drug.min_number,orderInfo[i].warehouse_out_id)
               }
-              orderInfo[i].count = orderInfo[i].count + orderInfo[i].supply_unit
+
+              // orderInfo[i].count = orderInfo[i].count + orderInfo[i].supply_unit
             }
+
+
             if (orderInfo[i].is_source == 2) {
               for (let j = 0; j < goodList.length; j++) {
                 if (orderInfo[i].project_id == goodList[j].id) {
                   orderInfo[i].unitList = [{ id: 1, name: "" }];
                   orderInfo[i].unitList[0].name = goodList[j].packing_unit;
                 }
+
+                orderInfo[i].count =  this.getTotalStockCountSix(orderInfo[i].good_warehouse_info,orderInfo[i].warehouse_out_id)
               }
               orderInfo[i].sum_count = orderInfo[i].count
               orderInfo[i].min_number = 0
-              orderInfo[i].count = orderInfo[i].count;
+
+             // orderInfo[i].count = orderInfo[i].count;
               orderInfo[i].max_unit =""
               orderInfo[i].min_unit =""
             }
@@ -1165,6 +1170,7 @@ export default {
        id:this.id,
      }
      console.log("审核2322323232323",params)
+ 
      checkReturnOrder(params).then(response=>{
        if(response.data.state == 1){
 
@@ -1266,6 +1272,66 @@ export default {
     toPrint() {
       this.$router.push({ path: "/good/return/print?&id=" + this.id });
     },
+
+   getWarehoseInfoSix(arr, max_unit, min_unit, min_number,warehouse_out_id) {
+      var total = 0;
+      var max_str = "";
+      var min_str = "";
+      var newArr = []
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          if(warehouse_out_id == arr[i].supply_warehouse_id){
+              newArr.push(arr[i])
+          }
+          
+        }
+      }
+     
+      if(newArr.length > 0){
+         for(let i=0;i<newArr.length;i++){
+           total += parseInt(newArr[i].stock_max_number+ newArr[i].stock_min_number);
+         }
+      }
+     console.log("total232323232",total)
+      if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      console.log("hh2332232332",max_str + min_str)
+      return max_str + min_str;
+    },
+    getTotalStockCountSix(arr,warehouse_out_id) {
+      var total_count = 0;
+      var newArr =[]
+      for (let i = 0; i < arr.length; i++) {
+        if(arr[i].supply_warehouse_id == warehouse_out_id){
+           newArr.push(arr[i])
+        }
+      }
+      if(newArr.length > 0){
+        for(let i=0;i<newArr.length;i++){
+          total_count += arr[i].stock_count;
+        }
+      }
+     
+      if(total_count > 0){
+       return total_count;
+      }else{
+        return ""
+      }
+
+    },
   },
   created() {
     const tempObj = {};

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -915,7 +915,7 @@ export default {
             if (response.data.state == 1) {
               var info = response.data.data.info;
               this.is_check = info.is_check
-              this.showOne = true
+              this.showOne = false
               this.showTwo = false
               this.showThree = true
               this.disabled = true;

src/xt_pages/supply/components/editGoodReturn.vue

@@ -953,9 +953,7 @@ export default {
   getAllPrice() {
       var total_price = 0;
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
-        total_price +=
-          this.recordInfo.tableList[i].supply_price *
-          this.recordInfo.tableList[i].supply_count;
+        total_price += this.recordInfo.tableList[i].supply_price *this.recordInfo.tableList[i].supply_count - (this.recordInfo.tableList[i].supply_price**this.recordInfo.tableList[i].supply_count*(this.recordInfo.tableList[i].deposit_rate/100));
       }
       this.total_price = total_price;
       // this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);

src/xt_pages/supply/components/goodReturnPrint.vue

@@ -111,6 +111,16 @@
             >
               优惠金额：<span v-if="discount_amount>0">{{discount_amount}}</span>
             </div>
+            <!-- <div
+              style="
+                width: 25%;
+                text-align: left;
+                margin-bottom: 1px;
+                font-size: 18px;
+              "
+            >
+            优惠后金额：<span v-if="getAllPriceTwo()>0">{{getAllPriceTwo()}}</span>
+            </div> -->
             <div
               style="
                 width: 25%;
@@ -369,12 +379,25 @@ export default {
       }
      
     },
-   getAllPriceTwo() {
+    getAllPriceTwo() {
       var total_price = 0;
       for (let i = 0; i < this.tableList.length; i++) {
         total_price +=(this.tableList[i].price *this.tableList[i].supply_count - (this.tableList[i].price * this.tableList[i].supply_count*this.tableList[i].deposit_rate/100))
       }
       this.total_price = total_price;
+      if(total_price > 0){
+         return this.smallToBIG(total_price.toFixed(2));
+      }else{
+        return ""
+      }
+     
+    },
+   getAllPriceTwo() {
+      var total_price = 0;
+      for (let i = 0; i < this.tableList.length; i++) {
+        total_price +=(this.tableList[i].price *this.tableList[i].supply_count)
+      }
+      this.total_price = total_price;
       if(total_price > 0){
          return total_price.toFixed(2);
       }else{