Merge remote-tracking branch 'origin/developer' into developer

src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp

@@ -5,47 +5,262 @@
     <title>机构基本资料列表</title>
     <meta name="decorator" content="default"/>
     <style type="text/css">
-        .reg-row .new-tag.active{border:1px solid #de5801}
-        .reg-row{margin-bottom:20px}
-        .reg-row .reg-label{display:inline-block;width:120px;text-align:right;font-size:13px}
-        .the-oradio{display:inline-block;vertical-align:top}
-        .the-oradio div{width:85px;display:inline-block;font-size:12px;color:#666}
-        .the-oradio div input[type="radio"]{width:17px;height:17px;margin-right:5px;vertical-align:text-top}
-        .med-option{display:block;margin:10px 0 0 125px}
-        .reg-row .business-license{position:relative;display:inline-block;width:166px;height:123px;border-radius:6px;margin:18px 0 0 125px}
-        #medicalPracticeLicenseImgPreview{display:inline-block}
-        .qualification{margin-top:20px}
-        .reg-row .tags-area{display:inline-block;width:420px}
-        .reg-row .new-tag{display:inline-block;width:70px;border:1px solid #e5e5e5;border-radius:6px;padding:5px;margin-right:14px;margin-bottom:14px;text-align:center;font-size:10px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;cursor:pointer}
-        .reg-row .tags-operate{margin-left:125px}
-        .reg-row .reg-input{width:336px;height:32px;padding:0 8px;margin-right:20px;border:1px solid #dcdcdc;border-radius:6px}
-        .reg-row .tags-operate .tag-input{width:159px;margin-right:13px;display:none;vertical-align:top}
-        .reg-row .tags-operate .tag-add{line-height:20px;vertical-align:middle;margin-bottom:0;vertical-align:top}
-        .reg-row .tags-area{vertical-align:top}
-        .tag-add{display:none}
-        .table th{text-align:center}
-        .table td{text-align:center}
-        .modal{width:700px;margin-left:-350px}
-        #myModal{display:none}
-        .modal-body{max-height:300px !important}
-        .modal.fade.in{top:0 !important}
-        #btnSubmit{margin-left:20px}
-        .flex-wrap .item{margin-right:20px}
-        #auditBox{padding:20px;line-height:30px}
-        #auditBox .bd-row{display:flex;margin-bottom:15px}
-        #auditBox .bd-row > span{display:inline-block;width:60px}
-        #auditBox .auditCheckBox{width:250px}
-        #auditBox .auditCheckBox label{margin:0 5px 5px 0}
-        #auditBox .auditCheckBox input{display:none}
-        #auditBox .auditCheckBox input + span{display:inline-block;line-height:24px;padding:0 12px;border:1px solid #666;border-radius:5px}
-        #auditBox .auditCheckBox input:checked + span{background-color:#E6633A}
-        #alertModal{width:300px;height:200px;border:1px solid #ebebeb;border-radius:10px;position:fixed;top:0;bottom:0;left:0;right:0;margin:auto;background:#FFFFFF;display:none}
-        #alertModal .title{height:50px;line-height:50px;font-size:14px;font-weight:bold;text-align:center;position:relative;border-bottom:1px solid #EBEBEB}
-        #alertModal .close{width:50px;height:50px;display:block;position:absolute;right:0;top:0;line-height:50px;color:#000;font-weight:bold;text-align:center;font-style:normal;font-size:18px}
-        #alertModal .alert-content{width:260px;height:60px;padding:20px}
-        #alertModal .alertModal-btn{width:260px;height:49px;padding:0 20px;border-top:1px solid #EBEBEB}
-        #alertModal .alertModal-btn button{float:right;margin:5px}
-        .acticer_span{display: inline-block;width: 14px;height: 14px;border-radius: 50%;box-sizing: border-box;border: 1px solid #999999;text-align: center;color: #333333;font-size: 12px;line-height: 14px;float: none;margin-left: 3px;}
+        .reg-row .new-tag.active {
+            border: 1px solid #de5801
+        }
+
+        .reg-row {
+            margin-bottom: 20px
+        }
+
+        .reg-row .reg-label {
+            display: inline-block;
+            width: 120px;
+            text-align: right;
+            font-size: 13px
+        }
+
+        .the-oradio {
+            display: inline-block;
+            vertical-align: top
+        }
+
+        .the-oradio div {
+            width: 85px;
+            display: inline-block;
+            font-size: 12px;
+            color: #666
+        }
+
+        .the-oradio div input[type="radio"] {
+            width: 17px;
+            height: 17px;
+            margin-right: 5px;
+            vertical-align: text-top
+        }
+
+        .med-option {
+            display: block;
+            margin: 10px 0 0 125px
+        }
+
+        .reg-row .business-license {
+            position: relative;
+            display: inline-block;
+            width: 166px;
+            height: 123px;
+            border-radius: 6px;
+            margin: 18px 0 0 125px
+        }
+
+        #medicalPracticeLicenseImgPreview {
+            display: inline-block
+        }
+
+        .qualification {
+            margin-top: 20px
+        }
+
+        .reg-row .tags-area {
+            display: inline-block;
+            width: 420px
+        }
+
+        .reg-row .new-tag {
+            display: inline-block;
+            width: 70px;
+            border: 1px solid #e5e5e5;
+            border-radius: 6px;
+            padding: 5px;
+            margin-right: 14px;
+            margin-bottom: 14px;
+            text-align: center;
+            font-size: 10px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            cursor: pointer
+        }
+
+        .reg-row .tags-operate {
+            margin-left: 125px
+        }
+
+        .reg-row .reg-input {
+            width: 336px;
+            height: 32px;
+            padding: 0 8px;
+            margin-right: 20px;
+            border: 1px solid #dcdcdc;
+            border-radius: 6px
+        }
+
+        .reg-row .tags-operate .tag-input {
+            width: 159px;
+            margin-right: 13px;
+            display: none;
+            vertical-align: top
+        }
+
+        .reg-row .tags-operate .tag-add {
+            line-height: 20px;
+            vertical-align: middle;
+            margin-bottom: 0;
+            vertical-align: top
+        }
+
+        .reg-row .tags-area {
+            vertical-align: top
+        }
+
+        .tag-add {
+            display: none
+        }
+
+        .table th {
+            text-align: center
+        }
+
+        .table td {
+            text-align: center
+        }
+
+        .modal {
+            width: 700px;
+            margin-left: -350px
+        }
+
+        #myModal {
+            display: none
+        }
+
+        .modal-body {
+            max-height: 300px !important
+        }
+
+        .modal.fade.in {
+            top: 0 !important
+        }
+
+        #btnSubmit {
+            margin-left: 20px
+        }
+
+        .flex-wrap .item {
+            margin-right: 20px
+        }
+
+        #auditBox {
+            padding: 20px;
+            line-height: 30px
+        }
+
+        #auditBox .bd-row {
+            display: flex;
+            margin-bottom: 15px
+        }
+
+        #auditBox .bd-row > span {
+            display: inline-block;
+            width: 60px
+        }
+
+        #auditBox .auditCheckBox {
+            width: 250px
+        }
+
+        #auditBox .auditCheckBox label {
+            margin: 0 5px 5px 0
+        }
+
+        #auditBox .auditCheckBox input {
+            display: none
+        }
+
+        #auditBox .auditCheckBox input + span {
+            display: inline-block;
+            line-height: 24px;
+            padding: 0 12px;
+            border: 1px solid #666;
+            border-radius: 5px
+        }
+
+        #auditBox .auditCheckBox input:checked + span {
+            background-color: #E6633A
+        }
+
+        #alertModal {
+            width: 300px;
+            height: 200px;
+            border: 1px solid #ebebeb;
+            border-radius: 10px;
+            position: fixed;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            margin: auto;
+            background: #FFFFFF;
+            display: none
+        }
+
+        #alertModal .title {
+            height: 50px;
+            line-height: 50px;
+            font-size: 14px;
+            font-weight: bold;
+            text-align: center;
+            position: relative;
+            border-bottom: 1px solid #EBEBEB
+        }
+
+        #alertModal .close {
+            width: 50px;
+            height: 50px;
+            display: block;
+            position: absolute;
+            right: 0;
+            top: 0;
+            line-height: 50px;
+            color: #000;
+            font-weight: bold;
+            text-align: center;
+            font-style: normal;
+            font-size: 18px
+        }
+
+        #alertModal .alert-content {
+            width: 260px;
+            height: 60px;
+            padding: 20px
+        }
+
+        #alertModal .alertModal-btn {
+            width: 260px;
+            height: 49px;
+            padding: 0 20px;
+            border-top: 1px solid #EBEBEB
+        }
+
+        #alertModal .alertModal-btn button {
+            float: right;
+            margin: 5px
+        }
+
+        .acticer_span {
+            display: inline-block;
+            width: 14px;
+            height: 14px;
+            border-radius: 50%;
+            box-sizing: border-box;
+            border: 1px solid #999999;
+            text-align: center;
+            color: #333333;
+            font-size: 12px;
+            line-height: 14px;
+            float: none;
+            margin-left: 3px;
+        }
     </style>
 </head>
 <body>
