新增拦截时间戳

package.json

@@ -43,7 +43,7 @@
     "clipboard": "2.0.6",
     "core-js": "^3.30.2",
     "echarts": "4.9.0",
-    "element-ui": "2.15.6",
+    "element-ui": "^2.15.13",
     "file-saver": "^2.0.5",
     "fuse.js": "6.4.3",
     "gsap": "^3.11.4",

src/api/financed/index.js

@@ -62,6 +62,7 @@ export function orderList(query) {
     url: "/receive/order/list",
     method: "get",
     params: query,
+    isProce: true,
   });
 }
 
@@ -71,6 +72,7 @@ export function orderExport(query) {
     url: "/receive/order/listExport",
     method: "get",
     params: query,
+    isProce: true,
   });
 }
 // 机构分成列表导出
@@ -120,6 +122,7 @@ export function companyList(query) {
     url: "/divide/log/companyList",
     method: "get",
     params: query,
+    isProce: true,
   });
 }
 // 机构分成列表

src/utils/common.js

@@ -0,0 +1,29 @@
+export function paramMate(data) {
+  console.log(1234);
+  if (typeof data != "object") {
+    return data;
+  }
+  data = JSON.parse(JSON.stringify(data));
+  if (Array.isArray(data)) {
+    data = data.map((e) => {
+      if (isTimeStamp(e)) {
+        e = parseInt(e / 1000);
+      }
+      return e;
+    });
+  } else {
+    for (const key in data) {
+      if (Array.isArray(data[key])) {
+        data[key] = paramMate(data[key]);
+      } else {
+        if (isTimeStamp(data[key])) {
+          data[key] = parseInt(data[key] / 1000);
+        }
+      }
+    }
+  }
+  return data;
+}
+export function isTimeStamp(time) {
+  return typeof time == "number" && String(time).length == 13;
+}

src/utils/request.js

@@ -1,116 +1,132 @@
-import axios from 'axios'
-import { Notification, MessageBox, Message } from 'element-ui'
-import store from '@/store'
-import { getToken } from '@/utils/auth'
-import errorCode from '@/utils/errorCode'
-import methods from '@/utils/methodsTool';
+import axios from "axios";
+import { Notification, MessageBox, Message } from "element-ui";
+import store from "@/store";
+import { getToken } from "@/utils/auth";
+import errorCode from "@/utils/errorCode";
+import { paramMate } from "@/utils/common";
 
-axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
 // export const baseURL = process.env.VUE_APP_BASE_API
 // export const baseURL = 'https://ptapi.gdzzkj.net/'
-export const baseURL = 'http://192.168.1.24:7077/'
-export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
+export const baseURL = "http://192.168.1.24:7077/";
+export const BASE_IMG_URL = process.env.VUE_APP_IMG_API;
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: baseURL,
   // 超时
-  timeout: 60000
-})
+  timeout: 60000,
+});
 // request拦截器
