From 0af05bd06f88aa0e839925e94038699b70d3db3a Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Sat, 5 Aug 2023 17:20:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=80=E9=94=AE=E7=AD=BE=E6=94=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionSigndetail.js    |    9 +
 src/router/views/index.js                     |   15 +
 .../distributionDeliveryListedt.vue           |    3 +-
 .../signdetail/distributionSigndetail.vue     |   11 +-
 .../signdetail/distributionSigndetaledt.vue   | 1113 +++++++++--------
 5 files changed, 599 insertions(+), 552 deletions(-)

diff --git a/src/api/distribution/distributionSigndetail.js b/src/api/distribution/distributionSigndetail.js
index 918849f7..65cffb69 100644
--- a/src/api/distribution/distributionSigndetail.js
+++ b/src/api/distribution/distributionSigndetail.js
@@ -32,6 +32,15 @@ export const getDetail = (id) => {
     }
   })
 }
+export const packdetail = (id) => {
+  return request({
+    url: '/api/logpm-distribution/signdetail/packdetail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
 
 export const remove = (ids) => {
   return request({
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 4b530884..aa114bfc 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -681,6 +681,21 @@ export default [
       },
     ],
   },
+  {
+    path: '/distribution/signdetail/distributionSigndetaledt',
+    component: Layout,
+    redirect: '/distribution/signdetail',
+    children: [
+      {
+        path: '/distribution/signdetail/distributionSigndetaledt',
+        name: '订单查看',
+        meta: {
+          i18n: 'dict',
+        },
+        component: () => import('@/views/distribution/signdetail/distributionSigndetaledt.vue'),
+      },
+    ],
+  },
   {
     path: '/distribution/stockup/distributionStockupDetails',
     component: Layout,
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index be37dc91..b7d28942 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -103,7 +103,7 @@
                   <!--              <el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>-->
                   <el-button type="primary" text icon="el-icon-view" @click="handleOne(row)" v-if="deliverydata.deliveryNumber > deliverydata.loadNub && row.signingStatus=='未签收'">一 键 装 车</el-button>
                   <el-button type="primary" text icon="el-icon-view" @click="handleSign(row)" v-if="row.signingStatus=='未签收'">复 核 签 收</el-button>
-                  <el-button type="primary" text icon="el-icon-view" @click="handleSignone(row)" v-if="row.signingStatus=='未签收' || row.driverSigning=='未签收' ">一 键 签 收</el-button>
+                  <el-button type="primary" text icon="el-icon-view" @click="handleSignone(row)" v-if="row.signingStatus=='已签收' || row.driverSigning=='已签收' ">一 键 签 收</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -1030,6 +1030,7 @@ export default {
           let data ={}
           data.reservationId =row.id
           data.deliveryId =this.deliverydata.id
+          console.log("一键签收data>>>>>>>>>>",data);
           getOneclickq(data).then(res => {
             this.$message.success(res.data.msg)
             this.onLoad()
diff --git a/src/views/distribution/signdetail/distributionSigndetail.vue b/src/views/distribution/signdetail/distributionSigndetail.vue
index 0b0347ec..55ca5a16 100644
--- a/src/views/distribution/signdetail/distributionSigndetail.vue
+++ b/src/views/distribution/signdetail/distributionSigndetail.vue
@@ -29,7 +29,7 @@
           @selection="selectionsc"
         >
           <template #default="slotProps">
-            <el-button size="small" @click="editsolt(slotProps.scope)">编辑</el-button>
+            <el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
             <!--            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
             <!--              >Delete</el-button>-->
           </template>
@@ -487,7 +487,14 @@ export default {
     },
     editsolt(scope) {
       const { row } = scope;
-      console.log("编辑>>>>>>>>>>>>>>>>>>>",row);
+      console.log("订单》》》》》》",row);
+      this.$router.push({
+        path: '/distribution/signdetail/distributionSigndetaledt',
+        query: {
+          data: encodeURIComponent(JSON.stringify(row)),
+          name: row.orderCode +'-查看订单'
+        }
+      });
 
     },
     btnsc(index, row) {
diff --git a/src/views/distribution/signdetail/distributionSigndetaledt.vue b/src/views/distribution/signdetail/distributionSigndetaledt.vue
index 06756d2b..395eac74 100644
--- a/src/views/distribution/signdetail/distributionSigndetaledt.vue
+++ b/src/views/distribution/signdetail/distributionSigndetaledt.vue
@@ -1,79 +1,101 @@
 <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 style="padding-left: 10%" >当前签收单状态>>>>>>>>> {{signfordata.signingStatusAll}}</span>
+          <span>服务号：{{orderdata.serviceNumber}} </span>
+        </el-col>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>订单自编号：{{orderdata.orderCode}} </span>
         </el-col>
       </el-row>
-      <el-divider>基本信息</el-divider>
       <el-row :gutter="24" class="rows">
-        <el-col :xl="5" :lg="7" :md="8" :sm="24" >
-          <span>服务号：{{signfordata.reservationCode}} </span>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>商城名称：{{orderdata.mallName}} </span>
         </el-col>
-        <el-col :xl="5" :lg="7" :md="8" :sm="24">
-          <span>订单自编号：{{signfordata.mallName}} </span>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>当前仓库：{{orderdata.warehouse}} </span>
         </el-col>
-        <el-col :xl="5" :lg="7" :md="8" :sm="24">
-          <span>商城名称：{{signfordata.reservationDate}} </span>
-        </el-col>
-        <el-col :xl="3" :lg="7" :md="8" :sm="24">
-          <span>当前仓库：{{signfordata.deliveryType}}</span>
-        </el-col>
-        <el-col :xl="3" :lg="7" :md="8" :sm="24">
-          <span>品牌：{{signfordata.deliveryType}}</span>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>品牌：{{orderdata.brand}} </span>
         </el-col>
       </el-row>
       <el-divider>收货人信息</el-divider>
       <el-row :gutter="24" class="rows">
-        <el-col :xl="7" :lg="7" :md="10" :sm="24" >
-          <span>收货人：{{signfordata.consignee}} </span>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>收货人：{{orderdata.consignee}} </span>
         </el-col>
-        <el-col :xl="7" :lg="7" :md="10" :sm="24">
-          <span>手机号码：{{signfordata.deliveryPhone}} </span>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>手机号码：{{orderdata.deliveryPhone}} </span>
         </el-col>
-        <el-col :xl="7" :lg="7" :md="10" :sm="24">
-          <span>收货地址：{{signfordata.deliveryAddress}} </span>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>收货地址：{{orderdata.deliveryAddress}} </span>
         </el-col>
       </el-row>
+      <el-divider>包 件 列 表</el-divider>
+
+
+
+
+
+          <!-- 列表模块 -->
+          <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-divider>订单信息</el-divider>
-      <tablecmt
-        :columnList="columnList"
-        :tableData="data"
-        :loading="loading"
-        @inputTxt="inputsc"
-        @timeCheck="timesc"
-        @btnCheck="btnsc"
-        @selectCheck="selectsc"
-        @selection="selectionsc"
-      >
-        <template #default="slotProps">
-          <el-button size="small" @click="editsolt(slotProps.scope)">查 看 包 条</el-button>
-          <el-button size="small" @click="checkAddValue(slotProps.scope)">费 用 增 项</el-button>
-        </template>
-      </tablecmt>
-      <div class="avue-crud__pagination" style="width:100%">
-        <!-- 分页模块 -->
-        <el-pagination align="right"
-                       background
-                       @size-change="sizeChange"
-                       @current-change="currentChange"
-                       :current-page="page.currentPage"
-                       :page-sizes="[10, 20, 30, 40, 50, 100]"
-                       :page-size="page.pageSize"
-                       layout="total, sizes, prev, pager, next, jumper"
-                       :total="page.total">
-        </el-pagination>
-      </div>
-      <el-divider>包件信息</el-divider>
-      <avue-form :option="signoption"
-                 v-model="signfordata"
-                 :data="signdata"
-                 ref="signform"
-      >
-      </avue-form>
-      <!--包间信息-->
+      <el-row>
+        <div class="avue-crud__pagination" style="width:100%">
+          <!-- 分页模块 -->
+          <!--          <el-pagination align="right"-->
+          <!--                         background-->
+          <!--                         @size-change="sizeChange"-->
+          <!--                         @current-change="currentChange"-->
+          <!--                         :current-page="page.currentPage"-->
+          <!--                         :page-sizes="[10, 20, 30, 40, 50, 100]"-->
+          <!--                         :page-size="page.pageSize"-->
+          <!--                         layout="total, sizes, prev, pager, next, jumper"-->
+          <!--                         :total="page.total">-->
+          <!--          </el-pagination>-->
+        </div>
+      </el-row>
+      <!-- 表单模块 -->
       <el-dialog :title="title"
                  v-model="box"
                  width="50%"
@@ -83,10 +105,9 @@
                   @selection-change="selectionChange"
                   :data="wrapdata"
                   :height="height"
-                  :border="wrapoption.border"
                   style="width: 100%"
-                  >
-          <el-table-column type="expand"  v-if="wrapoption.expand" align="center"></el-table-column>
+                  :border="option.border">
+          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
           <template v-for="(item,index) in wrapoption.column">
             <!-- table字段 -->
             <el-table-column v-if="item.hide!==true"
@@ -120,18 +141,35 @@
         <!--        </template>-->
       </el-dialog>
 
+<!--      <el-dialog :title="'签收'"-->
+<!--                 v-model="signBox"-->
+<!--                 width="45%"-->
+<!--                 append-to-body>-->
+<!--        <avue-form :option="signoption"-->
+<!--                   v-model="signform"-->
+<!--                   :data="signdata"-->
+<!--                   ref="signform"-->
+<!--        >-->
+<!--        </avue-form>-->
+<!--        <div style="bottom: 7%;margin-left: 500px;width: 50%">-->
+<!--          <div style="width: 100%">-->
+<!--            <el-button  type="primary" @click="submitForm" style="margin-right: 20%" >确定</el-button>-->
+<!--            <el-button  type="primary" @click="cancellation" >取消</el-button>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </el-dialog>-->
 
     </div>
   </basic-container>
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove ,getDetailById,getListOrder} from '@/api/distribution/distributionSignfor';
+import { getList,getPage, packdetail, add, update, remove } from "@/api/distribution/distributionSigndetail";
+
 
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
-import { getWrapdetail } from '@/api/distribution/distributionDeliveryList';
-import { getStockAddValue } from '@/api/distribution/distributionStockArticle';
+import dayjs from 'dayjs';
 
 export default {
   data() {
@@ -141,31 +179,130 @@ export default {
       title: '',
       // 是否展示弹框
       box: false,
-      // 服务内容是否展示弹框
-      fbox: false,
+      //签收是否显示
+      signBox: false,
+      //签收类型
+      signBoxO: false,
       dataForm: {},
       // 是否显示查询
       search: true,
-      // 是否显示新增
+      //是否显示新增
       isadd: false,
-      signfordata:{},
+      orderdata:{
+        reservationList:[],
+      },
       // 加载中
       loading: true,
-      // 查看按钮
+      //查看按钮
       edt:false,
-      // 查看pda
+      activeTab:'tab1',
+      previousTab: null,
+      //隐藏
+      pake:false,
+      cus:true,
+      ord:false,
+      inventory:false,
+      //查看pda
       padview:false,
       // 是否为查看模式。。
       view: false,
+      // 签收。。
+      signView:false,
       // 查询信息
       query: {},
-      // 包条查询信息
-      wquery: {},
       inputTypeData:[],
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
       // 签收表单数据
       signform: {},
-      // 签收列表
-      signdata: [],
+      // 选择行
+      selectionList: [],
+      isLiabilityData: [],
+      //状态列表
+      stateData: [],
+      // 表单配置
+      option: {
+        expand: false,
+        index: true,
+        border: true,
+        selection: true,
+        column: [
+          {
+            label: "配送单号",
+            prop: "noteNumber",
+            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',
@@ -181,8 +318,41 @@ export default {
         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",
@@ -191,7 +361,7 @@ export default {
             type: "radio",
             width:"150px",
             align:'center',
-            disabled:true,
+            disabled:false,
             dicData: [
               {
                 label: '签收',
@@ -204,7 +374,7 @@ export default {
             ],
           },
           {
-            label: "司机签收图片",
+            label: "签收图片",
             prop: "deliverySignPictures",
             labelWidth:'150',
             type: 'upload',
@@ -219,148 +389,47 @@ export default {
               res: 'data',
               url: 'link',
             },
-            disabled:true,
+            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: "clerkSignPictures",
-            type: 'upload',
-            listType: 'picture-card',
-            dataType: 'string',
+            label: "备注",
+            prop: "clerkSignRemarks",
             labelWidth:'150',
             span:15,
-            disabled:true,
-            multiple:true,
-            width:"200px",
-            align:'left',
-            action: '/blade-resource/oss/endpoint/put-file',
-            limit: 15,
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-            },
-
+            type: "input",
+            width:"150px",
+            align:'center',
           },
 
-
         ]
       },
-      columnList: [
-        // {
-        //   prop: '',
-        //   label: '序号',
-        //   type: 0,
-        //   values: '',
-        //   width: 55,
-        //   checkarr: [],
-        //   fixed: true,
-        // },
-        {
-          prop: 'orderCode',
-          label: '订单自编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          // head: true,
-        },
-        {
-          label: "货物名称",
-          prop: "descriptionGoods",
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          label: "物料名称",
-          prop: "materialName",
-          type: 1,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          label: "备货件数",
-          prop: "deliveryNumber",
-          type: 1,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          label: "已备数量",
-          prop: "readyStock",
-          type: 1,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          label: "备货状态",
-          prop: "stockArticleState",
-          type: 1,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          label: "托盘码",
-          prop: "pallet",
-          type: 1,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: '',
-          label: '操作',
-          type: 6,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed:'right',
-          sortable: false,
-        }
-        // 更多列的配置...
-      ],
-      // 分页信息
-      page: {
-        currentPage: 1,
-        pageSize: 10,
-        total: 40
-      },
-      // 表单数据
-      form: {},
-      wid:null,
-      // 选择行
-      selectionList: [],
-      isLiabilityData: [],
-      addvalueServeTypeData:[],
-      dialogVisible:false,
-      //状态列表
-      stateData: [],
-      //包肩分页信息
-      wpage:{
-        currentPage: 1,
-        pageSize: 10,
-        total: 40
-      },
-      // 包间配置
+
+
+      // 表单配置
       wrapoption: {
         expand: false,
         index: true,
@@ -369,7 +438,7 @@ export default {
         column: [
           {
             label: "包条码",
-            prop: "packetBarCode",
+            prop: "orderPackageCode",
             search: true,
             width:"100px"
           },
@@ -379,6 +448,12 @@ export default {
             search: true,
             width:"100px"
           },
+          {
+            label: "货位名称",
+            prop: "goodsAllocation",
+            search: true,
+            width:"100px"
+          },
           {
             label: "一级品类",
             prop: "firsts",
@@ -399,37 +474,192 @@ export default {
           },
           {
             label: "物料编号",
-            prop: "encoded",
+            prop: "materialCode",
             search: true,
             width:"100px"
           },
           {
             label: "物料名称",
-            prop: "material",
+            prop: "materialName",
             search: true,
             width:"100px"
           },
           {
             label: "托盘码",
             prop: "pallet",
+            width:"100px"
+          },
+          {
+            label: "签收数量",
+            prop: "receivedQuantity",
+            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: "goodsAllocation",
+            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: "deliveryNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "已备数量",
+            prop: "readyStock",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "备货状态",
+            prop: "stockArticleState",
+            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: [],
-      // 基本信息表单列表
-      basicdata: {},
-      //
+      // 签收列表
+      signdata: [],
+      //客户id
+      wid:null,
+      //客户详情
       wrapdata:[],
+      //包条列表
+      packdata:[],
+      //订单列表
+      orddata:[],
+      //库存品列表
+      inventorydata:[],
     };
   },
   watch: {
@@ -438,21 +668,20 @@ export default {
       // 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 {
-      }
+      // 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();
-    this.queryDictionary();
   },
   created() {
     // //查询字典
@@ -469,11 +698,18 @@ export default {
     }
   },
   methods: {
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
     //修改
-    rowUpdate() {
-
+    rowUpdate(row, index, done, loading) {
+      console.log("row>>>>>>>>",row);
     },
-
     queryDictionary() {
       getDictionaryBiz('yes_no').then(res => {
         this.isLiabilityData = res.data.data;
@@ -481,33 +717,15 @@ export default {
       getDictionaryBiz('basic_in_type').then(res => {
         this.inputTypeData = res.data.data;
       });
-      getDictionaryBiz('addvalue_serve_type').then(res => {
-        this.addvalueServeTypeData = res.data.data;
-      });
 
     },
     //返回
     handleViewpda() {
 
     },
-    //增值服务
-    handleCheckedCitiesChange(value) {
-      if (value) {
-        this.form.addvalueType = value;
-      }
-      console.log('>>>>>', this.form);
-      if (value.length < 1) {
-        this.costList = [];
-        this.costListName = [];
-      }
-      this.deliveryWayData.forEach(i => {
-        if (value.includes(i.dictKey)) {
-          console.log(i);
-          i.pitch = true;
-          this.costListName = value;
-        }
-      });
-
+    //取消
+    cancellation(){
+      this.signBox = false;
     },
     init() {
       this.height = this.setPx(document.body.clientHeight - 340);
@@ -523,103 +741,40 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    costadd(scope) {
-      const { row } = scope;
-      //查询增值任务
-      console.log("row>>>>>>>>>>>>>>>>>>>>",row);
-      this.fbox = true;
-    },
-    selectionsc(value) {
-      console.log("进来了>>>>>>>>>>>>>",value);
-    },
-    delectsolt(scope) {
-      const { row } = scope;
-      console.log(row);
-    },
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => {
-        });
-    },
-    editsolt(scope) {
-      const { row } = scope;
-      this.title = '查看包件';
-      console.log("row>>>>>>>",row);
-      this.view = true;
-      this.box = true;
-      this.wid= row.stockArticleId
-      this.getWrapdetails(this.wpage)
-    },
-    btnsc(index, row) {
-      console.log(index, row);
-    },
-    selectsc(index, row) {
-      this.query[row.prop] =index
-      if (!index){
-        delete this.query[row.prop]
-      }
-      this.onLoad(this.page);
-    },
-    timesc(index, row) {
-      console.log(index, row);
-    },
-    inputsc(index, row) {
-      this.query[row.prop] =index
-      if (!index){
-        delete this.query[row.prop]
-      }
-      this.onLoad(this.page);
+
+
+    //订单列表
+    handleOrder(page){
+      let params={}
+      params.deliveryId =  this.orderdata.id
+      getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        console.log("查看>>>>>订单>>",res.data.data);
+        const data =res.data.data
+        this.orddata = data.records
+        this.ordpage.total = data.total
+      });
     },
-    getWrapdetails(page){
+    //包件列表
+    handlePackage(page){
       let params={}
-      params.orderId = this.wid
-      console.log("this.wid>>>>>>>",this.wid);
-      getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.wquery)).then(res => {
-        console.log("查看>>>>>>>",res.data.data);
+      params.deliveryId =  this.orderdata.id
+      getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        console.log("查看>>>>>包间>>",res.data.data);
         const data =res.data.data
-        this.wrapdata = data.records
-        this.wpage.total = data.total
+        this.packdata = data.records
+        this.packpage.total = data.total
       });
+
     },
-    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;
-        }
+    //库存列表
+    handleInventory(page){
+      let params={}
+      params.deliveryId =  this.orderdata.id
+      getinventorydetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        console.log("查看>>>>>库存>>",res.data.data);
+        const data =res.data.data
+        this.inventorydata = data.records
+        this.inventorypage.total = data.total
       });
     },
     handleAdd() {
@@ -639,59 +794,60 @@ export default {
       this.title = '查看';
       this.view = true;
       this.box = true;
-      getWrapdetail(row.id).then(res => {
+      this.wid= row.id
+      this.getWrapdetails(this.wpage)
+    },
+    handleSign(row) {
+      console.log("签收>>>>>>>>>>",row);
+      // this.title = '查看';
+      // this.view = true;
+      this.signform = row
+      this.signBox = true;
+      //  this.wid= row.id
+      // this.getWrapdetails(this.wpage)
+    },
+    //一键签收
+    handleSignone(row) {
+      console.log("一键签收>>>>>>>>>>",row);
+      this.$confirm('确认一键签收？')
+        .then(_ => {
+          let data ={}
+          data.reservationId =row.id
+          data.deliveryId =this.orderdata.id
+          getOneclickq(data).then(res => {
+            this.$message.success(res.data.msg)
+            this.onLoad()
+          });
+        })
+        .catch(_ => {
+        });
+    },
+    handleOne(row) {
+      console.log("签收>>>>>>>>>>",row);
+      this.$confirm('确认一键装车？')
+        .then(_ => {
+          let data ={}
+          data.reservationId =row.id
+          data.deliveryId =this.orderdata.id
+          getOneclick(data).then(res => {
+            this.$message.success(res.data.msg)
+            this.onLoad()
+          });
+        })
+        .catch(_ => {
+        });
+    },
+    getWrapdetails(page){
+      let params={}
+      params.reservationId = this.wid
+      getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         console.log("查看>>>>>>>",res.data.data);
+        const data =res.data.data
+        this.wrapdata = data.records
+        this.wpage.total = data.total
       });
     },
-    //查看增值服务
-    checkAddValue(scope) {
-      const { row } = scope;
-      this.fbox =true;
-      let id = row.id
-      getStockAddValue(id).then(res=>{
-        let data= res.data.data.data;
-        //存在多种增值服务项
-        let a=[];
-        data.forEach((item,index)=>{
-          if (item.addvalueId === "1" ){
-            this.addvalueServeTypeData[0].f = item.number;
-            this.addvalueServeTypeData[0].e = item.fee;
-            this.addvalueServeTypeData[0].d = item.floor;
-          }
-
-          if (item.addvalueId === "2"){
-            this.addvalueServeTypeData[1].a = item.kilometer;
-            this.addvalueServeTypeData[1].e = item.fee;
-          }
-          if (item.addvalueId === "3"){
-            this.addvalueServeTypeData[2].f = item.number;
-            this.addvalueServeTypeData[2].e = item.fee;
-          }
-          if (item.addvalueId === "4"){
-            this.addvalueServeTypeData[3].b = item.distance;
-            this.addvalueServeTypeData[3].e = item.fee;
-          }
-          if (item.addvalueId === "5"){
-            this.addvalueServeTypeData[4].f = item.number;
-            this.addvalueServeTypeData[4].e = item.fee;
-          }
-          if (item.addvalueId === "6"){
-            this.addvalueServeTypeData[5].c = item.peopleNum;
-            this.addvalueServeTypeData[5].e = item.fee;
-          }
-          if (item.addvalueId === "7"){
-            this.addvalueServeTypeData[6].f = item.number;
-            this.addvalueServeTypeData[6].e = item.fee;
-          }
-          a.push(item.addvalueId);
-          console.log("<<<<<<<<<<",a);
 
-        })
-        this.form.addvalueType=a;
-
-        console.log(">>>>>>>>>>>>>>>>>>>>>>>>>",res);
-      })
-    },
     handleDelete() {
       if (this.selectionList.length === 0) {
         this.$message.warning('请选择至少一条数据');
@@ -737,6 +893,7 @@ export default {
       this.view = false;
     },
     selectionChange(list) {
+      console.log("sllsls");
       this.selectionList = list;
     },
     selectionClear() {
@@ -745,11 +902,11 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
-      this.getListOrders(this.page);
+      this.onLoad(this.page);
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
-      this.getListOrders(this.page);
+      this.onLoad(this.page);
     },
     wcurrentChange(currentPage) {
       this.wpage.currentPage = currentPage;
@@ -761,163 +918,21 @@ export default {
     },
     onLoad() {
       //查询详情
+      const data = decodeURIComponent(this.$route.query.data);
+      this.orderdata = JSON.parse(data);
+      console.log("data>>>>>>>>", this.orderdata);
       this.loading = true;
-      let id = this.$route.query.id;
-      getDetail(id).then(res => {
+      let id =  this.orderdata.id;
+      packdetail(id).then(res => {
+        console.log("res.data>>>>>>>>>>>>",res.data.data);
         const data = res.data.data
-        console.log("data>>>>>>>>>",data);
-        this.signfordata = data
-        this.getListOrders(this.page)
-      });
+        //this.orderdata = data
+        this.wpage.total = data.total;
+        this.packdata = data.records
 
-      this.loading = false;
-    },
-    getListOrders(page,params = {}){
-      this.query.reservationId =this.signfordata.reservationId;
-      getListOrder(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data =res.data.data
-        this.page.total = data.total
-          this.data =data.records
       });
+      this.loading = false;
     }
   }
 };
 </script>
-
-<style lang="scss">
-.btsbx{
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 20px;
-  >button{
-    width: 120px;
-    height: 40px;
-  }
-}
-.maxitembxlist{
-  display: flex;
-  flex-direction: column;
-  // padding: 10px;
-  box-sizing: border-box;
-  margin-top: 20px;
-  >.items{
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    background-color: #fcfcfc;
-    padding: 10px;
-    box-sizing: border-box;
-    border: 1px solid #e2e0e0;
-    border-radius: 2px;
-    margin-bottom: 20px;
-    &:nth-last-child(1){
-      margin-bottom: 0;
-    }
-    >.contbx{
-      display: flex;
-      flex-direction: column;
-      width: 100%;
-      margin-top: 10px;
-      >.tabitem{
-        display: flex;
-        align-items: center;
-        >div{
-          flex: 1;
-          height: 45px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          background-color: #f3f3f3;
-          border: 1px solid #e2e0e0;
-          margin-bottom: -2px;
-          margin-right: -2px;
-        }
-      }
-      >.contentitem{
-        display: flex;
-        align-items: center;
-        >div{
-          flex: 1;
-          height: 45px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          background-color: #ffffff;
-          border: 1px solid #e2e0e0;
-          margin-bottom: -2px;
-          margin-right: -2px;
-        }
-      }
-    }
-    >.titltophead{
-      width: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      .icons{
-        font-size: 27px;
-        &:nth-of-type(1){
-          margin-right: 8px;
-        }
-      }
-    }
-    >.editinput{
-      display: flex;
-      flex-direction: column;
-      padding: 20px 0;
-      >.inputitem{
-        display: flex;
-        align-items: flex-start;
-        justify-content: space-between;
-        margin-bottom: 10px;
-        &:nth-last-child(1){
-          margin-bottom: 0;
-        }
-        .inpts{
-          display: flex;
-          align-items: flex-start;
-
-          flex: 1;
-          padding-right: 10px;
-          >span{
-            width: 90px;
-          }
-          >div:nth-of-type(1){
-            flex: 1;
-          }
-        }
-      }
-    }
-  }
-}
-.topbox{
-  display: flex;
-  flex-direction: column;
-  >.titlxbx{
-    font-size: 16px;
-    display: flex;
-    align-items: center;
-    >div{
-      flex: 1;
-      display: flex;
-      align-items: center;
-      >div{
-        flex: 1;
-        height: 40px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border: 1px solid #e2e0e0;
-        margin-bottom: -1px;
-        margin-right: -1px;
-        word-break: break-all;
-        &:nth-of-type(1){
-          background-color: #f3f3f3;
-        }
-      }
-
-    }
-  }
-}
-</style>