@@ -66,11 +281,12 @@
     <div class="flex-wrap">
         <div class="item">
             <label>机构ID：</label>
-            <form:input path="clubID" type="text" onkeyup="this.value=value.replace(/[^\d]/g,'')" htmlEscape="false" maxlength="50" class="input-medium"/>
+            <form:input path="clubID" type="text" onkeyup="this.value=value.replace(/[^\d]/g,'')" htmlEscape="false"
+                        maxlength="50" class="input-medium"/>
         </div>
         <div class="item">
             <label>机构名称：</label>
-            <form:input path="searchName"  htmlEscape="false" maxlength="50" class="input-medium"/>
+            <form:input path="searchName" htmlEscape="false" maxlength="50" class="input-medium"/>
         </div>
         <div class="item">
             <label>联系人：</label>
@@ -148,7 +364,8 @@
         </div>
         <div class="item">
             <label>分配时间：</label>
-            <form:input path="allocationStartTime" type="text" maxlength="20" class="input-mini Wdate" value="${startTime}"
+            <form:input path="allocationStartTime" type="text" maxlength="20" class="input-mini Wdate"
+                        value="${startTime}"
                         onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
             -
             <form:input path="allocationEndTime" type="text" maxlength="20" class="input-mini Wdate" value="${endTime}"
