diff --git a/src/views/oms/emisWaybill/WsInBatchList.vue b/src/views/oms/emisWaybill/WsInBatchList.vue
new file mode 100644
index 0000000..9fa907a
--- /dev/null
+++ b/src/views/oms/emisWaybill/WsInBatchList.vue
@@ -0,0 +1,392 @@
+<template>
+  <div >
+
+    <div style="display:inline-flex;width: 100%;border-bottom: 1px solid #d9d9d9;margin-bottom: 20px;">
+        <div class="form-group-title"><span class="title">{{ $t('进仓记录') }}</span></div>
+      </div>
+      <!-- <el-scrollbar style="height: 100%"> -->
+        <!-- 如果显示子单勾选则循环显示子单 -->
+        <div v-for="(item,index) in emisWarehouseInBatchList" :key="resetRefreshId+'.'+index">
+          <CardWithHeader :header="'入仓时间:'+item.entryDate + '          操作员:' + (item.createByName==null?'':item.createByName)+' 进仓子单号:'+item.inNo+'-'+(item.inBatchNo==null?'':item.inBatchNo)" >
+              <template v-slot:body>
+                <div>
+                        <el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 8px;margin-bottom:8px;color:black;font-weight:bold">
+                            <el-col :span="3">
+                                    件数:{{ item.parcelQty }}
+                              </el-col>
+                              <el-col :span="3">
+                                    重量：{{ item.billWeight }}(kg)
+                              </el-col>
+                              <el-col :span="3">
+                                    体积：{{ item.totalVolume }}(m³)
+                              </el-col>
+                        </el-row>
+                </div>
+
+                <div style="margin-top:10px">
+                    <el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 8px;margin-bottom:8px;color:black;font-weight:bold">
+                      <el-col :span="5">
+                          快递公司: <dict-tag :options="dict.type.emis_express_code" :value="item.prepareInExpress"/>
+                        </el-col>
+                        <el-col :span="5">
+                          快递单号:{{ item.prepareInBillCode }}
+                        </el-col>
+                        <el-col :span="6">
+                          是否代垫运费:
+                          <span v-if="item.blPrepareInFreight==1">是</span>
+                          <span v-else>否</span>
+
+                        </el-col>
+                        <el-col :span="5" v-if="item.blPrepareInFreight==1">
+                          代垫运费:{{ item.prepareInEstFee }} 元
+                        </el-col>
+                        <el-col :span="5">
+                          自定义标识:{{item.prepareInRemark  }}
+
+                        </el-col>
+
+
+                      </el-row>
+                  </div>
+
+                <div >
+
+                      <el-table
+                            :cell-style="{
+                              'padding': '0px!important',
+                              'padding-left': '0px!important',
+                              'padding-right': '0px!important',
+                              'font-size':'11px'
+                            }"
+                            :header-cell-style="{
+                              'font-size':'11px'
+                            }"
+                              border
+                              stripe
+                              :data="item.cargoList"
+                              size="mini"
+                              style="width: 100%"
+
+                            >
+                              <el-table-column  :label="$t('序号')" align="center" width="60">
+                                    <template slot-scope="scope">
+                                        <span > {{scope.$index+1}}</span>
+                                    </template>
+                              </el-table-column>
+                              <el-table-column prop="goodsName" label="品名" align="center" min-width="120" :show-overflow-tooltip="true">
+                                <template slot-scope="scope">
+                                  <span > {{scope.row.goodsName}}</span>
+                                </template>
+                              </el-table-column>
+                              <el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="60">
+                                <template slot-scope="scope">
+                                  <span > {{scope.row.cargoQty}}</span>
+                                </template>
+                              </el-table-column>
+                              <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="80">
+                                <template slot-scope="scope">
+                                  <span > {{scope.row.length}}</span>
+                                </template>
+                              </el-table-column>
+                              <el-table-column prop="width"  :label="$t('宽(cm)')"  align="center" width="80">
+                                <template slot-scope="scope">
+                                  <span > {{scope.row.width}}</span>
+                                </template>
+                              </el-table-column>
+                              <el-table-column prop="height"   :label="$t('高(cm)')" align="center" width="80">
+                                <template slot-scope="scope">
+                                  <span > {{scope.row.height}}</span>
+                                </template>
+                              </el-table-column>
+                              <!-- <el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
+                                <template slot-scope="scope">
+                                  <el-input  v-model="scope.row.goodsModel" size="mini" ></el-input>
+                                </template>
+                              </el-table-column> -->
+                              <el-table-column prop="goodsName" label="品牌" align="center" width="80" :show-overflow-tooltip="true">
+                                <template slot-scope="scope">
+                                  <span > {{scope.row.brand}}</span>
+                                </template>
+                              </el-table-column>
+                              <!--
+                              <el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
+                                <template slot-scope="scope">
+                                  <el-input  v-model="scope.row.hscode" size="mini" placeholder=""></el-input>
+                                </template>
+                              </el-table-column> -->
+
+                              <el-table-column prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true">
+                                <template slot-scope="scope">
+                                  <span > {{scope.row.material}}</span>
+                                </template>
+                              </el-table-column>
+                              <el-table-column prop="purpose" label="用途" align="center" width="60" :show-overflow-tooltip="true">
+                                <template slot-scope="scope">
+                                  <span > {{scope.row.purpose}}</span>
+                                </template>
+                              </el-table-column>
+                              <el-table-column prop="ingredients" label="成分" align="center" width="60" :show-overflow-tooltip="true">
+                                <template slot-scope="scope">
+                                  <span > {{scope.row.ingredients}}</span>
+                                </template>
+                              </el-table-column>
+                              <el-table-column prop="supplier" label="供应商" align="center" min-width="80" :show-overflow-tooltip="true">
+                                <template slot-scope="scope">
+                                  <span > {{scope.row.supplier}}</span>
+                                </template>
+                              </el-table-column>
+
+                      </el-table>
+
+                  </div>
+
+                  <div style="margin-top: 10px;padding: 10px 0px;border-top: 1px solid #e6ebf5;">
+                        <!-- <div>进仓图片：</div> -->
+                        <div v-if="item.picUrl" style="display:inline-flex">
+                          <div >
+                            <ImagePreview height="40px" v-for="(pic,index2) in (item.picUrl||'').split(',')" :key="index2" :src="pic" ></ImagePreview>
+                          </div>
+                        </div>
+                  </div>
+              </template>
+          </CardWithHeader>
+      </div>
+
+
+  </div>
+</template>
+
+<script>
+import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+import CardWithHeader from '@/components/CardWithHeader/index.vue';
+import { getWarehouseInDetail} from "@/api/oms/emisWarehouseIn";
+
+export default {
+  name: "emisWarehouseInBatch",
+  components: { elDateSimplePicker,CardWithHeader },
+  props:{
+    inNo:{
+        type:String
+    },
+    stockInBatchList:{
+      type:Array,
+      default:()=>[]
+    }
+  },
+  dicts: [
+  ],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      resetRefreshId:null,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 进仓单批次表格数据
+      emisWarehouseInBatchList: this.stockInBatchList,
+
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+      // 更新站点时间范围
+      daterangeEntryDate: [],
+      // 更新站点时间范围
+      daterangeConfirmDate: [],
+      // 更新站点时间范围
+      daterangeCreateTime: [],
+      // 更新站点时间范围
+      daterangeUpdateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        serialNo: null,
+        inNo: null,
+        inBatchNo: null,
+        customerCode: null,
+        customerName: null,
+        orderSn: null,
+        billCode: null,
+        transCarNo: null,
+        entryDate: null,
+        confirmStatus: null,
+        confirmDate: null,
+        status: null,
+        totalParcelQty: null,
+        totalVolume: null,
+        totalWeight: null,
+        remark: null,
+        delFlag: null,
+      },
+    };
+  },
+  created() {
+    this.queryParams.inNo=this.inNo;
+    // this.getList();
+  },
+  methods: {
+    /** 查询进仓单批次列表 */
+    getList() {
+      this.loading = true;
+      // listEmisWarehouseInBatch(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+
+      //   this.emisWarehouseInBatchList = response.rows;
+      //   this.resetRefreshId="wsbatch-"+Math.random().toString(36).substring(3,10);
+
+      //   this.total = response.total;
+      //   this.loading = false;
+      // });
+      getWarehouseInDetail(this.inNo).then(response => {
+        // this.emisWarehouseInBatchList = response.data;
+        // this.resetRefreshId="wsbatch-"+Math.random().toString(36).substring(3,10);
+
+        // this.total = response.total;
+        // this.loading = false;
+      });
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.currentId=null;
+      this.openForm= true;
+      this.titleForm = "新增";
+    },
+    handleShowMoreInput(){
+      this.moreInputVisible = !this.moreInputVisible;
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+       this.currentId= row.id;
+       this.openForm = true;
+       this.titleForm = "修改";
+    },
+    handleView(row) {
+       this.id=row.id;
+       this.titleView="查看";
+       this.openView=true;
+    //   this.router.push({ path: '/emis/emisWarehouseInBatch/viewDetail', query: { id: row.id }})
+    },
+    handleFormChanged(){
+        this.openForm = false;
+        this.getList();
+    },
+    cancelForm(){
+      this.openForm = false;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除').then(function() {
+        return delEmisWarehouseInBatch(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+    //   this.download('emis/emisWarehouseInBatch/export', {
+    //     ...this.queryParams
+    //   }, `emisWarehouseInBatch_${new Date().getTime()}.xlsx`)
+     const loadingInstance = this.$loading({
+            text: '正在导出...'
+        })
+       var qParam = {...this.queryParams};
+       qParam.pageNum=1;
+       qParam.pageSize=5000;
+
+       listEmisWarehouseInBatch(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
+        this.downloadLoading = false
+        if (response.code === 200) {
+                const curList = response.rows
+                import('@/vendor/Export2Excel').then(excel => {
+                  const tHeader = ['id','进仓序列号','进仓单号','进仓子批次单号in_no+001','客户编号','客户名称','订单号','运单号','运输工具编号','进仓日期','客户确认状态','确认时间','状态','总件数','总体积','总重量','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
+                  const filterVal = ['id','serialNo','inNo','inBatchNo','customerCode','customerName','orderSn','billCode','transCarNo','entryDate','confirmStatus','confirmDate','status','totalParcelQty','totalVolume','totalWeight','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
+                  const data = this.formatJson(filterVal, curList, response.rows)
+                  excel.export_json_to_excel({
+                    header: tHeader,
+                    data,
+                    filename: '进仓单批次',
+                    autoWidth: true
+                  })
+                  loadingInstance.close()
+                })
+        }
+      });
+    },
+    formatJson(filterVal, jsonData, resData) {
+      let index = 0
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'status') {
+          var statusStr='xxx'
+          if(v[j] == 10){
+              statusStr='xxx'
+          }
+          return statusStr;
+        }
+        return v[j]
+      }))
+    },
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+    /** 时间搜索响应函数 */
+    dateTimeChange(value){
+        this.dateTimeRange=value;
+    },
+  }
+};
+</script>
+
+<style scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+</style>
diff --git a/src/views/oms/orderCheck/WarehouseInBatchPanel.vue b/src/views/oms/orderCheck/WarehouseInBatchPanel.vue
index b9ad4b1..14a836c 100644
--- a/src/views/oms/orderCheck/WarehouseInBatchPanel.vue
+++ b/src/views/oms/orderCheck/WarehouseInBatchPanel.vue
@@ -52,7 +52,7 @@
 
   <div style="margin-bottom:20px">
       <div>
