diff --git a/public/components/property/addNotepadDetail/addNotepadDetail.html b/public/components/property/addNotepadDetail/addNotepadDetail.html new file mode 100644 index 000000000..a6565bcf0 --- /dev/null +++ b/public/components/property/addNotepadDetail/addNotepadDetail.html @@ -0,0 +1,40 @@ + \ No newline at end of file diff --git a/public/components/property/addNotepadDetail/addNotepadDetail.js b/public/components/property/addNotepadDetail/addNotepadDetail.js new file mode 100644 index 000000000..392dc5028 --- /dev/null +++ b/public/components/property/addNotepadDetail/addNotepadDetail.js @@ -0,0 +1,86 @@ +(function(vc) { + + vc.extends({ + propTypes: { + callBackListener: vc.propTypes.string, //父组件名称 + callBackFunction: vc.propTypes.string //父组件监听方法 + }, + data: { + addNotepadDetailInfo: { + noteId: '', + content: '', + state: 'W', + } + }, + _initMethod: function() {}, + _initEvent: function() { + vc.on('addNotepadDetail', 'openAddNotepadModal', function(_param) { + vc.copyObject(_param, $that.addNotepadDetailInfo); + + $('#addNotepadDetailModel').modal('show'); + }); + }, + methods: { + addNotepadDetailValidate() { + return vc.validate.validate({ + addNotepadDetailInfo: vc.component.addNotepadDetailInfo + }, { + + 'addNotepadDetailInfo.content': [{ + limit: "required", + param: "", + errInfo: "内容不能为空" + }, ], + 'addNotepadDetailInfo.noteId': [{ + limit: "required", + param: "", + errInfo: "登记不能为空" + }], + }); + }, + saveNotepadDetailInfo: function() { + if (!vc.component.addNotepadDetailValidate()) { + vc.toast(vc.validate.errInfo); + + return; + } + + vc.component.addNotepadDetailInfo.communityId = vc.getCurrentCommunity().communityId; + //不提交数据将数据 回调给侦听处理 + + vc.http.apiPost( + '/notepad.saveNotepadDetail', + JSON.stringify(vc.component.addNotepadDetailInfo), { + emulateJSON: true + }, + function(json, res) { + //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); + let _json = JSON.parse(json); + if (_json.code == 0) { + //关闭model + $('#addNotepadDetailModel').modal('hide'); + vc.component.clearAddNotepadDetailInfo(); + vc.emit('notepadManage', 'listNotepad', {}); + vc.emit('simplifyNotepadManage', 'listNotepad', {}); + return; + } + vc.message(_json.msg); + + }, + function(errInfo, error) { + console.log('请求失败处理'); + + vc.message(errInfo); + }); + }, + clearAddNotepadDetailInfo: function() { + vc.component.addNotepadDetailInfo = { + noteId: '', + content: '', + state: 'W', + }; + } + } + }); + +})(window.vc); \ No newline at end of file diff --git a/public/components/property/notepadDetail/notepadDetail.html b/public/components/property/notepadDetail/notepadDetail.html new file mode 100644 index 000000000..6b44794b8 --- /dev/null +++ b/public/components/property/notepadDetail/notepadDetail.html @@ -0,0 +1,36 @@ + \ No newline at end of file diff --git a/public/components/property/notepadDetail/notepadDetail.js b/public/components/property/notepadDetail/notepadDetail.js new file mode 100644 index 000000000..520a621f0 --- /dev/null +++ b/public/components/property/notepadDetail/notepadDetail.js @@ -0,0 +1,52 @@ +(function(vc, vm) { + vc.extends({ + data: { + notepadDetailInfo: { + noteId: '', + details: [] + } + }, + _initMethod: function() {}, + _initEvent: function() { + vc.on('notepadDetail', 'openNotepadDetailModal', function(_params) { + vc.component.refreshnotepadDetailInfo(); + $('#notepadDetailModel').modal('show'); + vc.copyObject(_params, vc.component.notepadDetailInfo); + $that._loadNotepadDetails(); + }); + }, + methods: { + refreshnotepadDetailInfo: function() { + vc.component.notepadDetailInfo = { + noteId: '', + details: [] + } + }, + + _loadNotepadDetails: function() { + let param = { + params: { + communityId: vc.getCurrentCommunity().communityId, + noteId: $that.notepadDetailInfo.noteId, + page: 1, + row: 50 + } + }; + //发送get请求 + vc.http.apiGet('/notepad.listNotepadDetail', + param, + function(json, res) { + let _json = JSON.parse(json); + if (_json.code != '0') { + return; + } + $that.notepadDetailInfo.details = _json.data; + }, + function(errInfo, error) { + console.log('请求失败处理'); + } + ); + } + } + }); +})(window.vc, window.vc.component); \ No newline at end of file diff --git a/public/pages/property/simplifyNotepadManage/simplifyNotepadManage.html b/public/pages/property/simplifyNotepadManage/simplifyNotepadManage.html index 29f25841d..b43690045 100644 --- a/public/pages/property/simplifyNotepadManage/simplifyNotepadManage.html +++ b/public/pages/property/simplifyNotepadManage/simplifyNotepadManage.html @@ -39,6 +39,9 @@ + + + @@ -59,10 +62,21 @@ {{notepad.roomName}} {{notepad.objName}} {{notepad.link}} + {{notepad.state=='F'?'完成':'跟进中'}} {{notepad.createTime}} {{notepad.createUserName}} {{notepad.title}} +
+ +
+
+ +
\ No newline at end of file diff --git a/public/pages/property/simplifyNotepadManage/simplifyNotepadManage.js b/public/pages/property/simplifyNotepadManage/simplifyNotepadManage.js index 1ad69a590..7df6effc2 100644 --- a/public/pages/property/simplifyNotepadManage/simplifyNotepadManage.js +++ b/public/pages/property/simplifyNotepadManage/simplifyNotepadManage.js @@ -20,6 +20,7 @@ objName: '', createUserName: '', state: '', + objId: '' } } @@ -29,6 +30,7 @@ let _ownerId = vc.getParam('ownerId'); $that.simplifyNotepadManageInfo.roomId = _roomId; $that.simplifyNotepadManageInfo.ownerId = _ownerId; + $that.simplifyNotepadManageInfo.conditions.objId = _ownerId; vc.component._listNotepads(DEFAULT_PAGE, DEFAULT_ROWS); }, _initEvent: function() { @@ -73,6 +75,12 @@ ownerId: $that.simplifyNotepadManageInfo.ownerId }); }, + _openAddNotepadDetailModal: function(_notepad) { + vc.emit('addNotepadDetail', 'openAddNotepadModal', _notepad); + }, + _openListNotepadDetailModal: function(_notepad) { + vc.emit('notepadDetail', 'openNotepadDetailModal', _notepad); + }, _openEditNotepadModel: function(_notepad) { vc.emit('editNotepad', 'openEditNotepadModal', _notepad); },