diff --git a/app.js b/app.js index 0ba9148d2..4b4cb0be0 100644 --- a/app.js +++ b/app.js @@ -34,10 +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://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.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/components/property/purchaseApprovers/purchaseApprovers.js b/public/components/property/purchaseApprovers/purchaseApprovers.js index 31012f37a..a417a66ec 100644 --- a/public/components/property/purchaseApprovers/purchaseApprovers.js +++ b/public/components/property/purchaseApprovers/purchaseApprovers.js @@ -3,7 +3,8 @@ vc.extends({ propTypes: { callBackListener: vc.propTypes.string, //父组件名称 - callBackFunction: vc.propTypes.string //父组件监听方法 + callBackFunction: vc.propTypes.string, //父组件监听方法 + flowType:vc.propTypes.string='30003' }, data: { purchaseApproversInfo: { @@ -47,7 +48,7 @@ var param = { params: { communityId: vc.getCurrentCommunity().communityId, - flowType: '30003' + flowType: $props.flowType } }; //发送get请求 diff --git a/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.html b/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.html new file mode 100644 index 000000000..9f680fdb3 --- /dev/null +++ b/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.html @@ -0,0 +1,76 @@ +
+
+
+
+
+
待办单
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
订单号订单类型订单状态创建时间操作
{{auditOrder.applyOrderId}}{{auditOrder.resOrderTypeName}}{{auditOrder.stateName}}{{auditOrder.createTime}} +
+ +
+
+
+ +
+
+ +
+
+ +
+ +
+ + + +
+
    +
    + + +
    +
    +
    +
    + +
    \ No newline at end of file diff --git a/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.js b/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.js new file mode 100644 index 000000000..2d43f18aa --- /dev/null +++ b/public/pages/admin/myItemOutAuditOrders/myItemOutAuditOrders.js @@ -0,0 +1,155 @@ +/** + 审核订单 + **/ +(function (vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + auditOrdersInfo: { + auditOrders: [], + total: 0, + records: 1, + moreCondition: false, + userName: '', + currentUserId:vc.getData('/nav/getUserInfo').userId, + conditions: { + AuditOrdersId: '', + userName: '', + auditLink: '', + }, + orderInfo:'', + procure:false + } + }, + _initMethod: function () { + vc.component._listAuditOrders(DEFAULT_PAGE, DEFAULT_ROWS); + $that._loadStepStaff(); + }, + _initEvent: function () { + + vc.on('myAuditOrders', 'listAuditOrders', function (_param) { + vc.component._listAuditOrders(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('pagination', 'page_event', function (_currentPage) { + vc.component._listAuditOrders(_currentPage, DEFAULT_ROWS); + }); + + vc.on('myAuditOrders','notifyAudit',function(_auditInfo){ + vc.component._auditOrderInfo(_auditInfo); + }); + }, + methods: { + _listAuditOrders: function (_page, _rows) { + + vc.component.auditOrdersInfo.conditions.page = _page; + vc.component.auditOrdersInfo.conditions.row = _rows; + var param = { + params: vc.component.auditOrdersInfo.conditions + }; + + //发送get请求 + vc.http.get('myAuditOrders', + 'list', + param, + function (json, res) { + var _auditOrdersInfo = JSON.parse(json); + vc.component.auditOrdersInfo.total = _auditOrdersInfo.total; + vc.component.auditOrdersInfo.records = _auditOrdersInfo.records; + vc.component.auditOrdersInfo.auditOrders = _auditOrdersInfo.resourceOrders; + vc.emit('pagination', 'init', { + total: vc.component.auditOrdersInfo.records, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _openAuditOrderModel: function (_auditOrder) { + vc.component.auditOrdersInfo.orderInfo = _auditOrder; + vc.emit('audit','openAuditModal',{}); + }, + _queryAuditOrdersMethod: function () { + vc.component._listAuditOrders(DEFAULT_PAGE, DEFAULT_ROWS); + }, + _openDetailPurchaseApplyModel:function(_purchaseApply){ + vc.jumpToPage("/admin.html#/pages/common/purchaseApplyDetail?applyOrderId="+_purchaseApply.applyOrderId+"&resOrderType="+_purchaseApply.resOrderType); + }, + //提交审核信息 + _auditOrderInfo: function (_auditInfo) { + console.log("提交得参数："+_auditInfo); + _auditInfo.taskId = vc.component.auditOrdersInfo.orderInfo.taskId; + _auditInfo.applyOrderId = vc.component.auditOrdersInfo.orderInfo.applyOrderId; + //发送get请求 + vc.http.post('myAuditOrders', + 'audit', + JSON.stringify(_auditInfo), + { + emulateJSON: true + }, + function (json, res) { + vc.toast("处理成功"); + vc.component._listAuditOrders(DEFAULT_PAGE, DEFAULT_ROWS); + }, function (errInfo, error) { + console.log('请求失败处理'); + vc.toast("处理失败：" + errInfo); + } + ); + }, + _finishAuditOrder:function(_auditOrder){ + let _auditInfo = { + taskId: _auditOrder.taskId, + applyOrderId: _auditOrder.applyOrderId, + state:'1200', + remark:'处理结束' + }; + //发送get请求 + vc.http.post('myAuditOrders', + 'audit', + JSON.stringify(_auditInfo), + { + emulateJSON: true + }, + function (json, res) { + vc.toast("处理成功"); + vc.component._listAuditOrders(DEFAULT_PAGE, DEFAULT_ROWS); + }, function (errInfo, error) { + console.log('请求失败处理'); + vc.toast("处理失败：" + errInfo); + } + ); + }, + _loadStepStaff: function () { + + var param = { + params: { + page:1, + row:1, + staffId: $that.auditOrdersInfo.currentUserId, + staffRole: '3003' + } + }; + + //发送get请求 + vc.http.apiGet('workflow.listWorkflowStepStaffs', + param, + function (json, res) { + var _json = JSON.parse(json); + if(_json.data.length > 0){ + $that.auditOrdersInfo.procure = true; + } + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + + _distributionOrder:function(_purchaseApply){ + vc.jumpToPage("/admin.html#/pages/common/resourceEnterManage?applyOrderId="+_purchaseApply.applyOrderId+"&resOrderType="+_purchaseApply.resOrderType+"&taskId="+_purchaseApply.taskId); + } + + + } + }); +})(window.vc); diff --git a/public/pages/common/addItemOutStep/addItemOutStep.html b/public/pages/common/addItemOutStep/addItemOutStep.html index 0ebff0300..25df08d70 100644 --- a/public/pages/common/addItemOutStep/addItemOutStep.html +++ b/public/pages/common/addItemOutStep/addItemOutStep.html @@ -23,6 +23,7 @@ diff --git a/public/pages/common/addItemOutStep/addItemOutStep.js b/public/pages/common/addItemOutStep/addItemOutStep.js index e3c84f869..19372c382 100644 --- a/public/pages/common/addItemOutStep/addItemOutStep.js +++ b/public/pages/common/addItemOutStep/addItemOutStep.js @@ -8,15 +8,15 @@ $step: {}, index: 0, infos: [], - purchaseApply:{ - resourceStores:[], - description:'', - endUserName:'', - endUserTel:'', - file:'', - resOrderType:'', - staffId:'', - staffName:'' + purchaseApply: { + resourceStores: [], + description: '', + endUserName: '', + endUserTel: '', + file: '', + resOrderType: '', + staffId: '', + staffName: '' } } }, @@ -51,7 +51,7 @@ vc.component.addItemOutStepInfo.$step.step({ index: 0, time: 500, - title: ["选择物品", "申请信息","审批人"] + title: ["选择物品", "申请信息", "审批人"] }); vc.component.addItemOutStepInfo.index = vc.component.addItemOutStepInfo.$step.getIndex(); }, @@ -71,19 +71,16 @@ vc.toast("请选择或填写必选信息"); return; } - for( var i = 0; i < _resourceStores.length; i++){ - if(_resourceStores[i].quantity <= 0){ - vc.toast("请完善物品信息"); + 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; - } - } - - } + } + 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(); @@ -94,14 +91,14 @@ _finishStep: function () { vc.emit('addItemOutViewInfo', 'setItemOutInfo', null); var _currentData = vc.component.addItemOutStepInfo.infos[vc.component.addItemOutStepInfo.index]; - if(vc.component.addItemOutStepInfo.index != 2){ + if (vc.component.addItemOutStepInfo.index != 2) { if (_currentData == null || _currentData == undefined) { vc.toast("请选择或填写必选信息"); return; } - } + } vc.http.apiPost( - '/purchase/purchaseApply', + '/collection/goodsCollection', JSON.stringify(vc.component.addItemOutStepInfo.purchaseApply), { emulateJSON: true @@ -110,9 +107,9 @@ let _json = JSON.parse(json); if (_json.code == 0) { //关闭model - if(vc.component.addItemOutStepInfo.purchaseApply.resOrderType == "10000"){ + if (vc.component.addItemOutStepInfo.purchaseApply.resOrderType == "10000") { vc.jumpToPage("/admin.html#/pages/common/purchaseApplyManage"); - }else{ + } else { vc.jumpToPage("/admin.html#/pages/common/itemOutManage"); } return; diff --git a/public/pages/common/itemOutManage/itemOutManage.html b/public/pages/common/itemOutManage/itemOutManage.html index 49fc1037d..1d0040e2e 100644 --- a/public/pages/common/itemOutManage/itemOutManage.html +++ b/public/pages/common/itemOutManage/itemOutManage.html @@ -47,11 +47,11 @@
    -
    物品申请信息
    +
    物品领用
    @@ -63,22 +63,21 @@ 单号 - 审批状态 - 流程处理人 + 物品 申请人 申请时间 - 物品 + 状态 操作 {{itemOut.applyOrderId}} - {{itemOut.stateName}} - {{itemOut.agreeMan}} - {{itemOut.userName}} - {{itemOut.createTime}} {{itemOut.resourceNames}} + {{itemOut.userName}} + {{itemOut.createTime}} + {{itemOut.stateName}} +