-        <!-- <WsInBatchList :inNo="inNo"> </WsInBatchList> -->
+        <WsInBatchList :inNo="settleBillNo" :stockInBatchList="whsInInfo.stockInBatchList"> </WsInBatchList>
       </div>
   </div>
 
@@ -67,11 +67,13 @@
 <script>
 import { getWarehouseInDetail} from "@/api/oms/emisWarehouseIn";
 import OrderDetailReadOnly from '@/views/oms/emisWaybill/OrderDetailReadOnly.vue';
+import WsInBatchList from '@/views/oms/emisWaybill/WsInBatchList.vue';
 
 export default {
-  name: "emisWarehouseInBatch",
+  name: "WarehouseInBatchPanel",
   components: {
     OrderDetailReadOnly,
+    WsInBatchList
   },
   dicts: [
   ],
@@ -169,9 +171,8 @@ export default {
         this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
         this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
       }
-      getWarehouseInDetail({inNo:this.settleBillNo}).then(response => {
+      getWarehouseInDetail({'inNo':this.settleBillNo}).then(response => {
         this.whsInInfo=response.data;
-        console.log('this.whsInInfo' , this.whsInInfo);
         this.loading = false;
       });
     },
diff --git a/src/views/oms/orderCheck/WarehouseInPanel.vue b/src/views/oms/orderCheck/WarehouseInPanel.vue
index 995e15f..4f02d56 100644
--- a/src/views/oms/orderCheck/WarehouseInPanel.vue
+++ b/src/views/oms/orderCheck/WarehouseInPanel.vue
@@ -176,20 +176,7 @@
                 <el-tag v-if="scope.row.stockInFlag=='2'" type="warning">部分入仓</el-tag>
               </template>
       </el-table-column>
-
-      <!-- <el-table-column :label="$t('状态')" align="center" prop="status" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
-
-      <!-- <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
-       -->
-
-      <!-- <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
-       -->
        <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-       <!-- <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/> -->
-
     </XdTable>
 <!--
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>