diff --git a/public/components/property/addFeeFormula/addFeeFormula.js b/public/components/property/addFeeFormula/addFeeFormula.js index 8b69be659..06b3ccd66 100755 --- a/public/components/property/addFeeFormula/addFeeFormula.js +++ b/public/components/property/addFeeFormula/addFeeFormula.js @@ -42,11 +42,6 @@ param: "", errInfo: "单价不能为空" }, - { - limit: "num", - param: "", - errInfo: "单价格式错误" - }, { limit: "moneyModulus", param: "", diff --git a/public/components/property/roomSelect2/roomSelect2.js b/public/components/property/roomSelect2/roomSelect2.js index 35626c078..c1f31e087 100755 --- a/public/components/property/roomSelect2/roomSelect2.js +++ b/public/components/property/roomSelect2/roomSelect2.js @@ -86,7 +86,7 @@ return markup; }, // 自定义格式化防止xss注入 ajax: { - url: "/callComponent/roomSelect2/listRoom", + url: "/app/room.queryRooms", dataType: 'json', delay: 250, headers:{ diff --git a/public/components/property/unitSelect2/unitSelect2.js b/public/components/property/unitSelect2/unitSelect2.js index f34f7a1b4..f3c82bd9d 100755 --- a/public/components/property/unitSelect2/unitSelect2.js +++ b/public/components/property/unitSelect2/unitSelect2.js @@ -72,7 +72,7 @@ return markup; }, // 自定义格式化防止xss注入 ajax: { - url: "/callComponent/unitSelect2/loadUnits", + url: "/app/unit.queryUnits", dataType: 'json', delay: 250, headers: { diff --git a/public/pages/property/reportPayFeeDetail/unitSelect2.js b/public/pages/property/reportPayFeeDetail/unitSelect2.js new file mode 100644 index 000000000..f3c82bd9d --- /dev/null +++ b/public/pages/property/reportPayFeeDetail/unitSelect2.js @@ -0,0 +1,140 @@ +(function(vc) { + vc.extends({ + propTypes: { + parentModal: vc.propTypes.string, + callBackListener: vc.propTypes.string, //父组件名称 + callBackFunction: vc.propTypes.string //父组件监听方法 + }, + data: { + unitSelect2Info: { + units: [], + floorId: '-1', + unitId: '-1', + unitNum: '', + floorNum: '', + unitName: '', + unitSelector: {} + } + }, + watch: { + unitSelect2Info: { + deep: true, + handler: function() { + vc.emit($props.callBackListener, $props.callBackFunction, this.unitSelect2Info); + console.log('是否执行 watch', $props.callBackListener, $props.callBackFunction, this.unitSelect2Info); + vc.emit($namespace, 'roomSelect2', 'clearRoom', {}); + vc.emit($namespace, 'roomSelect2', "transferRoom", this.unitSelect2Info); + } + } + }, + _initMethod: function() { + this._initUnitSelect2(); + }, + _initEvent: function() { + //监听 modal 打开 + /* $('#'+$props.parentModal).on('show.bs.modal', function () { + this._initUnitSelect2(); + })*/ + vc.on('unitSelect2', "transferFloor", function(_param) { + vc.copyObject(_param, this.unitSelect2Info); + this._initUnitSelect2(); + }); + vc.on('unitSelect2', 'setUnit', function(_param) { + vc.copyObject(_param, this.unitSelect2Info); + /* $(".unitSelector").val(_param.unitId).select2();*/ + this._initUnitSelect2(); + var option = new Option(_param.unitNum, _param.unitId, true, true); + this.unitSelect2Info.unitSelector.append(option); + }); + vc.on('unitSelect2', 'clearUnit', function(_param) { + $('#unitSelector').val('').select2(); + this.unitSelect2Info = { + units: [], + floorId: '-1', + unitId: '-1', + unitNum: '', + floorNum: '', + unitName: '', + unitSelector: {} + }; + + }); + }, + methods: { + _initUnitSelect2: function() { + console.log("调用_initUnitSelect2 方法"); + $.fn.modal.Constructor.prototype.enforceFocus = function() {}; + $.fn.select2.defaults.set('width', '100%'); + this.unitSelect2Info.unitSelector = $('#unitSelector').select2({ + placeholder: '必填,请选择单元', + allowClear: true, //允许清空 + escapeMarkup: function(markup) { + return markup; + }, // 自定义格式化防止xss注入 + ajax: { + url: "/app/unit.queryUnits", + dataType: 'json', + delay: 250, + headers: { + 'APP-ID': '8000418004', + 'TRANSACTION-ID': vc.uuid(), + 'REQ-TIME': vc.getDateYYYYMMDDHHMISS(), + 'SIGN': '' + }, + data: function(params) { + console.log("param", params); + var _term = ""; + if (params.hasOwnProperty("term")) { + _term = params.term; + } + return { + unitNum: _term, + page: 1, + row: 50, + floorId: this.unitSelect2Info.floorId, + communityId: vc.getCurrentCommunity().communityId + }; + }, + processResults: function(data) { + // console.log(data, this._filterUnitData(data)); + return { + results: this._filterUnitData(data) + }; + }, + cache: true + } + }); + $('#unitSelector').on("select2:select", function(evt) { + //这里是选中触发的事件 + //evt.params.data 是选中项的信息 + console.log('select', evt); + this.unitSelect2Info.unitId = evt.params.data.id; + this.unitSelect2Info.unitName = evt.params.data.text; + this.unitSelect2Info.unitNum = evt.params.data.text; + }); + + $('#unitSelector').on("select2:unselect", function(evt) { + //这里是取消选中触发的事件 + //如配置allowClear: true后,触发 + console.log('unselect', evt); + this.unitSelect2Info.unitId = '-1'; + this.unitSelect2Info.unitName = ''; + this.unitSelect2Info.unitNum = ''; + + + }); + }, + _filterUnitData: function(_units) { + var _tmpUnits = []; + for (var i = 0; i < _units.length; i++) { + var _tmpUnit = { + id: _units[i].unitId, + text: _units[i].unitNum + '单元' + }; + _tmpUnits.push(_tmpUnit); + } + return _tmpUnits; + } + } + }); +})(window.vc); \ No newline at end of file