账号审核状态、审核列表

static/css/user/user.css

@@ -58,11 +58,21 @@
     cursor: pointer;
 }
 
+.userTable table tr td .activitiStatus{
+    color: #ffffff;
+    background-color: var(--color)!important;
+    display: inline-block;
+    padding: 0px 10px;
+    border-radius: 5px;
+    margin-left: 10px;
+    cursor: pointer;
+}
+
 .userTable table tr td{
     padding: 18px 0px;
 }
 .userTable table tr td:nth-child(odd){
-    width: 10%;
+    width: 12%;
     text-align: right;
 }
 
@@ -294,4 +304,4 @@ textarea {
     color: #ffffff;
     margin: 0 auto;
     border-radius: 50px;
-}
+}

static/js/api/user.js

@@ -8,6 +8,12 @@
 */
 var userUpdate = '/transaction/member/edit'  //修改用户信息类接口
 
+/*
+@purl /activiti/process/listHistory
+@param
+*/
+var listHistory = '/activiti/process/listHistory'  //审批历史查询
+
 /*
 @purl /getInfo
 @param

static/js/common/tools.js

@@ -546,6 +546,48 @@ define(['jquery', 'dialog','jsencrypt'], function ($, dialog,JSEncrypt) {
 			return encryptor.decrypt(txt) // 对数据进行解密
 		},
 
+		format: function (time, format) {
+			var t = new Date(time);
+			var tf = function (i) { return (i < 10 ? '0' : '') + i };
+			return format.replace(/yyyy|MM|dd|HH|mm|ss/g, function (a) {
+				switch (a) {
+					case 'yyyy':
+						return tf(t.getFullYear());
+						break;
+					case 'MM':
+						return tf(t.getMonth() + 1);
+						break;
+					case 'mm':
+						return tf(t.getMinutes());
+						break;
+					case 'dd':
+						return tf(t.getDate());
+						break;
+					case 'HH':
+						return tf(t.getHours());
+						break;
+					case 'ss':
+						return tf(t.getSeconds());
+						break;
+				}
+			})
+		},
+
+		/**
+		 * 计算出相差天数
+		 * @param secondSub
+		 */
+		formatTotalDateSub: function (secondSub) {
+			var days = Math.floor(secondSub / (24 * 3600));     // 计算出小时数
+			var leave1 = secondSub % (24*3600) ;                // 计算天数后剩余的毫秒数
+			var hours = Math.floor(leave1 / 3600);              // 计算相差分钟数
+			var leave2 = leave1 % (3600);                       // 计算小时数后剩余的毫秒数
+			var minutes = Math.floor(leave2 / 60);              // 计算相差秒数
+			var leave3 = leave2 % 60;                           // 计算分钟数后剩余的毫秒数
+			var seconds = Math.round(leave3);
+			return days + "天" + hours + "时" + minutes + "分" + seconds + '秒';
+		}
+
 	});
 	return Tool;
 });

static/js/project/user/index.js

@@ -273,7 +273,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
             $("#bankType").html(bankTypeData);
             var bankAddressData = template('bankAddressData', module.data);
             $("#bankAddress").html(bankAddressData);
-
+            document.getElementById('bankSubmitBtn').style.display = content.activitiStatus == '1'?'none':'block';
             if(content.memberType == '1'){
                 document.getElementById('companyInformationContent').style.display = 'none';
                 document.getElementById('userInformationContent').style.display = 'block';
@@ -304,6 +304,8 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
             tools.doGet(userConsulting, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.consulting);
             //我的竞价
             tools.doGet(userBidding, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.bidding);
+
+            tools.doPost(listHistory, {processInstanceId:content.instanceId}, module.listHistory);
             //个人资料提交
             $('#supplyAction').on('click', module.supplyAction)
             $('#releaseAction').on('click', module.releaseAction)
@@ -315,6 +317,22 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
         }
     }
 
