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

src/HDrpManagement/contractManage/modules/detail.vue

@@ -150,7 +150,7 @@ import productDetailList from '../components/productDetailList/productDetailList
 import addProduct from '../components/productList/addProduct'
 import addProductDetail from '../components/productDetailList/addProduct.vue'
 import addTool from '../components/toolList/addTool'
-import toolList from '../components/toolList/toolList'
+import toolList from '../components/toolList/toolList.vue'
 import addClass from '../components/productClassList/addProduct'
 import productClassList from '../components/productClassList/productClassList.vue'
 import contractClause from '../components/contractClause/contractClause'

src/HDrpManagement/orderManage/index.vue

@@ -186,7 +186,7 @@ export default {
         this.$refs.basicLayout.param.content.where.enddate = ''
       }
       this.$refs.basicLayout.listData()
-    }
+    },
   },
   created () {
     this.getTradefield()

src/utils/tool.js

@@ -2,32 +2,20 @@ import { Message } from 'element-ui';
 import router from '@/router';
 import api from '@/api/api';
 export default {
+  sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  },
+
   // 获取应用权限
   checkAuth (appname,auth) {
-    // console.log(appname)
-    try {
-      let _haveAuth = true
-      
-      let app = JSON.parse(sessionStorage.getItem('activeApp'))
-
-      // 获取当前应用权限
-      let auth_list = app.meta.auth
-
-      // 判断是否拥有权限
-      _haveAuth = auth_list.some(item=>item.option === auth)
-
-      return _haveAuth
-      
-    } catch (error) {
-      api.requested({
-        classname:"system.tools",
-        method:"saveWebClientErrLog",
-        content:{
-          "keyname":'auth',
-          "log":JSON.stringify(error)
-        }
-      })
-    }
+    // await this.sleep(3000)
+    let _haveAuth = false
+    let app = JSON.parse(sessionStorage.getItem('activeApp'))
+    // 获取当前应用权限
+    let auth_list = app.meta.auth
+    // 判断是否拥有权限
+    _haveAuth = auth_list.some(item=>item.option === auth)
+    return _haveAuth
   },
 
   // 获取应用表格