diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue
index 3dff2858..46b1ae1a 100644
--- a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue
+++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue
@@ -42,7 +42,7 @@
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
+            <!-- <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">
                 <span slot="label">供货单位：</span>
               </el-form-item>
@@ -58,6 +58,23 @@
                  </el-option>
              </el-select>
               </el-form-item>
+            </el-col> -->
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">供货单位：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-select v-model="purchaseForm.custId" placeholder="请选择" @change="setCustername(purchaseForm.custId)"  style="width: 100%;" >
+                 <el-option
+                   v-for="(custName,i) in custList"
+                   :key="i"
+                   :label="custName.enterpriseName"
+                   :value="custName.sid">
+                 </el-option>
+               </el-select>
+              </el-form-item>
             </el-col>
             <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">
@@ -72,9 +89,9 @@
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
+            <!-- <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">
-                <span slot="label">客户名称：</span>
+                <span slot="label">供货单位：</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -88,11 +105,11 @@
                  </el-option>
                </el-select>
               </el-form-item>
-            </el-col>
+            </el-col> -->
 
             <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">
-                <span slot="label">仓库名称：</span>
+                <span slot="label">入库仓库：</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -115,8 +132,8 @@
                 <span style="margin-left: 15px;">商品信息</span><div class="span" @click.stop="add()"><i class="el-icon-plus"></i>添加货物</div>
               </template>
               <el-table  :data="purchaseForm.products" border style="width: 100%;"
-                :row-style="{height: '40px'}">
-                <el-table-column label="质物名称" width="150" prop="proName" align="center">
+                :row-style="{height: '40px'}" class="TableInput">
+                <el-table-column label="质物名称" width="180" prop="proName" align="center">
                   <template slot-scope="scope">
                      <el-select v-model="scope.row.proId" placeholder="请选择"  @change="selectPro(scope.row)" >
                          <el-option
@@ -128,24 +145,14 @@
                      </el-select>
                     </template>
                 </el-table-column>
-                <!-- <el-table-column label="商品品类" width="120" prop="productTypeName" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.productTypeName" placeholder="商品品类" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="商品品牌" width="120" prop="brandInfoName" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.brandInfoName" placeholder="商品品牌" clearable></el-input>
-                  </template>
-                </el-table-column> -->
                 <el-table-column label="规格（型号）" width="120" prop="proModel" align="center">
                   <template slot-scope="scope">
                     <el-input v-model="scope.row.proModel" placeholder="" clearable></el-input>
                   </template>
                 </el-table-column>
-                <el-table-column label="单价(元)" width="120" prop="estimateConfirmedPrice" align="center">
+                <el-table-column label="生产厂家(产地)" width="230" prop="manufacturer" align="center">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.estimateConfirmedPrice" @input="limitInput1($event,scope.$index)" placeholder="" clearable></el-input>
+                    <el-input v-model="scope.row.manufacturer" placeholder="" clearable ></el-input>
                   </template>
                 </el-table-column>
                 <el-table-column label="数量/重量" width="140"  prop="estimateNum" align="center">
@@ -153,47 +160,22 @@
                     <el-input v-model="scope.row.estimateNum" @input="limitInput2($event,scope.$index)" placeholder="" clearable></el-input>
                   </template>
                 </el-table-column>
-                <el-table-column label="总价值(元)" width="150px" prop="estimateCalculatedValue" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.estimateCalculatedValue"  :readonly="true"   placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="规格单位" width="130" prop="proUnit" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.proUnit" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="生产厂家(产地)" width="150" prop="manufacturer" align="center">
+                <el-table-column label="单价(元)" width="150" prop="estimateConfirmedPrice" align="center">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.manufacturer" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column label="实际数量(个)" width="120px" prop="realityNum" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.realityNum" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column>
-                <!-- <el-table-column label="实际重量" width="100px" prop="realityWeight" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.realityWeight" placeholder="" clearable></el-input>
-                  </template>
-                </el-table-column> -->
-                <el-table-column label="实际质权人确认的单价(元)" width="220px"  prop="realityConfirmedPrice" align="center">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.realityConfirmedPrice" placeholder="" clearable></el-input>
+                    <el-input v-model="scope.row.estimateConfirmedPrice" @input="limitInput1($event,scope.$index)" placeholder="" clearable></el-input>
                   </template>
                 </el-table-column>
