Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/page/index/index.vue

@@ -16,9 +16,9 @@
         <div id="avue-view" v-show="!isSearch" v-if="isRefresh">
           <router-view #="{ Component }">
             <!-- <keep-alive :include="$store.getters.tagsKeep" :max="20">    -->
-            <!-- <keep-alive :max="20"> -->
+            <keep-alive :max="10">
               <component :is="Component" />
-            <!-- </keep-alive> -->
+            </keep-alive>
           </router-view>
         </div>
       </div>

src/router/views/index.js

@@ -1035,30 +1035,30 @@ export default [
       },
     ],
   },
-  {
+  // {
-    path: '/distribution/turndelivery/devtmp',
+  //   path: '/distribution/turndelivery/devtmp',
-    component: Layout,
+  //   component: Layout,
-    redirect: '/distribution/turndelivery/devtmp',
+  //   redirect: '/distribution/turndelivery/devtmp',
-    children: [
+  //   children: [
-      {
+  //     {
-        path: '/distribution/turndelivery/devtmp',
+  //       path: '/distribution/turndelivery/devtmp',
-        name: '商配计划重构',
+  //       name: '商配计划重构',
-        component: () => import('@/views/distribution/turndelivery/devtmp.vue'),
+  //       component: () => import('@/views/distribution/turndelivery/devtmp.vue'),
-      },
+  //     },
-    ],
+  //   ],
-  },
+  // },
-  {
+  // {
-    path: '/distribution/signfor//devtmp',
+  //   path: '/distribution/signfor//devtmp',
-    component: Layout,
+  //   component: Layout,
-    redirect: '/distribution/signfor//devtmp',
+  //   redirect: '/distribution/signfor//devtmp',
-    children: [
+  //   children: [
-      {
+  //     {
-        path: '/distribution/signfor//devtmp',
+  //       path: '/distribution/signfor//devtmp',
-        name: '签收明细重构',
+  //       name: '签收明细重构',
-        component: () => import('@/views/distribution/signfor//devtmp.vue'),
+  //       component: () => import('@/views/distribution/signfor//devtmp.vue'),
-      },
+  //     },
-    ],
+  //   ],
-  },
+  // },
   // {
   //   path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
   //   component: Layout,

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -134,7 +134,7 @@
             >
             <el-text
               size="small"
-              v-if="slotProps.scope.row.signingStatusAll == '司机签收'"
+              v-if="slotProps.scope.row.sijiSigningStatus == '司机已签收' && slotProps.scope.row.wenyuanSigningStatus=='文员待审核'"
               @click="handleSign(slotProps.scope.row)"
               >复 核</el-text
             >
@@ -1326,6 +1326,10 @@ export default {
       // this.view = true;
       this.signform = row;
       this.signBox = true;
+      getDetail(row.id).then(res => {
+        console.log("res");
+        this.form = res.data.data;
+      });
       //  this.wid= row.id
       // this.getWrapdetails(this.wpage)
     },