Kaynağa Gözat

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

高敬炎 1 yıl önce
ebeveyn
işleme
56ec18343b

BIN
public/img/eyes.png


+ 1 - 1
public/static/aduitprint.html

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

+ 1 - 1
public/static/collectionContractRecordPrint.html

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

+ 1 - 1
public/static/inspection.html

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

+ 1 - 1
public/static/inspectionnew.html

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

+ 1 - 1
public/static/outInspectionPrint.html

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

+ 1 - 1
public/static/outWeightPrint.html

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

+ 1 - 1
public/static/payprint.html

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

+ 1 - 1
public/static/payprint1.html

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

+ 1 - 1
public/static/payprint1A5.html

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

+ 1 - 1
public/static/payprint2.html

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

+ 1 - 1
public/static/payprint3.html

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

+ 1 - 1
public/static/print.html

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

+ 1 - 1
public/static/printdry.html

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

+ 1 - 1
public/static/tradeServicesPrint.html

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

+ 1 - 1
public/static/warehouseBatchPrint.html

@@ -75,7 +75,7 @@
     </style>
   </head>
   <body>
-    <div id="app">
+    <div id="app" v-cloak>
       <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-else class="title">{{item.contractManagementInfo?item.contractManagementInfo.seller:item.companyName}}

+ 1 - 1
public/static/warehousePrint.html

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

+ 1 - 1
public/static/weightCheck.html

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

+ 1 - 1
public/static/weightCheckInOut.html

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

+ 1 - 1
public/static/weightCheckOut.html

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

+ 1 - 1
public/static/weightCheckOutNew.html

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

+ 1 - 1
public/static/weightChecknew.html

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

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

@@ -13,129 +13,129 @@ const platformauditRouter = {
     },
     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;

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

@@ -48,6 +48,40 @@ const tradeServicesManagementRouter = {
       },
       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',

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

@@ -169,6 +169,7 @@
       }
     },
     activated() {
+      
       let height = document.body.offsetHeight - 57
       document.querySelector('.container').setAttribute('style', 'height:' + height + 'px;')
       // let _showPage = localStorage.getItem('warehouseReceiptRegulation_selectShowType')
@@ -336,13 +337,27 @@
           this.isActive = true
           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,
             currentPage: this.currentPage,
             pageSize: this.pageSize,
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
-          })
+          }
+        }
+        getList(data)
           .toPromise()
           .then((response) => {
             this.tradeServicesList = response.records