-                <el-table-column label="实际核算的价值(元)" width="160px" prop="realityCalculatedValue" align="center">
+                <el-table-column label="质物总价(元)" width="150px" prop="estimateCalculatedValue" align="center">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.realityCalculatedValue" placeholder="" clearable></el-input>
+                    <el-input v-model="scope.row.estimateCalculatedValue"  :readonly="true"   placeholder="" clearable></el-input>
                   </template>
                 </el-table-column>
-                <el-table-column label="货位号" width="150px" prop="locationNumber" align="center">
+                <el-table-column label="货位号"  prop="locationNumber" align="center">
                   <template slot-scope="scope">
                     <el-input v-model="scope.row.locationNumber" placeholder="" clearable></el-input>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" fixed="right" align="center" width="150">
+                <el-table-column label="操作" fixed="right" align="center" width="120">
                   <template slot-scope="scope">
                     <el-button type="primary" size="mini" @click="doCommoditylDel(scope.$index)">删除</el-button>
                   </template>
@@ -528,5 +510,8 @@
    .el-input__inner {
      height: 36px;
     }
+    .TableInput .el-input /deep/ .el-input__inner {
+    text-align: center;
+    }
   </style>
 
diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseShow.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseShow.vue
index 39b1a700..317884a7 100644
--- a/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseShow.vue
+++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseShow.vue
@@ -37,15 +37,25 @@
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
+            <!-- <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">
-                <span slot="label">供货商名称：</span>
+                <span slot="label">供货单位：</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
             <el-form-item prop="supplier" class="trightb_item">
              <span>{{purchaseForm.supplierName}}</span>
               </el-form-item>
+            </el-col> -->
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">供货单位：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+               <span>{{purchaseForm.custName}}</span>
+              </el-form-item>
             </el-col>
             <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">
@@ -60,7 +70,7 @@
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
+            <!-- <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">
                 <span slot="label">客户名称：</span>
               </el-form-item>
@@ -69,11 +79,11 @@
               <el-form-item class="trightb_item">
                <span>{{purchaseForm.custName}}</span>
               </el-form-item>
-            </el-col>
+            </el-col> -->
 
             <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">
-                <span slot="label">仓库名称：</span>
+                <span slot="label">入库仓库：</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -91,33 +101,19 @@
               <el-table  :data="purchaseForm.products" border style="width: 100%;"
                 :row-style="{height: '40px'}">
                 <el-table-column label="序号" type="index" width="60" fixed  align="center" />
-                <el-table-column label="商品名称" width="120" prop="proName" align="center">   
+                <el-table-column label="质物名称" width="180" prop="proName" align="center">   
                 </el-table-column>
-                <el-table-column label="商品品类" width="120" prop="productTypeName" align="center">
+                <el-table-column label="规格（型号）" width="120" prop="proModel" align="center">
                 </el-table-column>
-                <el-table-column label="商品品牌" width="120" prop="brandInfoName" align="center">
+                <el-table-column label="生产厂家(产地)" width="230" prop="manufacturer" align="center">
                 </el-table-column>
-                <el-table-column label="规格（型号）" width="150" prop="proModel" align="center">
+                <el-table-column label="数量/重量" width="150"  prop="estimateNum" align="center">
                 </el-table-column>
-                <el-table-column label="单价(元)" width="140" prop="estimateConfirmedPrice" align="center">
+                <el-table-column label="单价(元)" width="150" prop="estimateConfirmedPrice" align="center">
                 </el-table-column>
-                <el-table-column label="数量/重量" width="160"  prop="estimateNum" align="center">
+                <el-table-column label="质物总价(元)" width="180px" prop="estimateCalculatedValue" align="center">
                 </el-table-column>
-                <el-table-column label="总价值(元)" width="150px" prop="estimateCalculatedValue" align="center">
-                </el-table-column>
-                <el-table-column label="规格单位" width="130" prop="proUnit" align="center">
-                </el-table-column>
-                <el-table-column label="生产厂家(产地)" width="150" prop="manufacturer" align="center">
-                </el-table-column>
-                <el-table-column label="实际数量" width="100px" prop="realityNum" align="center">
-                </el-table-column>
-                <el-table-column label="实际重量" width="100px" prop="realityWeight" align="center">
-                </el-table-column>
-                <el-table-column label="实际质权人确认的单价(元)" width="200px"  prop="realityConfirmedPrice" align="center">
-                </el-table-column>
-                <el-table-column label="实际核算的价值" width="150px" prop="realityCalculatedValue" align="center">
-                </el-table-column>
-                <el-table-column label="货位号" width="150px" prop="locationNumber" align="center">
+                <el-table-column label="货位号"  prop="locationNumber" align="center">
                 </el-table-column>
               </el-table>
 
