From 2e3af9eda26ae2a0334906693243ed16f6485d33 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 05 一月 2023 09:28:07 +0800
Subject: [PATCH] 测试
---
config/dev.env.js | 10 ++++++----
src/views/purchase/person.vue | 5 ++++-
src/filters/index.js | 20 ++++++++++++++++++++
3 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/config/dev.env.js b/config/dev.env.js
index 76380da..b493a6e 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -13,13 +13,15 @@
// // IMG_API: '"http://127.0.0.1:8100/upload/"',
// BASE_API: '"http://192.168.0.35:8100"',
+// 最新
+ BASE_API: '"http://39.104.85.193:4105"',
+ IMG_API: '"http://39.104.85.193:4105/upload/"',
+ //
+ // BASE_API: '"http://192.168.0.29:8100"',
+ // IMG_API: '"http://192.168.0.29:8100/upload/"',
// BASE_API: '"http://39.104.85.193:4105"',
// IMG_API: '"http://39.104.85.193:4105/upload/"',
-
- BASE_API: '"http://192.168.0.29:8100"',
- IMG_API: '"http://192.168.0.29:8100/upload/"',
-
// IMG_API: '"http://127.0.0.1:8100/upload/"',
// IMG_API: '"https://sinanoaq.com:8100/upload/"',
// BASE_API: '"http://220.171.99.118:4100"',
diff --git a/src/filters/index.js b/src/filters/index.js
index 79f8467..13ffa73 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -19,6 +19,26 @@
}
}
+export function formatDate(value) {
+ if (!value){
+ return "---"
+ }else{
+ let date = new Date(value);
+ let month = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1);
+ let day = (date.getDate()+1 < 10 ? '0'+(date.getDate()+1) : date.getDate()+1);
+ let hours = date.getHours();
+ if (hours < 10)
+ hours = "0" + hours;
+ let minutes = date.getMinutes();
+ if (minutes < 10)
+ minutes = "0" + minutes;
+ let time = date.getFullYear() + "-" + month + "-" + day +
+ " " + hours +":" + minutes ;
+ // + hours + ":" + minutes
+ return time;
+ }
+}
+
/* 数字 格式化*/
export function numberFormatter(num, digits) {
const si = [
diff --git a/src/views/purchase/person.vue b/src/views/purchase/person.vue
index 907ad75..cd82d61 100644
--- a/src/views/purchase/person.vue
+++ b/src/views/purchase/person.vue
@@ -155,6 +155,9 @@
<el-table-column label="退货数量(挂、个)" prop="returnnum" align="center" width="100">
</el-table-column>
<el-table-column label="最近购买时间" prop="saletime" align="center" width="200">
+ <template slot-scope="scope">
+ <span>{{scope.row.saletime | formatDate}}</span>
+ </template>
</el-table-column>
<el-table-column label="证件照" align="center">
<template slot-scope="scope">
@@ -201,6 +204,7 @@
import {getCityListData, getProvinceListData , } from "../../api/area";
import uploadDialog from "./customerPhoto/index";
import Cookies from "js-cookie";
+
export default {
name: "addSelfExam",
data(){
@@ -312,7 +316,6 @@
}
this.listLoading = false
},
-
showPurchaseDetail(val){
this.$refs.person.openPersonPurchaseDetail(this.listQuery.filter.starttime,this.listQuery.filter.endtime,val.identify,val.companynumber,this.listQuery.filter.directioncode)
--
Gitblit v1.9.2