diff --git a/src/views/oms/emisWaybill/SendOrderbillList.vue b/src/views/oms/emisWaybill/SendOrderbillList.vue
index 09e65d0..23eec0f 100644
--- a/src/views/oms/emisWaybill/SendOrderbillList.vue
+++ b/src/views/oms/emisWaybill/SendOrderbillList.vue
@@ -540,10 +540,30 @@
       <WaybillDetailReadOnly  :key="currentTraceBillCode" :billCode="currentTraceBillCode" ></WaybillDetailReadOnly>
     </el-dialog>
 
+    <div>
+      <el-image-viewer
+             v-if="showViewer"
+             :on-close="closeViewer"
+             :url-list="[billPicSendRmk]"
+        />
+    </div>
+
     <el-dialog title="查看揽收底单图片" :visible.sync="openShowGotPic" width="30%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
 
       <div>
-        <el-image :src="billPicSendRmk" style="width: 200px"></el-image>
+        <!-- <el-image :src="billPicSendRmk" style="width: 200px"></el-image> -->
+              <ImagePreview height="300px" :key="billPicSendRmk" :src="billPicSendRmk" >
+              </ImagePreview>
+              <el-image
+                :src="`${realSrc}`"
+                fit="cover"
+                :style="`width:${realWidth};height:${realHeight};`"
+                :preview-src-list="realSrcList"
+              >
+                <div slot="error" class="image-slot">
+                  <i class="el-icon-picture-outline"></i>
+                </div>
+            </el-image>
       </div>
 
     </el-dialog>
@@ -590,13 +610,14 @@ import WaybillDetailReadOnly from '@/views/oms/emisWaybill/WaybillDetailReadOnly
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
 import { formatSearchStr,deepClone } from '@/utils/index'
 import clip from '@/utils/clipboard'
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 
 export default {
   name: "SendWaybillList",
   // name: "DispatchWaybillList",
 
   components: {
-
+    ElImageViewer,
     EmisMonthpayAccountPicker,
     elDateAdvPicker,
     CountryPicker1,
@@ -646,6 +667,7 @@ export default {
       openForm: false,
       titleForm: "",
       billCode:null,
+      currentSelectBill:null,
 
 
       openTraceInfo:false,
@@ -666,6 +688,7 @@ export default {
 
       openShowGotPic:false,
       billPicSendRmk:null,
+      showViewer: false,
 
       // 时间搜索
       dateRange:[],
@@ -915,14 +938,18 @@ export default {
     },
     handleShowGotPic(row){
 
-      if(!this.billPicSendRmk){
-         this.$modal.msgError("无揽收底单" );
-          return
+      if(!this.currentSelectBill.orderStatus==0){
+         this.$modal.msgError("未揽收" );
+        return
       }
 
-      if(this.billPicSendRmk){
-        this.openShowGotPic=true;
-      }
+      this.billPicSendRmk=process.env.VUE_APP_BASE_API+"/oms2c/common/getGotImage?billCode="+this.billCode;
+      // this.billPicSendRmk='https://api.sapp.tanex56.com/api/omssvr/oms2c/common/getGotImage?billCode=T7080300122056';
+      this.showViewer=true;
+
+    },
+    closeViewer() {
+      this.showViewer = false
     },
     handleCopyOrderRecord(row){
       this.$router.push({
@@ -1008,6 +1035,7 @@ export default {
     handleSelectionChange(selection) {
       console.log("====>selection==>",selection)
       if(selection!=null){
+        this.currentSelectBill = selection[0];
         this.billCode=selection[0].billCode;
         this.billPicSendRmk=selection[0].billPicSendRmk;
 
diff --git a/src/views/oms/orderCheck/WarehouseInPanel.vue b/src/views/oms/orderCheck/WarehouseInPanel.vue
index 672306a..2ee5c0c 100644
--- a/src/views/oms/orderCheck/WarehouseInPanel.vue
+++ b/src/views/oms/orderCheck/WarehouseInPanel.vue
@@ -70,7 +70,7 @@
               </el-select>
       </el-form-item>
       <el-form-item   :label="$t('进仓状态')" prop="status">
-              <el-select  clearable v-model="queryParams.status" placeholder="">
+              <el-select  clearable v-model="queryParams.stockInFlag" placeholder="">
                   <el-option key="0" label="未进仓" value="0"></el-option>
                   <el-option key="1" label="已进仓" value="1"></el-option>
                   <el-option key="2" label="部分进仓" value="2"></el-option>
@@ -171,9 +171,9 @@
       <el-table-column :label="$t('确认时间')" align="center" prop="confirmDate" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('进仓状态')" align="center" prop="status" min-width="100" >
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.status=='0'" type="info">未入库</el-tag>
-                <el-tag v-if="scope.row.status=='1'" type="success">已入仓</el-tag>
-                <el-tag v-if="scope.row.status=='2'" type="warning">部分入仓</el-tag>
+                <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>
               </template>
       </el-table-column>