@@ -137,22 +133,29 @@
            purchaseId: '',
            product: '',
            barCode: '',
+           custId:'',
+           custName:'',
            purchaseDate:'',
            purchaseNo:'',
            supplier: '',
            storehouseName:'',
-           supplierName:'',
+            storehouseId:"",
+          supplierName:'',
+          supplierId:'',
            count: '',
            storehouse: '',
            status: '',
            products:[]
         },
         activeNames: ['1'],
+        custList:[]
      }
     },
     mounted() {
     },
-    created() {},
+    created() {
+        
+    },
     methods: {
       handleReturn() {
         this.$emit("reloadlist");
@@ -163,8 +166,22 @@
        const { data: result } = await this.$http.get(`/purchasenew/fetchDetailsBySid/${row.sid}`)
          if (result.code==200) {
            _this.purchaseForm=result.data
+           this.getcustListList()
        }
-     }
+     },
+     async getcustListList () {
+      const { data: result } = await this.$http.get('/v1/shstorehouse/fetchEntList')
+      if (result.code == 200){
+        this.custList = result.data
+      }
+      if(this.purchaseForm.custId){
+        this.custList.forEach((v, i) => {
+          if(v.sid == this.purchaseForm.custId){
+            this.purchaseForm.custName = v.enterpriseName
+          }
+        })
+      }
+    },
     },
   };
   </script>
diff --git a/warehousing-system/project_web_ui/src/views/component/instorehouse/purchase.vue b/warehousing-system/project_web_ui/src/views/component/instorehouse/purchase.vue
index e0d56624..799cc18a 100644
--- a/warehousing-system/project_web_ui/src/views/component/instorehouse/purchase.vue
+++ b/warehousing-system/project_web_ui/src/views/component/instorehouse/purchase.vue
@@ -24,7 +24,7 @@
         <el-table-column label="序号" type="index" width="60" :index="indexMethod" align="center" />
         <el-table-column
           prop="custName"
-          label="客户名称"
+          label="供货单位"
           align="center"
           width="180">
         </el-table-column>
@@ -40,17 +40,17 @@
           align="center"
           width="180">
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="supplierName"
           label="供应商名称"
           align="center"
           width="180">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           prop="purchasePerson"
           label="采购申请人"
           align="center"
-          width="180">
+          width="140">
         </el-table-column>
         <el-table-column
           prop="storehouseName"
diff --git a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue
index 627e6c2b..49d75e36 100644
--- a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue
+++ b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue
@@ -109,7 +109,7 @@
                 <span style="margin-left: 15px;">出库商品明细</span><div class="span" @click.stop="add()"><i class="el-icon-plus"></i>添加货物</div>
               </template>
               <el-table  :data="purchaseForm.list" border style="width: 100%;"
-                :row-style="{height: '40px'}">
+                :row-style="{height: '40px'}" class="TableInput">
                 <el-table-column label="质物名称" width="120" prop="proName" align="center">
                     <template slot-scope="scope">
                      <el-select v-model="scope.row.proSid"  placeholder="请选择"  @change="selectPro(scope.row)" >
