数据

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-     // host: 'xt.test.sgjyun.com',
+    host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
     // host: 'xt.test.sgjyun.com',
-    host: 'localhost',
+    // host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/stock.js

@@ -121,7 +121,7 @@ export function GetGoodType(params) {
 }
 
 export function createGoodInfo(params) {
-  console.log("prams",params)
+  console.log('prams', params)
   return request({
     url: '/api/stock/good/info/create',
     method: 'post',
@@ -387,12 +387,6 @@ export function DeleteWarehouseInfoItem(params) {
 }
 
 export function EditWarehouse(params, warehousing_time, id, type, manufacturer_id, dealer_id) {
-  console.log("params",params)
-  console.log("warehousing",warehousing_time)
-  console.log("id",id)
-  console.log("type",type)
-  console.log("manufacturer_id",manufacturer_id)
-  console.log("dealer_id",dealer_id)
   return request({
     url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
@@ -567,64 +561,59 @@ export function getWarehouseOutUser(params) {
   })
 }
 
-
-export function PostSearchStock(keyword,params){
-  
+export function PostSearchStock(keyword, params) {
   return request({
-    url:'/api/warehouseout/postsearchstock?keyword='+keyword,
-    method:"get",
-    params:params
+    url: '/api/warehouseout/postsearchstock?keyword=' + keyword,
+    method: 'get',
+    params: params
   })
 }
 
-export function GetOutStockTotalCount(params){
-  
+export function GetOutStockTotalCount(params) {
   return request({
-    url:"/api/warehouseout/getoutstocktotalcount",
-    method:"get",
-    params:params
+    url: '/api/warehouseout/getoutstocktotalcount',
+    method: 'get',
+    params: params
   })
 }
 
-export function postGoodInformation(params){
-  console.log("PARMAS22",params)
+export function postGoodInformation(params) {
+  console.log('PARMAS22', params)
   return request({
-    url:"/api/good/postgoodinformation",
-    method:"Post",
-    data:params,
+    url: '/api/good/postgoodinformation',
+    method: 'Post',
+    data: params
   })
 }
 
-export function postDrugInformation(params){
-  
+export function postDrugInformation(params) {
   return request({
-    url:"/api/good/postdruginformation",
-    method:"post",
-    data:params
+    url: '/api/good/postdruginformation',
+    method: 'post',
+    data: params
   })
 }
 
-export function getInitializtion(params){
+export function getInitializtion(params) {
   return request({
-    url:"/api/good/initializtion",
-    method:"get",
-    params:params
+    url: '/api/good/initializtion',
+    method: 'get',
+    params: params
   })
 }
 
-export function getWarehouseOrderInfoList(params){
-   return request({
-      url:"/api/good/getwarehouseorderinfolist",
-      method:"get",
-      params:params
-   })
-} 
+export function getWarehouseOrderInfoList(params) {
+  return request({
+    url: '/api/good/getwarehouseorderinfolist',
+    method: 'get',
+    params: params
+  })
+}
 
-export function postSearchGoodList(keyword,params){
-  
+export function postSearchGoodList(keyword, params) {
   return request({
-    url:"/api/good/postsearchgoodlist?keyword="+keyword,
-    method:"Get",
-    params:params
+    url: '/api/good/postsearchgoodlist?keyword=' + keyword,
+    method: 'Get',
+    params: params
   })
-}
+}

src/router/index_路由未分离前.js

@@ -832,7 +832,8 @@ export const xt_asyncRouterMap = [
         hidden: true,
         is_menu: false,
         meta: { title: 'stockInOrderAdd' }
-      }, {
+      },
+      {
         path: '/stock/in/detail',
         component: () => import('@/xt_pages/stock/stockInDetail'),
         name: 'stockInDetail',

src/router/modules/drugs.js

@@ -172,6 +172,14 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockOutOrderEdit', noCache: true }
+    },
+    {
+      path: '/stock/in/order/edit',
+      component: () => import('@/xt_pages/stock/stockInOrderEdit'),
+      name: 'stockInOrderEdit',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockInOrderEdit' }
     }
 
   ]

src/xt_pages/stock/stockInOrder.vue

@@ -90,6 +90,7 @@
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266'
         }"
+       @current-change="handleSearch"
       >
         <el-table-column align="center" type="selection" width="55">
         </el-table-column>
@@ -126,7 +127,7 @@
 
         <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
-            <el-tooltip
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="详情"
@@ -139,7 +140,7 @@
                 @click="handleSearch(scope.row.id)"
               >
               </el-button>
-            </el-tooltip>
+            </el-tooltip> -->
             <el-tooltip
               class="item"
               effect="dark"
@@ -187,6 +188,100 @@
     </div>
 
 
+   <div v-show="tableShow" style="margin-bottom:10px">
+      <el-table
+        :data="tableList"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%"
+        border
+        highlight-current-row
+        v-loading="Warehouse.loading"
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+       <el-table-column align="center" type="selection" width="55">
+       </el-table-column>
+
+       <el-table-column label="耗材名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.GoodInfo.good_name }}
+          </template>
+        </el-table-column>
+      
+        <el-table-column label="耗材类型" align="center">
+          <template slot-scope="scope">
+            {{  getTypeName(scope.row.GoodInfo.good_type_id)}}
+          </template>
+        </el-table-column>
+
+
+       <el-table-column label="规格&单位" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.GoodInfo.specification_name}} * {{scope.row.GoodInfo.min_number}}{{scope.row.GoodInfo.min_unit}}
+          </template>
+        </el-table-column>
+
+
+       <el-table-column label="批号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.number}}
+          </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">
+            {{ scope.row.price}}
+          </template>
+        </el-table-column>
+
+
+       <el-table-column label="总价" align="center">
+          <template slot-scope="scope">
+            {{ (scope.row.warehousing_count * scope.row.price).toFixed(2)}}
+          </template>
+        </el-table-column>
+
+
+         <el-table-column label="生产厂家" align="center">
+          <template slot-scope="scope">
+            {{ getManufactuerName(scope.row.GoodInfo.manufacturer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="生产日期" align="center">
+          <template slot-scope="scope">
+            {{ getTime(scope.row.product_date)}}
+          </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.remark }}
+          </template>
+        </el-table-column>
+       
+      </el-table>
+    </div>
+
 
     <el-dialog
       title="详情"
@@ -596,30 +691,6 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
      
-  
-    // var date1 = new Date();
-    // var date2 = new Date(date1);
-
-    // //-30为30天前，+30可以获得30天后的日期
-    // date2.setDate(date1.getDate() - 30);
-
-    // //30天前（月份判断是否小于10，小于10的前面+0）
-    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
-      
-    // //当前日期
-    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
-
-    //  this.start_time = agoDay
-    //  console.log("333333332222",this.start_time)
-
-      // this.warehousing_time =
-      //   nowYear +
-      //   '-' +
-      //   (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
-      //   '-' +
-      //   (nowDay < 10 ? '0' + nowDay : nowDay)
-
-    
     this.GetWarehouse();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
@@ -714,10 +785,14 @@ export default {
       },
         isCreated: 1,
         isVisibility: false,
-        drug_id:1
+       drug_id:1,
       },
+      drug_id:1,
+      tableShow:false,
+      tableList:[],
+      isVisibility:false
     };
-
+    
   
   },
   methods: {
@@ -992,10 +1067,11 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      this.$router.push({
-        name: "stockInDetail",
-        query: { id: row.id, type: this.type }
-      });
+      // this.$router.push({
+      //   name: "stockInDetail",
+      //   query: { id: row.id, type: this.type }
+      // });
+      this.$router.push({path:"/stock/in/order/edit?id="+row.id})
     },
     handleDelete: function(index, row) {
       const ids = [];
@@ -1089,11 +1165,18 @@ export default {
         .catch(() => {});
     },
 
-    handleSearch(id){
-      this.WarehouseInfo.warehouseInfoDate = [];
-      this.GetOrderDetail(id)
-      this.drug_id = id
-      this.dialogVisible = true
+    // handleSearch(id){
+    //   this.WarehouseInfo.warehouseInfoDate = [];
+    //   this.GetOrderDetail(id)
+    //   this.drug_id = id
+    //   this.dialogVisible = true
+    // },
+
+    handleSearch(val){
+      this.tableList= []
+      this.GetOrderDetail(val.id)
+      this.drug_id = val.id 
+
     },
 
     GetOrderDetail: function(id) {
@@ -1105,24 +1188,17 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          
+          this.tableShow = true
           for (let i = 0; i < response.data.data.info.length; i++) {
             this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
-            response.data.data.info[i].product_date = this.getTime(
-              response.data.data.info[i].product_date,
-              "{y}-{m}-{d}"
-            );
-            response.data.data.info[i].expiry_date = this.getTime(
-              response.data.data.info[i].expiry_date,
-              "{y}-{m}-{d}"
-            );
-            
-           response.data.data.info[i].price = response.data.data.info[i].price.toString();
-           response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
+            // response.data.data.info[i].product_date = this.getTime(response.data.data.info[i].product_date,"{y}-{m}-{d}");
+            // response.data.data.info[i].expiry_date = this.getTime(response.data.data.info[i].expiry_date,"{y}-{m}-{d}");
+            response.data.data.info[i].price = response.data.data.info[i].price.toString();
+            response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
 
             this.recordInfo.recordData.push(response.data.data.info[i]);
-
-          
+            this.tableList.push(response.data.data.info[i])
+            console.log("详情",this.tableList)
           }
            this.warehouse = response.data.data.warehousing;
            this.warehousing_time = this.getTime(this.warehouse.warehousing_time,"{y}-{m}-{d}");

src/xt_pages/stock/stockInOrderAdd.vue

@@ -127,8 +127,10 @@
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.warehousing_count'"
                             :rules='tableRules.warehousing_count' style="padding-top: 17px">
-                <el-input placeholder="请输入入库数量" type="number" v-model="scope.row.warehousing_count"></el-input>
+                <el-input placeholder="请输入入库数量" type="number" v-model="scope.row.warehousing_count" style="width:120px"></el-input>
+                  {{scope.row.min_unit}}
               </el-form-item>
+            
             </template>
           </el-table-column>
 
@@ -475,7 +477,7 @@
         }
         return name
       }, specificationName: function(good_info_id) {
-        // console.log("333333333",this.goodInfo)
+      
         let name = ''
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == good_info_id) {
@@ -711,13 +713,14 @@
               this.recordInfo.recordData[i].good_type_id = val.id
               this.recordInfo.recordData[i].good_name = val.good_name
               this.recordInfo.recordData[i].good_type_id = val.good_type_id
-              this.recordInfo.recordData[i].name = val.specification_name + "*" + val.min_number+val.min_unit +"/"+val.packing_unit
+              this.recordInfo.recordData[i].name = val.specification_name + "*" + val.min_number+val.min_unit
               this.recordInfo.recordData[i].number =  val.number
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
               this.recordInfo.recordData[i].price = val.buy_price
               this.recordInfo.recordData[i].specification_name = val.specification_name
               this.recordInfo.recordData[i].good_id = val.id
+              this.recordInfo.recordData[i].min_unit = val.min_unit
            }
          }
       }

src/xt_pages/stock/stockInOrderEdit.vue

@@ -96,24 +96,59 @@
           border
           max-height="450"
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
-        >
+        > 
+         <el-table-column align="center" width="200">
+             <template slot="header" slot-scope="scope">
+              <span>耗材名称</span>
+            </template>
+            <template slot-scope="scope">
+                <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="scope.row.good_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="false"
+                    placeholder="请输入耗材名称"
+                    @select="handleSelect"
+                    @input="changeGoodName(scope.$index)"
+                    style="width:160px;"
+                  >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.good_name }}</div>
+                  </template>
+                 </el-autocomplete>
+            </template>
+          </el-table-column>
           <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
