From 523cfe1924cdbc42e3fdac041aa009cfb13762a9 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Fri, 14 Feb 2025 15:24:22 +0800
Subject: [PATCH] 1
---
admin-web-master/src/components/add/addinformation.vue | 5 ++++-
admin-web-master/src/components/add/addmap.vue | 6 +++---
admin-web-master/src/components/add/addmb.vue | 8 ++++++--
admin-web-master/src/components/add/addsam.vue | 12 ++++++------
admin-web-master/src/components/add/addss.vue | 1 +
admin-web-master/src/components/chakan/sam.vue | 12 +++++-------
admin-web-master/src/components/change/cl.vue | 2 +-
admin-web-master/src/components/editor/index.vue | 2 +-
admin-web-master/src/components/resourceCommodity/index.vue | 3 +++
admin-web-master/src/views/business/autd/index.vue | 2 +-
admin-web-master/src/views/shopRental/rentTermination/add.vue | 2 +-
admin-web-master/src/views/shopRental/rentalMan/add.vue | 2 +-
12 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/admin-web-master/src/components/add/addinformation.vue b/admin-web-master/src/components/add/addinformation.vue
index 56d97d6..5e96ae2 100644
--- a/admin-web-master/src/components/add/addinformation.vue
+++ b/admin-web-master/src/components/add/addinformation.vue
@@ -82,7 +82,10 @@
-
+
+
+
diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue
index 56fed02..a9b37d1 100644
--- a/admin-web-master/src/components/add/addmap.vue
+++ b/admin-web-master/src/components/add/addmap.vue
@@ -18,9 +18,9 @@
-
-
-
+
+
+
diff --git a/admin-web-master/src/components/add/addmb.vue b/admin-web-master/src/components/add/addmb.vue
index eea8b5d..aa98c14 100644
--- a/admin-web-master/src/components/add/addmb.vue
+++ b/admin-web-master/src/components/add/addmb.vue
@@ -267,7 +267,7 @@ import { Input } from "element-ui";
value: '',
},
{
- name: '付款日',
+ name: '首次付款日',
key: 'paymentDay',
type: '付款日',
isrequired: '是',
@@ -509,7 +509,11 @@ import { Input } from "element-ui";
console.log(valid)
if (valid) {
let allist = [...this.list2,...this.list1]
- this.forminfo.otherInfo = JSON.stringify(allist)
+ let listallcl = allist.map((item) => {
+ item.value = ''
+ return item;
+ });
+ this.forminfo.otherInfo = JSON.stringify(listallcl)
console.log(
{...this.forminfo}
)
diff --git a/admin-web-master/src/components/add/addsam.vue b/admin-web-master/src/components/add/addsam.vue
index 90587c5..0b7de35 100644
--- a/admin-web-master/src/components/add/addsam.vue
+++ b/admin-web-master/src/components/add/addsam.vue
@@ -74,13 +74,13 @@
-
+
@@ -153,11 +153,11 @@
{{scope.row.rentalPrice}}/{{scope.row.leaseTerm}}
-
+
{{scope.row.isrental == '0'?'自营':'是'}}
@@ -252,13 +252,13 @@
-
+
diff --git a/admin-web-master/src/components/add/addss.vue b/admin-web-master/src/components/add/addss.vue
index ab802b8..9aad1d6 100644
--- a/admin-web-master/src/components/add/addss.vue
+++ b/admin-web-master/src/components/add/addss.vue
@@ -223,6 +223,7 @@
cerePlatformMerchantadd({
...this.formInline,
checkState: '2',
+ state:'1',
applyTime: this.updateCurrentTime()
}).then(res => {
if (res.code == 200) {
diff --git a/admin-web-master/src/components/chakan/sam.vue b/admin-web-master/src/components/chakan/sam.vue
index 0babe76..848dee9 100644
--- a/admin-web-master/src/components/chakan/sam.vue
+++ b/admin-web-master/src/components/chakan/sam.vue
@@ -25,11 +25,11 @@
-
+
{{editbgid.rentalPrice || '无'}}
@@ -40,13 +40,13 @@
{{editbgid.leaseTerm || '无'}}
-
-
{{editbgid.contact || '无'}}
+
+
{{editbgid.rentFreeCondition || '无'}}
@@ -57,9 +57,7 @@
{{editbgid.rentFreePeriod || '无'}}
-
-
-
+
{{editbgid.businessType || '无'}}
diff --git a/admin-web-master/src/components/change/cl.vue b/admin-web-master/src/components/change/cl.vue
index 4d43d2b..46f0e19 100644
--- a/admin-web-master/src/components/change/cl.vue
+++ b/admin-web-master/src/components/change/cl.vue
@@ -27,7 +27,7 @@
-
+
diff --git a/admin-web-master/src/components/editor/index.vue b/admin-web-master/src/components/editor/index.vue
index 10d4b5d..a16f31c 100644
--- a/admin-web-master/src/components/editor/index.vue
+++ b/admin-web-master/src/components/editor/index.vue
@@ -53,7 +53,7 @@ export default {
},
editorConfig: {
- maxLength:254,
+ // maxLength:254,
readOnly:false,
placeholder: "请输入内容...",
MENU_CONF: {
diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue
index 217968b..b2ffa5e 100644
--- a/admin-web-master/src/components/resourceCommodity/index.vue
+++ b/admin-web-master/src/components/resourceCommodity/index.vue
@@ -73,6 +73,9 @@
+
+ {{editbgid.houseNumber || '无'}}
+
{{editbgid.detailedLocation || '无'}}
diff --git a/admin-web-master/src/views/business/autd/index.vue b/admin-web-master/src/views/business/autd/index.vue
index cf92d9a..edbd361 100644
--- a/admin-web-master/src/views/business/autd/index.vue
+++ b/admin-web-master/src/views/business/autd/index.vue
@@ -161,7 +161,7 @@
pagequery: {
pageNumber: 0,
pageSize: 10,
- checkState:'1',
+ // checkState:'1',
name: '',
},
diff --git a/admin-web-master/src/views/shopRental/rentTermination/add.vue b/admin-web-master/src/views/shopRental/rentTermination/add.vue
index 93be18d..6928cd1 100644
--- a/admin-web-master/src/views/shopRental/rentTermination/add.vue
+++ b/admin-web-master/src/views/shopRental/rentTermination/add.vue
@@ -30,7 +30,7 @@
:close-on-click-modal="false" append-to-body>