新分支

src/api/role/admin.js

@@ -363,4 +363,4 @@ export function GetFiledConfigList(params){
     method:"Get",
     params:params,
   })
-}
+}

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1113,7 +1113,8 @@ export default {
            if(this.is_sort == 0){
               newList = schedules
            }
-           if(this.is_sort == 1){
+          
+           if(this.is_sort == 0 ||  this.is_sort == 1){
               schedules.map(item => {
                   item.is_sort = item.device_number.sort
                   item.assess_time = item.dialysisassesmentbefor&&item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"

src/xt_pages/role/admin.vue

@@ -241,7 +241,7 @@
           style="float:left"
           @click="toZiDuanJiaoBen">字段脚本</el-button> -->
 
-
+        
      </div>
 
 
@@ -1228,7 +1228,8 @@ export default {
          this.$message.success("脚本成功")
         }
       })
-    }
+    },
+    
 
   },
   watch: {

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -90,11 +90,16 @@
               <span v-if="scope.row.consumable_type == 10 || scope.row.consumable_type == 11 || scope.row.consumable_type == 13">{{scope.row.warehousing_order}}</span>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="操作日期" align="center">
+        <el-table-column prop="drug_name" label="出库日期" align="center">
            <template slot-scope="scope">
              {{getTime(scope.row.ctime,"{y}-{h}-{d}")}}
            </template>
         </el-table-column>
+        <el-table-column prop="drug_name" label="操作日期" align="center">
+           <template slot-scope="scope">
+             {{getTime(scope.row.operate_time,"{y}-{h}-{d}")}}
+           </template>
+        </el-table-column>
         <el-table-column prop="drug_name" label="仓库名称" align="center">
            <template slot-scope="scope">
               <span>{{getHouseName(scope.row.storehouse_id)}}</span>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -372,15 +372,19 @@
                     <span v-if="org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217  && org_id!=0 && org_id!=10088 && org_id!=10510">
                       <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
                     <span v-if="is_sys == 0">
-                      <span v-if="scope.row.child.length == 1">{{item.count * item.retail_price}} </span> 
-                      <span v-if="scope.row.child.length > 1">{{item.count * item.price}} </span> 
+                      <!-- <span v-if="scope.row.child.length == 1">{{item.count * item.retail_price}} </span> 
+                      <span v-if="scope.row.child.length > 1">{{item.count * item.price}} </span>  -->
+                      {{(scope.row.count * scope.row.price).toFixed(2)}}
                     </span>
                     </span>
 
                     <span v-if="org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217 || org_id==0 || org_id ==10088 || org_id ==10510">
                       <!-- {{(item.count * item.price).toFixed(2)}} -->
                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*scope.row.min_price).toFixed(2)}}</span>  
-                     <span v-if="is_sys==0"> {{(getOutCountNightTenOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}}</span>
+                     <span v-if="is_sys==0">
+                       {{(scope.row.count * scope.row.price).toFixed(2)}}
+                       <!-- {{(getOutCountNightTenOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}} -->
+                      </span>
                      
                     </span>
                   </td>
@@ -1248,10 +1252,7 @@ export default {
     getTime(val) {
       if (val < 0) {
         return "";
-      }
-      if (val == "") {
-        return "";
-      } else {
+      }else{
         return uParseTime(val, "{y}-{m}-{d}");
       }
     },
@@ -1660,11 +1661,69 @@ export default {
               }
             }
           }
-          this.exportList = list;
+          console.log("list---------------------",list)
+          if(list!=null && list.length>0){
+            let dataInfo = {}
+              list.forEach((item, index) => {
+              let { drug_id } = item
+              if (!dataInfo[drug_id]) {
+                dataInfo[drug_id] = {
+                  drug_id:item.drug_id,
+                  drug_name:item.drug_name,
+                  warehouse_out_order_number:item.warehouse_out_order_number,
+                  dose:item.dose,
+                  dose_unit:item.dose_unit,
+                  min_unit:item.min_unit,
+                  max_unit:item.max_unit,
+                  min_number:item.min_number,
+                  child: [],
+                  count:0,
+                  price:item.price,
+                  manufacturer:item.manufacturer,
+                  dealer:item.dealer,
+                  product_date:item.product_date,
+                  expire_date:item.expire_date,
+                  remark:item.remark,
+                  warehouse_out_time:item.warehouse_out_time,
+                  ctime:item.ctime,
+                  drug_type:item.drug_type,
+                  batch_number:item.batch_number,
+                  number:item.number,
+                  min_price:item.min_price,
+                  count_one:item.count_one,
+                }
+              }
+            })
+            let arr = Object.values(dataInfo)
+            if(arr!=null && arr.length>0){
+              for(let i=0;i<arr.length;i++){
+                for(let j=0;j<list.length;j++){
+                  if(arr[i].drug_id == list[j].drug_id){
+                     arr[i].child.push(list[j])
+                  }
+                }
+              }
+            }
+
+            if(arr!=null&& arr.length>0){
+               
+              for(let i=0;i<arr.length;i++){
+                for(let j=0;j<arr[i].child.length;j++){
+                  arr[i].count +=arr[i].child[j].count_one
+                }
+              }
+            }
+            console.log("arr-----------------------",arr)
+            this.exportList = []
+            this.exportList = arr;
+         
+          }
+          
           this.exportLoding = false
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
           this.outInfoList = response.data.data.outInfoList
+        
         }
       });
     },
