优化代码

This commit is contained in:
wuxw 2021-04-29 23:26:24 +08:00
parent a38bbbcca1
commit 996e6ca291
7 changed files with 118 additions and 103 deletions

View File

@ -11,23 +11,21 @@
<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">物品名称</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>
</thead>
<tbody>
<tr v-for="auditOrder in allocationStorehouseAuditOrdersInfo.auditOrders">
<td class="text-center">{{auditOrder.resId}}</td>
<td class="text-center">{{auditOrder.resName}}</td>
<td class="text-center">{{auditOrder.shaName}}</td>
<td class="text-center">{{auditOrder.shzName}}</td>
<td class="text-center">{{auditOrder.stock}}</td>
<td class="text-center">{{auditOrder.applyId}}</td>
<td class="text-center">{{auditOrder.applyCount}}</td>
<td class="text-center">{{auditOrder.startUserName}}</td>
<td class="text-center">{{auditOrder.stateName}}</td>
<td class="text-center">{{auditOrder.createTime}}</td>
<td class="text-center">
<div>
<div class="btn-group"
@ -42,8 +40,7 @@
</button>
</div>
<div class="btn-group">
<button class="btn-white btn btn-xs"
v-on:click="_toDetail(auditOrder)">详情
<button class="btn-white btn btn-xs" v-on:click="_toDetail(auditOrder)">详情
</button>
</div>
</div>

View File

@ -115,7 +115,7 @@
);
},
_toDetail: function (_item) {
vc.jumpToPage("/admin.html#/pages/common/allocationStorehouseDetail?asId=" + _item.asId);
vc.jumpToPage("/admin.html#/pages/common/allocationStorehouseDetail?applyId=" + _item.applyId);
}
}
});

View File

@ -11,25 +11,21 @@
<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">物品名称</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>
</thead>
<tbody>
<tr v-for="auditOrder in allocationStorehouseHistoryAuditOrdersInfo.auditOrders">
<td class="text-center">{{auditOrder.resId}}</td>
<td class="text-center">{{auditOrder.resName}}</td>
<td class="text-center">{{auditOrder.shaName}}</td>
<td class="text-center">{{auditOrder.shzName}}</td>
<td class="text-center">{{auditOrder.stock}}</td>
<td class="text-center">{{auditOrder.applyId}}</td>
<td class="text-center">{{auditOrder.applyCount}}</td>
<td class="text-center">{{auditOrder.startUserName}}</td>
<td class="text-center">{{auditOrder.remark}}</td>
<td class="text-center">{{auditOrder.stateName}}</td>
<td class="text-center">{{auditOrder.createTime}}</td>
<td class="text-center">
<div>
<div class="btn-group">

View File

@ -13,55 +13,6 @@
<div class="ibox-content">
<div class="row">
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">调拨单号:</label>
<label class="">{{allocationStorehouseDetailInfo.asId}}</label>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">物品ID</label>
<label class="">{{allocationStorehouseDetailInfo.resId}}</label>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">物品名称:</label>
<label class="">{{allocationStorehouseDetailInfo.resName}}</label>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">源仓库:</label>
<label class="">{{allocationStorehouseDetailInfo.shaName}}</label>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">目标仓库:</label>
<label class="">{{allocationStorehouseDetailInfo.shzName}}</label>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">调拨数量:</label>
<label class="">{{allocationStorehouseDetailInfo.stock}}</label>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">状态:</label>
<label class="">{{allocationStorehouseDetailInfo.stateName}}</label>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">申请人:</label>
@ -70,19 +21,79 @@
</div>
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">说明:</label>
<label class="col-form-label">申请时间:</label>
<label class="">{{allocationStorehouseDetailInfo.createTime}}</label>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">状态:</label>
<label class="">{{allocationStorehouseDetailInfo.stateName}}</label>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-form-label">申请说明:</label>
<label class="">{{allocationStorehouseDetailInfo.remark}}</label>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<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">
<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">物品名称</th>
<th class="text-center">物品编码</th>
<th class="text-center">源仓库</th>
<th class="text-center">目标仓库</th>
<th class="text-center">调拨数量</th>
</tr>
</thead>
<tbody>
<tr v-for="resourceStore in allocationStorehouseDetailInfo.resourceStores">
<td class="text-center">{{resourceStore.resId}}</td>
<td class="text-center">{{resourceStore.resName}}</td>
<td class="text-center">{{resourceStore.resCode}}</td>
<td class="text-center">{{resourceStore.shaName}}</td>
<td class="text-center">{{resourceStore.shzName}}</td>
<td class="text-center">{{resourceStore.stock}}</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="10">
<ul class="pagination float-right"></ul>
</td>
</tr>
</tfoot>
</table>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div class="ibox">

