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-06-19 14:23:36 +08:00
parent 1dde8c5635
commit f99192f48b
7 changed files with 96 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/components/property/editMachine/editMachine.html
View File

@ -56,7 +56,8 @@
<div class="form-group row">
<label class="col-sm-2 col-form-label">设备位置</label>
<div class="col-sm-10">
<select class="custom-select" v-model="editMachineInfo.locationTypeCd" @change="onAddChangeLocation">
<select class="custom-select" v-model="editMachineInfo.locationTypeCd"
@change="onAddChangeLocation">
<option selected disabled value="">必填，请选择设备位置</option>
<option v-for="item in editMachineInfo.locations" :label="item.locationName"
:value="item.locationId">{{item.locationName}}

59
public/components/property/selectStaff/selectStaff.html
View File

@ -1,35 +1,36 @@
<div class="container">
<div class="row">
<div class="form-group">
<div class="dropdown">
<a id="dLabel" role="button" data-toggle="dropdown" class="btn btn-white" data-target="#"
href="javascript:;"><span id="select-title">选择员工</span> <span class="caret"></span></a>
<ul class="dropdown-menu multi-level" role="menu" aria-labelledby="dropdownMenu">
<li><a href="javascript:;" data-index="1" data-title="一级菜单">一级菜单</a></li>
<li class="dropdown-submenu">
<a href="javascript:;" data-index="2" data-title="一级菜单">一级菜单</a>
<ul class="dropdown-menu">
<li><a data-index="2-1" href="javascript:;" data-title="二级菜单">二级菜单</a></li>
</ul>
</li>
<div class="modal fade" id="selectStaffModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-body">
<div class="row">
<div class="col-md-4 border-right">
<div class="text-center">公司信息</div>
<div>青海开机公司</div>
<div>青海开机公司</div>
<div>青海开机公司</div>
<div>青海开机公司</div>
<div>青海开机公司</div>
<div>青海开机公司</div>
<div>青海开机公司</div>
<div>青海开机公司</div>
<div>青海开机公司</div>
<div>青海开机公司</div>
<div>青海开机公司</div>
</div>
<div class="col-md-4 border-right">
<div class="text-center">部门信息</div>
</div>
<div class="col-md-4">
<div class="text-center">员工信息</div>
</div>
</div>
<li class="dropdown-submenu">
<a tabindex="3" href="javascript:;" data-title="一级菜单">一级菜单</a>
<ul class="dropdown-menu">
<li><a tabindex="3-1" href="javascript:;" data-title="二级菜单">二级菜单</a></li>
<li class="divider"></li>
<li class="dropdown-submenu">
<a href="javascript:;" data-index="3-2" data-title="二级菜单">二级菜单</a>
<ul class="dropdown-menu">
<li><a href="javascript:;" data-index="3-2-1" data-title="三级菜单">三级菜单</a></li>
</ul>
</li>
</ul>
</li>
</ul>
</div>
</div>
</div>
</div>

46
public/components/property/selectStaff/selectStaff.js
View File

@ -6,26 +6,64 @@
flowId: '',
flowName: '',
describle: '',
steps: []
companys: [],
departments: [],
staffs: []
}
},
_initMethod: function () {
$that._initSelectStaffInfo();
},
_initEvent: function () {
vc.on('selectStaff','openStaff',function(){
$('#selectStaffModel').modal('show');
})
},
methods: {
_initSelectStaffInfo: function () {
$('.dropdown li a').click(function(){
console.log(this);
$('.dropdown li a').click(function () {
console.log(this);
title = $(this).attr("data-title");
id = $(this).attr("data-index");
$("#select-title").text(title);
$("#category_id").val(id);
});
},
_changeCompany: function (_e) {
console.log(_e);
},
_initOrg:function(_orgLevel,_parentOrgId){
var param = {
params: {
page:1,
row:100,
orgLevel: _orgLevel,
parentOrgId: _parentOrgId
}
};
//发送get请求
vc.http.get('orgManage',
'list',
param,
function (json, res) {
var _orgManageInfo = JSON.parse(json);
if(_orgLevel == 1){
$that.selectStaffInfo.companys = _orgManageInfo.orgs;
}else if(_orgLevel == 2){
$that.selectStaffInfo.departments = _orgManageInfo.orgs;
}else{
$that.selectStaffInfo.staffs = _orgManageInfo.orgs;
}
}, function (errInfo, error) {
console.log('请求失败处理');
}
);
}
}
});

