From 6d0a98d2f787c6a26ab4347648be705efcf3a92a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
<188633308@qq.com>
Date: Thu, 20 May 2021 20:56:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E7=A7=8D?=
=?UTF-8?q?=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../seed/form-page/only-form/index.vue | 6 +-
.../doc-code/seed/form-page/tab-form/tab.vue | 3 +-
.../seed/form-page/tab-form/tabPane.vue | 6 +-
.../business/house/houseCode/form/index.vue | 4 +-
.../house/houseInfo/form/base/index.vue | 6 +-
.../houseInfo/form/curtainWall/index.vue | 6 +-
.../house/houseInfo/form/faceBrick/index.vue | 6 +-
.../business/house/houseInfo/form/index.vue | 3 +-
Web/src/pages/system/dict/_index.vue | 232 ------------------
9 files changed, 21 insertions(+), 251 deletions(-)
delete mode 100644 Web/src/pages/system/dict/_index.vue
diff --git a/Web/public/doc-code/seed/form-page/only-form/index.vue b/Web/public/doc-code/seed/form-page/only-form/index.vue
index 71cc94d..36c1566 100644
--- a/Web/public/doc-code/seed/form-page/only-form/index.vue
+++ b/Web/public/doc-code/seed/form-page/only-form/index.vue
@@ -14,7 +14,7 @@
-
+
{{part.title}}
\ No newline at end of file
From 9ed45ded7210f9be8096e925943e7d5d0885e4f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
<188633308@qq.com>
Date: Thu, 20 May 2021 21:24:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?update=20=E7=BC=96=E7=A0=81=E8=A1=A8?=
=?UTF-8?q?=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../business/house/houseCode/form/index.vue | 4 +-
.../business/house/houseCode/form/part.vue | 68 +++++++++++++++++--
2 files changed, 65 insertions(+), 7 deletions(-)
diff --git a/Web/src/pages/business/house/houseCode/form/index.vue b/Web/src/pages/business/house/houseCode/form/index.vue
index 71babbd..797531e 100644
--- a/Web/src/pages/business/house/houseCode/form/index.vue
+++ b/Web/src/pages/business/house/houseCode/form/index.vue
@@ -103,8 +103,8 @@ export default {
this.$message.success('保存成功');
this.$confirm({
content: '已添加成功，是否继续添加？',
- onOk() {
- console.log('OK');
+ onOk: () => {
+ this.$refs.forms[0].onProjectChange();
},
onCancel: () => {
this.closeContentWindow();
diff --git a/Web/src/pages/business/house/houseCode/form/part.vue b/Web/src/pages/business/house/houseCode/form/part.vue
index d5749b7..e52d7e3 100644
--- a/Web/src/pages/business/house/houseCode/form/part.vue
+++ b/Web/src/pages/business/house/houseCode/form/part.vue
@@ -35,8 +35,8 @@
-
-
+
+
宁波市 -
@@ -52,7 +52,7 @@
/>
-
+
-
@@ -66,7 +66,7 @@
-
+
-
@@ -83,8 +83,14 @@
/>
+
+ - {{ codeSuffix }}
+
+
+ {{ item}}
+
@@ -161,7 +167,7 @@ export default {
type: [{ required: true, message: '请选择房屋性质' }],
industry: [{ validator: validatorIndustry }],
areaCode: [{ required: true, message: '请选择房屋所在区域' }],
- projectId: [{ required: true, message: '请选择项目', trigger: 'blur' }],
+ projectId: [{ required: true, message: '请选择项目' }],
no: [{ required: true, message: '请输入房屋序号', trigger: 'blur' }],
address: [{ required: true, message: '请输入房屋地址', trigger: 'blur' }],
lng: [{ required: true, message: '请在地图中选择坐标' }],
@@ -185,6 +191,58 @@ export default {
};
},
+ computed: {
+ /**
+ * 房屋完整编号,仅展示
+ */
+ houseCode() {
+ const houseCode = [];
+ if (this.form.areaCode && this.form.areaCode.length === 4) {
+ let deep = this.$_.cloneDeep(this.options.areaTree);
+ this.form.areaCode.forEach((p, i) => {
+ const _deep = deep.find((m) => m.code === p);
+ if (i === 3) {
+ deep = _deep;
+ } else {
+ deep = _deep.children;
+ }
+ });
+ houseCode.push(...deep.adCode.split(''));
+ } else {
+ houseCode.push(...'XXXXXXXXXXXX'.split(''));
+ }
+
+ if (this.form.projectId) {
+ const project = this.options.projects.find((p) => p.id === this.form.projectId);
+ houseCode.push(...`000${project.sort}`.slice(-3).split(''));
+ } else {
+ houseCode.push(...'XXX'.split(''));
+ }
+
+ if (this.form.no) {
+ houseCode.push(...`000${this.form.no}`.slice(-3).split(''));
+ } else {
+ houseCode.push(...'XXX'.split(''));
+ }
+
+ if (this.codeSuffix) {
+ houseCode.push(this.codeSuffix);
+ }
+
+ return houseCode;
+ },
+ /**
+ * 非住宅编号后缀,仅展示
+ */
+ codeSuffix() {
+ if (this.form.industry) {
+ const houseIndustry = this.codes.houseIndustry.find((p) => p.code == this.form.industry);
+ return houseIndustry.extCode.tag;
+ }
+ return '';
+ },
+ },
+
async created() {
await this.onInit();
this.onFillData();
From 1e15747852f3af2e4f32892fe3a120ba52add7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
<188633308@qq.com>
Date: Fri, 21 May 2021 10:59:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E5=AD=97?=
=?UTF-8?q?=E5=85=B8=E6=89=A9=E5=B1=95=E5=80=BC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Web/src/pages/system/dict/dictdata/index.vue | 32 ++++++++++++++------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/Web/src/pages/system/dict/dictdata/index.vue b/Web/src/pages/system/dict/dictdata/index.vue
index 481d636..35d10ad 100644
--- a/Web/src/pages/system/dict/dictdata/index.vue
+++ b/Web/src/pages/system/dict/dictdata/index.vue
@@ -40,7 +40,7 @@
- 编辑
+ JSON
-