Home Explore Help
Register Sign In
gdc
/
yiliangyiyun-pc
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

高敬炎 1 year ago
parent
d86127ab28 3d7041b5ed
commit
56ec18343b
25 changed files with 192 additions and 143 deletions
Unified View Show Diff Stats
  1. BIN
      public/img/eyes.png
  2. 1 1
      public/static/aduitprint.html
  3. 1 1
      public/static/collectionContractRecordPrint.html
  4. 1 1
      public/static/inspection.html
  5. 1 1
      public/static/inspectionnew.html
  6. 1 1
      public/static/outInspectionPrint.html
  7. 1 1
      public/static/outWeightPrint.html
  8. 1 1
      public/static/payprint.html
  9. 1 1
      public/static/payprint1.html
  10. 1 1
      public/static/payprint1A5.html
  11. 1 1
      public/static/payprint2.html
  12. 1 1
      public/static/payprint3.html
  13. 1 1
      public/static/print.html
  14. 1 1
      public/static/printdry.html
  15. 1 1
      public/static/tradeServicesPrint.html
  16. 1 1
      public/static/warehouseBatchPrint.html
  17. 1 1
      public/static/warehousePrint.html
  18. 1 1
      public/static/weightCheck.html
  19. 1 1
      public/static/weightCheckInOut.html
  20. 1 1
      public/static/weightCheckOut.html
  21. 1 1
      public/static/weightCheckOutNew.html
  22. 1 1
      public/static/weightChecknew.html
  23. 120 120
      src/views/platformAudit/component/routers/route.js
  24. 34 0
      src/views/tradeServicesManagement/component/routers/route.js
  25. 17 2
      src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

BIN
public/img/eyes.png
View File


+ 1 - 1
public/static/aduitprint.html
View File 

@@ -115,7 +115,7 @@
 
    }
 
    }
 
 </style>
 
 </style>
 
 <body>
 
 <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
         <div class="center">
 
         <div class="center">
 
         <div class="wrap" v-for="item in printData">
 
         <div class="wrap" v-for="item in printData">
 
           <div v-if="item.printType==1" class="number">费用审核-请款</div>
 
           <div v-if="item.printType==1" class="number">费用审核-请款</div>

+ 1 - 1
public/static/collectionContractRecordPrint.html
View File 

@@ -195,7 +195,7 @@
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
       <div v-for="(item,index) in customerList1" :key="index">
 
       <div v-for="(item,index) in customerList1" :key="index">
 
         <div class="content">
 
         <div class="content">
 
           <div class="sfcard part3" v-if="isShowPrintType1">
 
           <div class="sfcard part3" v-if="isShowPrintType1">

+ 1 - 1
public/static/inspection.html
View File 

@@ -134,7 +134,7 @@
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
       <div class="content" v-if="bigContent">
 
       <div class="content" v-if="bigContent">
 
         <div>
 
         <div>

+ 1 - 1
public/static/inspectionnew.html
View File 

@@ -129,7 +129,7 @@
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
       <div class="content" v-if="bigContent">
 
       <div class="content" v-if="bigContent">
 
         <div>
 
         <div>

+ 1 - 1
public/static/outInspectionPrint.html
View File 

@@ -129,7 +129,7 @@
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
       <div class="content" v-if="bigContent">
 
       <div class="content" v-if="bigContent">
 
         <div>
 
         <div>

+ 1 - 1
public/static/outWeightPrint.html
View File 

@@ -125,7 +125,7 @@
 
 </head>
 
 </head>
 
 
 
 <body>
 
 <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
         <div v-if="bigContent">
 
         <div v-if="bigContent">
 
             <div class="title">出库检斤单</div>
 
             <div class="title">出库检斤单</div>
 
             <div class="title_top">
 
             <div class="title_top">

+ 1 - 1
public/static/payprint.html
View File 

@@ -203,7 +203,7 @@
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
       <div v-if="selectPrint">
 
       <div v-if="selectPrint">
 
         <div v-for="(item,index) in printData1" :key="index">
 
         <div v-for="(item,index) in printData1" :key="index">
 
           <div class="content">
 
           <div class="content">

+ 1 - 1
public/static/payprint1.html
View File 

