diff --git a/src/views/emis/emisWarehouseInBatch/WarehouseInBatchPanel copy.vue b/src/views/emis/emisWarehouseInBatch/WarehouseInBatchPanel copy.vue
new file mode 100644
index 00000000..417da062
--- /dev/null
+++ b/src/views/emis/emisWarehouseInBatch/WarehouseInBatchPanel copy.vue	
@@ -0,0 +1,530 @@
+<template>
+  <div >
+    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+
+      <el-form-item label="" prop="serialNo">
+        <el-input
+          v-model="queryParams.serialNo"
+          :placeholder="$t('进仓序列号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="inNo">
+        <el-input
+          v-model="queryParams.inNo"
+          :placeholder="$t('进仓单号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="inBatchNo">
+        <el-input
+          v-model="queryParams.inBatchNo"
+          :placeholder="$t('进仓子批次单号in_no+001')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="customerCode">
+        <el-input
+          v-model="queryParams.customerCode"
+          :placeholder="$t('客户编号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="customerName">
+        <el-input
+          v-model="queryParams.customerName"
+          :placeholder="$t('客户名称')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="orderSn">
+        <el-input
+          v-model="queryParams.orderSn"
+          :placeholder="$t('订单号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="billCode">
+        <el-input
+          v-model="queryParams.billCode"
+          :placeholder="$t('运单号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="transCarNo">
+        <el-input
+          v-model="queryParams.transCarNo"
+          :placeholder="$t('运输工具编号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="entryDate">
+        <el-date-picker clearable
+          v-model="queryParams.entryDate"
+          type="date"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :placeholder="$t('进仓日期')">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="" prop="confirmStatus">
+        <el-input
+          v-model="queryParams.confirmStatus"
+          :placeholder="$t('客户确认状态')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="confirmDate">
+        <el-date-picker clearable
+          v-model="queryParams.confirmDate"
+          type="date"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :placeholder="$t('确认时间')">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="" prop="status">
+        <el-input
+          v-model="queryParams.status"
+          :placeholder="$t('状态')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="totalParcelQty">
+        <el-input
+          v-model="queryParams.totalParcelQty"
+          :placeholder="$t('总件数')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="totalVolume">
+        <el-input
+          v-model="queryParams.totalVolume"
+          :placeholder="$t('总体积')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="totalWeight">
+        <el-input
+          v-model="queryParams.totalWeight"
+          :placeholder="$t('总重量')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          :placeholder="$t('备注')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="" prop="delFlag">
+        <el-input
+          v-model="queryParams.delFlag"
+          :placeholder="$t('删除标志（0代表存在')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+    </SearchForm>
+
+
+    <XdTable v-loading="loading"
+           border
+           size="small"
+           :data="emisWarehouseInBatchList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="getList"
+           @selection-change="handleSelectionChange"
+           @sort-change="handleSortChange"
+           >
+
+      <div slot="toolbar">
+        <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['emis:emisWarehouseInBatch:add']"
+                >新增</el-button>
+              </el-col>
+              <!--
+              <el-col :span="1.5">
+                <el-button
+                  type="success"
+                  plain
+                  icon="el-icon-edit"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleUpdate"
+                  v-hasPermi="['emis:emisWarehouseInBatch:edit']"
+                >修改</el-button>
+              </el-col> -->
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleDelete"
+                  v-hasPermi="['emis:emisWarehouseInBatch:remove']"
+                >删除</el-button>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['emis:emisWarehouseInBatch:export']"
+                >导出</el-button>
+              </el-col> -->
+          </el-row>
+      </div>
+
+      <el-table-column type="selection" width="55" align="center" />
+      <!--
+      <el-table-column label="序号" align="center" min-width="60">
+             <template slot-scope="scope">
+                <span v-text="getIndex(scope.$index)"> </span>
+             </template>
+      </el-table-column>
+
+       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
+        <template slot-scope="scope">
+            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
+         </template>
+      </el-table-column>
+
+      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
+            <template slot-scope="scope">
+              <div v-if="scope.row.settleStatus == 0" style="color:red;">
+                    <span class="el-tag el-tag--info">未结算</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 10" style="color:red;">
+                <span class="el-tag">待确认</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 11" style="color:green;">
+                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 20" >
+                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 21" style="color:green;">
+                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
+              </div>
+              <div v-if="scope.row.settleStatus == 40" style="color:red;">
+                <span class="el-tag el-tag--danger">已拒绝</span>
+              </div>
+            </template>
+          </el-table-column>
+      -->
+
+      <el-table-column :label="$t('进仓序列号')" align="center" prop="serialNo" min-width="100" />
+      <el-table-column :label="$t('进仓单号')" align="center" prop="inNo" min-width="100" />
+      <el-table-column :label="$t('进仓子批次单号in_no+001')" align="center" prop="inBatchNo" min-width="100" />
+      <el-table-column :label="$t('客户编号')" align="center" prop="customerCode" min-width="100" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
+      <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
+      <el-table-column :label="$t('运输工具编号')" align="center" prop="transCarNo" min-width="100" />
+      <el-table-column :label="$t('进仓日期')" align="center" prop="entryDate" min-width="100" />
+      <el-table-column :label="$t('客户确认状态')" align="center" prop="confirmStatus" min-width="100" />
+      <el-table-column :label="$t('确认时间')" align="center" prop="confirmDate" min-width="100" />
+      <el-table-column :label="$t('状态')" align="center" prop="status" min-width="100" />
+      <el-table-column :label="$t('总件数')" align="center" prop="totalParcelQty" min-width="100" />
+      <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
+      <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
+      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" 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="createTime"  width="170"/>
+      <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="updateTime"  width="170"/>
+
+
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['emis:emisWarehouseInBatch:edit']"
+          >修改</el-button>
+          <!--
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['emis:emisWarehouseInBatch:remove']"
+          >删除</el-button> -->
+        </template>
+      </el-table-column>
+    </XdTable>
+
+    <!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
+      <emisWarehouseInBatchForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWarehouseInBatchForm>
+    </el-dialog> -->
+
+
+
+
+  </div>
+</template>
+
+<script>
+import { listEmisWarehouseInBatch, getEmisWarehouseInBatch, delEmisWarehouseInBatch, addEmisWarehouseInBatch, updateEmisWarehouseInBatch } from "@/api/emis/emisWarehouseInBatch";
+import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+// import emisWarehouseInBatchView from '@/views/emis/emisWarehouseInBatch/emisWarehouseInBatchView';
+// import emisWarehouseInBatchForm from '@/views/emis/emisWarehouseInBatch/emisWarehouseInBatchForm';
+
+export default {
+  name: "emisWarehouseInBatch",
+  components: { elDateSimplePicker },
+  dicts: [
+  ],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 进仓单批次表格数据
+      emisWarehouseInBatchList: [],
+
+      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.getList();
+  },
+  methods: {
+    /** 查询进仓单批次列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeEntryDate && '' != this.daterangeEntryDate) {
+        this.queryParams.params["beginEntryDate"] = this.daterangeEntryDate[0];
+        this.queryParams.params["endEntryDate"] = this.daterangeEntryDate[1];
+      }
+      if (null != this.daterangeConfirmDate && '' != this.daterangeConfirmDate) {
+        this.queryParams.params["beginConfirmDate"] = this.daterangeConfirmDate[0];
+        this.queryParams.params["endConfirmDate"] = this.daterangeConfirmDate[1];
+      }
+      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      }
+      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
+        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
+        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
+      }
+      listEmisWarehouseInBatch(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+        this.emisWarehouseInBatchList = response.rows;
+        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/emis/emisWarehouseInBatch/WsInBatchList.vue b/src/views/emis/emisWarehouseInBatch/WsInBatchList.vue
new file mode 100644
index 00000000..12841541
--- /dev/null
+++ b/src/views/emis/emisWarehouseInBatch/WsInBatchList.vue
@@ -0,0 +1,353 @@
+<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" >
+              <template v-slot:body>
+                <div>入仓货物</div>
+                <div >
+                      <el-table
+                              class="cargoList"
+                              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" 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" width="80" :show-overflow-tooltip="true">
+                                <template slot-scope="scope">
+                                  <span > {{scope.row.supplier}}</span>
+                                </template>
+                              </el-table-column>
+
+                      </el-table>
+
+                      <div style="margin-top:20px">
+                        <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>
+
+                      <!-- <div>
+                        <el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 20px;">
+                            <el-col :span="6">
+                                    总件数:{{ item.parcelQty }}
+                              </el-col>
+                              <el-col :span="6">
+                                  <el-form-item  :label="$t('总重量')"  prop="billWeight" label-width="70px">
+                                    {{ item.billWeight }}(kg)
+                                  </el-form-item>
+                              </el-col>
+                              <el-col :span="6">
+                                  <el-form-item  :label="$t('总体积')"  prop="totalVolume" label-width="70px" >
+                                    <div style="">
+                                      {{ item.totalVolume }}(m³)
+                                    </div>
+                                  </el-form-item>
+                                </el-col>
+                        </el-row>
+                      </div> -->
+
+                  </div>
+              </template>
+          </CardWithHeader>
+      </div>
+
+
+  </div>
+</template>
+
+<script>
+import { listEmisWarehouseInBatch, getEmisWarehouseInBatch, delEmisWarehouseInBatch, addEmisWarehouseInBatch, updateEmisWarehouseInBatch } from "@/api/emis/emisWarehouseInBatch";
+import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+import CardWithHeader from '@/components/CardWithHeader/index.vue';
+
+export default {
+  name: "emisWarehouseInBatch",
+  components: { elDateSimplePicker,CardWithHeader },
+  props:{
+    inNo:{
+        type:String
+    }
+  },
+  dicts: [
+  ],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      resetRefreshId:null,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 进仓单批次表格数据
+      emisWarehouseInBatchList: [],
+
+      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;
+      });
+    },
+
+    /** 搜索按钮操作 */
+    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/emis/emisWaybill/OrderDetailReadOnly.vue b/src/views/emis/emisWaybill/OrderDetailReadOnly.vue
new file mode 100644
index 00000000..29729c49
--- /dev/null
+++ b/src/views/emis/emisWaybill/OrderDetailReadOnly.vue
@@ -0,0 +1,584 @@
+<template>
+<div class=""  >
+
+  <div >
+    <div style="    font-size: 13px;
+    color: black;
+    margin-bottom: 8px;display: inline-flex;    width: 100%;">
+      <div style="width:40%"> 订单号:{{ form.orderSn }}    运单号:{{ form.billCode }}  </div>
+      <div>下单时间:{{ form.orderDate }}</div>
+    </div>
+    <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+      <el-col :span="12" >
+        <div style="line-height: 30px;">
+          <span style="border-radius: 15px;
+                              padding: 5px 15px;
+                              background: black;
+                              font-size: 13px;
+                              color: white;">{{ $t('寄') }} - {{ form.sender.countryName }} {{ form.sender.provinceName }} - {{ form.sendSiteName }} </span>
+          </div>
+
+          <div style="    font-size: 12px;
+    font-weight: bold;
+    color: black;
+    border: 1px solid #e6ebf5;
+    margin-top: 10px;    min-height: 90px;">
+            <div>{{ form.sender.name }} {{ form.sender.phone }}</div>
+              <div>{{ form.sender.countryName }} {{ form.sender.provinceName }} {{ form.sender.cityName }} {{ form.sender.countyName }} {{ form.sender.address }}</div>
+              <div>{{ form.sender.company }}</div>
+          </div>
+
+      </el-col>
+      <el-col :span="12" >
+        <div style="line-height: 30px;">
+          <span style="border-radius: 15px;
+                              padding: 5px 15px;
+                              background: #b12e29;
+                              font-size: 13px;
+                              color: white;"> {{ $t('收') }} - {{ form.reciever.countryName }} {{ form.reciever.provinceName }} - {{ form.dispatchUnderlingSiteName }}</span>
+          </div>
+
+          <div style="    font-size: 12px;
+    font-weight: bold;
+    color: black;
+    border: 1px solid #e6ebf5;
+    margin-top: 10px;    min-height: 90px;">
+             <div>{{ form.reciever.name }} {{ form.reciever.phone }}</div>
+              <div>{{ form.reciever.countryName }} {{ form.reciever.provinceName }} {{ form.reciever.cityName }} {{ form.reciever.countyName }} {{ form.reciever.address }}</div>
+              <div>{{ form.reciever.company }}</div>
+              <!-- <div style="margin-top: 10px;">目的网点:{{ form.sendSiteName }}  目的地:{{ form.destinationName }}</div> -->
+          </div>
+
+      </el-col>
+    </el-row>
+  </div>
+
+    <el-descriptions :title="$t('发货信息')" size="small"  :column="2" style="margin-top:10px">
+            <!-- <el-descriptions-item label="产品类型">{{ form.productTypeName }}{{ form.timeType }}</el-descriptions-item> -->
+            <el-descriptions-item label="产品">{{ form.transLineTypeName }}-{{ form.productTypeName }}({{ form.timeType }})</el-descriptions-item>
+            <!-- <el-descriptions-item label="发件日期">{{ parseTime(form.sendDate, '{y}-{m}-{d}') }}</el-descriptions-item> -->
+            <!-- <el-descriptions-item label="预计送达时间">{{ parseTime(form.estimateDate, '{y}-{m}-{d}') }}</el-descriptions-item> -->
+            <!-- <el-descriptions-item label="目的网点">{{ form.dispatchUnderlingSiteName }}</el-descriptions-item> -->
+            <!-- <el-descriptions-item label="目的地">{{ form.destinationName }}</el-descriptions-item> -->
+            <el-descriptions-item label="取件方式">
+              <dict-tag :options="dict.type.emis_qujian_fangshi" :value="form.pickupMethod"/>
+            </el-descriptions-item>
+            <el-descriptions-item label="清关方式">
+              <dict-tag :options="dict.type.emis_customs_clear" :value="form.customsClear"/>
+            </el-descriptions-item>
+            <el-descriptions-item label="报关方式">
+              <dict-tag :options="dict.type.emis_declare_mode" :value="form.customsEclaration"/>
+            </el-descriptions-item>
+            <el-descriptions-item label="派送方式">
+              <dict-tag :options="dict.type.emis_tab_dispatch_mode" :value="form.dispatchMethod"/>
+            </el-descriptions-item>
+            <!-- <el-descriptions-item label="派件员">{{ form.dispatchManName }}/{{ form.operateEmployeeName }}</el-descriptions-item> -->
+            <!-- <el-descriptions-item label="合同号"  :span="4">{{ form.custOrderId }}</el-descriptions-item> -->
+            <!-- <el-descriptions-item label="专属取件员">{{ form.takePieceEmployeeName }}/{{ form.operateEmployeeName }}</el-descriptions-item> -->
+            <!-- <el-descriptions-item label="录单员">{{ form.registerManName }}</el-descriptions-item> -->
+            <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户" >{{ form.customerName }}</el-descriptions-item>
+            <!-- <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item> -->
+            <el-descriptions-item label="销售联系人">{{ form.salesmen }}</el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions title="" size="small"  :column="4" v-if="form.pickupMethod==1 || form.pickupMethod==3">
+      <el-descriptions-item label="仓库收货信息" :span="1">
+        <div>
+              仓库名：<span>{{ form.intoWarehouseName }}</span>
+            </div>
+            <div>
+              联系人: <span>{{ form.intoWarehouseContact }} {{ form.intoWarehousePhone }} </span>
+            </div>
+            <div>
+              地址:{{ form.intoWarehouseAddress }}
+            </div>
+            <div>
+              进仓单号：{{ form.warehouseInNo }}  预计进仓日期：{{ form.pickStartDate }}
+            </div>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions title="" size="small"  :column="4" v-if="form.pickupMethod==2 ">
+      <el-descriptions-item label="上门取件信息" :span="1">
+            <div>
+              取件员:{{ form.takePieceEmployeeName }}
+            </div>
+            <div>
+              预约取件时间：{{ form.pickStartDate }}
+            </div>
+      </el-descriptions-item>
+    </el-descriptions>
+
+
+  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 10px;">
+    <el-col :span="24">
+      <el-descriptions :title="$t('货物信息')" size="small" :column="4" style="margin-top:10px">
+            <el-descriptions-item label="货物名称" :span="4">{{ form.goodsInfo }}</el-descriptions-item>
+            <el-descriptions-item label="件数">{{ form.parcelQty }}件</el-descriptions-item>
+            <el-descriptions-item label="包装类型" :span="4">
+              <dict-tag v-if="form.packType&&form.packType!=''" :options="dict.type.emis_tab_packing_type" :value="form.packType.split(',')"/>
+            </el-descriptions-item>
+            <el-descriptions-item label="实际重量">{{ form.billWeight }}(kg)</el-descriptions-item>
+            <el-descriptions-item label="体积">{{ form.totalVolume }}(m³)</el-descriptions-item>
+            <el-descriptions-item label="体积重量" :span="4">{{ form.volumeWeight }}(kg)</el-descriptions-item>
+            <el-descriptions-item label="申报信息" :span="4">
+              <el-table
+                            class="cargoList"
+                            :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="form.cargoList"
+                            size="small"
+                            style="width: 100%"
+                            max-height="300px"
+                          >
+
+                            <el-table-column  :label="$t('序号')" align="center" width="30">
+                                  <template slot-scope="scope">
+                                      <span > {{scope.$index+1}}</span>
+                                  </template>
+                            </el-table-column>
+                            <el-table-column prop="goodsName"  :label="$t('货物名称')" align="center" width="80" :show-overflow-tooltip="true">
+                              <template slot-scope="scope">
+                                {{  scope.row.goodsName }}
+                              </template>
+                            </el-table-column>
+                            <!-- <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="60">
+                              <template slot-scope="scope">
+                                {{ scope.row.length }}
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="width"  :label="$t('宽(cm)')"  align="center" width="60">
+                              <template slot-scope="scope">
+                                {{  scope.row.width }}
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="height"   :label="$t('高(cm)')" align="center" width="60">
+                              <template slot-scope="scope">
+                                {{  scope.row.height }}
+                              </template>
+                            </el-table-column> -->
+                            <el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="60">
+                              <template slot-scope="scope">
+                                {{  scope.row.cargoQty }}
+                              </template>
+                            </el-table-column>
+                            <!-- <el-table-column prop="volume"  :label="$t('体积(m³)')" align="center" width="80">
+                              <template slot-scope="scope">
+                                {{  scope.row.volume }}
+                              </template>
+                            </el-table-column> -->
+
+                            <el-table-column prop="price" label="单价" align="center" width="60" :show-overflow-tooltip="true">
+                              <template slot-scope="scope">
+                                {{  scope.row.price }}
+                              </template>
+                            </el-table-column>
+                            <!-- <el-table-column prop="volume"  :label="$t('体积(m³)')" align="center" width="80">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
+                              </template>
+                            </el-table-column> -->
+
+
+                            <el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
+                              <template slot-scope="scope">
+                                {{  scope.row.goodsModel }}
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true">
+                              <template slot-scope="scope">
+                                {{  scope.row.brand }}
+                              </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">
+                                {{  scope.row.material }}
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="purpose" label="用途" align="center" width="60" :show-overflow-tooltip="true">
+                              <template slot-scope="scope">
+                                {{  scope.row.purpose }}
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="ingredients" label="成分" align="center" width="60" :show-overflow-tooltip="true">
+                              <template slot-scope="scope">
+                                {{  scope.row.ingredients }}
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="supplier" label="供应商" align="center" width="80" :show-overflow-tooltip="true">
+                              <template slot-scope="scope">
+                                {{  scope.row.supplier }}
+                              </template>
+                            </el-table-column>
+
+
+                            <!-- <el-table-column prop="volume"  :label="$t('描述')" align="center" width="80">
+                              <template slot-scope="scope">
+                                {{  scope.row.goodsName }}
+                              </template>
+                            </el-table-column> -->
+
+                       </el-table>
+
+            </el-descriptions-item>
+            <el-descriptions-item label="结算重量" :span="4">{{ form.settlementWeight }}(kg)</el-descriptions-item>
+
+      </el-descriptions>
+
+    </el-col>
+
+
+
+    <el-col :span="24">
+      <el-descriptions :title="$t('收费信息')" size="small" :column="4" style="margin-top:10px">
+            <!-- <el-descriptions-item label="计费方式" :span="4">
+              <dict-tag :options="dict.type.emis_calc_fee_type" :value="form.calcFeeType"/>
+            </el-descriptions-item> -->
+            <!-- <el-descriptions-item label="是否特殊报价" :span="1">
+              <span v-if="form.blSpecialQuote == 1"> 是 </span>
+              <span v-else> 否 </span>
+            </el-descriptions-item>
+            <el-descriptions-item label="是否敏感物" :span="4">
+              <span v-if="form.blSensitive == 1"> 是 </span>
+              <span v-else> 否 </span>
+            </el-descriptions-item> -->
+            <el-descriptions-item label="支付方式" :span="4">
+              <dict-tag :options="dict.type.emis_payment_type" :value="form.paymentType"/>
+            </el-descriptions-item>
+            <!-- <el-descriptions-item label="费用币种">{{ form.currency }}</el-descriptions-item> -->
+            <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户" :span="4">{{ form.customerName }}</el-descriptions-item>
+            <!-- <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
+            <el-descriptions-item label="销售联系人" :span="3">{{ form.salesmen }}</el-descriptions-item> -->
+            <el-descriptions-item label="费用明细" :span="4">
+              <el-table
+                            class="cargoList"
+                            :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="form.feeItems"
+                            size="mini"
+                            max-height="300px"
+                            style="width: 100%"
+                          >
+
+
+                            <el-table-column prop="feeName"  :label="$t('收费项')"  align="center" width="70">
+                              <template slot-scope="scope">
+                                <span style="font-weight:600;color:red">{{ scope.row.feeName }}</span>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="fee"  :label="$t('应收')"  align="center" width="50">
+                              <template slot-scope="scope">
+                                <span>{{ scope.row.fee }}</span>
+                              </template>
+                            </el-table-column>
+
+                            <el-table-column prop="initialWeightFee"  :label="$t('首重费')"  align="center" width="60">
+                              <template slot-scope="scope">
+                                <div> {{scope.row.initialWeightFee}} </div>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="addWeightPrice"  :label="$t('续重单价')"  align="center" width="70">
+                              <template slot-scope="scope">
+                                <div> {{scope.row.addWeightPrice}} </div>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="realFee" :label="$t('实收')" align="center" width="50">
+                              <template slot-scope="scope">
+                                <div> {{scope.row.realFee}} </div>
+                              </template>
+                            </el-table-column>
+                            <el-table-column  prop="remark" :label="$t('描述')"  align="center" min-width="100">
+                              <template slot-scope="scope">
+                                <div> {{scope.row.remark}} </div>
+                              </template>
+                            </el-table-column>
+                          </el-table>
+
+            </el-descriptions-item>
+            <el-descriptions-item label="运费" :span="4"><span style="color:red;font-weight:bold;font-size:15px">{{ form.freight }}</span></el-descriptions-item>
+
+            <!-- <el-descriptions-item label="费用备注" :span="4">{{ form.feeRemark }}</el-descriptions-item> -->
+
+      </el-descriptions>
+    </el-col>
+  </el-row>
+  <el-descriptions title="" size="small" :column="1" style="margin-top:10px;margin-bottom: 30px;">
+    <el-descriptions-item label="订单备注" :span="4">{{ form.orderRemark }}</el-descriptions-item>
+  </el-descriptions>
+
+</div>
+</template>
+
+<script>
+import { getWaybillDetail} from "@/api/emis/emisWaybill";
+import { parseTime } from "@/utils/custom";
+
+
+export default {
+  name: "WaybillDetailReadOnly",
+  // name: "WaybillModify",
+  props: {
+      billCode: {
+        type: String,
+        required: true
+      },
+    },
+components: {
+
+},
+dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
+        'emis_calc_fee_type','emis_print_type'],
+data() {
+  return {
+    canViewDetail:false,
+    activeNames:['1','2','3','4'],
+    form:{
+      id:null,
+      reciever: {
+          country: null,
+          name: null,
+          phone:null,
+          province: null,
+          city: null,
+          district: null,
+          town: null,
+          address: null,
+          postCode: null,
+          email: null,
+          company: null,
+      },
+      sender: {
+          country: null,
+          name: null,
+          phone:null,
+          province: null,
+          city: null,
+          district: null,
+          town: null,
+          address: null,
+          postCode: null,
+          email: null,
+          company: null,
+      },
+      feeItems: [],
+      cargoList: [],
+      attachmentList: [],
+      printTypeCheckList:[],
+      billCode: null,
+      orderDate:  null,
+      openId: null,
+      customerCode: null,
+      paymentType: null,
+      calcFeeType: '1',
+      custNo:  null,
+      productTypeSelArr: null,
+      transLine:  null,
+      productType: null,
+      customsClear: null,
+      customsEclaration: null,
+      packType: null,
+      dispatchMethod: "1",
+      pickupMethod: null,
+      pickStartDate: null,
+      pickFinishDate: null,
+      intoWarehouseCode: null,
+      intoWarehouseName: null,
+      intoWarehouseAddress: null,
+      intoWarehouseContact: null,
+      intoWarehousePhone:  null,
+      intoWarehouseBillCode: null,
+      customerDeliveryBeginTime: null,
+      goodsType:null,
+      goodsInfo: null,
+      length:null,
+      width:null,
+      height:null,
+      totalWeight: null,
+      totalVolume: null,
+      parcelQty: null,
+      billWeight: null,
+      volumeWeight: null,
+      settlementWeight: null,
+      feeWeight: null,
+      freight: null,
+      blOverLong: null,
+      blOverWeight: null,
+      overWeightNumber: null,
+      feeRemark: null,
+      realValue: null,
+      takePieceEmployeeCode: null,
+      sendSiteCode: null,
+      sendSiteName: null,
+      destinationCountry:  null,
+      destinationCode:  null,
+      dispatchUnderlingSiteCode: null,
+      destinationCenterCode: null,
+      marketManCode: null,
+      payee: null,
+      salesmen: null,
+      operateEmployeeCode: null,
+      blMessage: null,
+      blAcceptMessage: null,
+      meterType:null,
+      blGenSubbill:null,
+      billCodeSub:null,
+      blSpecialQuote:null,
+      blSensitive:null,
+      lockFlag:null,
+      lockReason:null,
+  },
+    // 遮罩层
+    loading: true,
+    // 表单校验
+    rules: {
+
+    }
+  };
+},
+computed: {
+},
+ watch: {
+  billCode(newVal){
+    this.initData();
+  }
+},
+
+created() {
+  this.initData();
+},
+methods: {
+    openCollapse(index){
+
+    },
+    initData() {
+
+        console.log("====billCode=1=>",this.billCode)
+        if(this.billCode && this.billCode!=undefined) {
+          this.loading = true;
+          getWaybillDetail(this.billCode).then(response => {
+            this.form = response.data;
+            console.log("====response.data=1=>",response.data)
+            this.loading = false;
+          });
+        }
+
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+
+.el-descriptions__header {
+    margin-bottom: 8px!important;
+    border-bottom: 1px solid #e6ebf5!important;
+    border-left: 4px solid #b30000!important;
+}
+
+.el-descriptions-item__content{
+  font-weight:bold;
+  color: #000;
+}
+
+.el-form-item__label {
+    color: #000;
+}
+
+.el-input-group__append {
+    padding: 0 4px;
+}
+
+.el-row{
+      display:flex;
+      flex-wrap: wrap;
+      // padding-right: 10px;
+ }
+
+.el-form-item__label {
+  font-size: 12px!important;
+}
+
+
+ .platform-auto-complete {
+  .el-autocomplete-suggestion__wrap {
+    padding: 5px 0;
+    ul li {
+      pointer-events: none; // 阻止可点击事件
+      .default {
+        text-align: center;
+        color: #999;
+      }
+      &:hover {
+        background-color: #fff;
+      }
+    }
+  }
+}
+
+.el-collapse {
+    border-top: none!important;
+    border-bottom: none!important;
+}
+
+.el-table .el-table__cell:first-child .cell {
+  padding: 0px;
+}
+
+.el-table .cell {
+    padding: 0px;
+}
+
+.cargoList{
+  .el-input__inner {
+      height: 28px;
+      line-height: 28px;
+      border: none;
+      background: #ffffcd;
+      font-size: 10px;
+      padding: 0px;
+      text-align: center;
+  }
+}
+
+.el-descriptions__title{
+  font-size: 12px;
+}
+
+  .el-collapse-item__content {
+      padding-bottom: 0px;
+  }
+  .el-collapse-item__header{
+    pointer-events: none;
+  }
+
+  .el-collapse-item__arrow {
+    pointer-events: auto;
+  }
+
+</style>
+