@@ -287,17 +287,19 @@
       },
       clearList() {
         this.purchaseForm={
+           sid:'',
            purchaseId: '',
            product: '',
            barCode: '',
            applicationDate:'',
            no:'',
            creatorName:'',
-          storeHouseName:'',
+           storeHouseName:'',
            storeHouseSid:"",
            custerName:'',
            custerSid:'',
-         list:[]
+           list:[],
+           outDate:""
          }
       },
       saveOrUpdate(){
@@ -517,5 +519,8 @@
    .el-input__inner {
      height: 36px;
     }
+    .TableInput .el-input /deep/ .el-input__inner {
+    text-align: center;
+    }
   </style>
 
diff --git a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListShow.vue b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListShow.vue
index c2bcde77..c28fdc5e 100644
--- a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListShow.vue
+++ b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListShow.vue
@@ -39,7 +39,7 @@
           <el-row>
             <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">
-                <span slot="label">供货商名称：</span>
+                <span slot="label">供货单位：</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -63,23 +63,23 @@
 
             <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">
-                <span slot="label">客户名称：</span>
+                <span slot="label">出库仓库：</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item class="trightb_item">
-               <span>{{purchaseForm.custName}}</span>
+               <span>{{purchaseForm.storeHouseName}}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">
-                <span slot="label">仓库名称：</span>
+                <span slot="label">出库日期：</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
             <el-form-item class="trightb_item">
-               <span>{{purchaseForm.storehouseName}}</span>
+               <span>{{purchaseForm.outDate}}</span>
              </el-form-item>
             </el-col>
           </el-row>
@@ -94,18 +94,17 @@
                 <el-table-column label="序号" type="index" width="60" fixed  align="center" />
                 <el-table-column label="质物名称"  prop="proName" align="center">   
                 </el-table-column>
-
                 <el-table-column label="规格（型号）" width="150" prop="proModel" align="center">
                 </el-table-column>
-                <el-table-column label="单价(元)" width="140" prop="estimateconfirmedPrice" align="center">
+                <el-table-column label="生产厂家(产地)" width="150" prop="manufacturer" align="center">
                 </el-table-column>
                 <el-table-column label="数量/重量" width="160"  prop="estimateNum" align="center">
                 </el-table-column>
-                <el-table-column label="总价值(元)" width="150px" prop="estimateCalculatedValue" align="center">
+                <el-table-column label="单价(元)" width="140" prop="estimateConfirmedPrice" align="center">
                 </el-table-column>
-                <el-table-column label="库存价值(元)" width="130" prop="realityCalculatedValue" align="center">
+                <el-table-column label="出库价值(元)" width="150px" prop="estimateCalculatedValue" align="center">
                 </el-table-column>
-                <el-table-column label="生产厂家(产地)" width="150" prop="manufacturer" align="center">
+                <el-table-column label="库存价值(元)" width="130" prop="realityCalculatedValue" align="center">
                 </el-table-column>
                 <el-table-column label="货位号" width="150px" prop="locationNumber" align="center">
                 </el-table-column>
@@ -124,20 +123,22 @@
       return {
         viewTitle: "出库信息",
         purchaseForm: {
+           sid:'',
            purchaseId: '',
            product: '',
            barCode: '',
-           purchaseDate:'',
-           purchaseNo:'',
-           supplier: '',
-           storehouseName:'',
-           supplierName:'',
-           count: '',
-           storehouse: '',
-           status: '',
-           products:[]
+           applicationDate:'',
+           no:'',
+           creatorName:'',
+           storeHouseName:'',
+           storeHouseSid:"",
+           custerName:'',
+           custerSid:'',
+           list:[],
+          outDate:""
         },
         activeNames: ['1'],
+        storehouseList:[]
      }
     },
     mounted() {
@@ -153,8 +154,22 @@
        const { data: result } = await this.$http.get(`/output/getOutStorehouse/${row.sid}`)
          if (result.code==200) {
            _this.purchaseForm=result.data
+           this.getStorehouseList()
        }
-     }
+     },
+     async getStorehouseList () {
+      const { data: result } = await this.$http.get("/v1/shstorehouse/listAll")
+      if (result.code == 200){
+        this.storehouseList = result.data
+       }
+     if(this.purchaseForm.storeHouseSid){
+        this.storehouseList.forEach((v, i) => {
+          if(v.sid == this.purchaseForm.storeHouseSid){
+            this.purchaseForm.storeHouseName = v.name
+          }
+        })
+      }
+      },
     },
   };
   </script>
