11月14日 库存扣减更新

src/xt_pages/supply/components/addGoodOrder.vue

@@ -487,7 +487,8 @@ import {
   ModefySupplyWarehousing,
   MofyGoodOrder,
   getSupplyWarehouseOutById,
-  UpdateSupplyWahouseingInfo
+  UpdateSupplyWahouseingInfo,
+  deleteGoodOrderById,
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -779,9 +780,30 @@ export default {
       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(() => {});
       }
+    
     },
     getWarehoseInfo(arr, max_unit, min_unit, min_number) {
       var total = 0;
@@ -1049,6 +1071,7 @@ export default {
               this.id = warehouseOut.id
               this.start_time = this.getTimes(warehouseOut.document_date);
               for (let i = 0; i < orderInfo.length; i++) {
+                orderInfo[i].id = orderInfo[i].id
                 orderInfo[i].supply_count = orderInfo[i].count;
                 orderInfo[i].supply_price = orderInfo[i].price;
                 orderInfo[i].supply_remake = orderInfo[i].remark;

src/xt_pages/supply/components/addGoodReturn.vue

@@ -230,12 +230,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="采购金额" align="center" width="120px">
-            <template slot-scope="scope">
-              {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
-              <div style="visibility: hidden">/</div>
-            </template>
-          </el-table-column>
+         
           <el-table-column label="折扣率(%)" align="center" width="120px">
             <template slot-scope="scope">
                <el-input
@@ -254,6 +249,13 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="采购金额" align="center" width="120px">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.supply_count * scope.row.supply_price - (scope.row.supply_count * scope.row.supply_price * (scope.row.deposit_rate/100)))}}
+              <div style="visibility: hidden">/</div>
+            </template>
+          </el-table-column>
+
           <el-table-column label="生产厂家" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
@@ -746,7 +748,7 @@ export default {
           min_str = (total % min_number) + min_unit;
         }
       }
-      console.log("hh2332232332",max_str + min_str)
+      // console.log("hh2332232332",max_str + min_str)
       return max_str + min_str;
     },
     getWarehoseInfoTwo(arr, max_unit, min_unit, min_number){
@@ -796,11 +798,17 @@ 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 - (this.recordInfo.tableList[i].supply_price**this.recordInfo.tableList[i].supply_count*(this.recordInfo.tableList[i].deposit_rate/100));
+        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);
-      return total_price.toFixed(2);
+      if(total_price > 0){
+        return total_price.toFixed(2);
+      }else{
+        return  ""
+      }
+     
+    
     },
      addressChange() {
       var discount_amount = 0;
@@ -943,9 +951,10 @@ export default {
                 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].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
@@ -1173,7 +1182,7 @@ export default {
  
      checkReturnOrder(params).then(response=>{
        if(response.data.state == 1){
-
+        this.loading = false
         var msg = response.data.data.msg
         if(msg == 1){
           this.loading = false
@@ -1185,10 +1194,12 @@ export default {
         }
 
          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)
+            this.loading = false
 
           }
           if(msg == 3){
@@ -1200,6 +1211,7 @@ export default {
               var max_unit =  response.data.data.max_unit
               var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
               this.$message.error(str + "库存不足,审核失败!")
+              this.loading = false
           }
 
        }
@@ -1292,7 +1304,7 @@ export default {
            total += parseInt(newArr[i].stock_max_number+ newArr[i].stock_min_number);
          }
       }
-     console.log("total232323232",total)
+    //  console.log("total232323232",total)
       if (total < min_number) {
         min_str = total + min_unit;
       }
@@ -1308,7 +1320,7 @@ export default {
           min_str = (total % min_number) + min_unit;
         }
       }
-      console.log("hh2332232332",max_str + min_str)
+      // console.log("hh2332232332",max_str + min_str)
       return max_str + min_str;
     },
     getTotalStockCountSix(arr,warehouse_out_id) {
@@ -1319,18 +1331,19 @@ export default {
            newArr.push(arr[i])
         }
       }
+      console.log("232323232332",newArr)
       if(newArr.length > 0){
         for(let i=0;i<newArr.length;i++){
-          total_count += arr[i].stock_count;
+          total_count += newArr[i].stock_count;
         }
       }
-     
+      console.log("total_count2323223",total_count)
       if(total_count > 0){
        return total_count;
       }else{
         return ""
       }
-
+    
     },
   },
   created() {

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -67,7 +67,7 @@
             size="small"
             type="primary"
             @click="toPrint()"
-            v-show="showOne"
+            v-show="showSix"
             >打印</el-button
           >
           <el-button
@@ -447,6 +447,7 @@ export default {
       total_price: 0,
       return_remark: "",
       is_check: 2,
+      showSix:false,
     };
   },
 
