d

etax-income-server/src/main/webapp/management-query-taxnumberuser-page.html

@@ -62,6 +62,7 @@
                 <div class="col-sm-4">
                 <div class="col-sm-4">
                     <select class="form-control" id="userStatus">
                     <select class="form-control" id="userStatus">
                         <option value="">请选择</option>
                         <option value="">请选择</option>
+                        <option value="1">待审核</option>
                         <option value="2">无权限</option>
                         <option value="2">无权限</option>
                         <option value="3">正常</option>
                         <option value="3">正常</option>
                         <option value="5">暂停</option>
                         <option value="5">暂停</option>
@@ -69,10 +70,26 @@
                         <option value="9">删除</option>
                         <option value="9">删除</option>
                     </select>
                     </select>
                 </div>
                 </div>
+                <label class="col-sm-2 control-label">结束标志:</label>
+                <div class="col-sm-4">
+                    <select class="form-control" id="overFlag">
+                        <option value="">请选择</option>
+                        <option value="0">否</option>
+                        <option value="1">是</option>
+                    </select>
+                </div>
                 <label class="col-sm-2 control-label">taxno:</label>
                 <label class="col-sm-2 control-label">taxno:</label>
                 <div class="col-sm-4">
                 <div class="col-sm-4">
                     <input class="form-control" id="taxno" value="">
                     <input class="form-control" id="taxno" value="">
                 </div>
                 </div>
+                <label class="col-sm-2 control-label">服务种类:</label>
+                <div class="col-sm-4">
+                    <input class="form-control" id="loginType" value="">
+                </div>
+                <label class="col-sm-2 control-label">登录名称:</label>
+                <div class="col-sm-4">
+                    <input class="form-control" id="userGroupName" value="">
+                </div>
             </div>
             </div>
         </div>
         </div>
     </form>
     </form>

etax-income-server/src/main/webapp/scripts/management-query-taxnumberuser-page.js

@@ -65,6 +65,9 @@ function queryPageList() {
     var areaCode = $("#areaCode").val();
     var areaCode = $("#areaCode").val();
     var taxno = $("#taxno").val();
     var taxno = $("#taxno").val();
     var userStatus = $("#userStatus").val();
     var userStatus = $("#userStatus").val();
+    var overFlag = $("#overFlag").val();
+    var loginType = $("#loginType").val();
+    var userGroupName = $("#userGroupName").val();
     $('#queryTaxUserTable').bootstrapTable({
     $('#queryTaxUserTable').bootstrapTable({
         url: 'jxSample/management/query/taxNumberUser/page', //接口地址
         url: 'jxSample/management/query/taxNumberUser/page', //接口地址
         method: 'post',
         method: 'post',
@@ -77,6 +80,9 @@ function queryPageList() {
                 userCode: userCode,
                 userCode: userCode,
                 areaCode: areaCode,
                 areaCode: areaCode,
                 userStatus: userStatus,
                 userStatus: userStatus,
+                overFlag: overFlag,
+                userGroupName: userGroupName,
+                loginType: loginType,
                 taxno: taxno
                 taxno: taxno
             };
             };
             return param;
             return param;
@@ -115,7 +121,9 @@ function queryPageList() {
             {field: 'zone', title: '地区'},
             {field: 'zone', title: '地区'},
             {field: '', title: '税号状态', formatter: function(value, row, index) {
             {field: '', title: '税号状态', formatter: function(value, row, index) {
                     var type = row['userStatus'];
                     var type = row['userStatus'];
-                    if (type === '2') {
+                    if (type === '1') {
+                        return '待审核';
+                    } else if (type === '2') {
                         return '无权限';
                         return '无权限';
                     } else if (type === '3') {
                     } else if (type === '3') {
                         return '正常';
                         return '正常';
@@ -171,6 +179,25 @@ function queryPageList() {
                     return new Date(autoStopDate).format('yyyy-MM-dd HH:mm:ss');
                     return new Date(autoStopDate).format('yyyy-MM-dd HH:mm:ss');
                 }
                 }
             },
             },
+            {field: '', title: 'token标志', formatter: function(value, row, index) {
+                    var tokenStatus = row['tokenStatus'];
+                    if (tokenStatus === '1') {
+                        return '是';
+                    } else {
+                        return '否';
+                    }
+                }
+            },
+            {field: '', title: 'token时间', formatter: function(value, row, index) {
+                    var tokenResDate = row["tokenResDate"];
+                    if (tokenResDate === undefined) {
+                        return '-';
+                    }
+                    return new Date(tokenResDate).format('yyyy-MM-dd HH:mm:ss');
+                }
+            },
+            {field: 'loginType', title: '服务种类'},
+            {field: 'userGroupName', title: '登录名称'},
             {field: 'curRecordNum', title: '当前记录数量'},
             {field: 'curRecordNum', title: '当前记录数量'},
             {field: '', title: '明细据结束标志', formatter: function(value, row, index) {
             {field: '', title: '明细据结束标志', formatter: function(value, row, index) {
                     var fullOverFlag = row['fullOverFlag'];
                     var fullOverFlag = row['fullOverFlag'];