@@ -212,7 +212,7 @@
 
 </head>
 
 </head>
 
 
 
 <body>
 
 <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
         <div v-if="selectPrint">
 
         <div v-if="selectPrint">
 
             <div v-for="(item,index) in printData1" :key="index">
 
             <div v-for="(item,index) in printData1" :key="index">
 
                 <div class="content">
 
                 <div class="content">

+ 1 - 1
public/static/payprint1A5.html
View File 

@@ -198,7 +198,7 @@
 
 </head>
 
 </head>
 
 
 
 <body>
 
 <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
         <div v-if="selectPrint">
 
         <div v-if="selectPrint">
 
             <div v-for="(item,index) in printData1" :key="index">
 
             <div v-for="(item,index) in printData1" :key="index">
 
                 <div class="content">
 
                 <div class="content">

+ 1 - 1
public/static/payprint2.html
View File 

@@ -198,7 +198,7 @@
 
 </head>
 
 </head>
 
 
 
 <body>
 
 <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
         <div v-if="selectPrint">
 
         <div v-if="selectPrint">
 
             <div v-for="(item,index) in printData1" :key="index">
 
             <div v-for="(item,index) in printData1" :key="index">
 
                 <div class="content">
 
                 <div class="content">

+ 1 - 1
public/static/payprint3.html
View File 

@@ -199,7 +199,7 @@
 
 </head>
 
 </head>
 
 
 
 <body>
 
 <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
         <div v-if="selectPrint">
 
         <div v-if="selectPrint">
 
             <div v-for="(item,index) in printData1" :key="index">
 
             <div v-for="(item,index) in printData1" :key="index">
 
                 <div class="content">
 
                 <div class="content">

+ 1 - 1
public/static/print.html
View File 

@@ -149,7 +149,7 @@
 
   </head>
 
   </head>
 
 
 
   <body>
 
   <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
       <div class="content"  v-if="type == 1"><!--容重打印-->
 
       <div class="content"  v-if="type == 1"><!--容重打印-->
 
         <div class="title">
 
         <div class="title">
 
           <div class="name">{{name}}{{name != '大豆'? '价格对照表（按容重）' : '价格对照表（按蛋白）'}}</div>
 
           <div class="name">{{name}}{{name != '大豆'? '价格对照表（按容重）' : '价格对照表（按蛋白）'}}</div>

+ 1 - 1
public/static/printdry.html
View File 

@@ -147,7 +147,7 @@
 
 </head>
 
 </head>
 
 
 
 <body>
 
 <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
             <div class="content"  v-if="isShowPrintType3&&!isShowPrintType6">
 
             <div class="content"  v-if="isShowPrintType3&&!isShowPrintType6">
 
               <!-- <div class="title">{{item.customer}}</div> -->
 
               <!-- <div class="title">{{item.customer}}</div> -->
 
               <div class="title">入库检斤单</div>
 
               <div class="title">入库检斤单</div>

+ 1 - 1
public/static/tradeServicesPrint.html
View File 

@@ -90,7 +90,7 @@
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
       <div v-for="(item,index) in printData">
 
       <div v-for="(item,index) in printData">
 
         <div class="center">
 
         <div class="center">
 
           <div class="title">磅码单</div>
 
           <div class="title">磅码单</div>

+ 1 - 1
public/static/warehouseBatchPrint.html
View File 

@@ -75,7 +75,7 @@
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
       <div class="content" v-for="(item,index) in tableData"  v-if="!isDDPrint||isEWPrint">
 
       <div class="content" v-for="(item,index) in tableData"  v-if="!isDDPrint||isEWPrint">
 
         <!--        <div v-if="item.inOutFlag == '2'" class="title">{{item.companyName}}</div>
 
         <!--        <div v-if="item.inOutFlag == '2'" class="title">{{item.companyName}}</div>
 
         <div v-else class="title">{{item.contractManagementInfo?item.contractManagementInfo.seller:item.companyName}}
 
         <div v-else class="title">{{item.contractManagementInfo?item.contractManagementInfo.seller:item.companyName}}

+ 1 - 1
public/static/warehousePrint.html
View File 

