导出

src/xt_pages/stock/detail/print.vue

@@ -60,12 +60,15 @@
                 <span v-else>{{calCount(stock)}}</span> 
               </td>
               <td style="line-height:50px" v-if="type == 1 && stock.query_warehousing_info.length > 0">{{stock.query_warehousing_info[0].price}}</td>
-              <td style="line-height:50px" v-if="type == 3 && stock.query_warehouseout_info.length > 0">{{stock.query_warehouseout_info[0].price}}</td>
+              <td style="line-height:50px" v-if="type == 3 && stock.query_warehouseout_info.length > 0">
+                <!-- {{stock.query_warehouseout_info[0].price}} -->
+                {{getReailPrice(stock.id)}}
+              </td>
               <td style="line-height: 50px" v-if="type == 1">{{calTotal(stock)}}</td>
               <td style="line-height: 50px" v-if="type == 3">
                 
-                  <span v-if="org_id == 10090">{{getPrice(stock.id)}}</span>
-                  <span v-else>{{(getStockCount(stock.id) * stock.query_warehouseout_info[0].price).toFixed(2)}}</span> 
+                  <span v-if="org_id == 9671">{{getPrice(stock.id)}}</span>
+                  <span v-else>{{(getStockCount(stock.id) * getPrice(stock.id)).toFixed(2)}}</span> 
                
              </td>
               <td style="line-height: 50px"></td>
@@ -134,7 +137,8 @@
         end_time: this.$route.query.end_time,
         stockTotal:[],
         wareOutInfo:[],
-        org_id:0
+        org_id:0,
+        informationList:[]
       }
     },
     methods: {
@@ -188,7 +192,10 @@
             var org_id = response.data.data.orgid
             console.log("org_id",org_id)
             this.org_id = org_id
-           
+
+            var informationlist = response.data.data.infomationList
+            console.log('数据列表',informationlist)
+            this.informationList = informationlist
             for (let i = 0; i < response.data.data.list.length; i++) {
               if (this.type == 1) {
                 if (response.data.data.list[i].query_warehousing_info.length > 0) {
@@ -352,14 +359,31 @@
      },
      getPrice(id){
        var sum = ""
+       for(let i=0;i<this.informationList.length;i++){
+        for(let j=0;j<this.wareOutInfo.length;j++){
+           if(this.informationList[i].id == this.wareOutInfo[j].good_id){
+             this.wareOutInfo[j].retail_price =  this.informationList[i].retail_price 
+           }
+        }
+       }
+      
        for(let j=0;j<this.wareOutInfo.length;j++){
          if(id == this.wareOutInfo[j].good_id){
-            sum += this.wareOutInfo[j].price * this.wareOutInfo[j].count
+            sum += (this.wareOutInfo[j].retail_price * this.wareOutInfo[j].count).toFixed(2)
          }
        }
        
        return sum
        
+     },
+     getReailPrice(id){
+       var price = 0
+       for(let i=0;i<this.informationList.length;i++){
+          if(id == this.informationList[i].id){
+             price = this.informationList[i].retail_price
+          }
+       }
+       return price
      }
     },
     created() {

src/xt_pages/stock/stockQuery.vue

@@ -383,7 +383,7 @@ export default {
     },
 
     exportList(){
-         console.log("2222222",this.WarehouseInfo.warehouseInfoDate)
+      
          import('@/vendor/Export2Excel').then(excel => {
          const tHeader = ['商品编码', '耗材名称', '耗材类型','规格型号','入库数量','进货价','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
          const filterVal = ['good_code', 'good_name', 'type_name','specification_name','stockInCount','price','salesReturnCount','realCount','stockOutCount','cancelStockCount','realOutCount','overplus']