（咨询记录）日常更新

src/main/java/com/caimei/modules/user/entity/CmClubRemarks.java

@@ -121,7 +121,7 @@ public class CmClubRemarks extends DataEntity<CmClubRemarks> {
      */
     private String oldName;
 
-    private Integer newDeal;//新分配机构状态 0.否，1.是
+    private Integer newDeal;//新分配机构状态 0.全部 1.是 2否，
 
     private String productName; //咨询商品名称
 

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -270,7 +270,7 @@ public class NewCmShopController extends BaseController {
             System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+"1:"+date+"2:"+dateStrings+"3:"+dateString);
         }
         Page<CmDiscernReceipt>discernReceip = newCmShopService.maintenanceList(new Page<CmDiscernReceipt>(request, response, 20),cmDiscernReceipt);
-        model.addAttribute("CmDiscernReceipt", cmDiscernReceipt);
+            model.addAttribute("CmDiscernReceipt", cmDiscernReceipt);
         model.addAttribute("discernReceipt", discernReceip);
         return "modules/user/maintenanceList";
     }

src/main/resources/mappings/modules/user/NewCmShopMapper.xml

@@ -520,3 +520,6 @@
     </select>
 
 </mapper>
+
+
+

src/main/webapp/WEB-INF/views/modules/user/maintenanceList.jsp

@@ -179,19 +179,26 @@
 	<div class="ul-form">
 		<div class="flex-wrap">
 
-				<label>操作时间：</label>
-				<form:input path="startTime" type="text" maxlength="20" class="input-mini Wdate" value="${startTime}"
-							onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-				-
-				<form:input path="endTime" type="text" maxlength="20" class="input-mini Wdate" value="${endTime}"
-							onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+			<label>操作时间：</label>
+			<form:input path="startTime" type="text" maxlength="20" class="input-mini Wdate" value="${startTime}"
+						onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+			-
+			<form:input path="endTime" type="text" maxlength="20" class="input-mini Wdate" value="${endTime}"
+						onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
 
 			&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+<<<<<<< HEAD
 			&nbsp;&nbsp;<input class="btn btn-primary" onclick="offocea(${CmDiscernReceipt.receiptID},${CmDiscernReceipt.shopID},'${CmDiscernReceipt.shopName}','${CmDiscernReceipt.linkMan}')" type="button" value="免除上架费"/>
 			</div>
 <%--		shopId, receStatct, receiptDate--%>
 		<strong>供应商:${CmDiscernReceipt.shopName}</strong>
+=======
+			&nbsp;&nbsp;<input class="btn btn-primary" onclick="offocea('${CmDiscernReceipt.receiptID}','${CmDiscernReceipt.shopID}','${CmDiscernReceipt.shopName}','${CmDiscernReceipt.linkMan}')" type="button" value="免除上架费"/>
+>>>>>>> origin/developer
 		</div>
+			<%--		shopId, receStatct, receiptDate--%>
+		<strong>供应商:${CmDiscernReceipt.shopName}</strong>
+	</div>
 	</div>
 </form:form>
 <sys:message content="${message}"/>

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

@@ -286,8 +286,8 @@
             <label>新分配机构：</label>
             <form:select path="newDeal" class="input-medium">
                 <form:option value="" label="请选择"/>
-                <form:option value="0">否</form:option>
                 <form:option value="1">是</form:option>
+                <form:option value="2">否</form:option>
             </form:select>
         </div>
         <div class="item">
@@ -357,21 +357,21 @@
             </td>
             <td>
                 <c:if test="${empty list.auditText}">
-                <c:if test="${list.status eq 1}"><span style="color: #00aa00">已审核 </span></c:if>
-                <c:if test="${list.status eq 2}"><span style="color: red">待审核</span></c:if>
+                <c:if test="${list.status eq 1}"><span style="color: red">待审核</span></c:if>
+                <c:if test="${list.status eq 2}"><span style="color: #00aa00">已审核 </span></c:if>
                 <c:if test="${list.status eq 3}">审核未通过</c:if>
                 </c:if>
                 <c:if test="${not empty list.auditText}">
-                    <c:if test="${list.status eq 1}"><a href="javascript:void(0)" onclick="audit('${list.auditText}')" style="color: #00aa00">已审核</a></c:if>
-                    <c:if test="${list.status eq 2}"><a href="javascript:void(0)" onclick="audit(${list.auditText})" style="color: red">待审核</a></c:if>
-                    <c:if test="${list.status eq 3}"><a href="javascript:void(0)" onclick="audit(${list.auditText})">审核未通过</a></c:if>
+                    <c:if test="${list.status eq 1}"><a href="javascript:void(0)" onclick="audit('${list.auditText}')" style="color: red;text-decoration: underline;">待审核</a></c:if>
+                    <c:if test="${list.status eq 2}"><a href="javascript:void(0)" onclick="audit('${list.auditText}')" style="color: #00aa00;text-decoration: underline;">已审核</a></c:if>
+                    <c:if test="${list.status eq 3}"><a href="javascript:void(0)" onclick="audit('${list.auditText}')" style="text-decoration: underline;">审核未通过</a></c:if>
                 </c:if>
 
             </td>
             <td>${list.auditName} </td>
             <td>${list.auditTime}</td>
             <td>
