From ba9494b6fd4523a8fb7d9ca615f79608079e9d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E8=B4=A4=E9=87=91?= <1960116313@qq.com>
Date: Wed, 31 Aug 2022 16:28:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?=
=?UTF-8?q?=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/base/region.vue | 765 ++++++++++--------
.../communicationmanage/flowpool/flowpool.vue | 45 +-
src/views/mallmanagement/banner/index.vue | 5 +-
.../mallmanagement/shopmanagement/index.vue | 5 +-
.../mallmanagement/specification/index.vue | 5 +-
5 files changed, 469 insertions(+), 356 deletions(-)
diff --git a/src/views/base/region.vue b/src/views/base/region.vue
index 0cb88a7..5a6be00 100644
--- a/src/views/base/region.vue
+++ b/src/views/base/region.vue
@@ -4,7 +4,11 @@
@@ -12,26 +16,75 @@
- 新增下级
- 删除
- 导入
- 导出
- 调试
+ 新增下级
+ 删除
+ 导入
+ 导出
+ 调试
-
+
-
- {{regionForm.parentCode}}
+
+ {{ regionForm.parentCode }}
-
-
+
+
点击下载
@@ -39,11 +92,13 @@
-
-
+
+
@@ -51,367 +106,399 @@
diff --git a/src/views/communicationmanage/flowpool/flowpool.vue b/src/views/communicationmanage/flowpool/flowpool.vue
index 0b74282..8344d9b 100644
--- a/src/views/communicationmanage/flowpool/flowpool.vue
+++ b/src/views/communicationmanage/flowpool/flowpool.vue
@@ -139,7 +139,7 @@ export default {
label: "流量池名称",
prop: "name",
span: 12,
-
+ disabled: false,
searchLabelWidth: 90,
search: true,
rules: [
@@ -154,12 +154,35 @@ export default {
label: "流量池总量(M)",
prop: "total",
span: 12,
+ addDisplay: true,
+ editDisplay: true,
+ searchLabelWidth: 90,
+ width: 115,
+ search: false,
+ hide: true,
+ type: "number",
+ rules: [
+ {
+ required: true,
+ message: "请输入流量池总量",
+ trigger: "blur",
+ },
+ {
+ pattern: /^\d+(\.\d+)?$/,
+ message: "请输入正确的流量池总量",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "流量池总量(M)",
+ prop: "totalM",
+ span: 12,
addDisplay: false,
editDisplay: false,
searchLabelWidth: 90,
width: 115,
search: false,
- hide: false,
type: "number",
rules: [
{
@@ -199,7 +222,7 @@ export default {
],
},
{
- label: "提醒阈值",
+ label: "提醒阈值(%)",
prop: "remindRatio",
span: 12,
searchLabelWidth: 90,
@@ -212,9 +235,10 @@ export default {
message: "请输入提醒阈值",
trigger: "blur",
},
+
{
- pattern: /^\d+(\.\d+)?$/,
- message: "请输入正确的提醒阈值",
+ pattern: /(^(\d|[1-9]\d)(\.\d{1,2})?$)|(^100$)/,
+ message: "请输入0-100数字,最多可保留两位小数",
trigger: "blur",
},
],
@@ -344,6 +368,16 @@ export default {
data: [],
};
},
+ watch: {
+ "form.name"() {
+ const column = this.findObject(this.option.column, "name");
+ if (this.form.name) {
+ column.disabled = true;
+ } else {
+ column.disabled = false;
+ }
+ },
+ },
computed: {
...mapGetters(["permission"]),
permissionList() {
@@ -375,6 +409,7 @@ export default {
},
//新增
rowSave(row, done, loading) {
+ console.log(row, "rowwwwww");
add(Object.assign(row, this.isSources)).then(
() => {
this.onLoad(this.page);
diff --git a/src/views/mallmanagement/banner/index.vue b/src/views/mallmanagement/banner/index.vue
index c8179ca..c1fea4a 100644
--- a/src/views/mallmanagement/banner/index.vue
+++ b/src/views/mallmanagement/banner/index.vue
@@ -254,10 +254,7 @@ export default {
});
},
uploadBefore(file, done, loading) {
- if (file.size > 500 * 1024) {
- this.$message.warning("图片大小切勿大于500kb");
- loading();
- } else if (
+ if (
file.type !== "image/jpg" &&
file.type !== "image/jpeg" &&
file.type !== "image/png"
diff --git a/src/views/mallmanagement/shopmanagement/index.vue b/src/views/mallmanagement/shopmanagement/index.vue
index 92ffa25..b79bb85 100644
--- a/src/views/mallmanagement/shopmanagement/index.vue
+++ b/src/views/mallmanagement/shopmanagement/index.vue
@@ -500,10 +500,7 @@ export default {
});
},
uploadBefore(file, done, loading) {
- if (file.size > 500 * 1024) {
- this.$message.warning("图片大小切勿大于500kb");
- loading();
- } else if (
+ if (
file.type !== "image/jpg" &&
file.type !== "image/jpeg" &&
file.type !== "image/png"
diff --git a/src/views/mallmanagement/specification/index.vue b/src/views/mallmanagement/specification/index.vue
index 03a80d8..5955892 100644
--- a/src/views/mallmanagement/specification/index.vue
+++ b/src/views/mallmanagement/specification/index.vue
@@ -275,10 +275,7 @@ export default {
});
},
uploadBefore(file, done, loading) {
- if (file.size > 500 * 1024) {
- this.$message.warning("图片大小切勿大于500kb");
- loading();
- } else if (file.type !== "image/jpg" && file.type !== "image/jpeg") {
+ if (file.type !== "image/jpg" && file.type !== "image/jpeg") {
this.$message.warning("上传图片只能是 JPG 格式");
loading();
} else {