From 6f9ca4eb15b4c607133f07344d324957eb8a662f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 20 Oct 2022 16:49:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A6=E6=88=B7=E8=BD=AC?=
=?UTF-8?q?=E5=85=A5=E9=94=99=E8=AF=AF=20=E6=92=A4=E9=94=80=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cancelAccountDetail.html | 41 ++++++++++
.../cancelAccountDetail.js | 77 +++++++++++++++++++
.../accountDetailManage.html | 10 ++-
.../accountDetailManage.js | 3 +
4 files changed, 127 insertions(+), 4 deletions(-)
create mode 100644 public/components/property/cancelAccountDetail/cancelAccountDetail.html
create mode 100644 public/components/property/cancelAccountDetail/cancelAccountDetail.js
diff --git a/public/components/property/cancelAccountDetail/cancelAccountDetail.html b/public/components/property/cancelAccountDetail/cancelAccountDetail.html
new file mode 100644
index 000000000..63416eacf
--- /dev/null
+++ b/public/components/property/cancelAccountDetail/cancelAccountDetail.html
@@ -0,0 +1,41 @@
+
\ No newline at end of file
diff --git a/public/components/property/cancelAccountDetail/cancelAccountDetail.js b/public/components/property/cancelAccountDetail/cancelAccountDetail.js
new file mode 100644
index 000000000..0d3392d8c
--- /dev/null
+++ b/public/components/property/cancelAccountDetail/cancelAccountDetail.js
@@ -0,0 +1,77 @@
+(function(vc) {
+ vc.extends({
+ data: {
+ cancelAccountDetailInfo: {
+ detailId: '',
+ acctName: '',
+ amount: '',
+ remark: '',
+ }
+ },
+ _initMethod: function() {},
+ _initEvent: function() {
+ vc.on('cancelAccountDetail', 'openAddModal', function(_param) {
+ $('#cancelAccountDetailModel').modal('show');
+
+ vc.copyObject(_param, $that.cancelAccountDetailInfo);
+ that.cancelAccountDetailInfo.remark = '';
+ });
+ },
+ methods: {
+ cancelAccountDetailValidate() {
+ return vc.validate.validate({
+ cancelAccountDetailInfo: vc.component.cancelAccountDetailInfo
+ }, {
+ 'cancelAccountDetailInfo.detailId': [{
+ limit: "required",
+ param: "",
+ errInfo: "明细不存在"
+ }],
+ 'cancelAccountDetailInfo.remark': [{
+ limit: "required",
+ param: "",
+ errInfo: "撤销原因不能空"
+ }],
+ });
+ },
+ _cancelAccountDetailInfo: function() {
+ if (!vc.component.cancelAccountDetailValidate()) {
+ vc.toast(vc.validate.errInfo);
+ return;
+ }
+ vc.component.cancelAccountDetailInfo.communityId = vc.getCurrentCommunity().communityId;
+ vc.http.apiPost(
+ '/account.cancelAccountDetail',
+ JSON.stringify(vc.component.cancelAccountDetailInfo), {
+ emulateJSON: true
+ },
+ function(json, res) {
+ //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+ let _json = JSON.parse(json)
+ if (_json.code == 0) {
+ //关闭model
+ $('#cancelAccountDetailModel').modal('hide');
+ vc.component.clearPrestoreAccountInfo();
+ vc.emit('accountDetailManage', 'listAccountDetail', {});
+ vc.toast('撤销成功');
+ return;
+ }
+ vc.toast(_json.msg);
+ },
+ function(errInfo, error) {
+ console.log('请求失败处理');
+ vc.component.cancelAccountDetailInfo.errorInfo = errInfo;
+ });
+ },
+ clearPrestoreAccountInfo: function() {
+ vc.component.cancelAccountDetailInfo = {
+ detailId: '',
+ acctName: '',
+ amount: '',
+ remark: '',
+ };
+ },
+
+ }
+ });
+})(window.vc);
\ No newline at end of file
diff --git a/public/pages/property/accountDetailManage/accountDetailManage.html b/public/pages/property/accountDetailManage/accountDetailManage.html
index b59755831..433464416 100644
--- a/public/pages/property/accountDetailManage/accountDetailManage.html
+++ b/public/pages/property/accountDetailManage/accountDetailManage.html
@@ -28,10 +28,12 @@
| {{accountDetail.detailId}} |
{{accountDetail.orderId}} |
{{accountDetail.acctName}} |
- {{accountDetail.detailType =='1001'?'转入':'转出'}} |
+ 转入(撤销) |
+ 转入已撤销 |
+ 转出 |
{{accountDetail.amount}} |
{{accountDetail.createTime}} |
- {{accountDetail.remark}} |
+ {{accountDetail.remark || '无'}} |
@@ -48,5 +50,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/public/pages/property/accountDetailManage/accountDetailManage.js b/public/pages/property/accountDetailManage/accountDetailManage.js
index 39c03fffa..a62cadfe0 100644
--- a/public/pages/property/accountDetailManage/accountDetailManage.js
+++ b/public/pages/property/accountDetailManage/accountDetailManage.js
@@ -71,6 +71,9 @@
vc.component.accountDetailManageInfo.moreCondition = true;
}
},
+ _cancelAccountDetail: function(_detail) {
+ vc.emit('cancelAccountDetail', 'openAddModal', _detail);
+ },
_goBack: function() {
vc.goBack();
}