1

src/layout/index/top/index.vue

@@ -44,6 +44,8 @@
               <el-button v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`" 
                 v-if="btnStatus.status5" @click="goToPage(6)" class="btn_css">去称皮重
               </el-button>
+              <!-- <el-button @click="goToPage(6)" class="btn_css">去称皮重
+              </el-button> -->
               <el-button v-hasPermission="`acquisitionManagement.acquisitionPay.add`" v-if="btnStatus.status6"
                 @click="goToPage(5)" class="btn_css">去结算</el-button>
               
@@ -606,7 +608,7 @@
       async getQRCodeData(tmp) {
         await getQRCodeData(tmp)
           .toPromise()
-          .then((response) => { 
+          .then((response) => { debugger
             this.toPageData = response
             // 处理按钮显示状态
             // this.btnStatus 
@@ -631,9 +633,10 @@
             if ( this.toPageData.qualityInspectionManagement.confirm != '0' &&  (_status1 == '已称毛重' || _status1 == '已称皮重') && _status3 == '') {
               this.btnStatus.status5 = true
             } 
-            if ( this.toPageData.qualityInspectionManagement.confirm != '0' &&   _status1 == '已称皮重' && _status3 == '待结算')  {
+            if (this.toPageData.qualityInspectionManagement.confirm != '0' &&   _status1 == '已称皮重' && _status3 == '待结算')  {
               this.btnStatus.status6 = true
             }
+           
             if (_status3 == '已结算') {
               this.$message.error('业务已完结');
             } else {
@@ -691,6 +694,8 @@
            _saomadata.monitorUrl2 = this.toPageData.warehouseBaseInfo.monitorUrl2
            _saomadata.allowEdit = this.toPageData.warehouseBaseInfo.allowEdit
            _saomadata.number = this.toPageData.number
+           //入库状态
+           
             localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
              this.$router.push({
             name: 'newWeighingManagement',query: {  id:this.index++ }
@@ -709,9 +714,11 @@
            _saomadata.monitorUrl1 = this.toPageData.warehouseBaseInfo.monitorUrl1
            _saomadata.monitorUrl2 = this.toPageData.warehouseBaseInfo.monitorUrl2
            _saomadata.allowEdit = this.toPageData.warehouseBaseInfo.allowEdit
+           _saomadata.number = this.toPageData.number
             localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
            this.$router.push({
-            name: 'newWeighingManagement',
+            name: 'newWeighingManagement'
+            ,query: {  id:this.index++ }
           })
         }
         this.smAlert = false

src/views/houseSelfCollect/component/routers/route.js

@@ -1,245 +1,245 @@
 import Layout from '@/layout/index';
 
 const houseSelfCollectRouter = {
-  path: '/houseSelfCollect',
-  component: Layout,
-  redirect: '/houseSelfCollect',
-  name: 'houseSelfCollect',
-  alwaysShow: true, // will always show the root menu
-  meta: {
-    title: 'houseSelfCollect',
-    module: 'acquisitionManagement',
-    icon: '-a-4-shougoubeifen'
-  },
-  children: [
-    // 客户管理
-    {
-      path: 'customerManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagement'),
-      name: 'customerManagement',
-      meta: {
-        title: 'customerManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionCustomer.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'入库管理客户管理'
-      }
+    path: '/houseSelfCollect',
+    component: Layout,
+    redirect: '/houseSelfCollect',
+    name: 'houseSelfCollect',
+    alwaysShow: true, // will always show the root menu
+    meta: {
+        title: 'houseSelfCollect',
+        module: 'acquisitionManagement',
+        icon: '-a-4-shougoubeifen'
     },
+    children: [
+        // 客户管理
+        {
+            path: 'customerManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagement'),
+            name: 'customerManagement',
+            meta: {
+                title: 'customerManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionCustomer.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '入库管理客户管理'
+            }
+        },
         //客户管理添加
         {
-          path: 'customerManagementAdd',
-          component: () =>
-            import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagementAdd'),
-          name: 'customerManagementAdd',
-          meta: {
-            title: 'customerManagementAdd',
-            shortcutEntrance: 'houseSelfCollect',
-            module: 'acquisitionManagement.acquisitionCustomer.add',
-            permissicon: [],
-            keepAlive: true,
-            _title:'客户管理添加'
-          },
-          hidden: true
+            path: 'customerManagementAdd',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagementAdd'),
+            name: 'customerManagementAdd',
+            meta: {
+                title: 'customerManagementAdd',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionCustomer.add',
+                permissicon: [],
+                keepAlive: true,
+                _title: '客户管理添加'
+            },
+            hidden: true
+        },
+        //收购管理
+        {
+            path: 'acquisitionManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagement'),
+            name: 'acquisitionManagement',
+            meta: {
+                title: 'acquisitionManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisition.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '入库管理仓库设置'
+            }
+        },
+        //收购新增
+        {
+            path: 'acquisitionManagementAdd',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagementAdd'),
+            name: 'acquisitionManagementAdd',
+            meta: {
+                title: 'acquisitionManagementAdd',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisition.add',
+                permissicon: [],
+                keepAlive: true,
+                _title: '收购管理新增'
+            },
+            hidden: true
+        },
+        // // 质检管理
+        // {
+        //   path: 'inspectionManagement',
+        //   component: () =>
+        //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagement'),
+        //   name: 'inspectionManagement',
+        //   meta: {
+        //     title: 'inspectionManagement',
+        //     shortcutEntrance: 'houseSelfCollect',
+        //     module: 'acquisitionManagement.acquisitionQuality.view',
+        //     permissicon: [],
+        //     keepAlive: true
+        //   }
+        // },
+        // // 质检管理记录
+        {
+            path: 'inspectionManagementrecord',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagementrecord'),
+            name: 'inspectionManagementrecord',
+            meta: {
+                title: 'inspectionManagementrecord',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionQuality.view',
+                permissicon: [],
+                _title: '质检管理记录'
+                    // keepAlive:true
+            },
+            hidden: true
+        },
+        {
+            path: 'inspectionManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagementNew'),
+            name: 'inspectionManagementNew',
+            meta: {
+                title: 'inspectionManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionQuality.view',
+                permissicon: [],
+                _title: '入库管理质检管理'
+                    // keepAlive:true
+            }
+        },
+        // // 检斤管理
+        // {
+        //   path: 'weighingManagement',
+        //   component: () =>
+        //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weighingManagement'),
+        //   name: 'weighingManagement',
+        //   meta: {
+        //     title: 'weighingManagement',
+        //     shortcutEntrance: 'houseSelfCollect',
+        //     module: 'acquisitionManagement.acquisitionWeight.view',
+        //     permissicon: [],
+        //     keepAlive: true
+        //   }
+        // },
+        // 新检斤管理
+        {
+            path: 'newWeighingManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/newWeighingManagement'),
+            name: 'newWeighingManagement',
+            meta: {
+                title: 'newWeighingManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionWeight.view',
+                permissicon: [],
+                _title: '入库管理检斤管理',
+                keepAlive: false
+            }
+        },
+        // 付款管理
+        {
+            path: 'paymentManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/paymentManagement'),
+            name: 'paymentManagement',
+            meta: {
+                title: 'paymentManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionPay',
+                permissicon: [],
+                _title: '付款管理'
+                    // keepAlive: true
+            }
+        },
+        {
+            path: 'settlement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/settlement'),
+            name: 'settlement',
+            meta: {
+                title: 'settlement',
+                shortcutEntrance: 'settlement',
+                module: 'acquisitionManagement.acquisitionPay.view',
+                permissicon: [],
+                keepAlive: false,
+                _title: '入库管理结算'
+            },
+            hidden: true
+        },
+        {
+            path: 'inspectInfolook',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfoLook'),
+            name: 'inspectInfo',
+            meta: {
+                title: 'inspectInfo',
+                shortcutEntrance: 'inspectInfo',
+                module: 'acquisitionManagement.acquisitionQuality.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '查看质检信息'
+            },
+            hidden: true
+        },
+        {
+            path: 'inspectInfo',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfo'),
+            name: 'inspectInfo',
+            meta: {
+                title: 'inspectInfo',
+                shortcutEntrance: 'inspectInfo',
+                module: 'acquisitionManagement.acquisitionQuality.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '质检信息'
+            },
+            hidden: true
+        },
+        {
+            path: 'weightCheck',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheck'),
+            name: 'weightCheck',
+            meta: {
+                title: 'weightCheck',
+                shortcutEntrance: 'weightCheck',
+                module: 'acquisitionManagement.acquisitionWeight.view',
+                permissicon: [],
+                keepAlive: true
+            },
+            hidden: true
         },
-    //收购管理
-    {
-      path: 'acquisitionManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagement'),
-      name: 'acquisitionManagement',
-      meta: {
-        title: 'acquisitionManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisition.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'入库管理仓库设置'
-      }
-    },
-    //收购新增
-    {
-      path: 'acquisitionManagementAdd',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagementAdd'),
-      name: 'acquisitionManagementAdd',
-      meta: {
-        title: 'acquisitionManagementAdd',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisition.add',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收购管理新增'
-      },
-        hidden: true
-    },
-    // // 质检管理
-    // {
-    //   path: 'inspectionManagement',
-    //   component: () =>
-    //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagement'),
-    //   name: 'inspectionManagement',
-    //   meta: {
-    //     title: 'inspectionManagement',
-    //     shortcutEntrance: 'houseSelfCollect',
-    //     module: 'acquisitionManagement.acquisitionQuality.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //   }
-    // },
-    // // 质检管理记录
-    {
-      path: 'inspectionManagementrecord',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagementrecord'),
-      name: 'inspectionManagementrecord',
-      meta: {
-        title: 'inspectionManagementrecord',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionQuality.view',
-        permissicon: [],
-        _title:'质检管理记录'
-        // keepAlive:true
-      },
-      hidden: true
-    },
-    {
-      path: 'inspectionManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagementNew'),
-      name: 'inspectionManagementNew',
-      meta: {
-        title: 'inspectionManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionQuality.view',
-        permissicon: [],
-        _title:'入库管理质检管理'
-        // keepAlive:true
-      }
-    },
-    // // 检斤管理
-    // {
-    //   path: 'weighingManagement',
-    //   component: () =>
-    //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weighingManagement'),
-    //   name: 'weighingManagement',
-    //   meta: {
-    //     title: 'weighingManagement',
-    //     shortcutEntrance: 'houseSelfCollect',
-    //     module: 'acquisitionManagement.acquisitionWeight.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //   }
-    // },
-     // 新检斤管理
-     {
-      path: 'newWeighingManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/newWeighingManagement'),
-      name: 'newWeighingManagement',
-      meta: {
-        title: 'newWeighingManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionWeight.view',
-        permissicon: [],
-        _title:'入库管理检斤管理'
-        // keepAlive: true
-      }
-    },
-    // 付款管理
-    {
-      path: 'paymentManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/paymentManagement'),
-      name: 'paymentManagement',
-      meta: {
-        title: 'paymentManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionPay',
-        permissicon: [],
-        _title:'付款管理'
-        // keepAlive: true
-      }
-    },
-    {
-      path: 'settlement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/settlement'),
-      name: 'settlement',
-      meta: {
-        title: 'settlement',
-        shortcutEntrance: 'settlement',
-        module: 'acquisitionManagement.acquisitionPay.view',
-        permissicon: [],
-        keepAlive: false,
-        _title:'入库管理结算'
-      },
-      hidden: true
-    },
-    {
-      path: 'inspectInfolook',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfoLook'),
-      name: 'inspectInfo',
-      meta: {
-        title: 'inspectInfo',
-        shortcutEntrance: 'inspectInfo',
-        module: 'acquisitionManagement.acquisitionQuality.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'查看质检信息'
-      },
-      hidden: true
-    },
-    {
-      path: 'inspectInfo',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfo'),
-      name: 'inspectInfo',
-      meta: {
-        title: 'inspectInfo',
-        shortcutEntrance: 'inspectInfo',
-        module: 'acquisitionManagement.acquisitionQuality.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'质检信息'
-      },
-      hidden: true
-    },
-    {
-      path: 'weightCheck',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheck'),
-      name: 'weightCheck',
-      meta: {
-        title: 'weightCheck',
-        shortcutEntrance: 'weightCheck',
-        module: 'acquisitionManagement.acquisitionWeight.view',
-        permissicon: [],
-        keepAlive: true
-      },
-      hidden: true
-    },
 
-    // 记录
-    {
-      path: 'weightCheckRecord',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheckRecord'),
-      name: 'weightCheckRecord',
-      meta: {
-        title: 'weightCheckRecord',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionWeight.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'检斤管理记录'
-      },
-      hidden: true
-    },
-  ],
+        // 记录
+        {
+            path: 'weightCheckRecord',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheckRecord'),
+            name: 'weightCheckRecord',
+            meta: {
+                title: 'weightCheckRecord',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionWeight.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '检斤管理记录'
+            },
+            hidden: true
+        },
+    ],
 
 };
 
-export default houseSelfCollectRouter;
+export default houseSelfCollectRouter;