-              <span>商品类型<span style="color: red">*</span></span>
+              <span>耗材类型<span style="color: red">*</span></span>
             </template>
 
             <template slot-scope="scope">
               <el-form-item style="padding-top: 15px">
                 <el-input
-                  placeholder="请输入商品类型"
+                  placeholder="请输入耗材类型"
                   v-model="scope.row.good_type_id"
                   :value="typeName(scope.row.good_type_id)"
-                  @focus="showDialog(scope.$index, scope.row)"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column align="center" width="200">
+            
+            <template slot="header" slot-scope="scope">
+              <span>规格&单位<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+
+              <el-form-item style="padding-top: 15px">
+                <el-input placeholder="请输入规格名称" v-model="scope.row.name"></el-input>
+              </el-form-item>
+
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
               <span>规格名称<span style="color: red">*</span></span>
             </template>
@@ -127,7 +162,7 @@
                 ></el-input>
               </el-form-item>
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
           <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
@@ -154,9 +189,7 @@
               <span>入库数量<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <!--{{scope.row.warehousing_count}}-->
-              <!--<el-input type="number" v-model="scope.row.warehousing_count"   @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
-
+             
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.warehousing_count'"
                 :rules="tableRules.warehousing_count"
@@ -166,7 +199,9 @@
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
+                  style="width:120px"
                 ></el-input>
