admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-24 05:46:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
java110 2020-09-06 23:52:43 +08:00
parent 27c405878f
commit 8311b0ebdd
5 changed files with 152 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/components/property/addMeterWater/addMeterWater.js
View File

@ -16,6 +16,7 @@
remark: '',
roomId: '',
objId: '',
objName: '',
feeTypeCd: '',
feeConfigs: [],
configId: '',
@ -35,6 +36,7 @@
if (_param.hasOwnProperty("roomId")) {
vc.component.addMeterWaterInfo.roomId = _param.roomId;
vc.component.addMeterWaterInfo.objId = _param.roomId;
$that.addMeterWaterInfo.objName = _param.name;
$that._queryPreMeterWater(_param.roomId);
}
});
@ -258,6 +260,7 @@
remark: '',
roomId: '',
objId: '',
objName: '',
feeTypeCd: '',
feeConfigs: [],
configId: '',

4
public/components/property/editMeterWater/editMeterWater.html
View File

@ -25,14 +25,14 @@
<label class="col-sm-2 col-form-label">上期读表时间</label>
<div class="col-sm-10">
<input v-model="editMeterWaterInfo.preReadingTime" type="text" placeholder="必填，请填写上期读表时间"
class="form-control">
class="form-control editPreReadingTime">
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">本期读表时间</label>
<div class="col-sm-10">
<input v-model="editMeterWaterInfo.curReadingTime" type="text" placeholder="必填，请填写本期读表时间"
class="form-control">
class="form-control editCurReadingTime">
</div>
</div>
<div class="form-group row">

236
public/components/property/editMeterWater/editMeterWater.js
View File

