From 037e46d104c31f36acb67ce4b70ac14f0eb01a01 Mon Sep 17 00:00:00 2001
From: mayf <m13160102112@163.com>
Date: 星期三, 11 九月 2024 10:01:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pages/shop/list.vue | 1 +
pages/supplier/list.vue | 1 +
utils/mark-up-config.js | 5 +++++
pages/partner/list.vue | 1 +
4 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/pages/partner/list.vue b/pages/partner/list.vue
index 9abe2b5..561494f 100644
--- a/pages/partner/list.vue
+++ b/pages/partner/list.vue
@@ -105,6 +105,7 @@
label: '启用/禁用',
id: 'isEnabled',
type: 'bus-select-dict',
+ default: '1',
el: {
code: 'USER_ENABLED_OR_DISABLED',
clearable: true,
diff --git a/pages/shop/list.vue b/pages/shop/list.vue
index feb7351..fa6389f 100644
--- a/pages/shop/list.vue
+++ b/pages/shop/list.vue
@@ -66,6 +66,7 @@
label: '启用/禁用',
id: 'isEnabled',
type: 'bus-select-dict',
+ default: '1',
el: {
code: 'USER_ENABLED_OR_DISABLED',
clearable: true,
diff --git a/pages/supplier/list.vue b/pages/supplier/list.vue
index a48765d..e9737f8 100644
--- a/pages/supplier/list.vue
+++ b/pages/supplier/list.vue
@@ -102,6 +102,7 @@
label: '启用/禁用',
id: 'isEnabled',
type: 'bus-select-dict',
+ default: '1',
el: {
code: 'USER_ENABLED_OR_DISABLED',
clearable: true,
diff --git a/utils/mark-up-config.js b/utils/mark-up-config.js
index 9f58213..f610b59 100644
--- a/utils/mark-up-config.js
+++ b/utils/mark-up-config.js
@@ -235,6 +235,11 @@
style: 'width:100%',
},
},
+ {
+ label: '供应商',
+ id: 'supplierName',
+ type: 'input',
+ },
],
},
],
--
Gitblit v1.9.3