+                {{scope.row.min_unit}}
               </el-form-item>
             </template>
           </el-table-column>
@@ -279,7 +314,8 @@ import {
   modifyWarehouseInfo,
   deleteWarehouseInfo,
   DeleteWarehouseInfoItem,
-  EditWarehouse
+  EditWarehouse,
+  postSearchGoodList
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 
@@ -608,6 +644,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          console.log("列表2222222",response.data.data.info)
           for (let i = 0; i < response.data.data.info.length; i++) {
             response.data.data.info[i].product_date = this.getTime(
               response.data.data.info[i].product_date,
@@ -617,16 +654,13 @@ export default {
               response.data.data.info[i].expiry_date,
               "{y}-{m}-{d}"
             );
-            response.data.data.info[i].price = response.data.data.info[
-              i
-            ].price.toString();
-            response.data.data.info[
-              i
-            ].warehousing_count = response.data.data.info[
-              i
-            ].warehousing_count.toString();
-
+            response.data.data.info[i].price = response.data.data.info[i].price.toString();
+            response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
+            response.data.data.info[i].good_name = response.data.data.info[i].GoodInfo.good_name
+            response.data.data.info[i].name = response.data.data.info[i].GoodInfo.specification_name + "*" + response.data.data.info[i].GoodInfo.min_number+response.data.data.info[i].GoodInfo.min_unit
+            response.data.data.info[i].min_unit = response.data.data.info[i].GoodInfo.min_unit
             this.recordInfo.recordData.push(response.data.data.info[i]);
+            console.log("列表",this.recordInfo.recordData)
           }
 
           this.warehouse = response.data.data.warehousing;
@@ -655,6 +689,54 @@ export default {
           }
         }
       });