+    module.listHistory = function(data){
+        if (data.code == 200) {
+            var content = data.rows;
+            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);
+        }
+    }
+
     module.showUserImage = function(data){
         console.log(data)
             var accountOpenCert = data.accountOpenCert==null||data.accountOpenCert == ''?null:['/api'+data.accountOpenCert];
@@ -467,7 +485,9 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
     submitInfo = function(type){
         var upLoadList = [];
         var data = {};
+        console.log(type)
         if(type == 'user'||type == 'company'){
+            console.log(module.data.memberType)
             if(module.data.memberType == '1'){
                 $('#cupload-3').find('input').each(function() {
                     if($(this).val()!=''&&$(this).val().indexOf('/api') == -1){
@@ -490,18 +510,21 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
                 $('#cupload-5').find('input').each(function() {
                     if($(this).val()!=''&&$(this).val().indexOf('/api') == -1){
                         module.data.upType5 = true;
+                        console.log('5')
                         tools.doPostImg(base64Upload, {file:$(this).val()}, module.upLoadOverInfo5);
                     }
                 })
                 $('#cupload-6').find('input').each(function() {
                     if($(this).val()!=''&&$(this).val().indexOf('/api') == -1){
                         module.data.upType6 = true;
+                        console.log('6')
                         tools.doPostImg(base64Upload, {file:$(this).val()}, module.upLoadOverInfo6);
                     }
                 })
                 $('#cupload-7').find('input').each(function() {
                     if($(this).val()!=''&&$(this).val().indexOf('/api') == -1){
                         module.data.upType7 = true;
+                        console.log('7')
                         tools.doPostImg(base64Upload, {file:$(this).val()}, module.upLoadOverInfo7);
                     }
                 })
@@ -735,7 +758,7 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
             var companyTimeLimit = $('#companyTimeLimit').val();
             var companySetupTime = $('#companySetupTime').val();
             var companyCapital = $('#companyCapital').val();
-            var companyLicense = $('#companyLicense').val();
+            var companyLicense = module.data.companyLicense;
             var address = $('#address').val();
             var accountOpenCert = module.data.khzm;
             var idCardPic = module.data.frzjz;
@@ -1221,4 +1244,4 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
     }
 
     return module;
-});
+});

view/user/user.html

@@ -173,7 +173,13 @@
             <script id="userInformationData" type="text/html">
                 <tr>
                     <td style="border: none;"><span>*</span>手机号码:</td>
-                    <td style="border: none;"><p class="m-l-10 m-r-10 fl">{{userInformationDetail.phone}}</p><span onclick="phoneUpdate('user')">修改手机号</span></td>
+                    <td style="border: none;">
+                        <p class="m-l-10 m-r-10 fl">{{userInformationDetail.phone}}</p>
+                        <span onclick="phoneUpdate('user')">修改手机号</span>
+                        <p class="activitiStatus">
+                            {{userInformationDetail.activitiStatus == '1' ? '待审':userInformationDetail.activitiStatus == '2' ? '驳回':userInformationDetail.activitiStatus == '3' ? '通过':''}}
+                        </p>
+                    </td>
                 </tr>
 <!--                <tr>-->
 <!--                    <td><span>*</span>密码:</td>-->
@@ -209,7 +215,11 @@
                 </tr>
                 <tr>
                     <td></td>
-                    <td><p onclick="submitInfo('user')">保存</p></td>
+                    <td>
+                        {{if userInformationDetail.activitiStatus != '1'}}
+                        <p onclick="submitInfo('user')">保存</p>
+                        {{/if}}
+                    </td>
                 </tr>
             </script>
             <table width="100%" id="userInformationContent"></table>
@@ -217,9 +227,18 @@
             <script id="companyInformationData" type="text/html">
                 <tr>
                     <td><span>*</span>手机号码:</td>
-                    <td><p class="m-l-10 m-r-10 fl">{{userInformationDetail.phone}}</p><span onclick="phoneUpdate('company')">修改手机号</span></td>
-<!--                    <td><span>*</span>密码:</td>-->
-<!--                    <td><input type="text" id="password"/></td>-->
+                    <td>
+                        <p class="m-l-10 m-r-10 fl">{{userInformationDetail.phone}}</p>
+                        <span onclick="phoneUpdate('company')">修改手机号</span>
+                        <p class="activitiStatus" onclick="$('#dialog-02').css('display','block')">
+                            {{userInformationDetail.activitiStatus == '1' ? '待审':userInformationDetail.activitiStatus == '2' ? '驳回':userInformationDetail.activitiStatus == '3' ? '通过':''}}
+                        </p>
+                    </td>
+                    <td></td>
+                    <td></td>
+                    <!--                    <td><span>*</span>密码:</td>-->
+
+                    <!--                    <td><input type="text" id="password"/></td>-->
                 </tr>
                 <tr>
                     <td><span>*</span>公司名称:</td>
@@ -271,7 +290,11 @@
                 </tr>
                 <tr>
                     <td></td>
-                    <td><p onclick="submitInfo('company')">保存</p></td>
+                    <td>
+                        {{if userInformationDetail.activitiStatus != '1'}}
+                        <p onclick="submitInfo('company')">保存</p>
+                        {{/if}}
+                    </td>
                 </tr>
             </script>
             <table width="100%" id="companyInformationContent"></table>
@@ -281,7 +304,7 @@
                 <tr>
                     <td style="border: none;"><span>*</span>账户类型:</td>
                     <td style="border: none;">
-                        <select id="accountType" class="p-l-10" style="width: 30%">
+                        <select id="accountType" class="p-l-10" style="width: 50%">
                             <script id="accountTypeData" type="text/html">
                                 {{each accountTypeOption as value i}}
                                 <option value="{{value.dictValue}}">{{value.dictLabel}}</option>
@@ -292,11 +315,11 @@
                 </tr>
                 <tr>
                     <td><span>*</span>开户姓名:</td>
-                    <td><input type="text" id="bankCardName" class="p-l-10" style="width: 30%"/></td>
+                    <td><input type="text" id="bankCardName" class="p-l-10" style="width: 50%"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>银行卡号:</td>
-                    <td><input type="text" id="bankCardNum" class="p-l-10" style="width: 30%"/></td>
+                    <td><input type="text" id="bankCardNum" class="p-l-10" style="width: 50%"/></td>
                 </tr>
 
                 <tr>
@@ -311,7 +334,7 @@
                 <tr>
                     <td style="border: none;"><span>*</span>所属银行:</td>
                     <td style="border: none;">
-                        <select id="bankType" class="p-l-10" style="width: 30%">
+                        <select id="bankType" class="p-l-10" style="width: 50%">
                             <script id="bankTypeData" type="text/html">
                                 {{each bankTypeOption as value i}}
                                 <option value="{{value.dictValue}}" {{value.dictLabel == userInformationDetail.bankType ? 'selected':''}}>{{value.dictLabel}}</option>
@@ -324,7 +347,7 @@
                 <tr>
                     <td style="border: none;"><span>*</span>开户省份:</td>
                     <td style="border: none;">
-                        <select id="sheng" class="p-l-10" style="width: 30%" onchange="getShi()">
+                        <select id="sheng" class="p-l-10" style="width: 50%" onchange="getShi()">
                             <script id="shengData" type="text/html">
                                 {{each sheng as value i}}
                                 <option value="{{value.value}}">{{value.label}}</option>
@@ -336,7 +359,7 @@
                 <tr>
                     <td style="border: none;"><span>*</span>开户城市:</td>
                     <td style="border: none;">
-                        <select id="shi" class="p-l-10" style="width: 30%">
+                        <select id="shi" class="p-l-10" style="width: 50%">
                             <script id="shiData" type="text/html">
                                 {{each shi as value i}}
                                 <option value="{{value.value}}">{{value.label}}</option>
@@ -348,13 +371,13 @@
 
                 <tr>
                     <td>关键词:</td>
-                    <td><input id="bankDeposit" type="text" class="p-l-10" style="width: 30%"/>（输入搜索开户行名称）</td>
+                    <td><input id="bankDeposit" type="text" class="p-l-10" style="width: 50%"/>（输入搜索开户行名称）</td>
                 </tr>
 
                 <tr>
                     <td style="border: none;"><span>*</span>开户银行:</td>
                     <td style="border: none;">
-                        <select id="bankAddress" class="p-l-10" style="width: 30%" onchange="changeBankAddress()">
+                        <select id="bankAddress" class="p-l-10" style="width: 50%" onchange="changeBankAddress()">
                             <script id="bankAddressData" type="text/html">
                                 <option value="{{userInformationDetail.bankAddress}}" selected>{{userInformationDetail.bankAddress}}</option>
                                 {{each bankAddress as value i}}
@@ -367,11 +390,13 @@
                 </tr>
                 <tr>
                     <td style="border: none;"><span>*</span>联行号:</td>
-                    <td style="border: none;"><input type="text" id="payeePaymentLines" class="p-l-10" style="width: 30%"/></td>
+                    <td style="border: none;"><input type="text" id="payeePaymentLines" class="p-l-10" style="width: 50%"/></td>
                 </tr>
                 <tr>
                     <td></td>
-                    <td><p onclick="formAction('bank')">保存</p></td>
+                    <td>
+                        <p onclick="formAction('bank')" id="bankSubmitBtn">保存</p>
+                    </td>
                 </tr>
             </table>
 
@@ -379,15 +404,15 @@
             <table width="100%" id="passWordInformationContent" style="display: none;">
                 <tr>
                     <td style="border: none;"><span>*</span>原密码:</td>
-                    <td style="border: none;"><input type="password" id="originalPassWord" class="p-l-10" style="width: 30%"/></td>
+                    <td style="border: none;"><input type="password" id="originalPassWord" class="p-l-10" style="width: 50%"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>新密码:</td>
-                    <td><input type="password" id="newPassWord" class="p-l-10" style="width: 30%"/></td>
+                    <td><input type="password" id="newPassWord" class="p-l-10" style="width: 50%"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>确认密码:</td>
-                    <td><input type="password" id="determinePassWord" class="p-l-10" style="width: 30%"/></td>
+                    <td><input type="password" id="determinePassWord" class="p-l-10" style="width: 50%"/></td>
                 </tr>
                 <tr>
                     <td></td>
@@ -404,11 +429,11 @@
                 </tr>
                 <tr>
                     <td><span>*</span>新手机号:</td>
-                    <td><input type="text" style="width: 30%" class="fl"/><p class="m-l-10 fl" style="line-height: 36px;">更换手机号后，下次登录使用新手机号</p></td>
+                    <td><input type="text" style="width: 50%" placeholder="更换手机号后，下次登录使用新手机号" class="fl"/></td>
                 </tr>
                 <tr>
                     <td><span>*</span>验证码:</td>
-                    <td><input type="text" style="width: 30%" class="fl"/><p class="m-l-10 fl" style="line-height: 36px;color:var(--color);cursor: pointer;">免费获取短信动态码</p></td>
+                    <td><input type="text" style="width: 50%" class="fl"/><p class="m-l-10 fl" style="line-height: 36px;color:var(--color);cursor: pointer;">免费获取短信动态码</p></td>
                 </tr>
                 <tr>
                     <td></td>
@@ -667,6 +692,41 @@
 
         </div>
 
+        <div class="dialog" id="dialog-02">
+            <div class="bg-mengban"></div>
+
+            <div class="dialog_content supplyTable" style="padding-left: 0;width: 60%;">
+                <div style="height: 400px;overflow-y: scroll;">
+                    <table width="100%" cellspacing="0" cellpadding="0" id="listHistoryContent">
+                        <script id="listHistoryData" type="text/html">
+                            <tr>
+                                <td>活动名称</td>
+                                <td>办理人ID</td>
+                                <td>办理人</td>
+                                <td>审批意见</td>
+                                <td>开始时间</td>
+                                <td>结束时间</td>
+                                <td>耗时</td>
+                            </tr>
+                            {{each listHistory as value i}}
+                            <tr>
+                                <td>{{value.activityName}}</td>
+                                <td>{{value.assignee}}</td>
+                                <td>{{value.assigneeName}}</td>
+                                <td>{{value.comment}}</td>
+                                <td>{{value.startTime}}</td>
+                                <td>{{value.endTime}}</td>
+                                <td>{{value.durationInMillis}}</td>
+                            </tr>
+                            {{/each}}
+                        </script>
+                    </table>
+                </div>
+                <div class="close_dialog" onclick="$('#dialog-02').css('display','none')"><p>关闭</p></div>
+            </div>
+
+        </div>
+
     </div>
 
     <!--底部链接  -->
@@ -690,6 +750,7 @@
                 <div class="clear"></div>
             </div>
         </div>
+
 </div>
 </body>
 <script src="../../static/js/common/require.js" data-main="../../static/js/common/main.js?t=101" id="require-page"