优化代码

This commit is contained in:
java110 2020-07-16 00:14:59 +08:00
parent 01447e0c7b
commit 15677b2383
5 changed files with 194 additions and 4 deletions

6
app.js
View File

@ -34,8 +34,10 @@ let opts = {
//app.use('/callComponent',proxy('https://app.demo.winqi.cn/',opts));
//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012/',opts));
//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
app.use('/app',proxy('http://192.168.1.16:8012',opts));
app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
//app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
//app.use('/app',proxy('http://192.168.1.16:8012',opts));
//app.listen(3000);
app.use(express.json());

View File

@ -0,0 +1,44 @@
<div>
<div class="java110_step">
<div id="step"></div>
</div>
<!-- 选择物品 -->
<div v-if="addItemOutStepInfo.index == 0">
<vc:create path="common/viewResourceStoreInfo2"
callBackListener="addItemOutStep"
callBackFunction="notify"
></vc:create>
</div>
<!-- 联系人 -->
<div v-if="addItemOutStepInfo.index == 1">
<vc:create path="common/addPurchaseApplyView"
callBackListener="addItemOutStep"
callBackFunction="notify2"
></vc:create>
</div>
<!-- 审批人 -->
<div v-show="addItemOutStepInfo.index == 2">
<vc:create path="property/purchaseApprovers"
callBackListener="addItemOutStep"
callBackFunction="notify3"
></vc:create>
</div>
<div class="row">
<div class="col-md-10"></div>
<div class="col-md-2 " style="margin-bottom:10px; text-align:right">
<button type="button" class="btn btn-secondary" v-on:click="_prevStep()">上一步</button>
<button v-if="addItemOutStepInfo.index != 2" type="button" class="btn btn-primary"
style="margin-left:10px;" v-on:click="_nextStep()">下一步
</button>
<button v-if="addItemOutStepInfo.index == 2" type="button" class="btn btn-primary"
style="margin-left:10px;" v-on:click="_finishStep()">提交
</button>
</div>
</div>
</div>

View File

@ -0,0 +1,130 @@
/**
入驻小区
**/
(function (vc) {
vc.extends({
data: {
addItemOutStepInfo: {
$step: {},
index: 0,
infos: [],
purchaseApply:{
resourceStores:[],
description:'',
endUserName:'',
endUserTel:'',
file:'',
resOrderType:'',
staffId:'',
staffName:''
}
}
},
_initMethod: function () {
vc.component._initStep();
//10000 采购 20000出库
vc.component.addItemOutStepInfo.purchaseApply.resOrderType = vc.getParam('resOrderType');
vc.emit("chooseResourceStore2", "setResourcesOut", vc.component.addItemOutStepInfo.purchaseApply.resOrderType);
},
_initEvent: function () {
vc.on("addItemOutStep", "notify", function (viewResourceStoreInfo2) {
vc.component.addItemOutStepInfo.purchaseApply.resourceStores = viewResourceStoreInfo2.resourceStores;
vc.component.addItemOutStepInfo.infos[0] = viewResourceStoreInfo2.resourceStores;
});
vc.on("addItemOutStep", "notify2", function (info) {
vc.component.addItemOutStepInfo.purchaseApply.description = info.description;
vc.component.addItemOutStepInfo.purchaseApply.endUserName = info.endUserName;
vc.component.addItemOutStepInfo.purchaseApply.endUserTel = info.endUserTel;
vc.component.addItemOutStepInfo.infos[1] = info;
});
vc.on("addItemOutStep", "notify3", function (info) {
vc.component.addItemOutStepInfo.purchaseApply.staffId = info.staffId;
vc.component.addItemOutStepInfo.purchaseApply.staffName = info.staffName;
vc.component.addItemOutStepInfo.infos[2] = info;
});
},
methods: {
_initStep: function () {
vc.component.addItemOutStepInfo.$step = $("#step");
vc.component.addItemOutStepInfo.$step.step({
index: 0,
time: 500,
title: ["选择物品", "申请信息","审批人"]
});
vc.component.addItemOutStepInfo.index = vc.component.addItemOutStepInfo.$step.getIndex();
},
_prevStep: function () {
vc.component.addItemOutStepInfo.$step.prevStep();
vc.component.addItemOutStepInfo.index = vc.component.addItemOutStepInfo.$step.getIndex();
vc.emit('viewResourceStoreInfo2', 'onIndex', vc.component.addItemOutStepInfo.index);
vc.emit('addItemOutView', 'onIndex', vc.component.addItemOutStepInfo.index);
},
_nextStep: function () {
vc.emit('viewResourceStoreInfo2', 'getSelectResourceStores', null);
let _resourceStores = vc.component.addItemOutStepInfo.purchaseApply.resourceStores;
var _currentData = vc.component.addItemOutStepInfo.infos[vc.component.addItemOutStepInfo.index];
if (_currentData == null || _currentData == undefined) {
vc.toast("请选择或填写必选信息");
return;
}
for( var i = 0; i < _resourceStores.length; i++){
if(_resourceStores[i].quantity <= 0){
vc.toast("请完善物品信息");
return;
}
if(vc.component.addItemOutStepInfo.purchaseApply.resOrderType == "20000"){
if(_resourceStores[i].quantity > _resourceStores[i].stock){
vc.toast(_resourceStores[i].resName+",库存不足");
return;
}
}
}
vc.component.addItemOutStepInfo.$step.nextStep();
vc.component.addItemOutStepInfo.index = vc.component.addItemOutStepInfo.$step.getIndex();
vc.emit('viewResourceStoreInfo2', 'onIndex', vc.component.addItemOutStepInfo.index);
vc.emit('addItemOutView', 'onIndex', vc.component.addItemOutStepInfo.index);
},
_finishStep: function () {
vc.emit('addItemOutViewInfo', 'setItemOutInfo', null);
var _currentData = vc.component.addItemOutStepInfo.infos[vc.component.addItemOutStepInfo.index];
if(vc.component.addItemOutStepInfo.index != 2){
if (_currentData == null || _currentData == undefined) {
vc.toast("请选择或填写必选信息");
return;
}
}
vc.http.apiPost(
'/purchase/purchaseApply',
JSON.stringify(vc.component.addItemOutStepInfo.purchaseApply),
{
emulateJSON: true
},
function (json, res) {
let _json = JSON.parse(json);
if (_json.code == 0) {
//关闭model
if(vc.component.addItemOutStepInfo.purchaseApply.resOrderType == "10000"){
vc.jumpToPage("/admin.html#/pages/common/purchaseApplyManage");
}else{
vc.jumpToPage("/admin.html#/pages/common/itemOutManage");
}
return;
}
vc.toast(_json.msg);
},
function (errInfo, error) {
console.log('请求失败处理');
vc.toast(errInfo);
});
}
}
});
})(window.vc);

View File

@ -68,7 +68,6 @@
<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>
@ -80,7 +79,6 @@
<td class="text-center">{{itemOut.userName}}</td>
<td class="text-center">{{itemOut.createTime}}</td>
<td class="text-center">{{itemOut.resourceNames}}</td>
<td class="text-center">{{itemOut.totalPrice}}</td>
<td class="text-center">
<div class="btn-group">
<button class="btn-white btn btn-xs"

View File

@ -71,6 +71,22 @@
</label>
</div>
</div>
<div class="margin-left" @click="chooseStaffRole(item)" v-if="workflowSettingInfo.flowType == '40004'">
<div class="form-check form-check-inline col-form-label">
<input class="form-check-input" type="radio" v-bind:name="index+'-radio2'"
v-bind:id="index+'-radio5'" value="3003" v-model="item.staffRole" checked>
<label class="form-check-label" v-bind:for="index+'-radio6'">
仓库管理员
</label>
</div>
<div class="form-check form-check-inline col-form-label">
<input class="form-check-input" type="radio" v-bind:name="index+'-radio2'"
v-bind:id="index+'-radio6'" value="1001" v-model="item.staffRole">
<label class="form-check-label" v-bind:for="index+'-radio5'">
普通人员
</label>
</div>
</div>
<div>
<button type="button" class="btn btn-link" @click="deleteStep(item)">删除步骤</button>
</div>