+    },
+    querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        console.log("keyrowrd",key)
+        postSearchGoodList(key).then(response => {
+          if (response.data.state == 1) {
+          
+            var list = response.data.data.list
+            this.goodList = list
+            var manufacturerList = response.data.data.manufacturerList
+            this.manufacturerList = manufacturerList
+            for(let i=0;i<this.goodList.length;i++){
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                    this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+            }
+          
+            cb(this.goodList)
+          } else {
+            cb([])
+           }
+         })
+       },
+    changeGoodName(val){
+      this.currentIndex = val
+    },
+    handleSelect(val){
+      console.log("val",val)
+        for(let i=0;i<this.recordInfo.recordData.length;i++){
+          if(this.currentIndex == i){
+            this.recordInfo.recordData[i].good_type_id = val.id
+            this.recordInfo.recordData[i].good_name = val.good_name
+            this.recordInfo.recordData[i].good_type_id = val.good_type_id
+            this.recordInfo.recordData[i].name = val.specification_name + "*" + val.min_number+val.min_unit +"/"+val.packing_unit
+            this.recordInfo.recordData[i].number =  val.number
+            this.recordInfo.recordData[i].manufacturer = val.manufacturer
+            this.recordInfo.recordData[i].remark = val.remark
+            this.recordInfo.recordData[i].price = val.buy_price
+            this.recordInfo.recordData[i].specification_name = val.specification_name
+            this.recordInfo.recordData[i].good_id = val.id
+            this.recordInfo.recordData[i].min_unit = val.min_unit
+          }
+        }
     }
   },
   created() {

src/xt_pages/stock/stockOutOrder.vue

@@ -87,6 +87,7 @@
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266'
         }"