48
public/css/vc-ui.css
View File

@ -1731,46 +1731,20 @@ table.table-mail tr td {
padding-bottom: 25px;
}
.dropdown-submenu {
position: relative;
.border-right{
border-right:1px solid #e7eaec;
}
.dropdown-submenu > .dropdown-menu {
top: 0;
left: 100%;
margin-top: -6px;
margin-left: -1px;
-webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius: 0 6px 6px;
border-radius: 0 6px 6px 6px;
.border-top{
border-top:1px solid #e7eaec;
}
.dropdown-submenu:hover > .dropdown-menu {
display: block;
.border-bottom{
border-bottom:1px solid #e7eaec;
}
.dropdown-submenu > a:after {
display: block;
content: " ";
float: right;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
border-width: 5px 0 5px 5px;
border-left-color: #ccc;
margin-top: 5px;
margin-right: -10px;
}
.dropdown-submenu:hover > a:after {
border-left-color: #fff;
}
.dropdown-submenu.pull-left {
float: none;
}
.dropdown-submenu.pull-left > .dropdown-menu {
left: -100%;
margin-left: 10px;
-webkit-border-radius: 6px 0 6px 6px;
-moz-border-radius: 6px 0 6px 6px;
border-radius: 6px 0 6px 6px;
.border-left{
border-left:1px solid #e7eaec;
}

5
public/pages/property/listParkingSpaceFee/listParkingSpaceFee.html
View File

@ -5,10 +5,6 @@
<div class="ibox-title">
<h5>{{listParkingSpaceCreateFeeInfo.parkingSpaceName}}费用</h5>
<div class="ibox-tools" style="top:10px;">
<!-- <button type="button" class="btn btn-primary btn-sm"-->
<!-- style="margin-left:10px" v-on:click="_openParkingSpaceCreateFeeAddModal(null,true)">-->
<!-- <i class="fa fa-plus"></i> 批量创建-->
<!-- </button>-->
</div>
</div>
@ -40,6 +36,7 @@
<td class="text-center">{{fee.stateName}}</td>
<td class="text-right">
<button class="btn btn-link btn-xs"
v-if="fee.state != '2009001'"
v-on:click="_payFee(fee)">缴费
</button>
<button class="btn btn-link btn-xs"

15
public/pages/property/workflowSettingManage/workflowSettingManage.html
View File

@ -33,9 +33,10 @@
<div class="col-sm-1 text-center">
<label class="col-form-label">第{{index+1}}步</label>
</div>
<div>
<!-- <button type="button" class="btn btn-link" @click="chooseStaff()">选择员工</button> -->
<vc:create path="property/selectStaff"></vc:create>
<div >
<a id="dLabel" role="button" class="btn btn-white" data-target="#" href="javascript:;" @click="chooseStaff()">
<span id="select-title">选择员工</span> <span class="caret"></span>
</a>
</div>
<div class="margin-left" @click="chooseType(item)">
<div class="form-check form-check-inline col-form-label">
@ -64,9 +65,10 @@
<div class="col-sm-1">
<label class="col-form-label"></label>
</div>
<div class="margin-left">
<input v-model="subItem.staffName" type="text" disabled="disabled"
placeholder="请选择审核员工" class="form-control">
<div>
<a id="dLabel" role="button" class="btn btn-white" data-target="#" href="javascript:;" @click="chooseStaff()">
<span id="select-title">选择员工</span> <span class="caret"></span>
</a>
</div>
<div>
<button type="button" class="btn btn-link" @click="chooseStaff(subItem)">选择员工</button>
@ -90,4 +92,5 @@
</div>
</div>
</div>
<vc:create path="property/selectStaff"></vc:create>
</div>

2
public/pages/property/workflowSettingManage/workflowSettingManage.js
View File

@ -158,7 +158,7 @@
$that.workflowSettingInfo.steps.push(_step);
},
chooseStaff: function () {
vc.emit('selectStaff','openStaff',{})
},
_goBack: function () {
vc.getBack();