View File

@ -3,24 +3,22 @@
**/
(function (vc) {
var DEFAULT_PAGE = 1;
var DEFAULT_ROWS = 1;
var DEFAULT_ROWS = 100;
vc.extends({
data: {
allocationStorehouseDetailInfo: {
asId: '',
resId: '',
resName: '',
shaName: '',
shzName: '',
stock: '',
stateName: '',
startUserName: '',
applyId: '',
resourceStores: [],
remark: '',
auditUsers: []
startUserName:'',
createTime:'',
auditUsers: [],
stateName:''
}
},
_initMethod: function () {
vc.component.allocationStorehouseDetailInfo.asId = vc.getParam('asId');
vc.component.allocationStorehouseDetailInfo.applyId = vc.getParam('applyId');
$that._listAllocationStorehouseApply();
vc.component._listPurchaseApply(DEFAULT_PAGE, DEFAULT_ROWS);
$that._loadAuditUser();
},
@ -33,7 +31,7 @@
params: {
page: _page,
row: _rows,
applyOrderId: vc.component.allocationStorehouseDetailInfo.asId
applyId: vc.component.allocationStorehouseDetailInfo.applyId
}
};
@ -43,7 +41,28 @@
function (json, res) {
var _allocationStorehouseDetailInfo = JSON.parse(json);
var _purchaseApply = _allocationStorehouseDetailInfo.data;
vc.copyObject(_purchaseApply[0], vc.component.allocationStorehouseDetailInfo);
vc.component.allocationStorehouseDetailInfo.resourceStores = _purchaseApply;
}, function (errInfo, error) {
console.log('请求失败处理');
}
);
},
_listAllocationStorehouseApply: function () {
var param = {
params: {
page: 1,
row: 1,
applyId: vc.component.allocationStorehouseDetailInfo.applyId
}
};
//发送get请求
vc.http.apiGet('resourceStore.listAllocationStorehouseApplys',
param,
function (json, res) {
var _allocationStorehouseDetailInfo = JSON.parse(json);
var _purchaseApply = _allocationStorehouseDetailInfo.data[0];
vc.copyObject(_purchaseApply,vc.component.allocationStorehouseDetailInfo);
}, function (errInfo, error) {
console.log('请求失败处理');
}
@ -52,7 +71,7 @@
_loadAuditUser: function () {
var param = {
params: {
businessKey: vc.component.allocationStorehouseDetailInfo.asId,
businessKey: vc.component.allocationStorehouseDetailInfo.applyId,
communityId: vc.getCurrentCommunity().communityId,
}
};

View File

@ -77,11 +77,7 @@
<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">物品名称</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>
@ -91,12 +87,8 @@
</thead>
<tbody>
<tr v-for="resourceStore in allocationStorehouseManageInfo.resourceStores">
<td class="text-center">{{resourceStore.resId}}</td>
<td class="text-center">{{resourceStore.resName}}</td>
<td class="text-center">{{resourceStore.resCode}}</td>
<td class="text-center">{{resourceStore.shaName}}</td>
<td class="text-center">{{resourceStore.shzName}}</td>
<td class="text-center">{{resourceStore.stock}}</td>
<td class="text-center">{{resourceStore.applyId}}</td>
<td class="text-center">{{resourceStore.applyCount}}</td>
<td class="text-center">{{resourceStore.startUserName}}</td>
<td class="text-center">{{resourceStore.stateName}}</td>
<td class="text-center">{{resourceStore.createTime}}</td>

View File

@ -50,7 +50,7 @@
param.params.resName = param.params.resName.trim();
param.params.resCode = param.params.resCode.trim();
//发送get请求
vc.http.apiGet('resourceStore.listAllocationStorehouses',
vc.http.apiGet('resourceStore.listAllocationStorehouseApplys',
param,
function (json, res) {
var _allocationStorehouseManageInfo = JSON.parse(json);
@ -96,7 +96,7 @@
},
//详情
_toDetail: function (_item) {
vc.jumpToPage("/admin.html#/pages/common/allocationStorehouseDetail?asId=" + _item.asId);
vc.jumpToPage("/admin.html#/pages/common/allocationStorehouseDetail?applyId=" + _item.applyId);
},
_openAllocationStorehouseApplyModal: function () {