@@ -1692,48 +1751,42 @@ export default {
         if (this.exportList[i].manufacturer == 0) {
           this.exportList[i].manufacturer = "";
         }
-        this.exportList[i].unit =
-          this.exportList[i].dose +
-          this.exportList[i].dose_unit +
-          "*" +
-          this.exportList[i].min_number +
-          this.exportList[i].min_unit +
-          "/" +
-          this.exportList[i].max_unit;
-
-        // this.exportList[i].total_price = (this.exportList[i].count * this.exportList[i].price).toFixed(2);
+        this.exportList[i].unit =this.exportList[i].dose + this.exportList[i].dose_unit + "*" + this.exportList[i].min_number +this.exportList[i].min_unit +"/" +this.exportList[i].max_unit;
+        this.out_count = ""
         this.exportList[i].out_count = this.getAllOut(this.exportList[i].count,this.exportList[i].max_unit,this.exportList[i].min_unit,this.exportList[i].min_number)
-        this.exportList[i].expiry_date = this.getTime(
-          this.exportList[i].expire_date
-        );
-        this.exportList[i].product_date = this.getTime(
-          this.exportList[i].product_date
-        );
+        this.exportList[i].expiry_date = this.getTime(this.exportList[i].expire_date);
+        this.exportList[i].product_date_one = this.getTime(this.exportList[i].product_date);
         for (let j = 0; j < this.manufacturerList.length; j++) {
           if (this.exportList[i].manufacturer == this.manufacturerList[j].id) {
-            this.exportList[i].manufacturer = this.manufacturerList[j].manufacturer_name;
+            this.exportList[i].manufacturer_name = this.manufacturerList[j].manufacturer_name;
           }
         }
 
         for (let z = 0; z < this.dealerList.length; z++) {
           if (this.exportList[i].dealer == this.dealerList[z].id) {
-            this.exportList[i].dealer = this.dealerList[z].dealer_name;
+            this.exportList[i].dealer_name = this.dealerList[z].dealer_name;
           }
         }
-       
-        this.exportList[i].retail_price = (this.exportList[i].count_one * this.exportList[i].min_price).toFixed(2)
+        this.exportList[i].total_price = 0
+        this.exportList[i].total_price = (this.exportList[i].count * this.exportList[i].min_price).toFixed(2)
         
         this.exportList[i].ctime = this.getTime(this.exportList[i].ctime)
       }