@@ -702,6 +703,7 @@ export default {
             if (response.data.state == 1) {
               var order = response.data.data.order;
               this.loading = false;
+              this.showSix = true
               this.$message.success("保存成功!");
               var warehouseInfo = response.data.data.warehouseInfo;
               this.is_check = warehouseInfo.is_check;
@@ -919,6 +921,7 @@ export default {
               this.showTwo = false
               this.showThree = true
               this.disabled = true;
+              this.showSix = true
               this.$message.success("审核成功!");
               this.Reviewed = true;
             }

src/xt_pages/supply/components/editGoodOrder.vue

@@ -880,8 +880,7 @@ export default {
       }
       return uParseTime(time, "{y}-{m}-{d}");
     },
-
- getAllPrice() {
+    getAllPrice() {
       var total_price = 0;
       for (let i = 0; i < this.recordInfo.tableList.length; i++) {
         total_price +=
@@ -1389,6 +1388,7 @@ export default {
       MofyGoodOrder(params).then((response) => {
         if (response.data.state == 1) {
           var msg = response.data.data.msg;
+          this.is_check = 2
           if (msg == 1) {
             this.$message.success("反审核成功!");
             this.disabled = false

src/xt_pages/supply/components/editGoodReturn.vue

@@ -242,12 +242,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="采购金额" align="center" width="120px">
-            <template slot-scope="scope">
-              {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
-              <div style="visibility: hidden">/</div>
-            </template>
-          </el-table-column>
+         
           <el-table-column label="折扣率(%)" align="center" width="120px">
             <template slot-scope="scope">
                <el-input
@@ -265,8 +260,14 @@
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
-
-
+         
+          <el-table-column label="采购金额" align="center" width="120px">
+            <template slot-scope="scope">
+             {{ calculate(scope.row.supply_count * scope.row.supply_price - (scope.row.supply_count * scope.row.supply_price * (scope.row.deposit_rate/100)))}}
+              <div style="visibility: hidden">/</div>
+            </template>
+          </el-table-column>
+           
           <el-table-column label="生产厂家" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
@@ -744,6 +745,7 @@ export default {
       tempObj["min_number"] = 0
       tempObj["max_unit"] = ""
       tempObj["min_unit"] = ""
+      tempObj["order_type"] = 0
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -953,11 +955,16 @@ 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 - (this.recordInfo.tableList[i].supply_price**this.recordInfo.tableList[i].supply_count*(this.recordInfo.tableList[i].deposit_rate/100));
+        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);
-      return total_price.toFixed(2);
+      if(total_price > 0){
+        return total_price.toFixed(2);
+      }else{
+        return ""
+      }
+     
     },
 
      addressChange() {
@@ -1051,6 +1058,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.number = out.number;
           this.is_check = out.is_check;
@@ -1098,6 +1106,7 @@ export default {
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
             orderInfo[i].type = orderInfo[i].is_source;
+            orderInfo[i].order_type = orderInfo[i].type
             orderInfo[i].project_id = orderInfo[i].project_id;
             orderInfo[i].supply_unit = orderInfo[i].supply_unit;
             orderInfo[i].order_number = orderInfo[i].order_number;
@@ -1253,6 +1262,7 @@ export default {
            this.is_check = 1
            this.Reviewed = true
            this.disabled = true
+          
           }
           if(msg == 2){
             var good_name = response.data.data.good_name
@@ -1325,6 +1335,7 @@ export default {
     tempObj["min_number"] = 0
     tempObj["max_unit"] = ""
     tempObj["min_unit"] = ""
+    tempObj["order_type"] = 0
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
 

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -1073,12 +1073,12 @@ export default {
                   }
                 }
                 //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
-
+                console.log("Ar23322323",arr)
                 if (arr.length == 0) {
                   this.$message.error("该订单已全部生成采购单，请知悉!");
                   return;
                 }
-
+               
                 if (arr.length > 0) {
                   str = arr.join(",");
                   this.$router.push({

src/xt_pages/supply/components/goodOrderPrint.vue

@@ -110,6 +110,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="getAllPriceSix()>0">{{getAllPriceSix()}}</span>
+            </div>
             <div
               style="
                 width: 25%;
@@ -405,6 +415,20 @@ export default {
         console.log("ztr",ztr)
         return ztr
       },
+      getAllPriceSix(){
+        console.log("优惠金额",this.discount_amount)
+        var total_price = 0
+        for (let i = 0; i < this.tableList.length; i++) {
+          total_price +=(this.tableList[i].price *this.tableList[i].count)
+        }
+
+        total_price = total_price - this.discount_amount;
+        if(total_price > 0){
+          return total_price.toFixed(2);
+        }else{
+          return ""
+        }
+      }
   },
   created() {
     this.orgName = this.$store.getters.xt_user.org.org_name;

src/xt_pages/supply/components/goodReturnPrint.vue

@@ -75,7 +75,7 @@
                     <span v-if="(item.supply_count * item.price*item.deposit_rate) >0">{{(item.supply_count * item.price *item.deposit_rate/100).toFixed(2)}}</span>
                   </td>
                   <td style="line-height: 18px">
-                    <span v-if="(item.supply_count * item.price) >0">{{(item.supply_count * item.price).toFixed(2)}}</span>
+                    <span v-if="(item.supply_count * item.price) >0">{{(item.supply_count * item.price -(item.supply_count*item.price*item.deposit_rate/100)).toFixed(2)}}</span>
                   </td>
                  
                 
@@ -84,7 +84,7 @@
                   <td colspan="3" style="line-height: 18px">合计</td>
                   <td colspan="1" style="line-height: 18px">{{getAllCount()}}</td>
                   <td colspan="3" style="line-height: 18px"></td>
-                  <td style="line-height: 18px">{{getAllPriceTwo()}}</td>
+                  <td style="line-height: 18px">{{getAllPriceThree()}}</td>
                 </tr>
                  <tr>
                   <td colspan="9" style="line-height: 18px;text-align: left;">合计  金额大写 {{getAllPrice()}}</td>
@@ -111,7 +111,7 @@
             >
               优惠金额：<span v-if="discount_amount>0">{{discount_amount}}</span>
             </div>
-            <!-- <div
+            <div
               style="
                 width: 25%;
                 text-align: left;
@@ -119,8 +119,8 @@
                 font-size: 18px;
               "
             >
-            优惠后金额：<span v-if="getAllPriceTwo()>0">{{getAllPriceTwo()}}</span>
-            </div> -->
+            优惠后金额：<span>{{getAllPriceSix()}}</span>
+            </div>
             <div
               style="
                 width: 25%;
@@ -392,10 +392,10 @@ export default {
       }
      
     },
-   getAllPriceTwo() {
+   getAllPriceThree() {
       var total_price = 0;
       for (let i = 0; i < this.tableList.length; i++) {
-        total_price +=(this.tableList[i].price *this.tableList[i].supply_count)
+       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){
@@ -434,6 +434,19 @@ export default {
         console.log("ztr",ztr)
         return ztr
       },
+      getAllPriceSix(){
+        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))
+        }
+        console.log("total-price2332323232",this.discount_amount)
+        total_price = total_price - this.discount_amount;
+        if(total_price > 0){
+          return total_price.toFixed(2);
+        }else{
+          return ""
+        }
+      }
   },
   created() {
     this.orgName = this.$store.getters.xt_user.org.org_name;