diff --git a/static/js/api/user.js b/static/js/api/user.js index 8626362..6f89d79 100644 --- a/static/js/api/user.js +++ b/static/js/api/user.js @@ -18,7 +18,8 @@ var userUpdate = '/transaction/member/edit' //修改用户信息类接口 @purl /activiti/process/listHistory @param */ -var listHistory = '/activiti/process/listHistory' //审批历史查询 +// var listHistory = '/activiti/process/listHistory' //审批历史查询 +var listHistory = '/transaction/website/auditHistory/list' //审批历史查询 /* @purl /getInfo diff --git a/static/js/project/user/index.js b/static/js/project/user/index.js index 62490be..25e228b 100644 --- a/static/js/project/user/index.js +++ b/static/js/project/user/index.js @@ -325,7 +325,8 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", //我的报名 tools.doGet(getSignupByMemberId, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.application); - tools.doPost(listHistory, {processInstanceId:content.instanceId}, module.listHistory); + // tools.doPost(listHistory, {processInstanceId:content.instanceId}, module.listHistory); + tools.doGet(listHistory, {auditbatchNo: content.auditbatchNo}, module.listHistory); //个人资料提交 $('#supplyAction').on('click', module.supplyAction) $('#releaseAction').on('click', module.releaseAction) @@ -340,13 +341,13 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor", module.listHistory = function(data){ if (data.code == 200) { var content = data.rows; - content.forEach((row) => { + /* content.forEach((row) => { row.startTime = tools.format(row.startTime, "yyyy-MM-dd HH:mm:ss"); row.endTime = tools.format(row.endTime, "yyyy-MM-dd HH:mm:ss"); row.durationInMillis = tools.formatTotalDateSub( row.durationInMillis / 1000 ); - }); + }); */ module.data.listHistory = content; var listHistoryData = template('listHistoryData', module.data); $("#listHistoryContent").html(listHistoryData); diff --git a/static/js/project/user/register.js b/static/js/project/user/register.js index 7e86a66..4366ae6 100644 --- a/static/js/project/user/register.js +++ b/static/js/project/user/register.js @@ -1,7 +1,7 @@ /** * Created by Administrator on 2021/4/5. */ -define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, template, Tools, echarts, swiper) { +define(['jquery', "template", "Tools", 'swiper'], function ($, template, Tools, swiper) { //数据存储 var module = { data: { @@ -75,4 +75,4 @@ define(['jquery', "template", "Tools", "echarts", 'swiper'], function ($, templa } return module; -}); \ No newline at end of file +}); diff --git a/static/js/project/user/registerFrom.js b/static/js/project/user/registerFrom.js index 94ea51b..c7a1ce5 100644 --- a/static/js/project/user/registerFrom.js +++ b/static/js/project/user/registerFrom.js @@ -1,7 +1,7 @@ /** * Created by Administrator on 2021/4/5. */ -define(['jquery', "template", "Tools", "user", "echarts", 'register', 'swiper',"cupload"], function ($, template, Tools, echarts, swiper) { +define(['jquery', "template", "Tools", "user", 'register', 'swiper',"cupload"], function ($, template, Tools, swiper) { //数据存储 var module = { data: { diff --git a/view/user/user.html b/view/user/user.html index aca24b1..2161912 100644 --- a/view/user/user.html +++ b/view/user/user.html @@ -187,7 +187,7 @@

{{userInformationDetail.phone}}

-

+

{{userInformationDetail.activitiStatus == '1' ? '待审(点击查看)':userInformationDetail.activitiStatus == '2' ? '驳回':userInformationDetail.activitiStatus == '3' ? '通过':''}}

@@ -770,10 +770,10 @@
-
+
-