-
-      import("@/vendor/Export2Excel").then((excel) => {
-        for (let i = 0; i < this.exportList.length; i++) {
-          for (let j = 0; j < this.drugTypeList.length; j++) {
-            if (this.exportList[i].drug_type == this.drugTypeList[j].value) {
-              this.exportList[i].drug_type = this.drugTypeList[j].name;
-            }
+      
+    
+      for (let i = 0; i < this.exportList.length; i++) {
+        for (let j = 0; j < this.drugTypeList.length; j++) {
+          if (this.exportList[i].drug_type == this.drugTypeList[j].value) {
+            this.exportList[i].drug_type = this.drugTypeList[j].name;
           }
         }
+        this.exportList[i].price_one = 0
+        this.exportList[i].price_one = this.exportList[i].price
+        this.exportList[i].warehouse_out_time = this.exportList[i].ctime
+      }
+      console.log("到处---------------------",this.exportList)
+      import("@/vendor/Export2Excel").then((excel) => {
+       
         const tHeader = [
           "单据日期",
           "药品名称",
@@ -1741,7 +1794,6 @@ export default {
           "规格&单位",
           "批号",
           "出库数量",
-          "单价",
           "拆零零售价",
           "总价",
           "生产厂家",
@@ -1754,29 +1806,29 @@ export default {
           
         ];
         const filterVal = [
-          "ctime",
+          "warehouse_out_time",
           "drug_name",
           "drug_type",
           "unit",
           "batch_number",
           "out_count",
-          "retail_price_one",
-          "price",
-          "retail_price",
-          "manufacturer",
-          "product_date",
+          "min_price",
+          "total_price",
+          "manufacturer_name",
+          "product_date_one",
           "expiry_date",
-          "dealer",
+          "dealer_name",
           "number",
           "ctime",
           "remark",
         ];
+        
 
       
 
         const data = this.formatJson(filterVal, this.exportList);
         console.log("Datewoo2o2o2o",data)
-      
+       
         excel.export_json_to_excel({
           header: tHeader,
           data,

src/xt_pages/stock/drugs/historyDrugInvetory.vue

@@ -0,0 +1,417 @@
+<template>
+    <!--患者发药-->
+    <div class="main-contain new-main-contain">
+      <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+      </div>
+      <div
+        class="app-container"
+        style="display: flex; flex: 1; padding: 10px 20px 0px 20px"
+      >
+        <div class="mainLeft">
+          <div>
+            <div
+              class="list"
+              style="display: flex; justify-content: space-between"
+            >
+              <el-input
+                size="small"
+                style="width: 200px"
+                v-model="keywords"
+                class="filter-item"
+                placeholder="请输入耗材名称"
+                clearable
+              />
+              <el-button
+               
+                size="small"
+                class="filter-item"
+                type="primary"
+                @click="searchAction"
+                >搜索
+              </el-button>
+            </div>
+  
+            <el-table
+              height="80vh"
+              ref="table01"
+              :data="drugList"
+              highlight-current-row
+              @current-change="handleCurrentChange"
+              border
+              style="width: 100%"
+              v-if="state == 1"
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{
+                backgroundColor: 'rgb(245, 247, 250)',
+                color: '#606266',
+              }"
+            >
+              <el-table-column prop="date" label="药品名称" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.drug_name}}
+                </template>
+              </el-table-column>
+              <el-table-column prop="name" label="规格" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.dose}}{{ scope.row.dose_unit }} * {{ scope.row.min_number }}{{ scope.row.min_unit }} /{{ scope.row.max_unit }}
+                </template>
+              </el-table-column>
+
+              <el-table-column prop="name" label="厂家" align="center">
+                <template slot-scope="scope">
+                  {{getManufacturerName(scope.row.manufacturer)}}
+                </template>
+              </el-table-column>
+            </el-table>
+            
+          </div>
+        </div>
+
+        <div class="mainRight">
+          <div class="titlelist">
+          <div>
+            <div>日期：{{nowTime}}   盘点人：{{user_name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
+           </div>
+          </div>
+
+        </div>
+        <el-divider style="margin-top: 10px"></el-divider>
+        <div>
+          <el-table
+            :height="tableHeight"
+            :data="infoList"
+            border
+            style="width: 100%"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+          >
+            <el-table-column label="入库单号"  align="center">
+              <template slot-scope="scope">
+                {{scope.row.warehousing_order}}
+              </template>
+            </el-table-column>
+            <el-table-column label="入库数量"  align="center">
+              <template slot-scope="scope">
+                {{scope.row.warehousing_count}}
+              </template>
+            </el-table-column>
+            <el-table-column label="有效期"  align="center">
+              <template slot-scope="scope">
+                {{getTime(scope.row.expiry_date)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="批号"  align="center">
+              <template slot-scope="scope">
+                 {{scope.row.batch_number}}
+              </template>
+            </el-table-column>
+            <el-table-column label="进货价"  align="center">
+              <template slot-scope="scope">
+                  {{scope.row.price}}
+              </template>
+            </el-table-column>
+            <el-table-column label="剩余库存"  align="center">
+              <template slot-scope="scope">
+                 {{scope.row.stock_max_number}}{{ scope.row.max_unit }} 
+                 {{scope.row.stock_min_number}}{{ scope.row.min_unit }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="盘点原因" width="100"  align="center">
+                <template slot-scope="scope">
+                   <el-select v-model="scope.row.type" placeholder="请选择">
+                      <el-option
+                        v-for="item in reasonList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
+                      </el-option>
+                    </el-select>
+                 </template> 
+              </el-table-column>
+            <el-table-column label="盘点后数量"  align="center" width="220">
+              <template slot-scope="scope">
+                <el-input style="width:80px" v-model="scope.row.last_stock_max_number" type="number"></el-input>
+                {{scope.row.max_unit}}
+                <el-input style="width:60px" v-model="scope.row.last_stock_min_number" type="number"></el-input>
+                {{scope.row.min_unit}}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作"  align="center">
+              <template slot-scope="scope">
+                <span><el-button type="danger" @click="UpdateDrugWarehouseInfo(scope.row)">保存</el-button></span>
+              </template>
+            </el-table-column>
+           
+          </el-table>
+        </div>
+       
+      </div>
+    
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  
+  import BreadCrumb from "@/xt_pages/components/bread-crumb";
+  import {
+    getDrugInventoryList,
+    getDrugInventoryByDrugId,
+    updateDrugInventoryWarehouseInfo
+  } from "@/api/pharmacy";
+  const moment = require("moment");
+  import { uParseTime } from '@/utils/tools'
+  export default {
+    components: {
+      BreadCrumb,
+    },
+    data() {
+      return {
+        nowTime: moment(new Date()).format("YYYY-MM-DD HH:MM:SS"),
+        patient_id: 0,
+        crumbs: [
+          { path: false, name: "药品管理" },
+          { path: "/Pharmacy/patiantDispensing", name: "药品盘点" },
+        ],
+        tableHeight: 400,
+        start_time: moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+        start_time2: moment(new Date()).add("year", 0).format("YYYY-MM-DD HH:mm"),
+        state: 1, //1待发药，2已发药
+        waitmount: 0, //待发药人数
+        waitmount_data: [],
+        alreadmount: 0, //已发药人数
+        alreadmount_data: [],
+        keywords: "",
+        tableData: [],
+        propsTable: [],
+        tableData_list: [],
+        isVisibility: false,
+        isVisibilityTwo:false,
+        currentRow: null,
+        dialogVisible: false,
+        is_open: "2",
+        banshift: [
+          { value: 0, text: "全部班" },
+          { value: 1, text: "上午" },
+          { value: 2, text: "下午" },
+          { value: 3, text: "晚上" },
+        ],
+        shift: 0, //班次
+        fen: [],
+        partition: 0, //分区
+        drugList:[],
+        baseList:[],
+        org_id:'',
+        patients:{},
+        doctors:[],
+        diagnosearr:[],
+        diagnosis:'',
+        goodList:[],
+        manufacturerList:[],
+        user_name:this.$store.getters.xt_user.user.user_name,
+        infoList:[],
+        reasonList:[
+          {id:6,name:"默认"},
+          {id:1,name:"到期退货"},
+          {id:2,name:"异常退货"},
+          {id:3,name:"退货"},
+          {id:4,name:"损坏"},
+          {id:5,name:"不计入报损分析"},
+          {id:7,name:"有效期到期"},
+         ],
+      };
+    },
+    watch: {},
+    created() {
+      this.org_id = this.$store.getters.xt_user.org.id
+
+      this.getDrugInventoryList()
+    },
+   methods:{
+    getTime(val) {
+        if(val < 0){
+        return ""
+        }
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
+    searchAction(){
+        this.getDrugInventoryList()
+    },
+    getDrugInventoryList(){
+        var params = {
+            keywords:this.keywords
+        }
+        getDrugInventoryList(params).then(response=>{
+            if(response.data.state ==1){
+                var list = response.data.data.drugList
+                console.log("HHHHHHHHH000000000000000000000",list)
+                this.drugList = list
+                this.$refs.table01.setCurrentRow(this.drugList[0])
+                this.manufacturerList = response.data.data.manufacturerList
+            }
+        })
+     },
+     getManufacturerName(id){
+       var manufacturer_name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+       }
+       return manufacturer_name
+     },
+     handleCurrentChange(val){
+       console.log("valo9oooooooooooooo",val)
+       getDrugInventoryByDrugId(val.id).then(response=>{
+          if(response.data.state ==1){
+             
+             this.infoList = []
+             var infoList = response.data.data.infoList
+             for(let i=0;i<infoList.length;i++){
+               infoList[i].type = 6
+               infoList[i].last_stock_max_number = infoList[i].stock_max_number
+               infoList[i].last_stock_min_number = infoList[i].stock_min_number
+               this.infoList.push(infoList[i])
+             }
+            
+             console.log("infoList====================",this.infoList)
+            
+
+          }
+       })
+     },
+     UpdateDrugWarehouseInfo(row){
+        console.log("row===============",row)
+        var stock_in_number = 0
+        var now_in_number = 0
+        stock_in_number = row.warehousing_count * row.XtBaseDrug.min_number
+
+        now_in_number = row.last_stock_max_number * row.XtBaseDrug.min_number + row.last_stock_min_number
+       if(parseInt(row.last_stock_max_number)<0 && parseInt(row.last_stock_min_number)<0){
+        this.$message.error("盘点后数量不能为负数!")
+        return false
+       }
+       console.log("stock_in_number",stock_in_number)
+       console.log("now_in_number",now_in_number)
+       if(parseInt(now_in_number) >parseInt(stock_in_number)){
+         this.$message.error("该批次盘点后数量不能大于或等于入库数量!")
+         return false
+       }
+        var params = {
+            id:row.id,
+            stock_max_number:parseInt(row.stock_max_number),
+            stock_min_number:parseInt(row.stock_min_number),
+            last_stock_max_number:parseInt(row.last_stock_max_number),
+            last_stock_min_number:parseInt(row.last_stock_min_number),
+            drug_id:row.drug_id,
+            storehouse_id:parseInt(row.storehouse_id), 
+            is_type:parseInt(row.type),
+            specification_name:row.XtBaseDrug.dose + row.XtBaseDrug.dose_unit + "*"+row.XtBaseDrug.min_number+row.min_unit+"/"+row.XtBaseDrug.max_unit
+        }
+        console.log("params22222222222222",params)
+       updateDrugInventoryWarehouseInfo(params).then(response=>{
+          if(response.data.state ==1){
+            var msg = response.data.data.msg
+            this.$message.success("保存成功!")
+            row.id =row.drug_id
+            this.handleCurrentChange(row)
+          }
+       })
+     }
+    }
+  };
+  </script>
+  
+  <style rel="stylesheet/css" lang="scss" scoped>
+  .new-main-contain {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .app-container {
+    height: 100%;
+  }
+  .mainLeft {
+    width: 400px;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+  
+    .el-radio {
+      margin-right: 5px;
+    }
+  
+    .list {
+      margin: 10px 0;
+    }
+  }
+  .mainRight {
+    margin-left: 10px;
+    flex: 1;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    overflow-y: auto;
+    .titlelist {
+      display: flex;
+      justify-content: space-between;
+      white-space: nowrap;
+      color: #909399;
+      font-size: 14px;
+      /deep/ .el-input__inner {
+        font-size: 13px !important;
+      }
+    }
+    .el-table {
+      margin-top: -13px;
+    }
+    .el-button {
+      height: 34px;
+      width: 65px;
+    }
+    /deep/ .el-divider {
+      height: 2px;
+      margin-top: 10px;
+    }
+  
+    /deep/ .el-table__body-wrapper {
+      overflow-x: scroll !important;
+    }
+  }
+  
+  /deep/ .el-input__inner {
+    padding-right: 15px;
+  }
+  
+  /deep/ .el-table--scrollable-x .el-table__body-wrapper {
+    overflow: auto;
+    overflow-x: hidden;
+  }
+  /deep/ .gutter {
+    width: 15px !important;
+    display: inline-block !important;
+  }
+  /deep/ .el-table__fixed-right-patch {
+    width: 15px !important;
+  }
+  
+  /deep/ .el-table__fixed-right {
+    bottom: 0 !important;
+    left: auto;
+    right: 0;
+  }
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+    width: 15px !important;
+    height: 15px !important;
+  }
+  </style>
+  

src/xt_pages/stock/query/goodNewQuery.vue

@@ -484,6 +484,10 @@ export default {
     },
     getlist(){
        this.loading = true
+       if(this.org_id == 10679){
+           this.page =1
+           this.limit =100
+       }
         var params = {
           storehouse_id:this.storehouse_id,
           good_type:this.good_type,

src/xt_pages/stock/stockFlow.vue

@@ -93,17 +93,17 @@
             <span v-if="scope.row.consumable_type == 15">{{scope.row.warehouse_out_order_number}}</span>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="操作日期" align="center">
+        <el-table-column prop="drug_name" label="出库日期" align="center">
            <template slot-scope="scope">
              {{getTime(scope.row.ctime)}}
            </template>
         </el-table-column>
-<!-- 
-        <el-table-column prop="drug_name" label="出库日期" align="center">
+
+        <el-table-column prop="drug_name" label="操作日期" align="center">
            <template slot-scope="scope">
-             {{getTime(scope.row.system_time)}}
+             {{getTime(scope.row.operate_time)}}
            </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column prop="drug_name" label="仓库名称"  align="center">
            <template slot-scope="scope">
              <span>{{getHouseName(scope.row.storehouse_id)}}</span>

src/xt_pages/stock/stockOutOrder.vue

@@ -2153,7 +2153,8 @@ export default {
       };
       getOutExportList(params).then((response) => {
         if (response.data.state == 1) {
-          var list = response.data.data.list;
+          var list = response.data.data.list
+        
           var outCount = response.data.data.outCount;
           
           for (let i = 0; i < list.length; i++) {
@@ -2178,9 +2179,58 @@ export default {
               }
             }
           }
-          console.log("list232332232332323223",list)
-          this.exportList = list;
-          this.exportLoding = false
+          console.log("list============",list)
+          if(list!=null && list.length>0){
+            let dataInfo = {}
+              list.forEach((item, index) => {
+              let { good_id } = item
+              if (!dataInfo[good_id]) {
+                dataInfo[good_id] = {
+                  good_id:item.good_id,
+                  good_name:item.good_name,
+                  warehouse_out_order_number:item.warehouse_out_order_number,
+                  specification_name:item.specification_name,
+                  child: [],
+                  count:0,
+                  price:item.price,
+                  manufacturer:item.manufacturer,
+                  dealer:item.dealer,
+                  product_date:item.product_date,
+                  expiry_date:item.expiry_date,
+                  remark:item.remark,
+                  warehouse_out_time:item.warehouse_out_time,
+                  good_type_id:item.good_type_id,
+                  ctime:item.ctime
+                }
+              }
+            })
+            let arr = Object.values(dataInfo)
+         
+
+            if(arr!=null && arr.length>0){
+              for(let i=0;i<arr.length;i++){
+                for(let j=0;j<list.length;j++){
+                  if(arr[i].good_id == list[j].good_id){
+                     arr[i].child.push(list[j])
+                  }
+                }
+              }
+            }
+
+            if(arr!=null&& arr.length>0){
+               
+              for(let i=0;i<arr.length;i++){
+                for(let j=0;j<arr[i].child.length;j++){
+                  arr[i].count +=arr[i].child[j].count
+                }
+              }
+            }
+
+            console.log("arr0233333333333333",arr)
+            this.exportList = arr;
+            this.exportLoding = false
+          }
+         
         }
       });
     },