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

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

Browse Source
This commit is contained in:
java110 2020-05-09 17:42:52 +08:00
commit f0a77c789a
4 changed files with 58 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/components/property/purchaseApprovers/purchaseApprovers.html
View File

@ -11,17 +11,21 @@
<div class="form-group row">
<label class="col-sm-2 col-form-label">所属公司</label>
<div class="col-sm-10">
<vc:create path="frame/orgSelect2" parentModal="purchaseApprovers"
<!-- <vc:create path="frame/orgSelect2" parentModal="purchaseApprovers"
callBackListener="purchaseApprovers" callBackFunction="notify"
namespace="purchaseApprovers"></vc:create>
namespace="purchaseApprovers"></vc:create> -->
<input placeholder="必填，请填写所属公司" class="form-control"
v-model="purchaseApproversInfo.companyName" readonly />
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">所属部门</label>
<div class="col-sm-10">
<vc:create path="frame/departmentSelect2" parentModal="purchaseApprovers"
<!-- <vc:create path="frame/departmentSelect2" parentModal="purchaseApprovers"
callBackListener="purchaseApprovers" callBackFunction="notify"
namespace="purchaseApprovers"></vc:create>
namespace="purchaseApprovers"></vc:create> -->
<input placeholder="必填，请填写所属部门" class="form-control"
v-model="purchaseApproversInfo.departmentName" readonly />
</div>
</div>
<div class="form-group row">

47
public/components/property/purchaseApprovers/purchaseApprovers.js
View File

@ -10,6 +10,10 @@
flowComponent: 'purchaseApprovers',
staffId: '',
staffName: '',
companyName: '',
departmentName: '',
departmentId:'',
companyId:''
}
},
watch: {
@ -21,7 +25,8 @@
}
},
_initMethod: function () {
$that._loadStaffOrg();
},
_initEvent: function () {
vc.on("purchaseApprovers", "notify", function (_param) {
@ -32,6 +37,43 @@
});
},
methods: {
_loadStaffOrg: function () {
let _userInfo = vc.getData("/nav/getUserInfo");
if (_userInfo == null || _userInfo == undefined) {
vc.toast('用户可能还没有登陆，无法获取用户信息');
return;
}
let _staffId = _userInfo.userId;
var param = {
params: {
staffId: _staffId,
page: 1,
row: 1
}
};
//发送get请求
vc.http.apiGet('org.listOrgs',
param,
function (json) {
var _staffInfo = JSON.parse(json);
if (_staffInfo.total == 1) {
let _tmpOrg = _staffInfo.orgs[0];
$that.purchaseApproversInfo.companyName = _tmpOrg.parentOrgName;
$that.purchaseApproversInfo.departmentName = _tmpOrg.orgName;
$that.purchaseApproversInfo.departmentId = _tmpOrg.orgId;
$that.purchaseApproversInfo.companyId = _tmpOrg.parentOrgId;
vc.emit('purchaseApprovers','staffSelect2', 'setStaff',{
companyId:_tmpOrg.parentOrgId,
departmentId:_tmpOrg.orgId
});
}
}, function () {
console.log('请求失败处理');
}
);
},
purchaseApproversValidate: function () {
return vc.validate.validate({
purchaseApproversInfo: vc.component.purchaseApproversInfo
@ -63,7 +105,8 @@
vc.emit($props.callBackListener, $props.callBackFunction, vc.component.purchaseApproversInfo);
return;
}
}
},
}
});

1
public/pages/common/addPurchaseApplyStep/addPurchaseApplyStep.js
View File

@ -65,6 +65,7 @@
},
_nextStep: function () {
vc.emit('viewResourceStoreInfo2', 'getSelectResourceStores', null);
let _resourceStores = vc.component.addPurchaseApplyStepInfo.purchaseApply.resourceStores;
var _currentData = vc.component.addPurchaseApplyStepInfo.infos[vc.component.addPurchaseApplyStepInfo.index];
if (_currentData == null || _currentData == undefined) {
vc.toast("请选择或填写必选信息");

6
public/pages/common/purchaseApplyManage/purchaseApplyManage.html
View File

@ -64,9 +64,10 @@
<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>
@ -77,7 +78,8 @@
<tr v-for="purchaseApply in purchaseApplyManageInfo.purchaseApplys">
<td class="text-center">{{purchaseApply.applyOrderId}}</td>
<td class="text-center">{{purchaseApply.userName}}</td>
<td class="text-center">{{purchaseApply.userName}}</td>
<td class="text-center">{{purchaseApply.endUserName}}</td>
<td class="text-center">{{purchaseApply.endUserTel}}</td>
<td class="text-center">{{purchaseApply.resourceNames}}</td>
<td class="text-center">{{purchaseApply.createTime}}</td>
<td class="text-center">{{purchaseApply.totalPrice}}</td>