From ce3980bb67c1e998a77e9c1f1338f64db4104a3a Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 7 Jun 2023 08:46:38 +0000 Subject: [PATCH 01/46] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=9A=E4=B8=BB=E6=97=B6=E6=B2=A1=E6=B3=95=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20=E9=97=A8=E7=A6=81=E5=8F=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: java110 <928255095@qq.com> --- public/components/property/editOwner/editOwner.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/public/components/property/editOwner/editOwner.js b/public/components/property/editOwner/editOwner.js index ce16c056b..f015aa388 100755 --- a/public/components/property/editOwner/editOwner.js +++ b/public/components/property/editOwner/editOwner.js @@ -36,6 +36,10 @@ if (_owner.address == null || _owner.address == undefined || _owner.address == '') { vc.component.editOwnerInfo.address = ""; } + + //清理 上次数据 + $that.clearEditOwnerInfo(); + vc.copyObject(_owner, vc.component.editOwnerInfo); //根据memberId 查询 照片信息 vc.component.editOwnerInfo.ownerPhoto = _owner.urls && _owner.urls.length > 0 ? _owner.urls[0] : ''; @@ -116,7 +120,7 @@ if (_json.code == 0) { //关闭model $('#editOwnerModel').modal('hide'); - vc.component.clearEditOwnerInfo(); + vc.emit($props.notifyLoadDataComponentName, 'listOwnerData', {}); vc.toast("修改成功"); return; @@ -132,6 +136,9 @@ clearEditOwnerInfo: function() { let _componentTitle = $that.editOwnerInfo.componentTitle; let _attrs = $that.editOwnerInfo.attrs; + _attrs.forEach(item => { + item.value = ''; + }) vc.component.editOwnerInfo = { componentTitle: _componentTitle, ownerId: '', -- Gitee From 2aa41bda0b000d7e4c2c69a7d3bccdd3eca9f243 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Tue, 13 Jun 2023 08:42:57 +0000 Subject: [PATCH 02/46] =?UTF-8?q?=E4=BC=98=E5=8C=96app.js=20=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: java110 <928255095@qq.com> --- app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index 137f52056..4d9587f3a 100755 --- a/app.js +++ b/app.js @@ -40,10 +40,10 @@ let opts = { } -app.use('/callComponent', proxy('http://192.168.100.108:8088', opts)); -app.use('/app', proxy('http://192.168.100.108:8088', opts)); +app.use('/callComponent', proxy('http://127.0.0.1:8008', opts)); +app.use('/app', proxy('http://127.0.0.1:8008', opts)); app.use('/ws', createProxyMiddleware({ - target: 'http://192.168.100.108:8008', + target: 'http://127.0.0.1:8008', changeOrigin: true, ws: true })); -- Gitee From e19835b3675b7f99a76988137227017687608417 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Tue, 20 Jun 2023 01:47:14 +0000 Subject: [PATCH 03/46] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: java110 <928255095@qq.com> --- .../property/printOweFee/printOweFee.html | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/public/pages/property/printOweFee/printOweFee.html b/public/pages/property/printOweFee/printOweFee.html index 271ac07db..22d8e2eee 100755 --- a/public/pages/property/printOweFee/printOweFee.html +++ b/public/pages/property/printOweFee/printOweFee.html @@ -18,13 +18,27 @@ - - - - - - - + + + + + + + @@ -32,8 +46,7 @@ @@ -43,7 +56,7 @@ - + -- Gitee From 04bfdc07dcc1720c03610e0bb9e84f3ffb0f2ce7 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Tue, 20 Jun 2023 03:47:45 +0000 Subject: [PATCH 04/46] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AC=A0=E8=B4=B9?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: java110 <928255095@qq.com> --- .../dataReportOweDetailStatistics.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/components/report/dataReportOweDetailStatistics/dataReportOweDetailStatistics.html b/public/components/report/dataReportOweDetailStatistics/dataReportOweDetailStatistics.html index 7064aaf00..fcd5effd4 100644 --- a/public/components/report/dataReportOweDetailStatistics/dataReportOweDetailStatistics.html +++ b/public/components/report/dataReportOweDetailStatistics/dataReportOweDetailStatistics.html @@ -64,13 +64,13 @@
+ + + + + + + + + + + + + +
{{item.payerObjName}} {{item.feeName}} - {{vc.dateFormat(item.endTime)}} - {{_getDeadlineTime(item)}} + {{vc.dateFormat(item.endTime)}}至{{_getDeadlineTime(item)}}
{{item.preDegrees}} 至 {{item.curDegrees}} 		{{(item.curDegrees-item.preDegrees).toFixed(2)}} {{printPayFeeInfo.builtUpArea}}{{item.mwPrice}}{{item.mwPrice}} {{item.squarePrice}}/{{item.additionalAmount}} {{item.feeTotalPrice}}
-
- --> + \ No newline at end of file -- Gitee From 2de3d58e646419d4e419621c5b56683c43cd5209 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Tue, 27 Jun 2023 17:29:53 +0000 Subject: [PATCH 05/46] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9F=9F=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: java110 <928255095@qq.com> --- public/pages/property/roomCreateFee/roomCreateFee.html | 2 +- public/pages/property/roomCreateFee/roomCreateFee.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/pages/property/roomCreateFee/roomCreateFee.html b/public/pages/property/roomCreateFee/roomCreateFee.html index fbdd85af0..0ffc6df1e 100755 --- a/public/pages/property/roomCreateFee/roomCreateFee.html +++ b/public/pages/property/roomCreateFee/roomCreateFee.html @@ -95,7 +95,7 @@