@ -1,152 +1,190 @@
(function(vc,vm){
(function (vc, vm) {
vc.extends({
data:{
editMeterWaterInfo:{
waterId:'',
meterType:'',
preDegrees:'',
curDegrees:'',
preReadingTime:'',
curReadingTime:'',
remark:'',
data: {
editMeterWaterInfo: {
waterId: '',
meterType: '',
preDegrees: '',
curDegrees: '',
preReadingTime: '',
curReadingTime: '',
remark: '',
}
},
_initMethod:function(){
},
_initEvent:function(){
vc.on('editMeterWater','openEditMeterWaterModal',function(_params){
_initMethod: function () {
$that._initEditMeterWaterDateInfo();
},
_initEvent: function () {
vc.on('editMeterWater', 'openEditMeterWaterModal', function (_params) {
vc.component.refreshEditMeterWaterInfo();
$('#editMeterWaterModel').modal('show');
vc.copyObject(_params, vc.component.editMeterWaterInfo );
vc.copyObject(_params, vc.component.editMeterWaterInfo);
vc.component.editMeterWaterInfo.communityId = vc.getCurrentCommunity().communityId;
});
},
methods:{
editMeterWaterValidate:function(){
return vc.validate.validate({
editMeterWaterInfo:vc.component.editMeterWaterInfo
},{
'editMeterWaterInfo.meterType':[
{
limit:"required",
param:"",
errInfo:"表类型不能为空"
methods: {
_initEditMeterWaterDateInfo: function () {
$('.editPreReadingTime').datetimepicker({
language: 'zh-CN',
fontAwesome: 'fa',
format: 'yyyy-mm-dd hh:ii:ss',
initTime: true,
initialDate: new Date(),
autoClose: 1,
todayBtn: true
});
$('.editPreReadingTime').datetimepicker()
.on('changeDate', function (ev) {
var value = $(".editPreReadingTime").val();
vc.component.editMeterWaterInfo.preReadingTime = value;
});
$('.editCurReadingTime').datetimepicker({
language: 'zh-CN',
fontAwesome: 'fa',
format: 'yyyy-mm-dd hh:ii:ss',
initTime: true,
initialDate: new Date(),
autoClose: 1,
todayBtn: true
});
$('.editCurReadingTime').datetimepicker()
.on('changeDate', function (ev) {
var value = $(".editCurReadingTime").val();
var start = Date.parse(new Date(vc.component.editMeterWaterInfo.preReadingTime))
var end = Date.parse(new Date(value))
if (start - end >= 0) {
vc.toast("计费终止时间必须大于计费起始时间")
$(".addCurReadingTime").val('')
} else {
vc.component.editMeterWaterInfo.curReadingTime = value;
}
});
},
editMeterWaterValidate: function () {
return vc.validate.validate({
editMeterWaterInfo: vc.component.editMeterWaterInfo
}, {
'editMeterWaterInfo.meterType': [
{
limit: "required",
param: "",
errInfo: "表类型不能为空"
},
{
limit:"num",
param:"",
errInfo:"表类型错误"
{
limit: "num",
param: "",
errInfo: "表类型错误"
},
],
'editMeterWaterInfo.preDegrees':[
{
limit:"required",
param:"",
errInfo:"上期度数不能为空"
'editMeterWaterInfo.preDegrees': [
{
limit: "required",
param: "",
errInfo: "上期度数不能为空"
},
{
limit:"money",
param:"",
errInfo:"上期度数格式错误"
{
limit: "money",
param: "",
errInfo: "上期度数格式错误"
},
],
'editMeterWaterInfo.curDegrees':[
{
limit:"required",
param:"",
errInfo:"本期度数不能为空"
'editMeterWaterInfo.curDegrees': [
{
limit: "required",
param: "",
errInfo: "本期度数不能为空"
},
{
limit:"money",
param:"",
errInfo:"本期度数格式错误"
{
limit: "money",
param: "",
errInfo: "本期度数格式错误"
},
],
'editMeterWaterInfo.preReadingTime':[
{
limit:"required",
param:"",
errInfo:"上期读表时间不能为空"
'editMeterWaterInfo.preReadingTime': [
{
limit: "required",
param: "",
errInfo: "上期读表时间不能为空"
},
{
limit:"date",
param:"",
errInfo:"格式错误"
{
limit: "dateTime",
param: "",
errInfo: "上期读表时间格式错误"
},
],
'editMeterWaterInfo.curReadingTime':[
{
limit:"required",
param:"",
errInfo:"本期读表时间不能为空"
'editMeterWaterInfo.curReadingTime': [
{
limit: "required",
param: "",
errInfo: "本期读表时间不能为空"
},
{
limit:"date",
param:"",
errInfo:"格式错误"
{
limit: "dateTime",
param: "",
errInfo: "本期读表时间格式错误"
},
],
'editMeterWaterInfo.remark':[
{
limit:"maxLength",
param:"500",
errInfo:"备注格式错误"
'editMeterWaterInfo.remark': [
{
limit: "maxLength",
param: "500",
errInfo: "备注格式错误"
},
],
'editMeterWaterInfo.waterId':[
{
limit:"required",
param:"",
errInfo:"表ID不能为空"
'editMeterWaterInfo.waterId': [
{
limit: "required",
param: "",
errInfo: "表ID不能为空"
}]
});
},
editMeterWater:function(){
if(!vc.component.editMeterWaterValidate()){
});
},
editMeterWater: function () {
if (!vc.component.editMeterWaterValidate()) {
vc.toast(vc.validate.errInfo);
return ;
return;
}
vc.http.apiPost(
'meterWater.updateMeterWater',
JSON.stringify(vc.component.editMeterWaterInfo),
{
emulateJSON:true
},
function(json,res){
emulateJSON: true
},
function (json, res) {
//vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
let _json = JSON.parse(json);
if (_json.code == 0) {
//关闭model
$('#editMeterWaterModel').modal('hide');
vc.emit('meterWaterManage','listMeterWater',{});
return ;
vc.emit('meterWaterManage', 'listMeterWater', {});
return;
}
vc.message(_json.msg);
},
function(errInfo,error){
},
function (errInfo, error) {
console.log('请求失败处理');
vc.message(errInfo);
});
});
},
refreshEditMeterWaterInfo:function(){
vc.component.editMeterWaterInfo= {
waterId:'',
meterType:'',
preDegrees:'',
curDegrees:'',
preReadingTime:'',
curReadingTime:'',
remark:'',
refreshEditMeterWaterInfo: function () {
vc.component.editMeterWaterInfo = {
waterId: '',
meterType: '',
preDegrees: '',
curDegrees: '',
preReadingTime: '',
curReadingTime: '',
remark: '',
}
}
}
});
})(window.vc,window.vc.component);
})(window.vc, window.vc.component);

3
public/components/property/unitSelect2/unitSelect2.js
View File

@ -104,6 +104,7 @@
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) {
@ -112,6 +113,8 @@
console.log('unselect', evt);
this.unitSelect2Info.unitId = '-1';
this.unitSelect2Info.unitName = '';
this.unitSelect2Info.unitNum = '';
});
},

10
public/pages/property/meterWaterManage/meterWaterManage.html
View File

@ -57,12 +57,14 @@
<table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
<thead>
<tr>
<th class="text-center">表ID</th>
<!-- <th class="text-center">表ID</th> -->
<th class="text-center">表类型</th>
<th class="text-center">对象名称</th>
<th class="text-center">上期度数</th>
<th class="text-center">本期度数</th>
<th class="text-center">上期读表时间</th>
<th class="text-center">本期读表时间</th>
<th class="text-center">创建时间</th>
<th class="text-center">操作</th>
@ -70,12 +72,14 @@
</thead>
<tbody>
<tr v-for="meterWater in meterWaterManageInfo.meterWaters">
<td class="text-center">{{meterWater.waterId}}</td>
<td class="text-center">{{meterWater.meterType}}</td>
<!-- <td class="text-center">{{meterWater.waterId}}</td> -->
<td class="text-center">{{meterWater.meterType == '1010'?'电表':'水表'}}</td>
<td class="text-center">{{meterWater.objName}}</td>
<td class="text-center">{{meterWater.preDegrees}}</td>
<td class="text-center">{{meterWater.curDegrees}}</td>
<td class="text-center">{{meterWater.preReadingTime}}</td>
<td class="text-center">{{meterWater.curReadingTime}}</td>
<td class="text-center">{{meterWater.createTime}}</td>
<td class="text-center">
<div class="btn-group">
<button class="btn-white btn btn-xs"