+       @current-change="handleSearch"
       >
         <el-table-column type="selection" width="55" align="center"> </el-table-column>
 
@@ -122,7 +123,7 @@
         <el-table-column label="操作" align="center" width="300px">
           <template slot-scope="scope">
            
-            <el-tooltip
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="详情"
@@ -135,7 +136,7 @@
                 @click="handleSearch(scope.row.id,scope.row)"
               >
               </el-button>
-            </el-tooltip>
+            </el-tooltip> -->
 
             <el-tooltip
               class="item"
@@ -184,6 +185,101 @@
 
 
 
+   <!--  详情 -->
+  <div v-show="tableShow">
+     <el-table
+        :data="tableList"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%"
+        border
+        highlight-current-row
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+       <el-table-column align="center" type="selection" width="55">
+       </el-table-column>
+
+       <el-table-column label="耗材名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.GoodInfo.good_name }}
+          </template>
+        </el-table-column>
+      
+        <el-table-column label="耗材类型" align="center">
+          <template slot-scope="scope">
+            {{  getTypeName(scope.row.GoodInfo.good_type_id)}}
+          </template>
+        </el-table-column>
+
+
+       <el-table-column label="规格&单位" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.GoodInfo.specification_name}} * {{scope.row.GoodInfo.min_number}}{{scope.row.GoodInfo.min_unit}}
+          </template>
+        </el-table-column>
+
+
+       <el-table-column label="批号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.number}}
+          </template>
+        </el-table-column>
+        
+        <el-table-column label="出库数量" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.count}}
+          </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.count * scope.row.price).toFixed(2)}}
+          </template>
+        </el-table-column>
+
+
+         <el-table-column label="生产厂家" align="center">
+          <template slot-scope="scope">
+            {{ getManufactuerName(scope.row.GoodInfo.manufacturer)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="生产日期" align="center">
+          <template slot-scope="scope">
+            {{ getTime(scope.row.product_date)}}
+          </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.remark }}
+          </template>
+        </el-table-column>
+       
+      </el-table>  
+    
+  </div>
+
 
     <!-- 新增弹窗 -->
 
@@ -639,7 +735,9 @@ export default {
         dealer: 0
       },
       isVisibility: false,
-      good_type_id:""
+      good_type_id:"",
+      tableShow:false,
+      tableList:[],
     };
   },
   methods: {
@@ -902,13 +1000,19 @@ export default {
 
     
     //新增
-    handleSearch(id,row){ 
+    // handleSearch(id,row){ 
       
-      this.warehousingOutInfo.info = []
-      this.warehousingOutInfo.warehousingOutData = []
-      this.GetOrderDetailOne(id)
-      this.GetTotalCount(row.warehouse_out_time)
+    //   this.warehousingOutInfo.info = []
+    //   this.warehousingOutInfo.warehousingOutData = []
+    //   this.GetOrderDetailOne(id)
+    //   this.GetTotalCount(row.warehouse_out_time)
       
+    // },
+
+    handleSearch(val){
+      this.tableList = []
+      this.GetOrderDetailOne(val.id)
+      this.GetTotalCount(val.warehouse_out_time)
     },
   
     //获取出库单详情数据
@@ -923,13 +1027,13 @@ export default {
             this.$message.error(response.data.msg)
             return false
           } else {
+            this.tableShow = true
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
-            }
 
+              this.tableList.push(response.data.data.list[i])
+            }
             this.warehousingOutInfo.info = response.data.data.info
-
-            console.log("出库222222222",this.warehousingOutInfo)           
             // this.handleSpanTempArr()
           }
         })
@@ -1052,7 +1156,7 @@ export default {
               var stockCount = response.data.data.stockCount
               console.log("出库数量2323",stockCount)
               this.stockCount = stockCount
-              this.dialogVisible = true
+              // this.dialogVisible = true
            }
         })
       },