diff --git a/src/api/distribution/distrilbutionBillLading.js b/src/api/distribution/distrilbutionBillLading.js
index fb9b5ef0..669983b0 100644
--- a/src/api/distribution/distrilbutionBillLading.js
+++ b/src/api/distribution/distrilbutionBillLading.js
@@ -11,6 +11,39 @@ export const getList = (current, size, params) => {
     }
   })
 }
+export const getOrderDetail = (current, size, params) => { //订单
+  return request({
+    url: '/api/logpm-distribution/distrilbutionBillStock/billOrderDetail',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+export const getPackDetail = (current, size, params) => { //包件
+  return request({
+    url: '/api/logpm-distribution/distrilbutionBillStock/billOrderPack',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+export const getInventoryDetail = (current, size, params) => { //库存品
+  return request({
+    url: '/api/logpm-distribution/distributionDeliveryDetails/billOrderInventory',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
 
 export const getListOwn = (current, size, params) => {
   return request({
@@ -24,6 +57,16 @@ export const getListOwn = (current, size, params) => {
   })
 }
 
+export const getListOwnNUm = (params) => {
+  return request({
+    url: '/api/logpm-distribution/distrilbutionBillLading/listNum',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-distribution/distrilbutionBillLading/detail',
@@ -34,6 +77,25 @@ export const getDetail = (id) => {
   })
 }
 
+export const getViewDetailOwn = (id) => {
+  return request({
+    url: '/api/logpm-distribution/distrilbutionBillLading/viewDetailOwn',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+export const getBillLadingDetail = (ids) => { //签收
+  return request({
+    url: '/api/logpm-distribution/distrilbutionBillLading/updateOwn',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
 export const remove = (ids) => {
   return request({
     url: '/api/logpm-distribution/distrilbutionBillLading/remove',
diff --git a/src/router/views/index.js b/src/router/views/index.js
index d86b4f92..12ff84ac 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -762,6 +762,25 @@ export default [
       },
     ],
   },
+  {
+    path: '/distribution/inventory/distrilbutionBillLadingView',
+    component: Layout,
+    redirect: '/inventory/distrilbutionBillLadingView',
+    children: [
+      {
+        path: '/distribution/inventory/distrilbutionBillLadingView',
+        name: '查看提货详情',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id
+        }),
+        component: () => import('@/views/distribution/inventory/distrilbutionBillLadingView.vue'),
+      },
+    ],
+  },
   {
     path: '/reservation/order_listFrom',
     component: Layout,
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 72429dc9..088356e4 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -1366,21 +1366,32 @@ export default {
       console.log(file);
     },
     textbox(e,index) {
-      // console.log("e,index",e,index);
-      this.costList[index+1] = e;
-      //计算合计费用
-      let n = 0;
-      this.costList.forEach( i =>{
-        n += parseInt(i);
-      })
-      this.form.totalCost = n;
+      let a = this.costListName.findIndex(i => i== index+1);
+      console.log("aaaa",a);
+      if(!!a){
+
+        // console.log("e,index",e,index);
+        this.costList[index+1] = e;
+        //计算合计费用
+        let n = 0;
+        this.costList.forEach( i =>{
+
+          n =  n + (!!i ? parseInt(i) : 0);
+        })
+        this.form.totalCost = n;
+      }
+
     },
     handleCheckedCitiesChange(value) {
       console.log(">>>>>>>",value );
+
       if(value.length < 1){
         this.costList = [];
         this.costListName = [];
       }
+      // console.log("字典",this.clientType);
+      // console.log("选择的",this.costListName);
+      // console.log("价格",this.costList);
       this.clientType.forEach(i =>{
         if(value.includes(i.dictKey)){
           console.log(i);
@@ -1389,7 +1400,14 @@ export default {
         }
 
       });
-
+      let n = 0;
+      value.forEach(s =>{
+        let a = this.costList[s];
+        if(!!a){
+          n =  n +  parseInt(a) ;
+        }
+      });
+      this.form.totalCost = n;
     },
     init () {
       this.height = this.setPx(document.body.clientHeight - 160);
@@ -1495,7 +1513,7 @@ export default {
              let fei = new Map();
              await this.bianLier(this.costListName,this.clientType,this.costList,fei);
              this.form.fei = Object.fromEntries(fei);
-             this.form.stockArticleId = !this.$route.query.id ? null : this.$route.query.id+','; //订单ID
+             this.form.stockArticleId = !this.$route.query.id ? null : this.$route.query.id; //订单ID
              this.form.stockDTOList = this.data;
              let o = [];
              if(this.fileListClerk.length > 0){
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index eab47302..b805d33a 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -3,17 +3,17 @@
     <div class="avue-crud" >
       <el-row>
         <el-col :span="5">
-          <span style="margin-bottom: 2%;font-size: 20px"> 待提货：{{page.total}}单/{{page.total}}件 </span>
+          <span style="margin-bottom: 2%;font-size: 20px"> 待提货：{{treatNum}}单/{{ numBill }}件 </span>
         </el-col>
         <el-col :span="10">
-          <span style="margin-bottom: 2%;font-size: 20px">  已提货：{{page.total}}单/{{page.total}}件</span>
+          <span style="margin-bottom: 2%;font-size: 20px">  已提货：{{stopNum}}单/{{ numBill }}件</span>
         </el-col>
       </el-row>
       <el-row :hidden="!search" style="padding:6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
-          <el-form-item label="订单自编号:">
-            <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
+          <el-form-item label="服务号:">
+            <el-input v-model="query.serviceNumber" placeholder="请输入服务号" ></el-input>
           </el-form-item>
           <el-form-item label="入库时间:">
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
@@ -79,7 +79,7 @@
            <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
             <el-button type="primary" icon="el-icon-plus" @click="handleBillAdd">创建自提</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">自提签收</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="handleSign(null,2)">自提签收</el-button>
 
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -104,10 +104,11 @@
         >
           <template #default="slotProps">
 <!--            <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
-            <el-button size="small" @click="handleLike(slotProps.scope)">查看</el-button>
+            <el-button size="small" text @click="handleLike(slotProps.scope)">查看</el-button>
+            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope,1)" v-if="slotProps.scope.row.conditions < 7">签收</el-button>
             <el-button type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)">编辑提货信息</el-button>
-            <el-button size="small" type="danger" icon="el-icon-edit" text @click="delectsolt(slotProps.scope)">删除</el-button>
-            <el-button size="small" type="danger" icon="el-icon-edit" text @click="delectsolt(slotProps.scope)">签收</el-button>
+<!--            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
+
           </template>
         </tablecmt>
       </el-row>
@@ -331,7 +332,15 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,getListOwn } from "@/api/distribution/distrilbutionBillLading";
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  getListOwn,
+  getBillLadingDetail, getListOwnNUm
+} from '@/api/distribution/distrilbutionBillLading';
 import option from "@/option/distribution/distrilbutionBillLading";
 import { mapGetters } from "vuex";
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -474,8 +483,8 @@ export default {
           sortable: true,
         },
         {
-          prop: 'pickUpTime',
-          label: '总费用',
+          prop: 'otherFee',
+          label: '其他增值费用',
           type: 1,
           values: '',
           width: '150',
@@ -483,6 +492,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        // {
+        //   prop: 'pickUpTime',
+        //   label: '总费用',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'totalNumber',
           label: '应提件数',
@@ -513,17 +532,6 @@ export default {
           fixed: false,
           sortable: true,
         },
-
-        {
-          prop: 'typeService',
-          label: '服务类型',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
         {
           prop: 'productInformation',
           label: '货品信息',
@@ -535,7 +543,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'pickupPhone',
+          prop: 'customerTelephone',
           label: '提货手机',
           type: 2,
           values: '',
@@ -575,7 +583,7 @@ export default {
           sortable: false,
         },
         {
-          prop: 'certificateType',
+          prop: 'certificateTypeName',
           label: '证件类型',
           type: 3,
           values: '',
@@ -587,7 +595,7 @@ export default {
         {
           prop: 'conditionName',
           label: '状态',
-          type: 3,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -632,6 +640,9 @@ export default {
       // 查询信息
       query: {},
       stockupDate:[],
+      stopNum:0,
+      treatNum:0,
+      numBill:0,
       // 分页信息
       page: {
         currentPage: 1,
@@ -812,24 +823,19 @@ export default {
       getDictionaryBiz('delivery_cost').then(res => {
         this.clientType = res.data.data;
       });
-      getDictionaryBiz('distribution_type').then(res => { //服务类型
-        this.distributionType = res.data.data;
-        this.columnList[17].checkarr = res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
-          return item
-        });
-      });
       //字典
       getDictionaryBiz('certificate_type').then(res => {
         this.certificateType = res.data.data;
-        this.columnList[23].checkarr = res.data.data.map(item=>{
+        this.checkcColumnList("certificateTypeName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
       });
     },
+    checkcColumnList(prop,columnList){
+      return columnList.find(item => item.prop === prop);
+    },
     searchHide () {
       this.search = !this.search;
     },
@@ -906,9 +912,58 @@ export default {
         }
       });
     },
+    //签收
+    handleSign(row,num){
+     let a =  this.selectionList.find( i => i.conditions > 6);
+      if(!!a){
+        this.$message.warning("有已签收的数据，请勿重复签收！！");
+        return ;
+      }
+
+
+      this.$confirm("确定签收吗?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return this.getQS(row,num);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    async getQS(row,num){
+      let ids = "";
+      switch (num) {
+        case 1 :
+          ids = row.row.id;
+          break;
+        case 2 :
+          ids = this.ids;
+          break;
+      }
+      console.log("签收！！",ids);
+      await getBillLadingDetail(ids);
+    },
+    //删除
+    handleDeleteOwn(row){
+      console.log("删除！！",row);
+
+    },
     //查询详细
-    handleLike(){
-      this.$message.warning("!!!");
+    handleLike(row){
+      this.$router.push({
+        path: '/distribution/inventory/distrilbutionBillLadingView',
+        query: {
+          id: row.row.id
+        }
+      });
     },
     handleEdits (row) {
       // this.title = '编辑'
@@ -999,6 +1054,21 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
+    getTime(dat){
+      let date = new Date(dat);
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? '0' + m : m
+      var d = date.getDate()
+      d = d < 10 ? '0' + d : d
+      var h = date.getHours()
+      h = h < 10 ? '0' + h : h
+      var minute = date.getMinutes()
+      minute = minute < 10 ? '0' + minute : minute
+      var s = date.getSeconds()
+      s = s < 10 ? '0' + s : s
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + s;
+    },
     onLoad (page, params = {}) {
       this.loading = true;
       if(this.stockupDate.length > 0){
@@ -1007,28 +1077,43 @@ export default {
         params.startDate = this.getTime(startDate.toString());
         params.entDate = this.getTime(entDate.toString());
       }
+      getListOwnNUm(params).then(res =>{
+        console.log("查询数量!!!",res.data.data);
+        this.treatNum = !res.data.data.treatNum ? 0 : res.data.data.treatNum;
+        this.stopNum = !res.data.data.stopNum ?  0 : res.data.data.stopNum;
+        this.numBill = parseInt(this.treatNum) + parseInt(this.stopNum);
+      });
       getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         console.log("???????",data);
         this.page.total = data.total;
         this.data = data.records;
+
         this.data.forEach( i => {
           if(!!i.list){
+            i.collectFee = 0;
+            i.storageFee = 0;
+            i.transport = 0;
+            i.forklift = 0;
+            i.otherFee = 0;
             i.list.forEach(a =>{
-              switch (a.cost){
-                case '1':
-
+              const { cost, money } = a; // 对象解构，获取a对象的cost和money属性
+              switch (cost) {
+                case '1': // 到付
+                  i.collectFee = money ? parseInt(money) : 0;
                   break;
-                case '2':
+                case '2': // 仓储费用
+                  i.storageFee = money ? parseInt(money) : 0;
                   break;
-                case '3':
+                case '3': // 搬运费
                   console.log("0=-0-=");
-                  // this.$set(i,i.transport ,a.money);
-                  i.transport = a.money
+                  i.transport = money ? parseInt(money) : 0;
+                  break;
+                case '4': // 叉车费
+                  i.forklift = money ? parseInt(money) : 0;
                   break;
-                case '4':
-                  // this.$set(i,i.forklift ,a.money);
-                  i.forklift = a.money
+                case '5': // 其他增值费
+                  i.otherFee = money ? parseInt(money) : 0;
                   break;
               }
             })
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
new file mode 100644
index 00000000..20adb151
--- /dev/null
+++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
@@ -0,0 +1,887 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <el-divider>基本信息</el-divider>
+      <!--      <avue-form :option="propertyoption"  ref="myForm" v-model="dataForm"  @row-update="rowUpdate" >-->
+      <!--        <template #input="{row}">-->
+      <!--          <el-tag>序号:{{row.$index}}-数据:{{row.input}}</el-tag>-->
+      <!--        </template>-->
+      <!--      </avue-form>-->
+      <el-row :gutter="24" class="rows">
+        <el-col :xl="7" :lg="7" :md="8" :sm="24" >
+          <span>提货批次：{{data.pickupBatch}} </span>
+        </el-col>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>服务号：{{data.serviceNumber}} </span>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="rows">
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>运单号：{{data.waybillNumber}} </span>
+        </el-col>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>收货单位：{{data.consigneeUnit}} </span>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="rows">
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>收货人：{{data.customerName}} </span>
+        </el-col>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <!--          <span>{{deliverydata.loadingTeamType}} </span> -->
+          <span>联系电话： {{data.customerTelephone}} </span>
+        </el-col>
+      </el-row>
+      <el-divider>订单列表</el-divider>
+      <el-tabs type="border-card" v-model="activeTab"  @tab-click="handleTabClick" >
+        <el-tab-pane label="订 单 列 表" name="tab2">
+
+          <!-- 列表模块 -->
+          <el-table ref="table" v-loading="loading"
+                    @selection-change="selectionChange"
+                    :data="orddata"
+                    :height="height"
+                    style="width: 70%"
+                    :border="option.border"
+          >
+            <el-table-column type="expand" v-if="ordoption.expand" align="center"></el-table-column>
+            <template v-for="(item,index) in ordoption.column">
+              <!-- table字段 -->
+              <el-table-column v-if="item.hide!==true"
+                               :prop="item.prop"
+                               :label="item.label"
+                               align="center"
+                               :width="item.width"
+                               :key="index">
+              </el-table-column>
+            </template>
+          </el-table>
+          <div class="avue-crud__pagination" style="width:100%">
+            <!-- 分页模块 -->
+            <el-pagination align="right"
+                           background
+                           @size-change="sizeOrderChange"
+                           @current-change="currentOrderChange"
+                           :current-page="ordpage.currentPage"
+                           :page-sizes="[10, 20, 30, 40, 50, 100]"
+                           :page-size="ordpage.pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="ordpage.total">
+            </el-pagination>
+          </div>
+
+        </el-tab-pane>
+        <el-tab-pane label="包 件 列 表" name="tab3">
+          <!-- 列表模块 -->
+          <el-table ref="table" v-loading="loading"
+                    @selection-change="selectionChange"
+                    :data="packdata"
+                    :height="height"
+                    style="width: 100%"
+                    :border="option.border"
+          >
+            <el-table-column type="expand" v-if="wrapoption.expand" align="center"></el-table-column>
+            <template v-for="(item,index) in wrapoption.column">
+              <!-- table字段 -->
+              <el-table-column v-if="item.hide!==true"
+                               :prop="item.prop"
+                               :label="item.label"
+                               align="center"
+                               :width="item.width"
+                               :key="index">
+              </el-table-column>
+            </template>
+          </el-table>
+
+          <div class="avue-crud__pagination" style="width:100%">
+            <!-- 分页模块 -->
+            <el-pagination align="right"
+                           background
+                           @size-change="psizeChange"
+                           @current-change="pcurrentChange"
+                           :current-page="packpage.currentPage"
+                           :page-sizes="[10, 20, 30, 40, 50, 100]"
+                           :page-size="packpage.pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="packpage.total">
+            </el-pagination>
+          </div>
+
+        </el-tab-pane>
+        <el-tab-pane label="库 存 品 列 表" name="tab4">
+
+          <!-- 列表模块 -->
+          <el-table ref="table" v-loading="loading"
+                    @selection-change="selectionChange"
+                    :data="inventorydata"
+                    :height="height"
+                    style="width: 100%"
+                    :border="option.border"
+          >
+            <el-table-column type="expand" v-if="inventoryoption.expand" align="center"></el-table-column>
+            <template v-for="(item,index) in inventoryoption.column">
+              <!-- table字段 -->
+              <el-table-column v-if="item.hide!==true"
+                               :prop="item.prop"
+                               :label="item.label"
+                               align="center"
+                               :width="item.width"
+                               :key="index">
+              </el-table-column>
+            </template>
+          </el-table>
+          <div class="avue-crud__pagination" style="width:100%">
+            <!-- 分页模块 -->
+            <el-pagination align="right"
+                           background
+                           @size-change="sizeInChange"
+                           @current-change="currentInChange"
+                           :current-page="inventorypage.currentPage"
+                           :page-sizes="[10, 20, 30, 40, 50, 100]"
+                           :page-size="inventorypage.pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="inventorypage.total">
+            </el-pagination>
+          </div>
+
+
+        </el-tab-pane>
+      </el-tabs>
+
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import {
+  getDetail,
+  add,
+  update,
+  remove,
+  getPackDetail,
+  getInventoryDetail, getViewDetailOwn, getOrderDetail
+} from '@/api/distribution/distrilbutionBillLading';
+import option from '@/option/basic/basicPdarecords';
+import { mapGetters } from 'vuex';
+import { getDictionaryBiz } from '@/api/system/dict';
+import dayjs from 'dayjs';
+
+export default {
+  data() {
+    return {
+      height: 300,
+      // 弹框标题
+      title: '',
+      signtitle: '',
+      // 是否展示弹框
+      box: false,
+      //签收是否显示
+      signBox: false,
+      //签收类型
+      signBoxO: false,
+      dataForm: {},
+      // 是否显示查询
+      search: true,
+      //是否显示新增
+      isadd: false,
+      deliverydata:{
+        reservationList:[],
+      },
+      // 加载中
+      loading: false,
+      //查看按钮
+      edt:false,
+      activeTab:'tab2',
+      previousTab: null,
+      //隐藏
+      pake:false,
+      cus:true,
+      ord:false,
+      inventory:false,
+      //查看pda
+      padview:false,
+      // 是否为查看模式。。
+      view: false,
+      // 签收。。
+      signView:false,
+      // 查询信息
+      query: {},
+      inputTypeData:[],
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 签收表单数据
+      signform: {},
+      // 选择行
+      selectionList: [],
+      isLiabilityData: [],
+      //状态列表
+      stateData: [],
+      // 表单配置
+      option: {
+        expand: false,
+        index: true,
+        border: true,
+        selection: true,
+        column: [
+          {
+            label: "配送车次号",
+            prop: "trainNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "收货人",
+            prop: "consignee",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "收货电话",
+            prop: "deliveryPhone",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "收货地址",
+            prop: "deliveryAddress",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "订单自编号",
+            prop: "orderIds",
+            search: true,
+            width:"100px"
+          },
+
+          {
+            label: "配送件数",
+            prop: "packageNub",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "配送库存品数",
+            prop: "reservationStockListNum",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "扫描件数",
+            prop: "loadedNub",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "是否加急",
+            prop: "businessDepartment",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "签收件数",
+            prop: "receivedQuantity",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "签收状态",
+            prop: "signingStatus",
+            search: true,
+            width:"100px"
+          },
+        ]
+      },
+
+      // 表单配置
+      signoption: {
+        height:'auto',
+        width:'40px',
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        viewBtn: true,
+        dialogClickModal: false,
+        emptyBtn: false, //隐藏清空按钮
+        submitBtn: false, //隐藏提交按钮
+        column: [
+          {
+            label: "收货人姓名",
+            labelWidth:'150',
+            span:11,
+            prop: "consignee",
+            type: "input",
+            width:"150px",
+            align:'center',
+            disabled:true,
+            // rules: [{
+            //   required: true,
+            //   message: "输入承运商编号",
+            //   trigger: "blur"
+            // }],
+          },
+          {
+            label: "收货人电话",
+            prop: "deliveryPhone",
+            labelWidth:'150',
+            span:11,
+            type: "input",
+            width:"150px",
+            align:'center',
+            disabled:true,
+          },
+          {
+            label: "收货地址",
+            prop: "deliveryAddress",
+            labelWidth:'150',
+            span:11,
+            type: "input",
+            width:"150px",
+            align:'center',
+            disabled:true,
+          },
+          {
+            label: "签收类型",
+            prop: "signingType",
+            labelWidth:'150',
+            span:11,
+            type: "radio",
+            width:"150px",
+            align:'center',
+            disabled:false,
+            dicData: [
+              {
+                label: '签收',
+                value: '1',
+              },
+              {
+                label: '代签收',
+                value: '2',
+              }
+            ],
+          },
+          {
+            label: "签收图片",
+            prop: "deliverySignPictures",
+            labelWidth:'150',
+            type: 'upload',
+            listType: 'picture-card',
+            width:"150px",
+            span:15,
+            multiple:true,
+            align:'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            limit: 5,
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+            disabled:false,
+          },
+          // {
+          //   label: "复核图片",
+          //   prop: "clerkSignPictures",
+          //   type: 'upload',
+          //   listType: 'picture-card',
+          //   dataType: 'string',
+          //   labelWidth:'150',
+          //   span:15,
+          //   multiple:true,
+          //   width:"200px",
+          //   align:'left',
+          //   action: '/blade-resource/oss/endpoint/put-file',
+          //   limit: 15,
+          //   propsHttp: {
+          //     res: 'data',
+          //     url: 'link',
+          //   },
+          //   rules: [{
+          //     required: true,
+          //     message: "请上传图片",
+          //     trigger: "blur"
+          //   }],
+          // },
+
+          {
+            label: "备注",
+            prop: "clerkSignRemarks",
+            labelWidth:'150',
+            span:15,
+            type: "input",
+            width:"150px",
+            align:'center',
+          },
+
+        ]
+      },
+
+
+      // 表单配置
+      wrapoption: {
+        expand: false,
+        index: true,
+        border: true,
+        selection: true,
+        column: [
+          {
+            label: "包条码",
+            prop: "orderPackageCode",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "仓库",
+            prop: "warehouse",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "一级品类",
+            prop: "firsts",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "二级品类",
+            prop: "second",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "三级品类",
+            prop: "thirdProduct",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "物料编号",
+            prop: "materialCode",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "物料名称",
+            prop: "materialName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "托盘码",
+            prop: "pallet",
+            width:"100px"
+          },
+          {
+            label: "库位号",
+            prop: "goodsAllocation",
+
+            width:"100px"
+          },
+
+        ]
+      },
+      // 库存品表单配置
+      inventoryoption: {
+        expand: false,
+        index: true,
+        border: true,
+        selection: true,
+        column: [
+          {
+            label: "sku",
+            prop: "sku",
+            search: true,
+            width:"100px"
+          },
+          // {
+          //   label: "订单自编号",
+          //   prop: "orderCode",
+          //   search: true,
+          //   width:"100px"
+          // },
+          {
+            label: "物料名称",
+            prop: "descriptionGoods",
+            search: true,
+            width:"100px"
+          },
+          // {
+          //   label: "单位",
+          //   prop: "cargoUnit",
+          //   search: true,
+          //   width:"100px"
+          // },
+          {
+            label: "备货数",
+            prop: "deliveryNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "已备数量",
+            prop: "readyStock",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "物料编号",
+            prop: "cargoNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "单位",
+            prop: "cargoUnit",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "托盘码",
+            prop: "pallet",
+            width:"100px"
+          },
+          {
+            label: "库位信息",
+            prop: "goodsAllocation",
+            width:"100px"
+          },
+
+
+        ]
+      },
+      // 订单表单配置
+      ordoption: {
+        expand: false,
+        index: true,
+        border: true,
+        selection: true,
+        column: [
+          {
+            label: "订单自编号",
+            prop: "orderCode",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "货物名称",
+            prop: "descriptionGoods",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "物料名称",
+            prop: "materialName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "备货件数",
+            prop: "handQuantity",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "已备数量",
+            prop: "preparedQuantity",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "备货状态",
+            prop: "stockupStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "托盘码",
+            prop: "pallet",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "货位信息",
+            prop: "goodsAllocation",
+            search: true,
+            width:"100px"
+          },
+        ]
+      },
+      //包肩分页信息
+      wpage:{
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      //包肩分页信息
+      packpage:{
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      ordpage:{
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      inventorypage:{
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单列表
+      data: [],
+      // 签收列表
+      signdata: [],
+      //客户id
+      wid:null,
+      //客户详情
+      wrapdata:[],
+      //包条列表
+      packdata:[],
+      //订单列表
+      orddata:[],
+      //库存品列表
+      inventorydata:[],
+    };
+  },
+  watch: {
+    // eslint-disable-next-line no-unused-vars
+    '$route'(to, from) {
+      // this.isadd =false;
+      // this.query.masterId = null;
+      // this.masterId = null;
+      // if (!!this.$route.query.data) {
+      //   //   //做一些路由变化的响应
+      //   //   //   this.isadd =true;
+      //   //   this.query.masterId = this.$route.query.data;
+      //   //   this.masterId = this.$route.query.data;
+      //   //重新获取数据
+      //   this.onLoad(this.page);
+      // } else {
+      // }
+    }
+  },
+  mounted() {
+    this.init();
+    this.onLoad();
+  },
+  created() {
+    // //查询字典
+    // this.queryDictionary();
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    }
+  },
+  methods: {
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    //修改
+    rowUpdate(row, index, done, loading) {
+      console.log("row>>>>>>>>",row);
+    },
+    queryDictionary() {
+      getDictionaryBiz('yes_no').then(res => {
+        this.isLiabilityData = res.data.data;
+      });
+      getDictionaryBiz('basic_in_type').then(res => {
+        this.inputTypeData = res.data.data;
+      });
+
+    },
+    //返回
+    handleViewpda() {
+
+    },
+    //取消
+    cancellation(){
+      this.signBox = false;
+    },
+    init() {
+      this.height = this.setPx(document.body.clientHeight - 340);
+    },
+    handleTabClick(tab, event){
+      console.log("tab>>>>>>>>", tab.paneName);
+      let tabName = tab.paneName
+      switch (tabName){
+        case 'tab2':
+          console.log("ssss");
+          this.handleOrder(this.ordpage);
+          break;
+        case 'tab3':
+          this.handlePackage(this.packpage);
+          break;
+        case 'tab4':
+          console.log("ssss");
+          this.handleInventory(this.inventorypage);
+          break;
+      }
+    },
+    searchHide() {
+      this.search = !this.search;
+    },
+    searchChange() {
+      this.onLoad(this.page);
+    },
+    searchReset() {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    handleSubmit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.form.stringValue =jsonString;
+          if (!this.form.id) {
+            this.form.masterId = this.propertyformdata.id;
+            add(this.form).then(() => {
+              this.box = false;
+              this.onLoad(this.page);
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              });
+              let str = {
+                val: false
+              }
+              this.$emit("returnproperty", str);
+            });
+          } else {
+            update(this.form).then(() => {
+              this.box = false;
+              this.onLoad(this.page);
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              });
+              let str = {
+                val: false
+              }
+              this.$emit("returnproperty", str);
+            });
+          }
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    //订单列表
+    handleOrder(page){
+      let params={}
+      params.billLadingId =  this.$route.query.id;
+      getOrderDetail(page.currentPage, page.pageSize, Object.assign(params)).then(res => {
+        console.log("查看>>>>>订单>>",res.data.data);
+        const data =res.data.data
+        this.orddata = data.records;
+        this.ordpage.total = data.total
+      });
+    },
+    //包件列表
+    handlePackage(page){
+      let params={}
+      params.billLadingId =  this.$route.query.id;
+      getPackDetail(page.currentPage, page.pageSize, Object.assign(params)).then(res => {
+        console.log("查看>>>>>包间>>",res.data.data);
+        const data =res.data.data
+        this.packdata = data.records
+        this.packpage.total = data.total
+      });
+
+    },
+    //库存列表
+    handleInventory(page){
+      let params={}
+      params.billLadingId =  this.$route.query.id;
+      getInventoryDetail(page.currentPage, page.pageSize, Object.assign(params)).then(res => {
+        console.log("查看>>>>>库存>>",res.data.data);
+        const data =res.data.data
+        this.inventorydata = data.records
+        this.inventorypage.total = data.total
+      });
+    },
+
+    beforeClose(done) {
+      done();
+      this.form = {};
+      this.view = false;
+    },
+    selectionChange(list) {
+      console.log("sllsls");
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.table.clearSelection();
+    },
+    currentOrderChange(currentPage) {
+      this.ordpage.currentPage = currentPage;
+      this.handleOrder(this.ordpage);
+    },
+    sizeOrderChange(pageSize) {
+      this.ordpage.pageSize = pageSize;
+      this.handleOrder(this.ordpage);
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page);
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page);
+    },
+    currentInChange(currentPage) {
+      this.inventorypage.currentPage = currentPage;
+      this.handleInventory(this.inventorypage);
+    },
+    sizeInChange(pageSize) {
+      this.inventorypage.pageSize = pageSize;
+      this.handleInventory(this.inventorypage);
+    },
+    pcurrentChange(currentPage) {
+      this.packpage.currentPage = currentPage;
+      this.handlePackage(this.packpage)
+    },
+    psizeChange(pageSize) {
+      this.packpage.pageSize = pageSize;
+      this.handlePackage(this.packpage)
+    },
+    onLoad() {
+      //查询详情
+      this.loading = true;
+      let id =  this.$route.query.id;
+      getViewDetailOwn(id).then(res => {
+        console.log("res.data>>>>>>>>>>>>",res.data.data);
+        const data = res.data.data[0]
+        //this.deliverydata = data
+        this.data = data;
+      });
+      this.handleOrder(this.ordpage);
+      /*this.handlePackage(this.packpage);
+      this.handleInventory(this.packpage);*/
+      this.loading = false;
+    }
+  }
+};
+</script>
+