11月14日 库存扣减更新

src/xt_pages/supply/components/addGoodOrder.vue

@@ -1052,7 +1052,7 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           };
-          // return
+        
           addGoodOrder( params,this.supplier_name,start,this.arrearage,this.payment, warehousing_id,this.number,this.rate_of_concession,this.discount_amount).then((response) => {
             if (response.data.state == 1) {
               this.loading = false;
@@ -1186,18 +1186,21 @@ export default {
           ).then((response) => {
             if (response.data.state == 1) {
               var orderInfo =  response.data.data.list
-              // 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;
-              //   orderInfo[i].type = orderInfo[i].is_source;
-              //   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
-              // }
+              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;
+                orderInfo[i].type = orderInfo[i].is_source;
+                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);
+                orderInfo[i].supply_expiry_date = this.getTimes(orderInfo[i].supply_expiry_date);
+                orderInfo[i].supply_product_date = this.getTimes( orderInfo[i].supply_product_date);
+              }
               this.recordInfo.tableList = orderInfo
               this.loading = false;
               this.$message.success("保存成功!");

src/xt_pages/supply/components/addGoodReturn.vue

@@ -1187,6 +1187,28 @@ export default {
           updateGoodReturn(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name,this.number).then(response=>{
             if(response.data.state == 1){
                var msg = response.data.msg
+               var orderInfo = response.data.data.list
+               for(let i=0;i< orderInfo.length;i++){
+                  orderInfo[i].id = orderInfo[i].id
+                  orderInfo[i].name = orderInfo[i].name
+                  orderInfo[i].id = orderInfo[i].id
+                  orderInfo[i].supply_count =  orderInfo[i].supply_count
+                  orderInfo[i].supply_price =  orderInfo[i].price
+                  orderInfo[i].supply_remake =  orderInfo[i].remark
+                  orderInfo[i].type =  orderInfo[i].is_source
+                  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].good_number = orderInfo[i].good_number
+                  orderInfo[i].supply_total_price = (orderInfo[i].supply_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].deposit_rate = orderInfo[i].deposit_rate
+                  orderInfo[i].count = orderInfo[i].count
+                  orderInfo[i].supply_total = orderInfo[i].supply_total
+                  orderInfo[i].supply_specification_name = orderInfo[i].supply_specification_name
+                }
+               this.recordInfo.tableList = orderInfo
                this.loading = false
                this.$message.success("保存成功!")
             }

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -902,18 +902,18 @@ export default {
               this.loading = false;
               var warehousingInfo = response.data.data.warehousingInfo;
               var orderInfo =  response.data.data.orderInfo
-              // for (let i = 0; i < orderInfo.length; i++) {
-              //   orderInfo[i].id = orderInfo[i].id
-              //   orderInfo[i].name = orderInfo[i].name
-              //   orderInfo[i].supply_count = orderInfo[i].count;
-              //   orderInfo[i].supply_price = orderInfo[i].price;
-              //   orderInfo[i].supply_remake = orderInfo[i].remark;
-              //   orderInfo[i].type = orderInfo[i].is_source;
-              //   orderInfo[i].project_id = orderInfo[i].project_id;
-              //   orderInfo[i].supply_unit = orderInfo[i].supply_unit;
-              //   orderInfo[i].supply_specification_name = orderInfo[i].supply_specification_name
-              //   orderInfo[i].supply_total = orderInfo[i].supply_total
-              // }
+              for (let i = 0; i < orderInfo.length; i++) {
+                orderInfo[i].id = orderInfo[i].id
+                orderInfo[i].name = orderInfo[i].name
+                orderInfo[i].supply_count = orderInfo[i].count;
+                orderInfo[i].supply_price = orderInfo[i].price;
+                orderInfo[i].supply_remake = orderInfo[i].remark;
+                orderInfo[i].type = orderInfo[i].is_source;
+                orderInfo[i].project_id = orderInfo[i].project_id;
+                orderInfo[i].supply_unit = orderInfo[i].supply_unit;
+                orderInfo[i].supply_specification_name = orderInfo[i].supply_specification_name
+                orderInfo[i].supply_total = orderInfo[i].supply_total
+              }
               this.recordInfo.tableList = orderInfo;
             
               this.$message.success("保存成功!");

src/xt_pages/supply/components/purchaseOrderPrint.vue

@@ -19,7 +19,7 @@
         <div class="print_main_content">
           <div class="order_title_panl">
             <div style="font-size: 22px; font-weight: bold">{{ orgName }}</div>
-            <span style="font-weight: 500; font-size: 18px">购货单</span>
+            <span style="font-weight: 500; font-size: 18px">采购订单</span>
           </div>
           <div style="display: flex; justify-content: space-between">
             <div style="text-align: left; margin-bottom: 1px; font-size: 18px">
@@ -70,10 +70,11 @@
                 <tr>
                   <td colspan="3" style="line-height: 18px">合计</td>
                   <td colspan="1" style="line-height: 18px">{{getAllCount()}}</td>
-                  <td colspan="2" style="line-height: 18px"></td>
+                  <td colspan="1" style="line-height: 18px"></td>
+                  <td colspan="2" style="line-height: 18px">{{getTotalPrice()}}</td>
                 </tr>
                  <tr>
-                  <td colspan="6" style="line-height: 18px">合计  金额大写 {{getAllPrice()}}</td>
+                  <td colspan="6" style="line-height: 18px;text-align: left;">合计  金额大写 {{getAllPrice()}}</td>
                  </tr>
               </tbody>
             </table>
@@ -110,16 +111,6 @@
               flex-wrap: wrap;
             "
           >
-            <div
-              style="
-                width: 25%;
-                text-align: left;
-                margin-bottom: 1px;
-                font-size: 18px;
-              "
-            >
-              供应商：{{ getSupplyName(supplier_id) }}
-            </div>
             <div
               style="
                 width: 25%;
@@ -389,6 +380,17 @@ export default {
         return ""
       } 
     },
+    getTotalPrice(){
+     var total = 0
+      for(let i=0;i<this.tableList.length;i++){
+         total +=(this.tableList[i].count*this.tableList[i].price)
+      }  
+      if(total > 0){
+       return total.toFixed(2)
+      }else{
+        return ""
+      } 
+    }
   },
   created() {
     this.orgName = this.$store.getters.xt_user.org.org_name;