@@ -177,7 +177,7 @@
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
       <div class="center">
 
       <div class="center">
 
         <div class="title">{{company?company:"黑龙江中天昊元贸易有限公司"}}<span v-if="type == '2'">出</span><span v-if="type == '3'">入</span>库单</div>
 
         <div class="title">{{company?company:"黑龙江中天昊元贸易有限公司"}}<span v-if="type == '2'">出</span><span v-if="type == '3'">入</span>库单</div>
 
         <div class='title12'>
 
         <div class='title12'>

+ 1 - 1
public/static/weightCheck.html
View File 

@@ -147,7 +147,7 @@
 
 </head>
 
 </head>
 
 
 
 <body>
 
 <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
         <div v-if="selectPrint">
 
         <div v-if="selectPrint">
 
             <div v-for="(item,index) in tableData1" :key="index" v-if="!isDDPrint||isEWPrint">
 
             <div v-for="(item,index) in tableData1" :key="index" v-if="!isDDPrint||isEWPrint">
 
                 <div class="content" :class="pageType=='A5'?'a5-content':''">
 
                 <div class="content" :class="pageType=='A5'?'a5-content':''">

+ 1 - 1
public/static/weightCheckInOut.html
View File 

@@ -126,7 +126,7 @@
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
       <div class="content" v-if="true">
 
       <div class="content" v-if="true">
 
         <!--<div v-if="tableData.inOutFlag == '2'" class="title">{{tableData.companyName}}</div>
 
         <!--<div v-if="tableData.inOutFlag == '2'" class="title">{{tableData.companyName}}</div>
 
          <div v-else class="title">
 
          <div v-else class="title">

+ 1 - 1
public/static/weightCheckOut.html
View File 

@@ -124,7 +124,7 @@
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
       <div class="content" v-if="true">
 
       <div class="content" v-if="true">
 
         <div class="title">出库检斤单</div>
 
         <div class="title">出库检斤单</div>
 
         <div>{{tableData.updateDate}}</div>
 
         <div>{{tableData.updateDate}}</div>

+ 1 - 1
public/static/weightCheckOutNew.html
View File 

@@ -146,7 +146,7 @@
 
 </head>
 
 </head>
 
 
 
 <body>
 
 <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
         <div v-if="selectPrint">
 
         <div v-if="selectPrint">
 
             <div v-for="(item,index) in tableData1" :key="index" v-if="!isDDPrint||isEWPrint">
 
             <div v-for="(item,index) in tableData1" :key="index" v-if="!isDDPrint||isEWPrint">
 
                 <div class="content" :class="pageType=='A5'?'a5-content':''">
 
                 <div class="content" :class="pageType=='A5'?'a5-content':''">

+ 1 - 1
public/static/weightChecknew.html
View File 

@@ -133,7 +133,7 @@
 
     </style>
 
     </style>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-    <div id="app">
 
+    <div id="app" v-cloak>
 
       <div v-if="selectPrint">
 
       <div v-if="selectPrint">
 
         <div v-for="(item,index) in tableData1" :key="index">
 
         <div v-for="(item,index) in tableData1" :key="index">
 
           <div class="content" :class="pageType=='A5'?'a5-content':''">
 
           <div class="content" :class="pageType=='A5'?'a5-content':''">

+ 120 - 120
src/views/platformAudit/component/routers/route.js
View File 