@@ -189,17 +406,17 @@
         <tr>
             <td>${newCmClubList.clubID}</td>
             <td>
-<%--                <c:if test="${newCmClubList.userIdentity eq 2}">--%>
+                    <%--                <c:if test="${newCmClubList.userIdentity eq 2}">--%>
                 <a href="${ctx}/new/user/agency/clubPortrait?clubID=${newCmClubList.clubID}&clubName=${newCmClubList.name}&dateType=0&type=4">${newCmClubList.name}</a>
-<%--                </c:if>--%>
-<%--                <c:if test="${newCmClubList.userIdentity eq 4}">--%>
-<%--                    <c:if test="${newCmClubList.name ne newCmClubList.userName}">--%>
-<%--                        ${newCmClubList.name}--%>
-<%--                    </c:if>--%>
-<%--                    <c:if test="${newCmClubList.name eq newCmClubList.userName}">--%>
-<%--                        ----%>
-<%--                    </c:if>--%>
-<%--                </c:if>--%>
+                    <%--                </c:if>--%>
+                    <%--                <c:if test="${newCmClubList.userIdentity eq 4}">--%>
+                    <%--                    <c:if test="${newCmClubList.name ne newCmClubList.userName}">--%>
+                    <%--                        ${newCmClubList.name}--%>
+                    <%--                    </c:if>--%>
+                    <%--                    <c:if test="${newCmClubList.name eq newCmClubList.userName}">--%>
+                    <%--                        ----%>
+                    <%--                    </c:if>--%>
+                    <%--                </c:if>--%>
             </td>
             <td>
                 <c:if test="${newCmClubList.userIdentity eq 2}">
@@ -320,12 +537,12 @@
             </td>
             <td>
                 <c:if test="${newCmClubList.lastModify ne null}">
-<%--                    ${newCmClubList.lastModify}--%>
+                    <%--                    ${newCmClubList.lastModify}--%>
                     <fmt:formatDate value="${newCmClubList.lastModify}" pattern="yyyy-MM-dd HH:mm:ss"></fmt:formatDate>
                 </c:if>
                 <c:if test="${newCmClubList.lastModify eq null and newCmClubList.addTime ne null}">
                     ${newCmClubList.addTime}
-<%--                    <fmt:formatDate value="${newCmClubList.addTime}" pattern="yyyy-MM-dd HH:mm:ss"></fmt:formatDate>--%>
+                    <%--                    <fmt:formatDate value="${newCmClubList.addTime}" pattern="yyyy-MM-dd HH:mm:ss"></fmt:formatDate>--%>
                 </c:if>
                 <c:if test="${newCmClubList.lastModify eq null and newCmClubList.addTime eq null}">
                     ---
@@ -352,23 +569,27 @@
                 <a href="${ctx}/new/user/agency/spLogs?clubID=${newCmClubList.clubID}">协销更换记录</a>
                 <c:if test="${newCmClubList.status eq 1 || newCmClubList.status eq 92}">
                     <shiro:hasPermission name="club:cmAgency:audit">
-                        <a href="javascript:void(0);" onclick="toAudit(${newCmClubList.clubID},'${newCmClubList.userName}','${newCmClubList.bindMobile}')">审核</a>
+                        <a href="javascript:void(0);"
+                           onclick="toAudit(${newCmClubList.clubID},'${newCmClubList.userName}','${newCmClubList.bindMobile}')">审核</a>
                     </shiro:hasPermission>
                 </c:if>
                 <shiro:hasPermission name="club:cmAgency:category">
