From 1a7f35515c4e3a33d5362a76b6b95c8403f92d72 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Fri, 30 Jul 2021 15:24:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/customer/AddCustomer.vue | 29 ++++++++++++++++++++++++-----
src/views/data/Product.vue | 2 +-
src/views/order/AddOrder.vue | 2 +-
src/views/order/Order.vue | 2 +-
4 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue
index 8a72c3f..5e16490 100644
--- a/src/views/customer/AddCustomer.vue
+++ b/src/views/customer/AddCustomer.vue
@@ -140,14 +140,26 @@
-
+
+
+ {{scope.row.periodOfUse}} 月
+
+
- {{scope.row.startTime}}~{{scope.row.endTime}}
+ {{scope.row.startTime}} - {{scope.row.endTime}}
+
+
+
+
+ {{scope.row.remainingPeriod}} 天
+
+
+
+
+ {{scope.row.accountNum}} 个
-
-
配置
@@ -176,10 +188,16 @@
+
+ {{scope.row.startTime.split(' ').shift()}} - {{scope.row.endTime.split(' ').shift()}}
+
+
+ {{scope.row.contractMoney}} 元
+
@@ -559,7 +577,8 @@ export default {
},
showContract(row){
if(!row.contractFile) return this.$message.warning('文件链接无效')
- let type = file.name.split('.').pop()
+ console.log(row.contractFile,'f');
+ let type = row.contractFile.split('.').pop()
let img = ['jpg','gif','png','jepg']
this.fileSrc = row.contractFile
diff --git a/src/views/data/Product.vue b/src/views/data/Product.vue
index ca8f9cf..0d83f9f 100644
--- a/src/views/data/Product.vue
+++ b/src/views/data/Product.vue
@@ -48,7 +48,7 @@
-
+
diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index c1ccabc..f0b573e 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -1214,7 +1214,7 @@ export default {
beforeAvatarUpload(file) {
const size = file.size / 1024 / 1024 < 10;
let type = file.name.split('.').pop()
- let str = ["jpg","jepg","gif","png","doc","pdf"].includes(type.toLowerCase())
+ let str = ["jpg","jepg","gif","png","doc","docx","pdf"].includes(type.toLowerCase())
console.log(type,str,'类型判断');
if(!str){
this.$message.error('只能上传图片，word文件和pdf文件！')
diff --git a/src/views/order/Order.vue b/src/views/order/Order.vue
index 65e9b99..5f58148 100644
--- a/src/views/order/Order.vue
+++ b/src/views/order/Order.vue
@@ -79,7 +79,7 @@
-
+