diff --git a/public/pages/admin/myAuditOrders/myAuditOrders.html b/public/pages/admin/myAuditOrders/myAuditOrders.html index fecccc068..f010b40d5 100644 --- a/public/pages/admin/myAuditOrders/myAuditOrders.html +++ b/public/pages/admin/myAuditOrders/myAuditOrders.html @@ -10,50 +10,60 @@
- +
- - - - - - - + + + + + + + - - - - - - + + + + + + +
+ +
+ + + + + + - - - + + +
订单号订单类型订单状态创建时间操作
订单号订单类型订单状态创建时间操作
{{auditOrder.applyOrderId}}{{auditOrder.resOrderTypeName}}{{auditOrder.stateName}}{{auditOrder.createTime}} -
- -
-
- -
-
- -
-
{{auditOrder.applyOrderId}}{{auditOrder.resOrderTypeName}}{{auditOrder.stateName}}{{auditOrder.createTime}} +
+ +
+
+
+ +
+
+ +
+
-
-
    -
    +
      +
      @@ -62,8 +72,5 @@
      - - + + \ No newline at end of file diff --git a/public/pages/admin/myAuditOrders/myAuditOrders.js b/public/pages/admin/myAuditOrders/myAuditOrders.js index 33b53240d..cdd87c1e1 100644 --- a/public/pages/admin/myAuditOrders/myAuditOrders.js +++ b/public/pages/admin/myAuditOrders/myAuditOrders.js @@ -18,11 +18,13 @@ userName: '', auditLink: '', }, - orderInfo:'' + orderInfo:'', + procure:false } }, _initMethod: function () { vc.component._listAuditOrders(DEFAULT_PAGE, DEFAULT_ROWS); + $that._loadStepStaff(); }, _initEvent: function () { @@ -117,6 +119,34 @@ vc.toast("处理失败：" + errInfo); } ); + }, + _loadStepStaff: function () { + + var param = { + params: { + page:1, + row:1, + staffId: $that.auditOrdersInfo.currentUserId, + staffRole: '2002' + } + }; + + //发送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('请求失败处理'); + } + ); + }, + + _procureEnterOrder:function(_purchaseApply){ + vc.jumpToPage("/admin.html#/pages/common/resourceEnterManage?applyOrderId="+_purchaseApply.applyOrderId+"&resOrderType="+_purchaseApply.resOrderType+"&taskId="+_purchaseApply.taskId); } diff --git a/public/pages/common/resourceEnterManage/resourceEnterManage.html b/public/pages/common/resourceEnterManage/resourceEnterManage.html index baa524009..523885c13 100644 --- a/public/pages/common/resourceEnterManage/resourceEnterManage.html +++ b/public/pages/common/resourceEnterManage/resourceEnterManage.html @@ -1,111 +1,66 @@ - -
      -
      -
      -
      -
      -
      查询条件
      -
      - -
      -
      -
      -
      -
      -
      - -
      -
      -
      - -
      - -
      -
      - -
      -
      -
      - - -
      -
      -
      -
      -
      -
      +
      -
      采购信息
      +
      单号：{{resourceEnterManageInfo.applyOrderId}}
      - +
      - - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + - + - - - + + +
      单号审批状态流程处理人申请人申请时间物品总计价格操作
      物品名称物品编码物品库存申请数量采购数量采购单价备注
      {{purchaseApply.applyOrderId}}{{purchaseApply.stateName}}{{purchaseApply.agreeMan}}{{purchaseApply.userName}}{{purchaseApply.createTime}}{{purchaseApply.resourceNames}}{{purchaseApply.totalPrice}} -
      - -
      -
      - -
      -
      {{resourceEnter.resName}}{{resourceEnter.resCode}}{{resourceEnter.stock}}{{resourceEnter.quantity}} + + + + + +
      -
        -
        +
          +
          - -
          - +
          +
          +
          + + +
          +
          -
          + +
          \ No newline at end of file diff --git a/public/pages/common/resourceEnterManage/resourceEnterManage.js b/public/pages/common/resourceEnterManage/resourceEnterManage.js index 73fb01cc3..34fe26e06 100644 --- a/public/pages/common/resourceEnterManage/resourceEnterManage.js +++ b/public/pages/common/resourceEnterManage/resourceEnterManage.js @@ -1,89 +1,139 @@ /** //入库 **/ -(function(vc){ +(function (vc) { var DEFAULT_PAGE = 1; var DEFAULT_ROWS = 10; vc.extends({ - data:{ - purchaseApplyManageInfo:{ - purchaseApplys:[], - total:0, - records:1, - moreCondition:false, - applyOrderId:'', - states:'', - conditions:{ - state:'1002', - userName:'', - resOrderType:'10000' - } + data: { + resourceEnterManageInfo: { + resourceEnters: [], + applyOrderId: '', + taskId:'', + resOrderType: '', + purchaseApplyDetailVo: [], } }, - _initMethod:function(){ - vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS); - vc.getDict('purchase_apply',"state",function(_data){ - vc.component.purchaseApplyManageInfo.states = _data; - }); + _initMethod: function () { + vc.component.resourceEnterManageInfo.applyOrderId = vc.getParam('applyOrderId'); + vc.component.resourceEnterManageInfo.resOrderType = vc.getParam('resOrderType'); + vc.component.resourceEnterManageInfo.taskId = vc.getParam('taskId'); + vc.component._listPurchaseApply(DEFAULT_PAGE, DEFAULT_ROWS); }, - _initEvent:function(){ - vc.on('purchaseApplyManage','listPurchaseApply',function(_param){ - vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS); - }); - vc.on('pagination','page_event',function(_currentPage){ - vc.component._listPurchaseApplys(_currentPage,DEFAULT_ROWS); - }); - }, - methods:{ - _listPurchaseApplys:function(_page, _rows){ + _initEvent: function () { - vc.component.purchaseApplyManageInfo.conditions.page = _page; - vc.component.purchaseApplyManageInfo.conditions.row = _rows; + }, + methods: { + _listPurchaseApply: function (_page, _rows) { var param = { - params:vc.component.purchaseApplyManageInfo.conditions - }; + params: { + page: _page, + row: _rows, + applyOrderId: vc.component.resourceEnterManageInfo.applyOrderId, + resOrderType: vc.component.resourceEnterManageInfo.resOrderType, + } + }; - //发送get请求 - vc.http.get('purchaseApplyManage', - 'list', - param, - function(json,res){ - var _purchaseApplyManageInfo=JSON.parse(json); - vc.component.purchaseApplyManageInfo.total = _purchaseApplyManageInfo.total; - vc.component.purchaseApplyManageInfo.records = _purchaseApplyManageInfo.records; - vc.component.purchaseApplyManageInfo.purchaseApplys = _purchaseApplyManageInfo.purchaseApplys; - vc.emit('pagination','init',{ - total:vc.component.purchaseApplyManageInfo.records, - currentPage:_page - }); - },function(errInfo,error){ - console.log('请求失败处理'); - } - ); + //发送get请求 + vc.http.get('purchaseApplyManage', + 'list', + param, + function (json, res) { + var _purchaseApplyDetailInfo = JSON.parse(json); + var _purchaseApply = _purchaseApplyDetailInfo.purchaseApplys; + vc.copyObject(_purchaseApply[0], vc.component.resourceEnterManageInfo); + $that.resourceEnterManageInfo.purchaseApplyDetailVo.forEach(function (item) { + item.purchaseQuantity = ''; + item.price = ''; + item.purchaseRemark = ''; + + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); }, - _openDetailPurchaseApplyModel:function(_purchaseApply){ - vc.jumpToPage("/admin.html#/pages/common/purchaseApplyDetail?applyOrderId="+_purchaseApply.applyOrderId+"&resOrderType=10000"); + _openDetailResourceEnterModel: function (_resourceEnter) { + vc.jumpToPage("/admin.html#/pages/common/resourceEnterDetail?applyOrderId=" + _resourceEnter.applyOrderId + "&resOrderType=10000"); }, - _openResourceEnterDetailManageModel:function(_purchaseApply){ - vc.jumpToPage("/admin.html#/pages/common/resourceEnterDetailManage?applyOrderId="+_purchaseApply.applyOrderId+"&resOrderType=10000"); + _openResourceEnterDetailManageModel: function (_resourceEnter) { + vc.jumpToPage("/admin.html#/pages/common/resourceEnterDetailManage?applyOrderId=" + _resourceEnter.applyOrderId + "&resOrderType=10000"); }, - _queryPurchaseApplyMethod:function(){ - vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS); + _queryResourceEnterMethod: function () { + vc.component._listResourceEnters(DEFAULT_PAGE, DEFAULT_ROWS); }, - _moreCondition:function(){ - if(vc.component.purchaseApplyManageInfo.moreCondition){ - vc.component.purchaseApplyManageInfo.moreCondition = false; - }else{ - vc.component.purchaseApplyManageInfo.moreCondition = true; + _moreCondition: function () { + if (vc.component.resourceEnterManageInfo.moreCondition) { + vc.component.resourceEnterManageInfo.moreCondition = false; + } else { + vc.component.resourceEnterManageInfo.moreCondition = true; } }, - _queryInspectionPlanMethod:function () { - vc.component._listPurchaseApplys(DEFAULT_PAGE, DEFAULT_ROWS); + _queryInspectionPlanMethod: function () { + vc.component._listResourceEnters(DEFAULT_PAGE, DEFAULT_ROWS); }, - _openAddResourceQuantityModel:function () { + _openAddResourceQuantityModel: function () { - } + }, + _submit: function () { + //校验 是否填写正确 + $that.resourceEnterManageInfo.purchaseApplyDetailVo.forEach(function (item) { + + if (!vc.notNull(item.purchaseQuantity)) { + vc.toast('采购数量未填写') + return; + } + if (!vc.notNull(item.price)) { + vc.toast('单价未填写') + return; + } + }); + + vc.http.apiPost( + '/purchase/resourceEnter', + JSON.stringify($that.resourceEnterManageInfo), + { + emulateJSON: true + }, + function (json, res) { + let _json = JSON.parse(json); + if (_json.code == 0) { + //处理审核通过 + $that._finishAuditOrder(); + return; + } + vc.toast(_json.msg); + }, + function (errInfo, error) { + console.log('请求失败处理'); + + vc.toast(errInfo); + }); + }, + _finishAuditOrder:function(){ + let _auditInfo = { + taskId: $that.resourceEnterManageInfo.taskId, + applyOrderId: $that.resourceEnterManageInfo.applyOrderId, + state:'1100', + remark:'采购入库完成' + }; + //发送get请求 + vc.http.post('myAuditOrders', + 'audit', + JSON.stringify(_auditInfo), + { + emulateJSON: true + }, + function (json, res) { + vc.toast("处理成功"); + vc.goBack(); + }, function (errInfo, error) { + console.log('请求失败处理'); + vc.toast("处理失败：" + errInfo); + } + ); + }, } diff --git a/public/pages/property/workflowSettingManage/workflowSettingManage.html b/public/pages/property/workflowSettingManage/workflowSettingManage.html index 17db8b8c6..7208c04e8 100644 --- a/public/pages/property/workflowSettingManage/workflowSettingManage.html +++ b/public/pages/property/workflowSettingManage/workflowSettingManage.html @@ -54,6 +54,23 @@ + +
          +
          + + +
          +
          + + +
          +
          diff --git a/public/pages/property/workflowSettingManage/workflowSettingManage.js b/public/pages/property/workflowSettingManage/workflowSettingManage.js index fd9c88659..aea48c6a5 100644 --- a/public/pages/property/workflowSettingManage/workflowSettingManage.js +++ b/public/pages/property/workflowSettingManage/workflowSettingManage.js @@ -5,6 +5,7 @@ workflowSettingInfo: { flowId: '', flowName: '', + flowType: '', describle: '', steps: [] } @@ -53,6 +54,7 @@ } $that.workflowSettingInfo.flowId = flowId; $that.workflowSettingInfo.flowName = vc.getParam('flowName'); + $that.workflowSettingInfo.flowType = vc.getParam('flowType'); //查询步骤 var param = { @@ -92,6 +94,7 @@ staffId: _workflowStep.workflowStepStaffs[0].staffId, staffName: _workflowStep.workflowStepStaffs[0].staffName, type: _workflowStep.type, + staffRole: _workflowStep.workflowStepStaffs[0].staffRole, subStaff: [] }; if (_workflowStep.type == 2) { @@ -110,7 +113,8 @@ let _subStaff = { id: vc.uuid(), staffId: _workflowStepStaff.staffId, - staffName: _workflowStepStaff.staffName + staffName: _workflowStepStaff.staffName, + staffRole: _workflowStepStaff.staffRole } _subStaffs.push(_subStaff); @@ -152,7 +156,8 @@ _step.subStaff.push({ id: vc.uuid(), staffId: '', - staffName: '' + staffName: '', + staffRole: '1001' }); }, deleteStaff: function (_step, _subStaff) { @@ -166,6 +171,10 @@ if (_item.type == '1') { _item.subStaff = []; } + }, + + chooseStaffRole: function () { + } } });