-                    <a href="javascript:void(0);" onclick="showClubAlert(${newCmClubList.clubID},${newCmClubList.userIdentity})">设置机构级别</a>
+                    <a href="javascript:void(0);"
+                       onclick="showClubAlert(${newCmClubList.clubID},${newCmClubList.userIdentity})">设置机构级别</a>
                 </shiro:hasPermission>
                 <c:if test="${newCmClubList.status eq 92 || newCmClubList.status eq 93}">
                     <shiro:hasPermission name="club:cmAgency:conform">
                         <a href="${ctx}/user/clubTemporary/confirmRecord?confirmUserId=${newCmClubList.userID}">确认记录</a>
                     </shiro:hasPermission>
                 </c:if>
-                <%--<shiro:hasPermission name="club:cmAgency:remarks">
-                    <a style="visibility: hidden" href="${ctx}/new/user/agency/remarks?clubId=${newCmClubList.clubID}">咨询记录</a>
-                </shiro:hasPermission>--%>
-                <%--<a href="${ctx}/new/user/agency/recordLinkage?clubId=${newCmClubList.clubID}">生成行为记录链接</a>--%>
-                <a href="javascript: void(0);" onclick="goNewBack(1, '${newCmClubList.addTime}', ${newCmClubList.userIdentity}, '${newCmClubList.name}', '${newCmClubList.linkMan}')">访问记录</a>
-                <a href="javascript: void(0);" onclick="goNewBack(2, '${newCmClubList.addTime}', ${newCmClubList.userIdentity}, '${newCmClubList.name}', '${newCmClubList.linkMan}')">咨询记录</a>
+                    <%--<shiro:hasPermission name="club:cmAgency:remarks">
+                        <a style="visibility: hidden" href="${ctx}/new/user/agency/remarks?clubId=${newCmClubList.clubID}">咨询记录</a>
+                    </shiro:hasPermission>--%>
+                    <%--<a href="${ctx}/new/user/agency/recordLinkage?clubId=${newCmClubList.clubID}">生成行为记录链接</a>--%>
+                <a href="javascript: void(0);"
+                   onclick="goNewBack(1, '${newCmClubList.addTime}', ${newCmClubList.userIdentity}, '${newCmClubList.name}', '${newCmClubList.linkMan}','${newCmClubList.clubID}')">访问记录</a>
+                <a href="javascript: void(0);"
+                   onclick="goNewBack(2, '${newCmClubList.addTime}', ${newCmClubList.userIdentity}, '${newCmClubList.name}', '${newCmClubList.linkMan}','${newCmClubList.clubID}')">咨询记录</a>
             </td>
         </tr>
     </c:forEach>
@@ -843,12 +1064,12 @@
         $.jBox(html, {title: "确定修改密码？", submit: submit});
     }
 