-                <a href="javascript:void(0)" onclick="auditShop(${list.reportId})">审核</a>
+                <c:if test="${list.status eq 1}"> <a href="javascript:void(0)" onclick="auditShop(${list.reportId})">审核</a></c:if>
                 <a href="${ctx}/new/user/agency/cmRegistReportList?reportID=${list.reportId}">查看</a>
                 <a href="javascript:void(0)" onclick="deleteReport(${list.reportId})">删除</a>
             </td>
@@ -394,7 +394,7 @@
             + "   <div class='bd-row'>"
             + "       <span><font color='red'>*</font>审核：</span>"
             + "       <select name='auditStatus' id='auditStatus'>"
-            + "           <option value='1'>审核通过</option>"
+            + "           <option value='2'>审核通过</option>"
             + "           <option value='3'>审核未通过</option>"
             + "       <select/>"
             + "   </div>"
@@ -402,7 +402,7 @@
             + "       <div class='bd-row'>"
             + "           <span></span>"
             + "           <div class='auditNote'>"
-            + "               <textarea name='auditNote' placeholder='不超过200个字'></textarea>"
+            + "               <textarea name='auditNote' maxlength='200' placeholder='不超过200个字'></textarea>"
             + "           </div>"
             + "       </div>"
             + "   </div>"
@@ -422,7 +422,7 @@
                 console.log(data.success)
                 console.log(true == data.success)
                 if (true == data.success) {
-                    $.jBox.confirm(htmls, "提示") ;
+                    $.jBox.confirm("该报备未关联任何咨询记录，无需审核。", "提示") ;
 
                 }else {
                     location.reload()

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

@@ -102,9 +102,9 @@
         <div class="item">
             <label>新分配机构：</label>
             <form:select path="newDeal" class="input-medium">
-                <form:option value="" label="请选择"/>
-                <form:option value="0">否</form:option>
+                <form:option value="0" label="请选择"/>
                 <form:option value="1">是</form:option>
+                <form:option value="2">否</form:option>
             </form:select>
         </div>
         <div class="item">

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

@@ -130,8 +130,8 @@
             <label>新分配机构：</label>
             <form:select path="newDeal" class="input-medium">
                 <form:option value="" label="请选择"/>
-                <form:option value="0">否</form:option>
                 <form:option value="1">是</form:option>
+                <form:option value="2">否</form:option>
             </form:select>
         </div>
         <div class="item">

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

@@ -167,8 +167,8 @@
             <label>新分配机构：</label>
             <form:select path="newDeal" class="input-medium">
                 <form:option value="" label="请选择"/>
-                <form:option value="0">否</form:option>
                 <form:option value="1">是</form:option>
+                <form:option value="2">否</form:option>
             </form:select>
         </div>
         <div class="item">
@@ -244,8 +244,8 @@
                              height="50"></td>
                     <td>${clubRemarks.proName}</td>
                     <td>${clubRemarks.reportText}</td>
-                    <td><c:if test="${clubRemarks.reportStatus eq 1}">已审核</c:if>
-                        <c:if test="${clubRemarks.reportStatus eq 2}">待审核</c:if>
+                    <td><c:if test="${clubRemarks.reportStatus eq 1}">待审核</c:if>
+                        <c:if test="${clubRemarks.reportStatus eq 2}">已审核</c:if>
                         <c:if test="${clubRemarks.reportStatus eq 3}">审核未通过</c:if>
                     </td>
                     <td>${clubRemarks.auditName}</td>
@@ -427,8 +427,8 @@
                                      height="50"></td>
                             <td>${visitRemarks.proName}</td>
                             <td>${visitRemarks.reportText}</td>
-                            <td><c:if test="${visitRemarks.reportStatus eq 1}">已审核</c:if>
-                                <c:if test="${visitRemarks.reportStatus eq 2}">待审核</c:if>
+                            <td><c:if test="${visitRemarks.reportStatus eq 1}">待审核</c:if>
+                                <c:if test="${visitRemarks.reportStatus eq 2}">已审核</c:if>
                                 <c:if test="${visitRemarks.reportStatus eq 3}">审核未通过</c:if>
                             </td>
                             <td>${visitRemarks.auditName}</td>