Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-operate-ui/src/utils/request.js

@@ -67,6 +67,7 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
+    const apiList = ['/login']  //需要提示错误的接口
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息
@@ -88,16 +89,16 @@ service.interceptors.response.use(res => {
       });
     }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-    }/* else if (code === 500) {
+    } else if (code === 500 && apiList.includes(res.config.url)) {
       Message({ message: msg, type: 'error' })
       return Promise.reject(new Error(msg))
-    } else if (code === 601) {
+    } else if (code === 601 && apiList.includes(res.config.url)) {
       Message({ message: msg, type: 'warning' })
       return Promise.reject('error')
-    } else if (code !== 200) {
+    } else if (code !== 200 && apiList.includes(res.config.url)) {
       Notification.error({ title: msg })
       return Promise.reject('error')
-    }*/ else {
+    } else {
       return res.data
     }
   },error => {

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -345,6 +345,8 @@ export default {
       getCustomerList(this.searchParam).then(result=>{
         this.tableData = result
         this.tableData.rows.forEach(item=>{
+          item.registerCapital.replace('万','')
+          item.registerCapital.replace('元','')
           if(item.mainBusiness != "" && item.mainBusiness != null && item.mainBusiness.length>84){
             item.mainBusiness1 = item.mainBusiness.substring(0,81)
             item.sq1 = true