From c2f4622c4687b4c0cbcf2919c4a02ff36f8ec4d6 Mon Sep 17 00:00:00 2001 From: toesbieya <1647775459@qq.com> Date: Sat, 25 Jul 2020 14:00:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=AE=80=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/components/UploadFile/index.vue | 3 +-- vue/src/views/purchase/inbound/detail.vue | 6 +++--- vue/src/views/purchase/order/detail.vue | 8 ++++---- vue/src/views/sell/order/detail.vue | 8 ++++---- vue/src/views/sell/outbound/detail.vue | 6 +++--- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/vue/src/components/UploadFile/index.vue b/vue/src/components/UploadFile/index.vue index cf42fe1..926c3b6 100644 --- a/vue/src/components/UploadFile/index.vue +++ b/vue/src/components/UploadFile/index.vue @@ -57,7 +57,6 @@ * */ import axios from 'axios' import {attachmentPrefix} from '@/config' - import {numberFormatter} from "@/filter" import {debounce, isEmpty} from '@/utils' import {elError} from "@/utils/message" import {isImage, isDoc, isPdf, isPpt, isRar, isXls, isTxt, isZip} from "@/utils/validate" @@ -211,7 +210,7 @@ } const maxSize = parseMaxSize(this.maxSize) if (file.size > maxSize) { - elError(`${file.name}的大小超出${numberFormatter(maxSize)}`) + elError(`${file.name}的大小超出${this.$options.filters.numberFormatter(maxSize)}`) return false } }, diff --git a/vue/src/views/purchase/inbound/detail.vue b/vue/src/views/purchase/inbound/detail.vue index 554d483..ea93b87 100644 --- a/vue/src/views/purchase/inbound/detail.vue +++ b/vue/src/views/purchase/inbound/detail.vue @@ -87,7 +87,6 @@ import {isEmpty} from "@/utils" import {isInteger} from "@/utils/validate" import {elAlert} from "@/utils/message" - import {timestamp2Date} from "@/filter" export default { name: "purchaseInboundDetail", @@ -116,11 +115,12 @@ computed: { headerDescription() { + const f = this.$options.filters.timestamp2Date return [ {label: '创建人:', content: this.form.cname}, - {label: '创建时间:', content: timestamp2Date(this.form.ctime)}, + {label: '创建时间:', content: f(this.form.ctime)}, {label: '审核人:', content: this.form.vname}, - {label: '审核时间:', content: timestamp2Date(this.form.vtime)} + {label: '审核时间:', content: f(this.form.vtime)} ] }, headerExtra() { diff --git a/vue/src/views/purchase/order/detail.vue b/vue/src/views/purchase/order/detail.vue index 8e8305e..4625584 100644 --- a/vue/src/views/purchase/order/detail.vue +++ b/vue/src/views/purchase/order/detail.vue @@ -133,7 +133,6 @@ import {isEmpty} from "@/utils" import {isInteger} from "@/utils/validate" import {mul, plus} from "@/utils/math" - import {timestamp2Date} from "@/filter" export default { name: "purchaseOrderDetail", @@ -165,12 +164,13 @@ computed: { headerDescription() { + const f = this.$options.filters.timestamp2Date return [ {label: '创建人:', content: this.form.cname}, - {label: '创建时间:', content: timestamp2Date(this.form.ctime)}, + {label: '创建时间:', content: f(this.form.ctime)}, {label: '审核人:', content: this.form.vname}, - {label: '审核时间:', content: timestamp2Date(this.form.vtime)}, - {label: '完成时间:', content: timestamp2Date(this.form.ftime)} + {label: '审核时间:', content: f(this.form.vtime)}, + {label: '完成时间:', content: f(this.form.ftime)} ] }, headerExtra() { diff --git a/vue/src/views/sell/order/detail.vue b/vue/src/views/sell/order/detail.vue index 70a81c5..1830fbc 100644 --- a/vue/src/views/sell/order/detail.vue +++ b/vue/src/views/sell/order/detail.vue @@ -118,7 +118,6 @@ import {isEmpty} from "@/utils" import {mul, plus} from "@/utils/math" import {isInteger} from "@/utils/validate" - import {timestamp2Date} from "@/filter" export default { name: "sellOrderDetail", @@ -151,12 +150,13 @@ computed: { headerDescription() { + const f = this.$options.filters.timestamp2Date return [ {label: '创建人:', content: this.form.cname}, - {label: '创建时间:', content: timestamp2Date(this.form.ctime)}, + {label: '创建时间:', content: f(this.form.ctime)}, {label: '审核人:', content: this.form.vname}, - {label: '审核时间:', content: timestamp2Date(this.form.vtime)}, - {label: '完成时间:', content: timestamp2Date(this.form.ftime)} + {label: '审核时间:', content: f(this.form.vtime)}, + {label: '完成时间:', content: f(this.form.ftime)} ] }, headerExtra() { diff --git a/vue/src/views/sell/outbound/detail.vue b/vue/src/views/sell/outbound/detail.vue index bc275f9..b9d8f71 100644 --- a/vue/src/views/sell/outbound/detail.vue +++ b/vue/src/views/sell/outbound/detail.vue @@ -107,7 +107,6 @@ import {plus, sub} from "@/utils/math" import {isInteger} from "@/utils/validate" import {elAlert} from "@/utils/message" - import {timestamp2Date} from "@/filter" export default { name: "sellOutboundDetail", @@ -138,11 +137,12 @@ computed: { headerDescription() { + const f = this.$options.filters.timestamp2Date return [ {label: '创建人:', content: this.form.cname}, - {label: '创建时间:', content: timestamp2Date(this.form.ctime)}, + {label: '创建时间:', content: f(this.form.ctime)}, {label: '审核人:', content: this.form.vname}, - {label: '审核时间:', content: timestamp2Date(this.form.vtime)} + {label: '审核时间:', content: f(this.form.vtime)} ] }, headerExtra() {