diff --git a/app.js b/app.js index 6a4d727fe..0ba9148d2 100644 --- a/app.js +++ b/app.js @@ -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()); diff --git a/public/pages/common/addItemOutStep/addItemOutStep.html b/public/pages/common/addItemOutStep/addItemOutStep.html new file mode 100644 index 000000000..0ebff0300 --- /dev/null +++ b/public/pages/common/addItemOutStep/addItemOutStep.html @@ -0,0 +1,44 @@ +
+ +
+
+
+ + +
+ +
+ +
+ +
+ +
+ +
+ + + +
+
+
+ + + +
+
+ +
diff --git a/public/pages/common/addItemOutStep/addItemOutStep.js b/public/pages/common/addItemOutStep/addItemOutStep.js new file mode 100644 index 000000000..e3c84f869 --- /dev/null +++ b/public/pages/common/addItemOutStep/addItemOutStep.js @@ -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); diff --git a/public/pages/common/itemOutManage/itemOutManage.html b/public/pages/common/itemOutManage/itemOutManage.html index e3e042c1a..49fc1037d 100644 --- a/public/pages/common/itemOutManage/itemOutManage.html +++ b/public/pages/common/itemOutManage/itemOutManage.html @@ -68,7 +68,6 @@ 申请人 申请时间 物品 - 总计价格 操作 @@ -80,7 +79,6 @@ {{itemOut.userName}} {{itemOut.createTime}} {{itemOut.resourceNames}} - {{itemOut.totalPrice}}
+
+
+ + +
+
+ + +
+