@@ -13,129 +13,129 @@ const platformauditRouter = {
 
     },
 
     },
 
     children: [
 
     children: [
 
 
 
-        // 粮商审核
 
-        {
 
-            path: 'grainmerchantreview',
 
-            component: () =>
 
-                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainmerchantreview'),
 
-            name: 'grainmerchantreview',
 
-            meta: {
 
-                title: 'grainmerchantreview',
 
-                shortcutEntrance: 'grainmerchantreview',
 
-                module: 'audit.grainMerchant.grainMerchantInfo',
 
-                permissicon: [],
 
-                keepAlive: true,
 
-                _title: '粮商审核'
 
-            },
 
-        },
 
+        // // 粮商审核
 
+        // {
 
+        //     path: 'grainmerchantreview',
 
+        //     component: () =>
 
+        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainmerchantreview'),
 
+        //     name: 'grainmerchantreview',
 
+        //     meta: {
 
+        //         title: 'grainmerchantreview',
 
+        //         shortcutEntrance: 'grainmerchantreview',
 
+        //         module: 'audit.grainMerchant.grainMerchantInfo',
 
+        //         permissicon: [],
 
+        //         keepAlive: true,
 
+        //         _title: '粮商审核'
 
+        //     },
 
+        // },
 
 
 
-        //司机审核
 
-        {
 
-            path: 'driverreview',
 
-            component: () =>
 
-                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/driverreview'),
 
-            name: 'driverreview',
 
-            meta: {
 
-                title: 'driverreview',
 
-                shortcutEntrance: 'driverreview',
 
-                module: 'audit.driverMerchant.driverMerchantInfo',
 
-                permissicon: [],
 
-                keepAlive: true,
 
-                _title: '司机审核'
 
-            },
 
-        },
 
+        // //司机审核
 
+        // {
 
+        //     path: 'driverreview',
 
+        //     component: () =>
 
+        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/driverreview'),
 
+        //     name: 'driverreview',
 
+        //     meta: {
 
+        //         title: 'driverreview',
 
+        //         shortcutEntrance: 'driverreview',
 
+        //         module: 'audit.driverMerchant.driverMerchantInfo',
 
+        //         permissicon: [],
 
+        //         keepAlive: true,
 
+        //         _title: '司机审核'
 
+        //     },
 
+        // },
 
 
 
-        //采购交易信息审核
 
-        {
 
-            path: 'transactioninformationreview',
 
-            component: () =>
 
-                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/transactioninformationreview'),
 
-            name: 'transactioninformationreview',
 
-            meta: {
 
-                title: 'transactioninformationreview',
 
-                shortcutEntrance: 'transactioninformationreview',
 
-                module: 'audit.tranMerchant.tranMerchantInfo',
 
-                permissicon: [],
 
-                keepAlive: true,
 
-                _title: '采购信息审核'
 
-            },
 
-        },
 
+        // //采购交易信息审核
 
+        // {
 
+        //     path: 'transactioninformationreview',
 
+        //     component: () =>
 
+        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/transactioninformationreview'),
 
+        //     name: 'transactioninformationreview',
 
+        //     meta: {
 
+        //         title: 'transactioninformationreview',
 
+        //         shortcutEntrance: 'transactioninformationreview',
 
+        //         module: 'audit.tranMerchant.tranMerchantInfo',
 
+        //         permissicon: [],
 
+        //         keepAlive: true,
 
+        //         _title: '采购信息审核'
 
+        //     },
 
+        // },
 
 
 
-        //销售交易信息审核
 
-        {
 
-            path: 'saletransactioninformationreview',
 
-            component: () =>
 
-                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/saletransactioninformationreview'),
 
-            name: 'saletransactioninformationreview',
 
-            meta: {
 
-                title: 'saletransactioninformationreview',
 
-                shortcutEntrance: 'saletransactioninformationreview',
 
-                module: 'audit.tranMerchant.tranMerchantInfo',
 
-                permissicon: [],
 
-                keepAlive: true,
 
-                _title: '销售信息审核'
 
-            },
 
-        },
 
-        //粮脉企业审核
 
-        {
 
-            path: 'grainpulseenterprisereview',
 
-            component: () =>
 
-                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainpulseenterprisereview'),
 
-            name: 'grainpulseenterprisereview',
 
-            meta: {
 
-                title: 'grainpulseenterprisereview',
 
-                shortcutEntrance: 'grainpulseenterprisereview',
 
-                module: 'audit.tranMerchant.tranMerchantInfo',
 
-                permissicon: [],
 
-                keepAlive: true,
 
-                _title: '粮脉企业审核'
 
-            },
 
-        },
 
-        //粮脉动态审核
 
-        {
 
-            path: 'grainPulseDynamic',
 
-            component: () =>
 
-                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainPulseDynamic'),
 
-            name: 'grainPulseDynamic',
 
-            meta: {
 
-                title: 'grainPulseDynamic',
 
-                shortcutEntrance: 'grainPulseDynamic',
 
-                module: 'audit.grainMerchant.grainMerchantInfo.review',
 
-                permissicon: [],
 
-                keepAlive: true,
 
-                _title: '粮脉动态审核'
 
-            },
 
-        },
 
-        //交易信息审核
 
-        {
 
-            path: 'tradeInformation',
 
-            component: () =>
 
-                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/tradeInformation'),
 
-            name: 'tradeInformation',
 
-            meta: {
 
-                title: 'tradeInformation',
 
-                shortcutEntrance: 'tradeInformation',
 
-                module: 'audit.grainMerchant.grainMerchantInfo.review',
 
-                permissicon: [],
 
-                keepAlive: true,
 
-                _title: '交易信息审核'
 
-            },
 
-        },
 
-        // 客服留言
 
-        {
 
-            path: 'customerService',
 
-            component: () =>
 
-                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/customerService'),
 
-            name: 'customerService',
 
-            meta: {
 
-                title: 'customerService',
 
-                shortcutEntrance: 'customerService',
 
-                module: 'audit.grainMerchant.grainMerchantInfo',
 
-                permissicon: [],
 
-                keepAlive: true,
 
-                _title: '客服留言'
 
-            },
 
-        },
 
+        // //销售交易信息审核
 
+        // {
 
+        //     path: 'saletransactioninformationreview',
 
+        //     component: () =>
 
+        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/saletransactioninformationreview'),
 
+        //     name: 'saletransactioninformationreview',
 
+        //     meta: {
 
+        //         title: 'saletransactioninformationreview',
 
+        //         shortcutEntrance: 'saletransactioninformationreview',
 
+        //         module: 'audit.tranMerchant.tranMerchantInfo',
 
+        //         permissicon: [],
 
+        //         keepAlive: true,
 
+        //         _title: '销售信息审核'
 
+        //     },
 
+        // },
 
+        // //粮脉企业审核
 
+        // {
 
+        //     path: 'grainpulseenterprisereview',
 
+        //     component: () =>
 
+        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainpulseenterprisereview'),
 
+        //     name: 'grainpulseenterprisereview',
 
+        //     meta: {
 
+        //         title: 'grainpulseenterprisereview',
 
+        //         shortcutEntrance: 'grainpulseenterprisereview',
 
+        //         module: 'audit.tranMerchant.tranMerchantInfo',
 
+        //         permissicon: [],
 
+        //         keepAlive: true,
 
+        //         _title: '粮脉企业审核'
 
+        //     },
 
+        // },
 
+        // //粮脉动态审核
 
+        // {
 
+        //     path: 'grainPulseDynamic',
 
+        //     component: () =>
 
+        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/grainPulseDynamic'),
 
+        //     name: 'grainPulseDynamic',
 
+        //     meta: {
 
+        //         title: 'grainPulseDynamic',
 
+        //         shortcutEntrance: 'grainPulseDynamic',
 
+        //         module: 'audit.grainMerchant.grainMerchantInfo.review',
 
+        //         permissicon: [],
 
+        //         keepAlive: true,
 
+        //         _title: '粮脉动态审核'
 
+        //     },
 
+        // },
 
+        // //交易信息审核
 
+        // {
 
+        //     path: 'tradeInformation',
 
+        //     component: () =>
 
+        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/tradeInformation'),
 
+        //     name: 'tradeInformation',
 
+        //     meta: {
 
+        //         title: 'tradeInformation',
 
+        //         shortcutEntrance: 'tradeInformation',
 
+        //         module: 'audit.grainMerchant.grainMerchantInfo.review',
 
+        //         permissicon: [],
 
+        //         keepAlive: true,
 
+        //         _title: '交易信息审核'
 
+        //     },
 
+        // },
 
+        // // 客服留言
 
+        // {
 
+        //     path: 'customerService',
 
+        //     component: () =>
 
+        //         import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/customerService'),
 
+        //     name: 'customerService',
 
+        //     meta: {
 
+        //         title: 'customerService',
 
+        //         shortcutEntrance: 'customerService',
 
+        //         module: 'audit.grainMerchant.grainMerchantInfo',
 
+        //         permissicon: [],
 
+        //         keepAlive: true,
 
+        //         _title: '客服留言'
 
+        //     },
 
+        // },
 
     ],
 
     ],
 
 };
 
 };
 
 export default platformauditRouter;
 
 export default platformauditRouter;

