diff --git a/src/views/oms/orderCheck/WarehouseInPanel.vue b/src/views/oms/orderCheck/WarehouseInPanel.vue
index abd172a..3c4d89c 100644
--- a/src/views/oms/orderCheck/WarehouseInPanel.vue
+++ b/src/views/oms/orderCheck/WarehouseInPanel.vue
@@ -10,7 +10,7 @@
                       </el-radio-group>
                   </div>
                   <XdTextareaInput
-                    v-model="queryParams.billCode"
+                    v-model="queryParams.queryKey"
                     :placeholder="$t('多个流水号逗号或换行隔开')"
                     clearable
                     :rows="2"
@@ -23,7 +23,7 @@
             <elDateSimplePicker  placeholder="" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateSimplePicker>
       </el-form-item>
 
-      <!-- <el-form-item label="" prop="orderSn">
+      <!-- <el-form-item label="" prop="orderSn"> 
         <el-input
           v-model="queryParams.orderSn"
           :placeholder="$t('订单号')"
@@ -131,18 +131,25 @@
                   @click="handleView"
                 >查看进仓信息</el-button>
               </el-col>
-
-
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
                   icon="el-icon-download"
                   size="mini"
-                  @click="handleExport"
-                  v-hasPermi="['emis:emisWarehouseIn:export']"
-                >导出</el-button>
-              </el-col> -->
+                  :disabled="single"
+                  @click="handleDownload"
+                >下载打印PDF</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="single || currentSelectOrder.confirmStatus=='1' || currentSelectOrder.stockInFlag !=='1' "
+                  @click="confirmJinCang"
+                >确认可发货</el-button>
+              </el-col>
           </el-row>
       </div>
 
@@ -173,12 +180,12 @@
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.stockInFlag=='0'" type="info">未入库</el-tag>
                 <el-tag v-if="scope.row.stockInFlag=='1'" type="success">已入仓</el-tag>
-                <el-tag v-if="scope.row.stockInFlag=='2'" type="warning">部分入仓</el-tag>
+                <el-tag v-if="scope.row.stockInFlag=='2'" type="warning">部分入仓</el-tag>      
               </template>
       </el-table-column>
        <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
     </XdTable>
-<!--
+<!-- 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
       <emisWarehouseInForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWarehouseInForm>
     </el-dialog> -->
@@ -189,7 +196,7 @@
 </template>
 
 <script>
-import { listSimpleEmisWarehouseIn } from "@/api/oms/emisWarehouseIn";
+import { listSimpleEmisWarehouseIn, cusConfirmWsIn } from "@/api/oms/emisWarehouseIn";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 
 export default {
@@ -241,6 +248,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 20,
+        queryKey: null,
         serialNo: null,
         inNo: null,
         orderSn: null,
@@ -255,7 +263,7 @@ export default {
         remark: null,
         delFlag: null,
         params:{
-          queryStatusType:null
+          queryStatusType:null,
         }
       },
     };
@@ -272,10 +280,13 @@ export default {
     getList() {
       this.loading = true;
 
-       // 按运单查询时的处理
-       if(this.queryOrderType==2){
-        this.queryParams.inNo=this.queryParams.billCode;
+       // 按运单查询时的处理 
+       if(this.queryOrderType=='2'){
+        this.queryParams.inNo=this.queryParams.queryKey;
         this.queryParams.billCode=null;
+      }else {
+        this.queryParams.inNo=null;
+        this.queryParams.billCode = this.queryParams.queryKey;
       }
 
       listSimpleEmisWarehouseIn(this.addDateRange(this.queryParams, this.dateTimeRange,"createTime")).then(response => {
@@ -422,8 +433,24 @@ export default {
     },
     /** 时间搜索响应函数 */
     dateTimeChange(value){
-        this.dateTimeRange=value;
+        this.dateTimeRange=value;                   
     },
+    handleDownload(){
+      this.download('oms2c/common/exportWarehouseInTpl', {
+        'orderSn':this.currentSelectOrder.orderSn
+      }, `emisWarehouseIn_${new Date().getTime()}.pdf`)
+    },
+    confirmJinCang(){
+        cusConfirmWsIn({
+          'confirmStatus':'1',
+          'inNo':this.currentSelectOrder.inNo
+        }).then(response => {
+          if (response.code === 200) {
+            this.$modal.msgSuccess("确认成功");
+            this.getList();
+          }
+        })
+    }
   }
 };
 </script>