admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-06-12 10:00:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/java110/MicrCommunityWeb

Browse Source
This commit is contained in:
java110 2020-03-28 01:09:02 +08:00
commit e874a603d0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/components/addPurchaseApplyStep/addPurchaseApplyStep.js
View File

@ -21,7 +21,6 @@
}, },
_initEvent: function () { _initEvent: function () {
vc.on("addPurchaseApplyStep", "notify", function (viewResourceStoreInfo2) { vc.on("addPurchaseApplyStep", "notify", function (viewResourceStoreInfo2) {
console.log("收到最终参数："+viewResourceStoreInfo2);
vc.component.addPurchaseApplyStepInfo.purchaseApply.resourceStores = viewResourceStoreInfo2.resourceStores; vc.component.addPurchaseApplyStepInfo.purchaseApply.resourceStores = viewResourceStoreInfo2.resourceStores;
}); });
@ -52,12 +51,12 @@
vc.emit('viewResourceStoreInfo2', 'getSelectResourceStores', null); vc.emit('viewResourceStoreInfo2', 'getSelectResourceStores', null);
var _resourceStores = vc.component.addPurchaseApplyStepInfo.purchaseApply.resourceStores; var _resourceStores = vc.component.addPurchaseApplyStepInfo.purchaseApply.resourceStores;
if (_resourceStores.length == 0) { if (_resourceStores.length == 0) {
vc.message("请完善需要采购的物品信息"); vc.toast("请完善需要采购的物品信息");
return; return;
} }
for( var i = 0; i < _resourceStores.length; i++){ for( var i = 0; i < _resourceStores.length; i++){
if(_resourceStores[i].quantity <= 0){ if(_resourceStores[i].quantity <= 0){
vc.message("请完善需要采购的物品信息"); vc.toast("请完善需要采购的物品信息");
return; return;
} }
} }
@ -72,7 +71,7 @@
vc.emit('addPurchaseApplyViewInfo', 'setPurchaseApplyInfo', null); vc.emit('addPurchaseApplyViewInfo', 'setPurchaseApplyInfo', null);
var _description = vc.component.addPurchaseApplyStepInfo.purchaseApply.description; var _description = vc.component.addPurchaseApplyStepInfo.purchaseApply.description;
if (_description == null || _description == '') { if (_description == null || _description == '') {
vc.message("请填写申请说明"); vc.toast("请填写申请说明");
return; return;
} }
vc.http.post( vc.http.post(
@ -94,7 +93,7 @@
function (errInfo, error) { function (errInfo, error) {
console.log('请求失败处理'); console.log('请求失败处理');
vc.message(errInfo); vc.toast(errInfo);
}); });
} }
} }

4
public/components/purchaseApplyManage/purchaseApplyManage.html
View File

@ -64,7 +64,9 @@
> >
<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>
@ -74,7 +76,9 @@
</thead> </thead>
<tbody> <tbody>
<tr v-for="purchaseApply in purchaseApplyManageInfo.purchaseApplys"> <tr v-for="purchaseApply in purchaseApplyManageInfo.purchaseApplys">
<td class="text-center">{{purchaseApply.applyOrderId}}</td>
<td class="text-center">{{purchaseApply.stateName}}</td> <td class="text-center">{{purchaseApply.stateName}}</td>
<td class="text-center">{{purchaseApply.agreeMan}}</td>
<td class="text-center">{{purchaseApply.userName}}</td> <td class="text-center">{{purchaseApply.userName}}</td>
<td class="text-center">{{purchaseApply.createTime}}</td> <td class="text-center">{{purchaseApply.createTime}}</td>
<td class="text-center">{{purchaseApply.resourceNames}}</td> <td class="text-center">{{purchaseApply.resourceNames}}</td>