diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js index 2d49bbb77..c09399836 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js @@ -13,8 +13,8 @@ var config = { - webapi: 'http://localhost:31173/', - web: "http://localhost:20472/"//web地址,用于配置logo + webapi: 'http://localhost:8088/', + web: "http://localhost:8087/"//web地址,用于配置logo }; // var config = { // webapi: 'http://123.57.209.16:31173/', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluatzp/partyevaluatzp.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluatzp/partyevaluatzp.js index 01a15b835..1862ccaf1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluatzp/partyevaluatzp.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluatzp/partyevaluatzp.js @@ -25,7 +25,7 @@ return page.rowRender(_index, _item, _$item, $page); }, click: function (item, $item, $et) {// 列表行点击事件 - //提交 + //提交 if ($et.hasClass('lr-btn-blue')) { page.btnClick(item, $item, $page); } @@ -62,15 +62,15 @@ }, queryJson: '{}' }; - var account = learun.storage.get('logininfo').account; - _postParam.queryJson=JSON.stringify({ account:account }); + var account = learun.storage.get('logininfo').account; + _postParam.queryJson = JSON.stringify({ account: account }); if (param.multipleData) { _postParam.queryJson = JSON.stringify(multipleData); } if (param.begin && param.end) { _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end }); } - + learun.httpget(config.webapi + 'learun/adms/evaluatingindicator/gezplist', _postParam, (data) => { $page.find('.lr-badge').text('0'); if (data) { @@ -83,24 +83,23 @@ }); }, rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据 - var status=_item.Status; - var statusname=''; - if (status == '-1') - { - statusname='未打分'; - } - else if (status == '0') { - statusname= '草稿'; - } - else if (status == '1') { - statusname= '已提交'; - } - // else if (status == '2') { - // statusname= '审核通过'; - // } - // else if (status == '3') { - // statusname= '审核未通过'; - // } + var status = _item.Status; + var statusname = ''; + if (status == '-1') { + statusname = '未打分'; + } + else if (status == '0') { + statusname = '草稿'; + } + else if (status == '1') { + statusname = '已提交'; + } + // else if (status == '2') { + // statusname= '审核通过'; + // } + // else if (status == '3') { + // statusname= '审核未通过'; + // } _$item.addClass('lr-list-item lr-list-item-multi'); _$item.append($('
年度:
').dataFormatter({ value: _item.ScoreYear })); _$item.append($('季度:
').dataFormatter({ value: _item.ScoreQuarter })); @@ -112,43 +111,40 @@ // learun.nav.go({ path: 'PersonnelManagement/CommunityInfo/form', title: '详情', type: 'right', param: { keyValue: item.Id } }); // }, btnClick: function (item, $item, $page) {// 左滑按钮点击事件 - console.log('item',item); - var status=item.Status; - if(status == '-1') - { - learun.layer.toast("当前项目未打分,无法提交!"); - return; - } - else if(status != '0') - { - learun.layer.toast("当前项目已提交!"); - return; - } - learun.layer.confirm('确定要提交该项数据吗?', function (_index) { - if (_index === '1') { - learun.layer.loading(true, '正在提交...'); - learun.httppost(config.webapi + 'learun/adms/evaluatingindicator/submitevaluationforzp', {Id:item.Id,Status:1}, (data) => { - if (data) {// 提交数据成功 - page.grid.reload(); - } - learun.layer.loading(false); - }); - } - }, '智慧校园提示', ['取消', '确定']); + var status = item.Status; + if (status == '-1') { + learun.layer.toast("当前项目未打分,无法提交!"); + return; + } + else if (status != '0') { + learun.layer.toast("当前项目已提交!"); + return; + } + learun.layer.confirm('确定要提交该项数据吗?', function (_index) { + if (_index === '1') { + learun.layer.loading(true, '正在提交...'); + learun.httppost(config.webapi + 'learun/adms/evaluatingindicator/submitevaluationforzp', { Assessed: item.BeAssessed, Status: 1 }, (data) => { + if (data) {// 提交数据成功 + page.grid.reload(); + } + learun.layer.loading(false); + }); + } + }, '智慧校园提示', ['取消', '确定']); }, btnPJClick: function (item, $item, $page) {// 左滑按钮点击事件 - var status=item.Status; - if(status == '1') - { - learun.layer.toast("当前项目已提交!"); - return; - } - learun.nav.closeCurrent(); - learun.nav.go({ - path: 'PartyevaluatQuestionsZP', - title: '党员评价', - type: 'right', - param: { ScoreYear: item.ScoreYear ,ScoreQuarter:item.ScoreQuarter} }); + var status = item.Status; + if (status == '1') { + learun.layer.toast("当前项目已提交!"); + return; + } + learun.nav.closeCurrent(); + learun.nav.go({ + path: 'PartyevaluatQuestionsZP', + title: '党员评价', + type: 'right', + param: { ScoreYear: item.ScoreYear, ScoreQuarter: item.ScoreQuarter } + }); // learun.layer.confirm('确定要自评打分吗?', function (_index) { // if (_index === '1') { // learun.nav.go({ path: 'partyevaluate', title: '党员自评', type: 'right' }); @@ -156,9 +152,9 @@ // }, '智慧校园提示', ['取消', '确定']); }, rowBtns: [ - '提交', - '自评打分', - ] // 列表行左滑按钮 + '提交', + '自评打分', + ] // 列表行左滑按钮 }; return page; })(); diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/customlist-action.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/customlist-action.vue index 46fee4d3b..c91825d3f 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/customlist-action.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/customlist-action.vue @@ -26,9 +26,10 @@ style="border: currentColor 1px solid" >