Merge branch 'rongxin_dev' of http://116.255.223.226:3000/zhangzl/nsgk_web into rongxin_dev

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

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);

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;
-});
+});

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: {

view/user/user.html

@@ -187,7 +187,7 @@
                         <td style="border: none;">
                             <p class="m-l-10 m-r-10 fl">{{userInformationDetail.phone}}</p>
 <!--                            <span onclick="phoneUpdate('user')">修改手机号</span>-->
-                            <p class="activitiStatus">
+                            <p class="activitiStatus" onclick="$('#dialog-02').css('display','block')">
                                 {{userInformationDetail.activitiStatus == '1' ? '待审(点击查看)':userInformationDetail.activitiStatus == '2' ? '驳回':userInformationDetail.activitiStatus == '3' ? '通过':''}}
                             </p>
                         </td>
@@ -770,10 +770,10 @@
         <div class="dialog" id="dialog-02">
             <div class="bg-mengban"></div>
 
-            <div class="dialog_content supplyTable" style="padding-left: 0;width: 60%;">
+            <div class="dialog_content supplyTable" style="padding-left: 0;width: 70%;">
                 <div style="height: 400px;overflow-y: scroll;">
                     <table width="100%" cellspacing="0" cellpadding="0" id="listHistoryContent">
-                        <script id="listHistoryData" type="text/html">
+                        <!-- <script id="listHistoryData" type="text/html">
                             <tr>
                                 <td>活动名称</td>
                                 <td>办理人ID</td>
@@ -794,6 +794,44 @@
                                 <td>{{value.durationInMillis}}</td>
                             </tr>
                             {{/each}}
+                        </script> -->
+                        <script id="listHistoryData" type="text/html">
+                            <tr>
+                                <td>批次号</td>
+                                <td>节点名称</td>
+                                <td>审批状态</td>
+                                <td>审批对象</td>
+                                <td>审批人</td>
+                                <td>审批时间</td>
+                                <td>审批意见</td>
+                            </tr>
+                            {{each listHistory as value i}}
+                            <tr>
+                                <td>{{value.auditbatchNo}}</td>
+                                <td>{{value.nodeName}}</td>
+                                <td>
+                                    {{if value.auditStatus === '0'}}
+                                        草稿
+                                    {{else if value.auditStatus === '1'}}
+                                        待审
+                                    {{else if value.auditStatus === '2'}}
+                                        驳回
+                                    {{else if value.auditStatus === '3'}}
+                                        通过
+                                    {{/if}}
+                                </td>
+                                <td>
+                                    {{if value.auditType === '1'}}
+                                        角色: {{ value.roleName }}
+                                    {{else if value.auditType === '2'}}
+                                        用户: {{ value.nickName }}
+                                    {{/if}}
+                                </td>
+                                <td>{{value.auditBy}}</td>
+                                <td>{{value.auditTime}}</td>
+                                <td>{{value.auditRemark}}</td>
+                            </tr>
+                            {{/each}}
                         </script>
                     </table>
                 </div>