-service.interceptors.request.use(config => {
-  // 是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
-  if (getToken() && !isToken) {
-    config.headers['AuthorizationToken'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
-  // config.headers.TenantId = sessionStorage.TenantId || methods.getQueryVariable('TenantId')
-  // get请求映射params参数
-  if (config.method === 'get' && config.params) {
-    let url = config.url + '?';
-    for (const propName of Object.keys(config.params)) {
-      const value = config.params[propName];
-      var part = encodeURIComponent(propName) + "=";
-      if (value !== null && typeof (value) !== "undefined") {
-        if (typeof value === 'object') {
-          for (const key of Object.keys(value)) {
-            if (value[key] !== null && typeof (value[key]) !== 'undefined') {
-              let params = propName + '[' + key + ']';
-              let subPart = encodeURIComponent(params) + '=';
-              url += subPart + encodeURIComponent(value[key]) + '&';
+service.interceptors.request.use(
+  (config) => {
+    // 是否需要设置 token
+    const isToken = (config.headers || {}).isToken === false;
+    if (getToken() && !isToken) {
+      config.headers["AuthorizationToken"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
+    }
+    if (config.isProce) {
+      if (config.params) {
+        config.params = paramMate(config.params);
+      }
+      if (config.data) {
+        config.data = paramMate(config.data);
+      }
+    }
+
+    // config.headers.TenantId = sessionStorage.TenantId || methods.getQueryVariable('TenantId')
+    // get请求映射params参数
+    if (config.method === "get" && config.params) {
+      let url = config.url + "?";
+      for (const propName of Object.keys(config.params)) {
+        const value = config.params[propName];
+        var part = encodeURIComponent(propName) + "=";
+        if (value !== null && typeof value !== "undefined") {
+          if (typeof value === "object") {
+            for (const key of Object.keys(value)) {
+              if (value[key] !== null && typeof value[key] !== "undefined") {
+                let params = propName + "[" + key + "]";
+                let subPart = encodeURIComponent(params) + "=";
+                url += subPart + encodeURIComponent(value[key]) + "&";
+              }
             }
+          } else {
+            url += part + encodeURIComponent(value) + "&";
           }
-        } else {
-          url += part + encodeURIComponent(value) + "&";
         }
       }
+      url = url.slice(0, -1);
+      config.params = {};
+      config.url = url;
     }
-    url = url.slice(0, -1);
-    config.params = {};
-    config.url = url;
+    return config;
+  },
+  (error) => {
+    console.log(error);
+    Promise.reject(error);
   }
-  return config
-}, error => {
-  console.log(error)
-  Promise.reject(error)
-})
+);
 
 // 响应拦截器
-service.interceptors.response.use(res => {
-  // 未设置状态码则默认成功状态
-  const code = res.data.code || 200;
-  // 获取错误信息
-  const msg = errorCode[code] || res.data.msg || errorCode['default']
-  if (code === 401) {
-    MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-      confirmButtonText: '重新登录',
-      cancelButtonText: '取消',
-      type: 'warning'
+service.interceptors.response.use(
+  (res) => {
+    // 未设置状态码则默认成功状态
+    const code = res.data.code || 200;
+    // 获取错误信息
+    const msg = errorCode[code] || res.data.msg || errorCode["default"];
+    if (code === 401) {
+      MessageBox.confirm(
+        "登录状态已过期，您可以继续留在该页面，或者重新登录",
+        "系统提示",
+        {
+          confirmButtonText: "重新登录",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          store.dispatch("LogOut").then(() => {
+            location.href = "/index";
+          });
+        })
+        .catch(() => {});
+      return Promise.reject("无效的会话，或者会话已过期，请重新登录。");
+    } else if (code === 500) {
+      Message({
+        message: msg,
+        type: "error",
+        duration: 5000,
+        showClose: true,
+      });
+      return Promise.reject(new Error(msg));
+    } else if (code === 510 || code === 511) {
+      return res.data;
+    } else if (code !== 200) {
+      Notification.error({
+        title: msg,
+      });
+      return Promise.reject("error");
+    } else {
+      return res.data;
     }
-    ).then(() => {
-      store.dispatch('LogOut').then(() => {
-        location.href = '/index';
-      })
-    }).catch(() => { });
-    return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-  } else if (code === 500) {
-    Message({
-      message: msg,
-      type: 'error',
-      duration: 5000,
-      showClose: true
-    })
-    return Promise.reject(new Error(msg))
-  } else if (code === 510 || code === 511) {
-    return res.data
-  } else if (code !== 200) {
-    Notification.error({
-      title: msg
-    })
-    return Promise.reject('error')
-  } else {
-    return res.data
-  }
-},
-  error => {
-    console.log('err' + error)
+  },
+  (error) => {
+    console.log("err" + error);
     let { message } = error;
     if (message == "Network Error") {
       message = "后端接口连接异常";
-    }
-    else if (message.includes("timeout")) {
+    } else if (message.includes("timeout")) {
       message = "系统接口请求超时";
-    }
-    else if (message.includes("Request failed with status code")) {
+    } else if (message.includes("Request failed with status code")) {
       message = "系统接口" + message.substr(message.length - 3) + "异常";
     }
     Message({
       message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
+      type: "error",
+      duration: 5 * 1000,
+    });
+    return Promise.reject(error);
   }
-)
+);
 
-export default service
+export default service;

src/views/financed/arap/index.vue

@@ -1,7 +1,5 @@
 <template>
   <div id="ActivityList">
-    <el-date-picker type="months" placeholder="选择一个或多个月">
-    </el-date-picker>
     <el-radio-group
       v-model="type"
       @change="changeSearch"
@@ -534,6 +532,7 @@ export default {
     },
     openDialog(data, type) {
       this.activeOrderInfo = data;
+      this.activeOrderInfo.orderSn = 123;
       this[
         ["tip", "examine", "remark", "order", "arap", "arap", "arap"][type] +
           "DialogVisible"
@@ -541,7 +540,7 @@ export default {
     },
     batchExport() {
       const fn = [orderExport, tenantExport, sellerExport][this.type];
-      fn(this.backData()).then((res) => {
+      fn(this.formData).then((res) => {
         if (res.msg) {
           exportFn(
             res.msg,
@@ -564,9 +563,9 @@ export default {
     changeSearch() {
       this.search(2);
     },
-    getDataList(data) {
+    getDataList() {
       const fn = [orderList, companyList, sellerList][this.type];
-      fn(data)
+      fn(this.formData)
         .then((res) => {
           this.tableData = this.changeData(res.rows);
           this.total = res.total;
@@ -602,24 +601,10 @@ export default {
         this.formData = {
           pageSize: 10,
           pageNum: 1,
-          month: "",
+          month: [],
         };
       }
-      this.getDataList(this.backData());
-    },
-    backData() {
-      let data = this.formData;
-      let { startTime, endTime } = this.formData;
-      if (startTime || endTime) {
-        data = JSON.parse(JSON.stringify(this.formData));
-        if (startTime) {
-          data.startTime = parseInt(startTime / 1000);
-        }
-        if (endTime) {
-          data.endTime = parseInt(endTime / 1000);
-        }
-      }
-      return data;
+      this.getDataList();
     },
     init() {
       this.getRoleList();
@@ -631,9 +616,10 @@ export default {
       });
     },
     getCountOrderNum() {
-      return countOrderNum().then((res) => {
-        return Promise.resolve(res);
-      });
+      // return countOrderNum().then((res) => {
+      //   return Promise.resolve(res);
+      // });
+      return Promise.resolve({ data: {} });
     },
   },
   computed: {