Squashed commit of the following:

commit 53fe58dc4f
Merge: c4b83f0 f6ccd21
Author: 0.0 <1092404103.qq.com>
Date:   Mon Jul 10 15:52:24 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit c4b83f0b53
Author: 0.0 <1092404103.qq.com>
Date:   Mon Jul 10 15:52:21 2023 +0800

    1.页面新增

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,

src/store/modules/common.js

@@ -10,7 +10,7 @@ const common = {
     isSearch: false,
     isRefresh: true,
     isLock: getStore({ name: 'isLock' }),
-    themeName: getStore({ name: 'themeName' }) || 'theme-hey',
+    themeName: getStore({ name: 'themeName' }) || 'default',
     lockPasswd: getStore({ name: 'lockPasswd' }) || '',
     website: website,
     setting: website.setting,

src/styles/css/beautiful.css

@@ -7,7 +7,7 @@
 .theme-beautiful .avue-sidebar .el-menu-item i, .theme-beautiful .avue-sidebar .el-menu-item span, .theme-beautiful .avue-sidebar .el-sub-menu__title i, .theme-beautiful .avue-sidebar .el-sub-menu__title span {
   color: #fff;
 }
-.theme-beautiful .avue-sidebar .el-menu-item .is-active, .theme-beautiful .avue-sidebar .el-sub-menu__title .is-active {
+.theme-beautiful .avue-sidebar .el-menu-item , .theme-beautiful .avue-sidebar .el-sub-menu__title .is-active {
   background: #399efd !important;
 }
 .theme-beautiful .avue-sidebar .el-menu-item:hover, .theme-beautiful .avue-sidebar .el-menu-item.is-active, .theme-beautiful .avue-sidebar .el-sub-menu__title:hover, .theme-beautiful .avue-sidebar .el-sub-menu__title.is-active {

src/styles/sidebar.scss

@@ -6,7 +6,7 @@
   position: relative;
   height: 100%;
   position: relative;
-  background-color: #031527;
+  background-color: #172e60;
   transition: width .2s;
   box-sizing: border-box;
   box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
@@ -46,10 +46,11 @@
     }
 
     &:hover {
-      background: transparent;
-
+      // background: transparent;
+      background-color: #2f4370;
       i, span {
-        color: #fff;
+        color: #d3832a;
+        
       }
     }
 
@@ -60,14 +61,14 @@
         left: 0;
         bottom: 0;
         width: 4px;
-        background: #172e60;
+        background-color: #4378eb;
         position: absolute;
       }
 
-      background-color: rgba(0, 0, 0, .8);
+      background-color: #2f4370;
 
       i, span {
-        color: #fff;
+        color: #d3832a;
       }
     }
   }

src/styles/theme/beautiful.scss

@@ -8,7 +8,8 @@
 
     .el-menu-item, .el-sub-menu__title {
       i, span {
-        color: #fff
+        color: #fff;
+        
       }
 
       .is-active {

src/styles/top.scss

@@ -12,10 +12,13 @@
   .el-menu-item {
     i, span {
       font-size: 13px;
+      // background-color: #d3832a;
     }
   }
 }
-
+.el-menu-item>.is-active{
+  background-color: #d3832a !important;
+}
 .avue-breadcrumb {
   height: 100%;
 
@@ -116,7 +119,7 @@
 .avue-logo {
   height: $top_height;
   line-height: $top_height;
-  background-color: #031527;
+  background-color: #172e60;
   font-size: 20px;
   overflow: hidden;
   box-sizing: border-box;

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: '车次',

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>

vite.config.js

@@ -12,7 +12,7 @@ export default ({ mode, command }) => {
       port: 2888,
       proxy: {
         '/api': {
-          target: 'http://192.168.2.29:13000',
+          target: 'http://192.168.2.11:8889',
           //target: 'http://test3.javablade.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),