From 9548481877db1d0016e96c89df926c57f05f021c Mon Sep 17 00:00:00 2001 From: xiaogang <905166056@qq.com> Date: Wed, 10 Mar 2021 08:39:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BF=E9=97=AE=E8=A3=85?= =?UTF-8?q?=E4=BF=AE=E5=92=8C=E6=97=B6=E9=97=B4=E6=8F=92=E4=BB=B6=E9=80=89?= =?UTF-8?q?=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addRoomRenovation/addRoomRenovation.js | 2 - .../components/property/editFee/editFee.html | 4 +- public/components/property/editFee/editFee.js | 16 +- .../property/editRoom/editRoom.html | 33 ++-- .../roomCreateFeeAdd/roomCreateFeeAdd.html | 84 +++++----- .../roomCreateFeeAdd/roomCreateFeeAdd.js | 52 +++--- .../roomDecorationRecord.js | 6 +- public/img/icon-bigimg.png | Bin 0 -> 2050 bytes .../listRoomRenovationRecordDetails.html | 13 +- .../listRoomRenovationRecordDetails.js | 11 +- .../property/roomCreateFee/roomCreateFee.html | 149 +++++++++--------- .../property/roomCreateFee/roomCreateFee.js | 18 +-- .../roomRenovationManage.js | 1 + 13 files changed, 198 insertions(+), 191 deletions(-) create mode 100644 public/img/icon-bigimg.png diff --git a/public/components/property/addRoomRenovation/addRoomRenovation.js b/public/components/property/addRoomRenovation/addRoomRenovation.js index 3fb3ee532..3732a6bf8 100644 --- a/public/components/property/addRoomRenovation/addRoomRenovation.js +++ b/public/components/property/addRoomRenovation/addRoomRenovation.js @@ -22,8 +22,6 @@ }, _initEvent: function () { vc.on('addRoomRenovation', 'openAddRoomRenovationModal', function (_param) { - console.log("look here") - console.log(_param[0].userId) vc.component.addRoomRenovationInfo.userId = _param[0].userId $('#addRoomRenovationModel').modal('show'); }); diff --git a/public/components/property/editFee/editFee.html b/public/components/property/editFee/editFee.html index bd9e72428..a99bb6704 100644 --- a/public/components/property/editFee/editFee.html +++ b/public/components/property/editFee/editFee.html @@ -10,14 +10,14 @@
-
-
diff --git a/public/components/property/editFee/editFee.js b/public/components/property/editFee/editFee.js index b551642f6..4b3a69bc3 100644 --- a/public/components/property/editFee/editFee.js +++ b/public/components/property/editFee/editFee.js @@ -17,15 +17,17 @@ if (_fee.startTime.indexOf(":") == -1) { $that.editFeeInfo.startTime = $that.editFeeInfo.startTime + " 00:00:00"; } - if (_fee.endTime.indexOf(":") == -1) { - $that.editFeeInfo.endTime = $that.editFeeInfo.endTime + " 00:00:00"; - } + /*if (_fee.endTime.indexOf(":") == -1) { + $that.editFeeInfo.endTime = $that.editFeeInfo.endTime; + }*/ + $that.editFeeInfo.endTime = _fee.endTime.split(' ')[0]; $('#editFeeModel').modal('show'); }); }, methods: { _initEditFeeDateInfo: function () { $('.editFeeStartTime').datetimepicker({ + minView: "month", language: 'zh-CN', fontAwesome: 'fa', format: 'yyyy-mm-dd hh:ii:ss', @@ -40,9 +42,10 @@ vc.component.editFeeInfo.startTime = value; }); $('.editFeeEndTime').datetimepicker({ + minView: "month", language: 'zh-CN', fontAwesome: 'fa', - format: 'yyyy-mm-dd hh:ii:ss', + format: 'yyyy-mm-dd', initTime: true, initialDate: new Date(), autoClose: 1, @@ -94,11 +97,6 @@ param: "", errInfo: "计费起始时间不能为空" }, - { - limit: "dateTime", - param: "", - errInfo: "计费起始时间不是有效的时间格式" - }, ] }); }, diff --git a/public/components/property/editRoom/editRoom.html b/public/components/property/editRoom/editRoom.html index 230c50413..d0aa0322c 100644 --- a/public/components/property/editRoom/editRoom.html +++ b/public/components/property/editRoom/editRoom.html @@ -1,5 +1,5 @@ @@ -65,15 +67,15 @@
+ placeholder="必填，请填写房屋建筑面积! 平方" class="form-control">
+ placeholder="请填写算费系数" class="form-control">
-
+
@@ -90,7 +95,7 @@
+ class="form-control">
@@ -100,7 +105,7 @@ + placeholder="请填写备注信息" class="form-control">
+ class="fa fa-check"> 保存 + + data-dismiss="modal">取消 +
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html index 64d0e1732..a1849c973 100644 --- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html +++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html @@ -10,7 +10,7 @@
+ v-if="roomCreateFeeAddInfo.isMore == true"> @@ -30,26 +30,26 @@ + v-if="!roomCreateFeeAddInfo.isMore" type="text" placeholder="必填，请填写收费范围" + class="form-control"/>
+ v-show="roomCreateFeeAddInfo.locationTypeCd == '2000' || roomCreateFeeAddInfo.locationTypeCd == '3000' ||roomCreateFeeAddInfo.locationTypeCd == '4000' ">
+ namespace="roomCreateFeeAdd">
+ v-show="roomCreateFeeAddInfo.locationTypeCd == '2000' || roomCreateFeeAddInfo.locationTypeCd == '3000' ">
+ callBackListener="roomCreateFeeAdd" callBackFunction="notify" + namespace="roomCreateFeeAdd">
@@ -57,21 +57,20 @@
+ callBackListener="roomCreateFeeAdd" callBackFunction="notify" + namespace="roomCreateFeeAdd">
-
@@ -83,7 +82,7 @@
@@ -92,17 +91,16 @@
+ placeholder="请输入楼层 多个层时用#分隔，如1#2" class="form-control">
+ placeholder="请输入楼层 多个层时用#分隔，如1#2" class="form-control">
@@ -110,49 +108,59 @@
- +
- +
- +
- +
- +
- +
- -
+ placeholder="必填，请填写计费起始时间" class="form-control roomCreateFeeStartTime">
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js index 1d3f36973..36f3d9188 100644 --- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js +++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js @@ -70,9 +70,10 @@ methods: { _initRoomCreateFeeAddInfo: function () { $('.roomCreateFeeStartTime').datetimepicker({ + minView: "month", language: 'zh-CN', fontAwesome: 'fa', - format: 'yyyy-mm-dd hh:ii:ss', + format: 'yyyy-mm-dd', initTime: true, initialDate: new Date(), autoClose: 1, @@ -92,54 +93,50 @@ }, roomCreateFeeAddValidate() { return vc.validate.validate({ - roomCreateFeeAddInfo: $that.roomCreateFeeAddInfo - }, + roomCreateFeeAddInfo: $that.roomCreateFeeAddInfo + }, { 'roomCreateFeeAddInfo.locationTypeCd': [{ limit: "required", param: "", errInfo: "收费范围不能为空" }, - { - limit: "num", - param: "", - errInfo: "收费范围格式错误" - }, + { + limit: "num", + param: "", + errInfo: "收费范围格式错误" + }, ], 'roomCreateFeeAddInfo.locationObjId': [{ limit: "required", param: "", errInfo: "收费对象不能为空" - } - ], + }], 'roomCreateFeeAddInfo.feeTypeCd': [{ limit: "required", param: "", errInfo: "费用类型不能为空" - } - ], + }], 'roomCreateFeeAddInfo.configId': [{ limit: "required", param: "", errInfo: "费用项目不能为空" - } - ], + }], 'roomCreateFeeAddInfo.roomState': [{ limit: "required", param: "", errInfo: "房屋状态不能为空" - } - ], + }], 'roomCreateFeeAddInfo.startTime': [{ limit: "required", param: "", errInfo: "计费起始时间不能为空" }, - { - limit: "datetime", - param: "", - errInfo: "计费起始时间格式错误 YYYY-MM-DD hh:mm:ss" - }] + { + limit: "datetime", + param: "", + errInfo: "计费起始时间格式错误 YYYY-MM-DD hh:mm:ss" + }] }); }, saveRoomCreateFeeInfo: function () { @@ -169,8 +166,8 @@ _roomCreateFeeAddInfo.roomState = _roomCreateFeeAddInfo.roomState.join(','); vc.http.post('roomCreateFeeAdd', 'save', JSON.stringify(_roomCreateFeeAddInfo), { - emulateJSON: true - }, + emulateJSON: true + }, function (json, res) { //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); if (res.status == 200) { @@ -209,7 +206,7 @@ roomType: '1010301', isMore: false, locationTypeCdName: '', - startTime: vc.dateTimeFormat(new Date().getTime()), + startTime: '', feeLayer: '全部' }; $that.roomCreateFeeAddInfo.feeTypeCds = _feeTypeCds; @@ -243,12 +240,11 @@ $that.roomCreateFeeAddInfo.roomState = ['2006']; } }, - _changeFeeLayer:function(){ + _changeFeeLayer: function () { let _feeLayer = $that.roomCreateFeeAddInfo.feeLayer; - - if(_feeLayer == '全部'){ + if (_feeLayer == '全部') { $that.roomCreateFeeAddInfo.feeLayer = '' - }else{ + } else { $that.roomCreateFeeAddInfo.feeLayer = '全部' } } diff --git a/public/components/property/roomDecorationRecord/roomDecorationRecord.js b/public/components/property/roomDecorationRecord/roomDecorationRecord.js index 05fc24063..b2288f362 100644 --- a/public/components/property/roomDecorationRecord/roomDecorationRecord.js +++ b/public/components/property/roomDecorationRecord/roomDecorationRecord.js @@ -35,7 +35,7 @@ vc.component.roomDecorationRecordInfo.photos = _param; }); vc.on("roomDecorationRecord", "notifyUploadVedio", function (_param) { - vc.component.roomDecorationRecordInfo.videoName = _param.fileName; + vc.component.roomDecorationRecordInfo.videoName = _param.realFileName; }); }, methods: { @@ -88,8 +88,6 @@ $('#roomDecorationRecordModel').modal('hide'); return; } - console.log("here") - console.log(vc.component.roomDecorationRecordInfo) vc.http.apiPost( '/roomRenovation/updateRoomDecorationRecord', JSON.stringify(vc.component.roomDecorationRecordInfo), @@ -99,8 +97,6 @@ function (json, res) { //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); let _json = JSON.parse(json); - console.log("12333121") - console.log(_json) if (_json.code == 0) { //关闭model $('#roomDecorationRecordModel').modal('hide'); diff --git a/public/img/icon-bigimg.png b/public/img/icon-bigimg.png new file mode 100644 index 0000000000000000000000000000000000000000..526e72ed3734a2b08a20a75b217bf5817c704c2b GIT binary patch literal 2050 zcmaJ?2~-nj9uH?h5F?Lufvq|Yv}l2xT#1P^Az*?H#&E7IVvd2FlbB3QfNj+%h$vW( zf=}EPgQzS5T6T-aLScns7rO%0Vx>?B3RRIKN&qRc6DxGzzGdgVng92F@Av!t&-cwC zUfky8%Y2t%Fqq{WHj9s168hp?oYAi=Fm@Yie30lABwm$)=mi=G!w{>45WrCiG9f-B z5NGZB8lqt^4)047QjiqxM^uqYi4)i`ID=A+vN0H1q(LnZ$sq&~LYY#S4vyXY5(K1T zI+z^FC2-YIkVMMP)5}lYM_H}bgAgtc8mvs zHxNWl2Y(4Fh06n?R2m2f#f1fnh~x+$oPr~UQX)tpK>&$B48s#Bcw$H}fk-7#s01SL z_5o3E8gT}d&x(2L3*FH{34*Apc)VV($LYy9l_nEUq);e$0trtd1*3>yZ5E6O48gG0 zZ$W_tX+;{T8j-4Cz@{h=s&oh)L?itr1*LjX7S_Hk6Iw95L7>JHaRggR3qUUS|3j6^ zMYI;-L%+uRKZUgkS!xK+hqNl4Muavl!_VeQO^wn(0z{=rP^lCPRpd!jh)OF_sez~{ zTh+pW^~q9LtkP>Yyy0-UR1T~~1h5F=u;?JFf|E+c)Ua?0g-M{qgvZ2?h{R|nGloTq z2xo;7qlh74Ok&sqm!%Tvln{(8aK(#U24P9AZ5)(p)H4gxNOwcx7>!B^yh)oXT{;%l zl6r5s;w59DL@&w3qru>9&HayNFC3v0WLqwdF1lG9eh5YnVm9D?vRnLN-SNaQDQj)sk=!pB55$TxQEbxbFM{qhd$mTckm?TI zd50{1R^B*Wmeb*yc&c>w>LbR8q5X=gQhu__Iryh2<52C;*f+gnKNVgh=z7^FPUiHt z(Wi!fP;Z)=oz-((wt02d5!f$}xcji2k1@p9|1yvEcuO2zb?@2kj&O(w4T%vthefuzuZlhw4i;PDJujtCX%Yq8m{bS&tNd6D@`|jPMwKeAr z=7X2!wli1yn)kg0^(-eG)_gJ3jvi{S^RV+KfZ(TbbbH?g6Ca1x} z?QM)lUTo$^rr6Is8gy3sF3I26v&L0(ucp`OZwZMvKhZX7JXvv08{yak=l7Zpd4p_T z%W!7(+TEpV=3ZWTcauff*>s#zdz*14KY!Tp$a?KbQIUrh@HW)d)xF3n8kAi8_DNbw ziu(D;$n>t%<8{EbAB7YTB@FY^Kc?r%C6e2+5MMVZ2KL0)=Ut>F?zzmXeSLkietv$D zW{+r3(hH!fs!F0zxL*y**?#u`ZOsb4g*Isr-5OO#I2)VGYOi0P`Ip&jc1Bu^aTmXR zpa>frA0O|5An0jhW20&yX-Ksdj1QyJ=U8b9&aR2ga=HB6+f=|Hf?crEwv9M5D4Q9 z?T;-wozAD|M$&f-;M33g=eu`i*VNRE-mzM(eO+B$XXm{-3}5zV9GjV$(d}>Mc}!W} zsR(HYyzO6Ilw(_l)qmnuCfw=kTXXNLOKScFYj%U6f?tVw@5$x;<0-DE8$Gc2W~pPk zL&-#Oaq+6+lPA}2{fp22`}Z?}n@&G}vd91Nj^Eo2WHn-Zo1QiE*d@j$9|VR+SBeRy zii(P)8-IS?lf|m-KC6_;y0*r})v)ECJD6IqWsc{&%dxXSU|`^$BSl58X%P|Ad9A|h zF5TuXU&TN{K|xn#W#v@G!Dcqr9FNcM@BYAG_BPR$o3YNHclMf0Cga4!gudtDLs@2K z=AMI-M3+$#&rGYa7|z|7HDH?kAI#2<4Jcy7ma{9!Wb$n>>G@qZ|NN#2Y~?Y34nL&y zn_BD3m)~N zvTOLo^BcWzmhk?FC)utIV9&LyzSzR%rSEi8ic6V9#sxt<3Ted@`Z zhq~H@Pk-*1h$lw~TiI2ULur>C^CS| 房屋 - 图片 + 图片/视频 创建时间 @@ -24,9 +24,11 @@ {{roomRenovationRecordDetail.roomName}} - +
+ + +