-    function toAudit(id,userName,bindMobile) {
-        if(null == bindMobile || "" == bindMobile){
+    function toAudit(id, userName, bindMobile) {
+        if (null == bindMobile || "" == bindMobile) {
             alertx("手机号尚未填写，请先编辑手机号再进行审核");
             return;
         }
-        if(null == userName || "" == userName){
+        if (null == userName || "" == userName) {
             alertx("联系人尚未尚未填写，请先编辑联系人再进行审核");
             return;
         }
@@ -909,26 +1130,28 @@
         };
         $.jBox(html, {title: "审核", submit: submit});
     }
+
     function activeStageMessage(type) {// 客户价值提示语
-        var content = '活跃状态是根据机构半年内是否产生活跃行为' +'<br/>'+
-            '来定义的，活跃行为包括以下3个部分（符合其一即可），数据每日更新'+'<br/>'+
-        '1、该机构登录了账号'+'<br/>'+
-        '2、该机构有订单（不论订单状态）'+'<br/>'+
-        '3、该机构有咨询记录';
-
-        var content2 = '客户价值是根据机构一年内的订单数量、订单金额和访问频率3个方面来定义的，数据每日更新。'+'<br/>'+
-            '1、若机构一年内订单数大于等于5，则为高价值客户'+'<br/>'+
-            '2、若机构一年内订单数小于5，但总订单金额大于等于5万，则为一般价值客户'+'<br/>'+
-            '3、若机构一年内订单数小于5，总订单金额小于5万，但访问频率大于等于一月一次，则为潜在价值客户'+'<br/>'+
+        var content = '活跃状态是根据机构半年内是否产生活跃行为' + '<br/>' +
+            '来定义的，活跃行为包括以下3个部分（符合其一即可），数据每日更新' + '<br/>' +
+            '1、该机构登录了账号' + '<br/>' +
+            '2、该机构有订单（不论订单状态）' + '<br/>' +
+            '3、该机构有咨询记录';
+
+        var content2 = '客户价值是根据机构一年内的订单数量、订单金额和访问频率3个方面来定义的，数据每日更新。' + '<br/>' +
+            '1、若机构一年内订单数大于等于5，则为高价值客户' + '<br/>' +
+            '2、若机构一年内订单数小于5，但总订单金额大于等于5万，则为一般价值客户' + '<br/>' +
+            '3、若机构一年内订单数小于5，总订单金额小于5万，但访问频率大于等于一月一次，则为潜在价值客户' + '<br/>' +
             '4、若机构一年内订单数小于5，总订单金额小于5万，访问频率小于一月一次，则为低价值客户';
 
         var typeMap = {
-                1:content,
-                2:content2
-            }
-        $.jBox.alert(typeMap[type],'提示',{ width: 450 })
+            1: content,
+            2: content2
+        }
+        $.jBox.alert(typeMap[type], '提示', {width: 450})
     }
-    function goNewBack (type, addTime, userIdentity, name, linkMan) {
+
+    function goNewBack(type, addTime, userIdentity, name, linkMan, clubId) {
         // 跳转到新后台查询数据 type: 1 访问记录 2：咨询记录
         const date = getZeroTimeToday();
         console.log(date)
@@ -943,12 +1166,12 @@
                 // 过往数据
                 if (userIdentity === 4) {
                     $.get("${ctx}/jump/link", function (data) {
-                        link = "https://manager.caimei365.com/#/user/record-list?type=second&corporateName="+linkMan+"&token=" + data;
+                        link = "https://manager.caimei365.com/#/user/record-list?type=second&corporateName=" + linkMan + "&clubId=" + clubId + "&token=" + data;
                         window.open(link, "_blank");
                     });
                 } else {
                     $.get("${ctx}/jump/link", function (data) {
-                        link = "https://manager.caimei365.com/#/user/record-list?type=second&corporateName="+name+"&token=" + data;
+                        link = "https://manager.caimei365.com/#/user/record-list?type=second&corporateName=" + name + "&clubId=" + clubId + "&token=" + data;
                         window.open(link, "_blank");
                     });
                 }
@@ -956,12 +1179,12 @@
                 // 今日数据
                 if (userIdentity === 4) {
                     $.get("${ctx}/jump/link", function (data) {
-                        link = "https://manager.caimei365.com/#/user/record-list?type=first&corporateName="+linkMan+"&token=" + data;
+                        link = "https://manager.caimei365.com/#/user/record-list?type=first&corporateName=" + linkMan + "&clubId=" + clubId + "&token=" + data;
                         window.open(link, "_blank");
                     });
                 } else {
                     $.get("${ctx}/jump/link", function (data) {
-                        link = "https://manager.caimei365.com/#/user/record-list?type=first&corporateName="+name+"&token=" + data;
+                        link = "https://manager.caimei365.com/#/user/record-list?type=first&corporateName=" + name + "&clubId=" + clubId + "&token=" + data;
                         window.open(link, "_blank");
                     });
                 }
@@ -971,22 +1194,24 @@
             // 点击咨询记录，跳转到新后台【用户咨询记录汇总】页面，页面展示以机构名称筛选后的结果
             if (userIdentity === 4) {
                 $.get("${ctx}/jump/link", function (data) {
-                    link = "https://manager.caimei365.com/#/user/consult/list?clubName="+linkMan+"&token=" + data;
+                    link = "https://manager.caimei365.com/#/user/consult/list?clubName=" + linkMan + "&clubId=" + clubId + "&token=" + data;
                     window.open(link, "_blank");
                 });
             } else {
                 $.get("${ctx}/jump/link", function (data) {
-                    link = "https://manager.caimei365.com/#/user/consult/list?clubName="+name+"&token=" + data;
+                    link = "https://manager.caimei365.com/#/user/consult/list?clubName=" + name + "&clubId=" + clubId + "&token=" + data;
                     window.open(link, "_blank");
                 });
             }
 
         }
     }
+
     function stringToDate(dateString) {
         const parts = dateString.split(/[- :]/);
         return new Date(parts[0], parts[1] - 1, parts[2], parts[3], parts[4], parts[5]);
     }
+
     // 当天0点0分时间
     function getZeroTimeToday() {
         const today = new Date();