优化完成 批次问题

This commit is contained in:
java110 2021-09-23 01:01:30 +08:00
parent dc6df87b77
commit 533208f482
4 changed files with 84 additions and 40 deletions

View File

@ -39,7 +39,7 @@
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<button class="btn btn-primary float-right" type="button" <button class="btn btn-primary float-right" type="button"
v-on:click="saveApplyRoomDiscountRecordInfo()"> v-on:click="saveApplyDeleteFeeBatchInfo()">
<i class="fa fa-check"></i>&nbsp;保存 <i class="fa fa-check"></i>&nbsp;保存
</button> </button>
<button type="button" class="btn btn-warning float-right" style="margin-right:20px;" <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"

View File

@ -49,12 +49,7 @@
return; return;
} }
vc.component.applyDeleteFeeBatchInfo.communityId = vc.getCurrentCommunity().communityId; vc.component.applyDeleteFeeBatchInfo.communityId = vc.getCurrentCommunity().communityId;
//不提交数据将数据 回调给侦听处理
if (vc.notNull($props.callBackListener)) {
vc.emit($props.callBackListener, $props.callBackFunction, vc.component.applyDeleteFeeBatchInfo);
$('#applyDeleteFeeBatchModel').modal('hide');
return;
}
vc.http.apiPost( vc.http.apiPost(
'/payFeeBatch.applyDeletePayFeeBatchCmd', '/payFeeBatch.applyDeletePayFeeBatchCmd',
JSON.stringify(vc.component.applyDeleteFeeBatchInfo), JSON.stringify(vc.component.applyDeleteFeeBatchInfo),
@ -69,7 +64,6 @@
$('#applyDeleteFeeBatchModel').modal('hide'); $('#applyDeleteFeeBatchModel').modal('hide');
vc.component.clearApplyDeleteFeeBatchInfo(); vc.component.clearApplyDeleteFeeBatchInfo();
vc.emit('pagination', 'page_event', 1); vc.emit('pagination', 'page_event', 1);
location.reload();
return; return;
} }
vc.message(_json.msg); vc.message(_json.msg);

View File

@ -1,4 +1,53 @@
<div class="animated fadeInRight ecommerce"> <div class="animated fadeInRight ecommerce">
<div class="row">
<div class="col-lg-12">
<div class="ibox ">
<div class="ibox-title">
<h5>查询条件</h5>
<div class="ibox-tools" style="top:10px;">
</div>
</div>
<div class="ibox-content">
<div class="row">
<div class="col-sm-3">
<div class="form-group">
<input type="text" placeholder="请输入批次编号" v-model="payFeeBatchInfo.conditions.batchId"
class=" form-control">
</div>
</div>
<div class="col-sm-4">
<select class="custom-select" v-model="payFeeBatchInfo.conditions.state">
<option selected value="">请选择状态</option>
<option value="2006001">
正常
</option>
<option value="2007001">
申请取消
</option>
<option value="2008001">
审核通过
</option>
<option value="2009001">
审核失败
</option>
</select>
</div>
<div class="col-sm-3">
<div class="form-group">
<input type="text" placeholder="请填写创建员工"
v-model="payFeeBatchInfo.conditions.createUserName" class=" form-control">
</div>
</div>
<div class="col-sm-2">
<button type="button" class="btn btn-primary btn-sm" v-on:click="_queryPayFeeBatchMethod()">
<i class="fa fa-search"></i> 查询
</button>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="ibox"> <div class="ibox">
@ -8,42 +57,42 @@
<div class="ibox-content"> <div class="ibox-content">
<table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15"> <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
<thead> <thead>
<tr> <tr>
<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>
<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>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="payFee in payFeeBatchInfo.payFeeBatchs"> <tr v-for="payFee in payFeeBatchInfo.payFeeBatchs">
<td class="text-center">{{payFee.batchId}}</td> <td class="text-center">{{payFee.batchId}}</td>
<td class="text-center">{{payFee.createUserName}}</td> <td class="text-center">{{payFee.createUserName}}</td>
<td class="text-center">{{payFee.createTime}}</td> <td class="text-center">{{payFee.createTime}}</td>
<td class="text-center">{{payFee.remark || '无'}}</td> <td class="text-center">{{payFee.remark || '无'}}</td>
<td class="text-center">{{payFee.stateName}}</td> <td class="text-center">{{payFee.stateName}}</td>
<td class="text-center">{{payFee.msg}}</td> <td class="text-center">{{payFee.msg}}</td>
<td class="text-center"> <td class="text-center">
<div class="btn-group"> <div class="btn-group">
<button class="btn-white btn btn-xs" v-if="payFee.state == 2006001" <button class="btn-white btn btn-xs" v-if="payFee.state == 2006001"
v-on:click="_openApply(payFee)">申请取消 v-on:click="_openApply(payFee)">申请取消
</button> </button>
<button class="btn-white btn btn-xs" v-if="payFee.state == 2007001" <button class="btn-white btn btn-xs" v-if="payFee.state == 2007001"
v-on:click="_openPayFeeBatchAuditModel(payFee)">审核 v-on:click="_openPayFeeBatchAuditModel(payFee)">审核
</button> </button>
</div> </div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="9"> <td colspan="9">
<ul class="pagination float-right"></ul> <ul class="pagination float-right"></ul>
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
<!-- 分页 --> <!-- 分页 -->
@ -52,6 +101,7 @@
</div> </div>
</div> </div>
</div> </div>
<vc:create path="property/applyDeleteFeeBatch" callBackListener="payFeeBatch" callBackFunction="notifyAuditInfo"></vc:create> <vc:create path="property/applyDeleteFeeBatch" callBackListener="payFeeBatch" callBackFunction="notifyAuditInfo">
</vc:create>
<vc:create path="common/audit" callBackListener="payFeeBatch" callBackFunction="notifyAuditInfo"></vc:create> <vc:create path="common/audit" callBackListener="payFeeBatch" callBackFunction="notifyAuditInfo"></vc:create>
</div> </div>

View File

@ -65,7 +65,7 @@
}, },
_auditPayFeeBatchState: function (_auditInfo) { _auditPayFeeBatchState: function (_auditInfo) {
vc.component.payFeeBatchInfo.payFeeBatch.state = _auditInfo.state; vc.component.payFeeBatchInfo.payFeeBatch.state = _auditInfo.state;
//vc.component.payFeeBatchInfo.payFeeBatch.remark = _auditInfo.remark; vc.component.payFeeBatchInfo.payFeeBatch.msg = _auditInfo.remark;
let _payFeeBatch = vc.component.payFeeBatchInfo.payFeeBatch; let _payFeeBatch = vc.component.payFeeBatchInfo.payFeeBatch;
vc.http.apiPost( vc.http.apiPost(
'payFeeBatch.updatePayFeeBatch', 'payFeeBatch.updatePayFeeBatch',