11月14日 库存扣减更新

src/api/supply.js

@@ -80,6 +80,14 @@ export function getGoodOrderDetail(id, params) {
   })
 }
 
+export function getGoodOrderDetailList(id, ids, params) {
+  return request({
+    url: '/api/supply/getgoodorderdetaillist?id=' + id + '&ids=' + ids,
+    method: 'get',
+    params: params
+  })
+}
+
 export function updateGoodOrder(data, supplier_name, start, arrearage, payment, warehose_out_id, number, rate_of_concession, discount_amount, good_number) {
   return request({
     url: '/api/supply/updategoodorder?supplier_id=' + supplier_name + '&start=' + start + '&arrerage=' + arrearage + '&payment=' + payment + '&warehose_out_id=' + warehose_out_id + '&number=' + number + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount + '&good_number=' + good_number,

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -628,7 +628,7 @@ export default {
 
     handleEdit: function(index, row) {
    
-      this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys})
+      this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys+"&supply_cancel_out_id="+row.supply_cancel_out_id})
     },
     handleSearch(val){
       

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -818,6 +818,9 @@
       if(sys == 1){
         this.drug_show = true
       }
+      if(parseInt(this.$route.query.supply_cancel_out_id)>0){
+        this.drug_show = true
+      }
      this.unitList =  getDataConfig('hemodialysis','units')
 
     }

src/xt_pages/stock/stockOutOrder.vue

@@ -954,8 +954,7 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      
-      this.$router.push({path:'/stock/stockoutorderedit?id='+row.id+"&is_sys="+row.is_sys})
+      this.$router.push({path:'/stock/stockoutorderedit?id='+row.id+"&is_sys="+row.is_sys+"&supply_cancel_out_id="+row.supply_cancel_out_id})
        
     },
     handleDelete: function(index, row) {

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -25,7 +25,7 @@
 
       <div class="cell clearfix">
         <label class="title"><span class="name">出库时间</span> : </label>
-        <el-date-picker size="small" v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false"
+        <el-date-picker size="small" v-model="warehouse_out_time" prefix-icon="el-icon-date" :disabled="stockShow"
                         style="width: 200px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"></el-date-picker>
@@ -60,6 +60,7 @@
                       @input="changeGoodName(scope.$index)"
                       style="width:150px;"
                       :disabled="stockShow"
+                      
                     >
                       <i class="el-icon-search el-input__icon" slot="suffix"></i>
                     <template slot-scope="{ item }">
@@ -321,6 +322,7 @@
         numberList:[],
         stockShow:false,
         stockTrue:true,
+       
       }
     },
     methods: {
@@ -794,6 +796,9 @@
       if(is_sys == 1){
         this.stockShow = true
       }
+      if(parseInt(this.$route.query.supply_cancel_out_id) >0){
+        this.stockShow = true
+      }
       
     }
 

src/xt_pages/supply/components/addGoodOrder.vue