+ 34 - 0
src/views/tradeServicesManagement/component/routers/route.js
View File 

@@ -48,6 +48,40 @@ const tradeServicesManagementRouter = {
 
       },
 
       },
 
       hidden: false
 
       hidden: false
 
     },
 
     },
 
+      //数据分析平台
 
+    {
 
+      path: 'dataAnalysisPlatform',
 
+      component: () =>
 
+        import( /* webpackChunkName: "applDetail" */
 
+          '@/views/tradeServicesManagement/dataAnalysisPlatform'),
 
+      name: 'dataAnalysisPlatform',
 
+      meta: {
 
+        title: '数据分析平台',
 
+        shortcutEntrance: 'warehouseReceiptRegulation',
 
+        module: 'tradeServicesManagement.tradeService.view',
 
+        permissicon: [],
 
+        keepAlive: true,
 
+        _title:'数据分析平台'
 
+      },
 
+      hidden: false
 
+    },
 
+        //仓单视频监控
 
+        {
 
+          path: 'warehouseReceiptVideoMonitoring',
 
+          component: () =>
 
+            import( /* webpackChunkName: "applDetail" */
 
+              '@/views/tradeServicesManagement/warehouseReceiptVideoMonitoring'),
 
+          name: 'warehouseReceiptVideoMonitoring',
 
+          meta: {
 
+            title: '仓单视频监控',
 
+            shortcutEntrance: 'warehouseReceiptRegulation',
 
+            module: 'tradeServicesManagement.tradeService.view',
 
+            permissicon: [],
 
+            keepAlive: true,
 
+            _title:'仓单视频监控'
 
+          },
 
+          hidden: false
 
+        },
 
     //创建仓单
 
     //创建仓单
 
     {
 
     {
 
       path: 'warehouseReceiptAdd',
 
       path: 'warehouseReceiptAdd',

+ 17 - 2
src/views/tradeServicesManagement/warehouseReceiptRegulation.vue
View File 

@@ -169,6 +169,7 @@
 
       }
 
       }
 
     },
 
     },
 
     activated() {
 
     activated() {
 
+      
       let height = document.body.offsetHeight - 57
 
       let height = document.body.offsetHeight - 57
 
       document.querySelector('.container').setAttribute('style', 'height:' + height + 'px;')
 
       document.querySelector('.container').setAttribute('style', 'height:' + height + 'px;')
 
       // let _showPage = localStorage.getItem('warehouseReceiptRegulation_selectShowType')
 
       // let _showPage = localStorage.getItem('warehouseReceiptRegulation_selectShowType')
 
@@ -336,13 +337,27 @@
 
           this.isActive = true
 
           this.isActive = true
 
           this.searchKeyWord = val
 
           this.searchKeyWord = val
 
         }
 
         }
 
-        getList({
 
+        var data={}
 
+        if(this.$route.query.compId){
 
+          data={
 
+            compId: this.$route.query.compId,
 
+            currentPage: this.currentPage,
 
+            pageSize: this.pageSize,
 
+            searchType: this.searchType,
 
+            searchKeyWord: this.searchKeyWord,
 
+            bankId: this.$route.query.bankId,
 
+            warehouseId: this.$route.query.warehouseId,
 
+          }
 
+        }else{
 
+          data={
 
             compId: this.compId,
 
             compId: this.compId,
 
             currentPage: this.currentPage,
 
             currentPage: this.currentPage,
 
             pageSize: this.pageSize,
 
             pageSize: this.pageSize,
 
             searchType: this.searchType,
 
             searchType: this.searchType,
 
             searchKeyWord: this.searchKeyWord,
 
             searchKeyWord: this.searchKeyWord,
 
-          })
 
+          }
 
+        }
 
+        getList(data)
 
           .toPromise()
 
           .toPromise()
 
           .then((response) => {
 
           .then((response) => {
 
             this.tradeServicesList = response.records
 
             this.tradeServicesList = response.records