From c4b83f0b5335a90a5d19b36a7b1752f39444c760 Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Mon, 10 Jul 2023 15:52:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/views/index.js                     | 19 +++++++++++++++
 .../deliverylist/distributionDeliveryList.vue |  4 ++--
 .../distributionDeliveryListdis.vue           | 24 +++++++++----------
 .../distributionDeliveryListedt.vue           |  7 +++---
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/router/views/index.js b/src/router/views/index.js
index a6cb9909..4c2b15ef 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -629,6 +629,25 @@ export default [
       },
     ],
   },
+  {
+    path: '/distribution/signfor/distributionSignforedt',
+    component: Layout,
+    redirect: '/distribution/distributionSignforedt',
+    children: [
+      {
+        path: '/distribution/signfor/distributionSignforedt',
+        name: '签收查看',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id
+        }),
+        component: () => import('@/views/distribution/signfor/distributionSignforedt.vue'),
+      },
+    ],
+  },
   // {
   //   path: '/distribution/inventory/distributionPrints',
   //   component: Layout,
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index bf7b24b5..0dbcda7b 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -314,7 +314,7 @@ export default {
   mounted () {
     this.queryDictionary();
     this.init();
-        /** 
+        /**
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
@@ -416,7 +416,7 @@ export default {
         this.columnList = newarr;
         this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
       }
-      
+
     },
     selectionsc(value) {
       console.log("进来了>>>>>>>>>>>>>",value);
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 2d8d3e62..70f2111f 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -16,7 +16,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-delete" @click="handleDelete" plain>新 增</el-button>-->
-            <el-button type="primary" @click="toDeliveryPlan">新 增</el-button>
+            <el-button type="primary" @click="toDeliveryPlan">新 增 商 配</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -141,15 +141,15 @@ export default {
       // 选择行
       selectionList: [],
       columnList: [
-        // {
-        //   prop: '',
-        //   label: '序号',
-        //   type: 0,
-        //   values: '',
-        //   width: 55,
-        //   checkarr: [],
-        //   fixed: true,
-        // },
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
         {
           prop: 'trainNumber',
           label: '车次',
@@ -303,7 +303,7 @@ export default {
   mounted () {
     this.queryDictionary();
     this.init();
-        /** 
+        /**
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
@@ -405,7 +405,7 @@ export default {
         this.columnList = newarr;
         this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
       }
-      
+
     },
     selectionsc(value) {
       console.log("进来了>>>>>>>>>>>>>",value);
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 34c8a405..998ac079 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -28,7 +28,8 @@
           <span>装卸班组：{{deliverydata.loadingTeamName}} </span>
         </el-col>
         <el-col :xl="7" :lg="7" :md="8" :sm="24">
-          <span>{{deliverydata.loadingTeamType}} </span>
+<!--          <span>{{deliverydata.loadingTeamType}} </span> -->
+          <span> 装 </span>
         </el-col>
       </el-row>
       <el-divider>作业时间</el-divider>
@@ -37,10 +38,10 @@
           <span>创建时间：{{deliverydata.createTime}} </span>
         </el-col>
         <el-col :xl="7" :lg="7" :md="8" :sm="24">
-          <span>备货时间：{{deliverydata.lead_time}} </span>
+          <span>备货时间：{{deliverydata.loadTime}} </span>
         </el-col>
         <el-col :xl="7" :lg="7" :md="8" :sm="24">
-          <span>装车时间：{{deliverydata.loading_time}} </span>
+          <span>装车时间：{{deliverydata.loadingTime}} </span>
         </el-col>
       </el-row>
       <el-divider>订单列表</el-divider>