@@ -1405,9 +1405,9 @@ export default {
       getSupplyWarehouseOutById(id).then((response) => {
         if (response.data.state == 1) {
           var cancelList = response.data.data.cancelList;
-          console.log("退库单", cancelList);
+          // console.log("退库单", cancelList);
            var drugList = response.data.data.drugList;
-          console.log("药品列表", drugList);
+          // console.log("药品列表", drugList);
           var cancelOrderList = response.data.data.cancelOrderList;
           console.log("退库单详情", cancelOrderList);
           var ids =""
@@ -1416,7 +1416,7 @@ export default {
           }
           if (cancelList.length > 0) {
             var outList = response.data.data.outList;
-            console.log("购货单2322323",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++){
@@ -1435,7 +1435,7 @@ export default {
                 for(let j=0;j<drugList.length;j++){
                   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
+                      cancelOrderList[i].supply_count = cancelOrderList[i].supply_count * drugList[j].min_number
                     }
                   }
                  }
@@ -1452,7 +1452,7 @@ export default {
                   objInfo[project_id] = {
                     project_id,
                     child: [],
-                    count: 0,
+                    supply_count: 0,
                   };
                 }
               });
@@ -1469,7 +1469,7 @@ export default {
 
             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;
+                newArr[i].supply_count += newArr[i].child[j].supply_count;
               }
             }
 
@@ -1482,22 +1482,22 @@ export default {
                 for (let j = 0; j < newArr.length; j++) {
                   if (outList[i].project_id == newArr[j].project_id) {
                     //根据商品ID比较数量大小,把数量不足的商品ID储存,表示退货单的数量未满足采购单的数据，可以继续生成退货单
-                    if (outList[i].count > newArr[j].count) {
+                    if (outList[i].count > newArr[j].supply_count) {
                        arr.push(outList[i].project_id);
                     }
                   }
                 }
               }
               //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
-
+              console.log("arr2332233223322332",arr)
               if (arr.length == 0) {
-                this.$message.error("该订单已全部生成退库单，请知悉!");
+                this.$message.error("该订单已全部生成退货单，请知悉!");
                 return
               }
               console.log("arr23323232232323",arr)
               if (arr.length > 0) {
                 str = arr.join(",");
-                this.$router.push({ path: "/good/return/edit?id=" + id + "&ids=" + str});
+                this.$router.push({ path: "/good/return/add?id=" + id + "&ids=" + str});
               }
              }
 

src/xt_pages/supply/components/addGoodReturn.vue

@@ -407,7 +407,7 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { uParseTime } from "@/utils/tools";
 import {
   getInitOrder,
-  getGoodOrderDetail,
+  getGoodOrderDetailList,
   saveGoodReturnOrder,
   checkReturnOrder,
   updateGoodReturn,
@@ -852,7 +852,8 @@ export default {
     },
     getGoodOrderDetail() {
       var id = this.$route.query.id;
-      getGoodOrderDetail(id).then((response) => {
+      var ids = this.$route.query.ids;
+      getGoodOrderDetailList(id,ids).then((response) => {
         if (response.data.state == 1) {
           var out = response.data.data.out;
           this.id = out.id;

src/xt_pages/supply/components/addPurchaseOrder.vue

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

src/xt_pages/supply/components/editGoodOrder.vue

@@ -1281,14 +1281,13 @@ export default {
           }
           if (cancelList.length > 0) {
             var outList = response.data.data.outList;
-            console.log("购货单2322323", 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++) {
                   if (outList[i].project_id == drugList[j].id) {
                     if (outList[i].supply_unit == drugList[j].max_unit) {
-                      outList[i].count =
-                        outList[i].count * drugList[j].min_number;
+                      outList[i].count = outList[i].count * drugList[j].min_number;
                     }
                   }
                 }
@@ -1299,11 +1298,8 @@ export default {
               if (cancelOrderList[i].is_source == 1) {
                 for (let j = 0; j < drugList.length; j++) {
                   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;
+                    if ( cancelOrderList[i].supply_unit == drugList[j].max_unit) {
+                      cancelOrderList[i].supply_count = cancelOrderList[i].supply_count * drugList[j].min_number;
                     }
                   }
                 }
@@ -1320,7 +1316,7 @@ export default {
                   objInfo[project_id] = {
                     project_id,
                     child: [],
-                    count: 0,
+                    supply_count: 0,
                   };
                 }
               });
@@ -1337,7 +1333,7 @@ export default {
 
               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;
+                  newArr[i].supply_count += newArr[i].child[j].supply_count;
                 }
               }
 
@@ -1350,23 +1346,23 @@ export default {
                   for (let j = 0; j < newArr.length; j++) {
                     if (outList[i].project_id == newArr[j].project_id) {
                       //根据商品ID比较数量大小,把数量不足的商品ID储存,表示退货单的数量未满足采购单的数据，可以继续生成退货单
-                      if (outList[i].count > newArr[j].count) {
+                      if (outList[i].count > newArr[j].supply_count) {
                         arr.push(outList[i].project_id);
                       }
                     }
                   }
                 }
                 //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
-
+                console.log("arr233322323322332",arr)
                 if (arr.length == 0) {
-                  this.$message.error("该订单已全部生成退库单，请知悉!");
+                  this.$message.error("该订单已全部生成退货单，请知悉!");
                   return;
                 }
                 console.log("arr23323232232323", arr);
                 if (arr.length > 0) {
                   str = arr.join(",");
                   this.$router.push({
-                    path: "/good/return/edit?id=" + id + "&ids=" + str,
+                    path: "/good/return/add?id=" + id + "&ids=" + str,
                   });
                 }
               }

src/xt_pages/supply/components/editGoodReturn.vue

@@ -1114,14 +1114,15 @@ export default {
                   orderInfo[i].min_number =  drugList[j].min_number
                   orderInfo[i].max_unit =drugList[j].max_unit
                   orderInfo[i].min_unit =drugList[j].min_unit
+                 
                   orderInfo[i].sum_count = this.getWarehoseInfoTwo(drugList[j].drug_warehouse_info,drugList[j].max_unit,drugList[j].min_unit,drugList[j].min_number)
-                  orderInfo[i].count = this.getWarehoseInfoSix(drugList[j].drug_warehouse_info,drugList[j].max_unit,drugList[j].min_unit,drugList[j].min_number,orderInfo[i].supply_warehouse_detail_info)
-                  orderInfo[i].supply_total = this.getWarehoseInfoSix(drugList[j].drug_warehouse_info,drugList[j].max_unit,drugList[j].min_unit,drugList[j].min_number,orderInfo[i].supply_warehouse_detail_info)
+                  // orderInfo[i].count = this.getWarehoseInfoSix(drugList[j].drug_warehouse_info,drugList[j].max_unit,drugList[j].min_unit,drugList[j].min_number,orderInfo[i].supply_warehouse_detail_info)
+                 // orderInfo[i].supply_total = this.getWarehoseInfoSix(drugList[j].drug_warehouse_info,drugList[j].max_unit,drugList[j].min_unit,drugList[j].min_number,orderInfo[i].supply_warehouse_detail_info)
                 }
                 
               }
-             // orderInfo[i].count = orderInfo[i].count 
-
+             orderInfo[i].count = orderInfo[i].count 
+             orderInfo[i].supply_total = orderInfo[i].supply_total
              
             }
             if (orderInfo[i].is_source == 2) {
@@ -1130,13 +1131,13 @@ export default {
                   orderInfo[i].unitList = [{ id: 1, name: "" }];
                   orderInfo[i].unitList[0].name = goodList[j].packing_unit;
                 }
-                orderInfo[i].count = this.getTotalStockCountTwo(goodList[j].good_warehouse_info);
-                orderInfo[i].supply_total = this.getTotalStockCountTwo(goodList[j].good_warehouse_info);
+                // orderInfo[i].count = this.getTotalStockCountTwo(goodList[j].good_warehouse_info);
+               // orderInfo[i].supply_total = this.getTotalStockCountTwo(goodList[j].good_warehouse_info);
               }
               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].supply_total = orderInfo[i].supply_total
              
               orderInfo[i].max_unit =""
               orderInfo[i].min_unit =""

src/xt_pages/supply/components/goodOrderPrint.vue

@@ -72,7 +72,8 @@
                 <tr>
                   <td colspan="3" style="line-height: 18px">合计</td>
                   <td colspan="1" style="line-height: 18px">{{getAllCount()}}</td>
-                  <td colspan="5" style="line-height: 18px"></td>
+                  <td colspan="1" style="line-height: 18px"></td>
+                  <td style="line-height: 18px">{{getAllPriceOne()}}</td>
                 </tr>
                  <tr>
                   <td colspan="9" style="line-height: 18px">合计  金额大写 {{getAllPrice()}}</td>
@@ -361,6 +362,19 @@ export default {
         return ""
       }
      
+    },
+    getAllPriceOne() {
+      var total_price = 0;
+      for (let i = 0; i < this.tableList.length; i++) {
+        total_price +=(this.tableList[i].price *this.tableList[i].count)
+      }
+      this.total_price = total_price;
+      if(total_price > 0){
+         return total_price.toFixed(2);
+      }else{
+        return ""
+      }
+     
     },
      smallToBIG(price) {
         let fraction = ['角', '分'];

src/xt_pages/supply/components/goodReturnPrint.vue

@@ -27,7 +27,6 @@
                 {{ getSupplyName(supplier_id) }}
             </div>
             <div style="margin-bottom: 1px; font-size: 18px">
-              单据日期：
              单据日期：{{ getTimes(document_date) }}
             </div>
             <div style="margin-bottom: 1px; font-size: 18px">
@@ -73,17 +72,19 @@
                     <span v-if="item.deposit_rate >0">{{item.deposit_rate}}</span>
                   </td>
                   <td style="line-height: 18px">
-                    <span v-if="(item.supply_count * item.price *item.deposit_rate/100) >0">{{(item.supply_count * item.price *item.deposit_rate/100).toFixed(2)}}</span>
+                    <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="discount_amount > 0">{{ discount_amount }}</span>
+                    <span v-if="(item.supply_count * item.price) >0">{{(item.supply_count * item.price).toFixed(2)}}</span>
                   </td>
+                 
                 
                 </tr>
                 <tr>
                   <td colspan="3" style="line-height: 18px">合计</td>
                   <td colspan="1" style="line-height: 18px">{{getAllCount()}}</td>
-                  <td colspan="5" style="line-height: 18px"></td>
+                  <td colspan="3" style="line-height: 18px"></td>
+                  <td style="line-height: 18px">{{getAllPriceTwo()}}</td>
                 </tr>
                  <tr>
                   <td colspan="9" style="line-height: 18px">合计  金额大写 {{getAllPrice()}}</td>
@@ -100,16 +101,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%;
@@ -368,7 +359,7 @@ export default {
     getAllPrice() {
       var total_price = 0;
       for (let i = 0; i < this.tableList.length; i++) {
-        total_price +=(this.tableList[i].supply_price *this.tableList[i].supply_count - (this.tableList[i].supply_price * this.tableList[i].supply_count*this.tableList[i].deposit_rate/100))
+        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){
@@ -377,6 +368,19 @@ export default {
         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.tableList[i].price * this.tableList[i].supply_count*this.tableList[i].deposit_rate/100))
+      }
+      this.total_price = total_price;
+      if(total_price > 0){
+         return total_price.toFixed(2);
+      }else{
+        return ""
+      }
+     
     },
      smallToBIG(price) {
         let fraction = ['角', '分'];

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,7 +70,8 @@
                 <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>
@@ -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;