From 281f9d165931bfd30b8045d4cc8405d42544aab4 Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Sat, 18 Apr 2020 18:26:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=97=A7=E8=B4=A7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../junkRequirementManage.html | 4 +- .../junkRequirementManage.js | 8 ++ .../resourceStoreManage.js | 102 +++++++++--------- .../editJunkRequirement.js | 75 +------------ 4 files changed, 63 insertions(+), 126 deletions(-) diff --git a/public/components/junkRequirementManage/junkRequirementManage.html b/public/components/junkRequirementManage/junkRequirementManage.html index 96f897383..afe424209 100644 --- a/public/components/junkRequirementManage/junkRequirementManage.html +++ b/public/components/junkRequirementManage/junkRequirementManage.html @@ -59,14 +59,14 @@
-
旧货信息
+
{{junkRequirementManageInfo.pageName}}信息
- + diff --git a/public/components/junkRequirementManage/junkRequirementManage.js b/public/components/junkRequirementManage/junkRequirementManage.js index d818af4c3..62f5ca3d1 100644 --- a/public/components/junkRequirementManage/junkRequirementManage.js +++ b/public/components/junkRequirementManage/junkRequirementManage.js @@ -12,6 +12,7 @@ records: 1, moreCondition: false, junkRequirementId: '', + pageName:'旧货', conditions: { classification: '', publishUserName: '', @@ -24,6 +25,12 @@ _initMethod: function () { vc.component._listJunkRequirements(DEFAULT_PAGE, DEFAULT_ROWS); $that.junkRequirementManageInfo.conditions.typeCd = vc.getParam('typeCd'); + if(vc.getParam('typeCd') == '333333'){ + $that.junkRequirementManageInfo.pageName = '需求'; + }else{ + $that.junkRequirementManageInfo.pageName = '旧货'; + + } }, _initEvent: function () { @@ -39,6 +46,7 @@ vc.component.junkRequirementManageInfo.conditions.page = _page; vc.component.junkRequirementManageInfo.conditions.row = _rows; + vc.component.junkRequirementManageInfo.conditions.communityId = vc.getCurrentCommunity().communityId; var param = { params: vc.component.junkRequirementManageInfo.conditions }; diff --git a/public/components/resourceStoreManage/resourceStoreManage.js b/public/components/resourceStoreManage/resourceStoreManage.js index eedc466a8..d9fac3792 100644 --- a/public/components/resourceStoreManage/resourceStoreManage.js +++ b/public/components/resourceStoreManage/resourceStoreManage.js @@ -1,87 +1,87 @@ /** 入驻小区 **/ -(function(vc){ +(function (vc) { var DEFAULT_PAGE = 1; var DEFAULT_ROWS = 10; vc.extends({ - data:{ - resourceStoreManageInfo:{ - resourceStores:[], - total:0, - records:1, - moreCondition:false, - resName:'', - conditions:{ - resId:'', -resName:'', -resCode:'', + data: { + resourceStoreManageInfo: { + resourceStores: [], + total: 0, + records: 1, + moreCondition: false, + resName: '', + conditions: { + resId: '', + resName: '', + resCode: '', } } }, - _initMethod:function(){ + _initMethod: function () { vc.component._listResourceStores(DEFAULT_PAGE, DEFAULT_ROWS); }, - _initEvent:function(){ - - vc.on('resourceStoreManage','listResourceStore',function(_param){ - vc.component._listResourceStores(DEFAULT_PAGE, DEFAULT_ROWS); + _initEvent: function () { + + vc.on('resourceStoreManage', 'listResourceStore', function (_param) { + vc.component._listResourceStores(DEFAULT_PAGE, DEFAULT_ROWS); }); - vc.on('pagination','page_event',function(_currentPage){ - vc.component._listResourceStores(_currentPage,DEFAULT_ROWS); + vc.on('pagination', 'page_event', function (_currentPage) { + vc.component._listResourceStores(_currentPage, DEFAULT_ROWS); }); }, - methods:{ - _listResourceStores:function(_page, _rows){ + methods: { + _listResourceStores: function (_page, _rows) { vc.component.resourceStoreManageInfo.conditions.page = _page; vc.component.resourceStoreManageInfo.conditions.row = _rows; vc.component.resourceStoreManageInfo.conditions.communityId = vc.getCurrentCommunity().communityId; var param = { - params:vc.component.resourceStoreManageInfo.conditions - }; + params: vc.component.resourceStoreManageInfo.conditions + }; - //发送get请求 - vc.http.get('resourceStoreManage', - 'list', - param, - function(json,res){ - var _resourceStoreManageInfo=JSON.parse(json); - vc.component.resourceStoreManageInfo.total = _resourceStoreManageInfo.total; - vc.component.resourceStoreManageInfo.records = _resourceStoreManageInfo.records; - vc.component.resourceStoreManageInfo.resourceStores = _resourceStoreManageInfo.resourceStores; - vc.emit('pagination','init',{ - total:vc.component.resourceStoreManageInfo.records, - currentPage:_page - }); - },function(errInfo,error){ - console.log('请求失败处理'); - } - ); + //发送get请求 + vc.http.get('resourceStoreManage', + 'list', + param, + function (json, res) { + var _resourceStoreManageInfo = JSON.parse(json); + vc.component.resourceStoreManageInfo.total = _resourceStoreManageInfo.total; + vc.component.resourceStoreManageInfo.records = _resourceStoreManageInfo.records; + vc.component.resourceStoreManageInfo.resourceStores = _resourceStoreManageInfo.resourceStores; + vc.emit('pagination', 'init', { + total: vc.component.resourceStoreManageInfo.records, + currentPage: _page + }); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); }, - _openAddResourceStoreModal:function(){ - vc.emit('addResourceStore','openAddResourceStoreModal',{}); + _openAddResourceStoreModal: function () { + vc.emit('addResourceStore', 'openAddResourceStoreModal', {}); }, - _openEditResourceStoreModel:function(_resourceStore){ - vc.emit('editResourceStore','openEditResourceStoreModal',_resourceStore); + _openEditResourceStoreModel: function (_resourceStore) { + vc.emit('editResourceStore', 'openEditResourceStoreModal', _resourceStore); }, - _openDeleteResourceStoreModel:function(_resourceStore){ - vc.emit('deleteResourceStore','openDeleteResourceStoreModal',_resourceStore); + _openDeleteResourceStoreModel: function (_resourceStore) { + vc.emit('deleteResourceStore', 'openDeleteResourceStoreModal', _resourceStore); }, - _queryResourceStoreMethod:function(){ + _queryResourceStoreMethod: function () { vc.component._listResourceStores(DEFAULT_PAGE, DEFAULT_ROWS); }, - _moreCondition:function(){ - if(vc.component.resourceStoreManageInfo.moreCondition){ + _moreCondition: function () { + if (vc.component.resourceStoreManageInfo.moreCondition) { vc.component.resourceStoreManageInfo.moreCondition = false; - }else{ + } else { vc.component.resourceStoreManageInfo.moreCondition = true; } } - + } }); })(window.vc); diff --git a/public/dailsComponents/editJunkRequirement/editJunkRequirement.js b/public/dailsComponents/editJunkRequirement/editJunkRequirement.js index 52dc124cc..139b52e06 100644 --- a/public/dailsComponents/editJunkRequirement/editJunkRequirement.js +++ b/public/dailsComponents/editJunkRequirement/editJunkRequirement.js @@ -30,78 +30,6 @@ return vc.validate.validate({ editJunkRequirementInfo: vc.component.editJunkRequirementInfo }, { - 'editJunkRequirementInfo.classification': [ - { - limit: "required", - param: "", - errInfo: "类别不能为空" - }, - { - limit: "num", - param: "", - errInfo: "任务编码格式错误" - }, - ], - 'editJunkRequirementInfo.inspectionPlanId': [ - { - limit: "required", - param: "", - errInfo: "巡检计划不能为空" - }, - { - limit: "maxin", - param: "1,100", - errInfo: "收费项目不能超过100位" - }, - ], - 'editJunkRequirementInfo.context': [ - { - limit: "required", - param: "", - errInfo: "内容不能为空" - }, - { - limit: "maxLength", - param: "200", - errInfo: "内容不能超过200个字符" - }, - ], - 'editJunkRequirementInfo.referencePrice': [ - { - limit: "required", - param: "", - errInfo: "参考价格不能为空" - }, - { - limit: "money", - param: "", - errInfo: "参考价格格式错误" - }, - ], - 'editJunkRequirementInfo.publishUserName': [ - { - limit: "required", - param: "", - errInfo: "发布人不能为空" - }, - { - limit: "maxLength", - param: "50", - errInfo: "发布人不能超过50" - }, - ], - 'editJunkRequirementInfo.publishUserLink': [ - { - limit: "required", - param: "", - errInfo: "联系方式不能为空" - }, - { - limit: "phone", - param: "", - errInfo: "联系方式不是有效的电话格式" - }, - ], 'editJunkRequirementInfo.state': [ { limit: "required", @@ -118,7 +46,7 @@ { limit: "required", param: "", - errInfo: "旧货编码不能为空" + errInfo: "编码不能为空" }] }); @@ -128,6 +56,7 @@ vc.toast(vc.validate.errInfo); return; } + vc.component.editJunkRequirementInfo.communityId = vc.getCurrentCommunity().communityId; vc.http.apiPost( 'junkRequirement.updateJunkRequirement',
旧货编码{{junkRequirementManageInfo.pageName}}编码 类别 参考价格 发布人