diff --git a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/pickingShow.vue b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/pickingShow.vue
new file mode 100644
index 00000000..44c6fafa
--- /dev/null
+++ b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/pickingShow.vue
@@ -0,0 +1,243 @@
+<template>
+    <div>
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()"
+            >返回</el-button
+          >
+        </div>
+      </div>
+        <div class="listconadd">
+        <el-form ref="dataForm" :model="purchaseForm" label-position="top" label-width="190px" class="formadd">
+          <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+            <div style="margin-left: 15px;">主体信息</div>
+          </div>
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">订单编号：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item" prop="purchaseNo">
+             <span>{{purchaseForm.no}}</span>
+           </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">订单日期：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <span>{{purchaseForm.applicationDate}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">供货单位：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+            <el-form-item prop="supplier" class="trightb_item">
+             <span>{{purchaseForm.custerName}}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">采购申请人：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <span>{{purchaseForm.creatorName}}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+
+
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">出库仓库：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+               <span>{{purchaseForm.storeHouseName}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">出库日期：</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+            <el-form-item class="trightb_item">
+               <span>{{purchaseForm.outDate}}</span>
+             </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-collapse v-model="activeNames">
+            <el-collapse-item name="1">
+              <template slot="title" >
+                <span style="margin-left: 15px;">商品信息</span>
+              </template>
+              <el-table  :data="purchaseForm.list" border style="width: 100%;"
+                :row-style="{height: '40px'}">
+                <el-table-column label="序号" type="index" width="60" fixed  align="center" />
+                <el-table-column label="质物名称"  prop="proName" align="center">   
+                </el-table-column>
+                <el-table-column label="规格（型号）" width="150" prop="proModel" align="center">
+                </el-table-column>
+                <el-table-column label="生产厂家(产地)" width="150" prop="manufacturer" align="center">
+                </el-table-column>
+                <el-table-column label="数量/重量" width="160"  prop="estimateNum" align="center">
+                </el-table-column>
+                <el-table-column label="单价(元)" width="140" prop="estimateConfirmedPrice" align="center">
+                </el-table-column>
+                <el-table-column label="出库价值(元)" width="150px" prop="estimateCalculatedValue" align="center">
+                </el-table-column>
+                <el-table-column label="库存价值(元)" width="130" prop="realityCalculatedValue" align="center">
+                </el-table-column>
+                <el-table-column label="货位号" width="150px" prop="locationNumber" align="center">
+                </el-table-column>
+              </el-table>
+
+            </el-collapse-item>
+          </el-collapse>
+        </el-form>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  export default {
+    data() {
+      return {
+        viewTitle: "拣货信息",
+        purchaseForm: {
+           sid:'',
+           purchaseId: '',
+           product: '',
+           barCode: '',
+           applicationDate:'',
+           no:'',
+           creatorName:'',
+           storeHouseName:'',
+           storeHouseSid:"",
+           custerName:'',
+           custerSid:'',
+           list:[],
+          outDate:""
+        },
+        activeNames: ['1'],
+        storehouseList:[]
+     }
+    },
+    mounted() {
+    },
+    created() {},
+    methods: {
+      handleReturn() {
+        this.$emit("reloadlist");
+        this.$emit("doback");
+      },
+      async showEdit(row) {
+       const _this = this;
+       const { data: result } = await this.$http.get(`/output/getOutStorehouse/${row.sid}`)
+         if (result.code==200) {
+           _this.purchaseForm=result.data
+           this.getStorehouseList()
+       }
+     },
+     async getStorehouseList () {
+      const { data: result } = await this.$http.get("/v1/shstorehouse/listAll")
+      if (result.code == 200){
+        this.storehouseList = result.data
+       }
+     if(this.purchaseForm.storeHouseSid){
+        this.storehouseList.forEach((v, i) => {
+          if(v.sid == this.purchaseForm.storeHouseSid){
+            this.purchaseForm.storeHouseName = v.name
+          }
+        })
+      }
+      },
+    },
+  };
+  </script>
+  
+  <style scoped>
+  /deep/ .el-collapse-item__header {
+      height: 40px;
+      font-weight: bold;
+      font-size: 16px;
+      text-align: left;
+      color: #ffffff;
+      background-color: #0294d7;
+    }
+  
+    /deep/ .el-collapse-item__content {
+      padding-bottom: 0;
+    }
+    .trightb {
+      display: flex;
+      align-items: center;
+      text-align: center;
+      justify-content: center;
+    }
+  
+    .trightb_item {
+      padding-top: 5px;
+    }
+  
+    .span {
+      margin-left: 50px;
+      font-size: 15px;
+      font-weight: 400;
+    }
+    .formadd {
+      padding: 10px 40px 0 40px;
+      font-size: 16px;
+    }
+    .formadd .title {
+      font-weight: bold;
+      font-size: 16px;
+      background-color: #0294d7;
+      text-align: left;
+      color: #ffffff;
+    }
+    .first_row{
+      border-top: 1px solid #e0e3eb;
+    }
+    .formadd .el-row {
+      display: flex;
+      flex-wrap: wrap;
+      border-left: 1px solid #e0e3eb;
+    }
+    .formadd  .el-row .el-col {
+       border-right: 1px solid #e0e3eb;
+       border-bottom: 1px solid #e0e3eb;
+       padding: 0 15px;
+       min-height: 42px;
+       line-height: 1;
+    }
+    .formadd  .el-row .el-col .el-form-item {
+      margin-bottom: 0;
+      line-height: 42px;
+    }
+    .addinputw {
+      width: 80%;
+      line-height: 42px;
+    }
+   .el-input__inner {
+     height: 36px;
+    }
+  </style>
\ No newline at end of file
diff --git a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue
index 6c7c2929..913806ce 100644
--- a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue
+++ b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue
@@ -223,7 +223,7 @@ methods: {
   },
   async deletePurchase (purchase) {
     if(purchase.state=='2'){
-      this.$message.error('已经拣货的出库订单不能删除')
+      this.$message.error('已拣货的出库订单不能删除')
     }else{
       const sids = []
       sids.push(purchase.sid)
@@ -233,7 +233,7 @@ methods: {
         type: 'warning'
       }).catch(error => error)
       if (result !== 'confirm') return this.$message.info('用户取消操作')
-      const { data: resultDB } = await this.$http.post('/purchasenew/delBySids', sids)
+      const { data: resultDB } = await this.$http.post('/output/delBySids', sids)
       if (resultDB.code == 200)
       this.$message.success('订单删除成功')
       this.getPurchaseList()
@@ -252,7 +252,7 @@ methods: {
     console.log(row.state);
     if(row.state=='2'){
       this.$message({
-        message: '已经拣货的出库订单不能编辑',
+        message: '已拣货的出库订单不能编辑',
         type: 'warning'
       });
     }else{
diff --git a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/pickingManagement.vue b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/pickingManagement.vue
index 0233451d..98a78f65 100644
--- a/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/pickingManagement.vue
+++ b/warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/pickingManagement.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="app-container">
-   <div>
+   <div v-show="viewState == 1">
     <button-bar ref="btnbar" view-title="拣货管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
     <div class="main-content">
         <div class="searchcon">
@@ -64,6 +64,21 @@
             align="center"
             width="120">
           </el-table-column>
+          <el-table-column
+             prop="operate"
+             label="操作"
+             width="130"
+             align="center">
+             <template slot-scope="scope" >
+               <el-button
+                 type="primary"
+                 icon="el-icon-zoom-in"
+                 size="small"
+                 @click="LookPurchase(scope.row)"
+                 >查看详情</el-button
+               >
+        </template>
+      </el-table-column>
        </el-table>
        <div class="pages">
          <div class="tit" />
@@ -78,7 +93,7 @@
         </div>
       </div>
      </div>
-
+     <pickingShow v-show="viewState == 4" ref="storeAdd" @doback="resetState" @reloadlist="getPickingList" />
   </div>
 </template>
 
@@ -86,14 +101,17 @@
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
+import pickingShow from '@/views/component/outStorehouseManagement/add/pickingShow.vue'
 export default {
   components: {
 		ButtonBar,
 		Pagination,
 		pageye,
+    pickingShow
 	},
   data () {
     return {
+      viewState: 1,
       btndisabled: false,
       isSearchShow: false,
       queryInfo: {
@@ -139,6 +157,9 @@ export default {
       },
 			this.getPickingList()
 		},
+    resetState() {
+    this.viewState = 1
+    },
     indexMethod(index) {
       var pagestart = (this.queryInfo.current - 1) * this.queryInfo.size
       var pageindex = index + 1 + pagestart
@@ -160,7 +181,11 @@ export default {
          } else{
 			     return ''
 		 }
-        },
+   },
+     LookPurchase(row) {
+      this.viewState = 4
+      this.$refs['storeAdd'].showEdit(row)
+    },
     doClose() {
         this.$store.dispatch('tagsView/delView', this.$route)
         this.$router.go(-1)