Jelajahi Sumber

上架费bugfix

zhijiezhao 2 tahun lalu
induk
melakukan
4344a32ea0

+ 1 - 1
src/main/resources/mappings/modules/user/NewCmShopMapper.xml

@@ -499,7 +499,7 @@
 
     <select id="cmrectiptlist" resultType="com.caimei.modules.order.entity.CmDiscernReceipt">
         SELECT r.receiptID as receiptID,r.dateStrings  as expirationDate,
-               r.validityDate as validityDate
+               r.validityDate as validityDate,c.receStatct AS receStatct
         FROM cm_receipt r
                  LEFT JOIN cm_discern_receipt c ON c.id = r.receiptID
                  LEFT JOIN shop s ON s.shopID = c.shopID

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

@@ -1,271 +1,307 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-	<title>上架费记录</title>
-	<meta name="decorator" content="default"/>
-	<style type="text/css">
-		.table th{text-align: center;}
-		.table td{text-align: center;}
-	</style>
-	<style>
-		.modal{
-			width: 900px;
-			margin-left: -450px;
-		}
-		#medicalPracticeLicenseImg1Preview,#medicalPracticeLicenseImg2Preview,#medicalPracticeLicenseImg3Preview{
-			display: inline-block;
-		}
-
-		.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;
-			/* margin-right: 25px; */
-		}
-		.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;
-		}
-		.smed-option{
-			margin: 20px 0 20px 123px;
-			display: block;
-		}
-		.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;
-			/*height: 26px;*/
-			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 {
-			/*height: 32px;*/
-			line-height: 20px;
-			vertical-align: middle;
-			margin-bottom: 0;
-			vertical-align: top;
-		}
-		.reg-row .tags-area{
-			vertical-align: top;
-		}
-		.tag-add {
-			display: none;
-		}
-		#myModal2{display: none;}
-		.modal-body{
-			max-height: 300px !important;
-		}
-		.modal.fade.in{
-			top: 0 !important;
-		}
-		#auditBox .auditCheckBox {
-			width: 250px;
-			margin: 0 auto;
-		}
-
-		#auditBox .auditCheckBox label {
-			margin: 0 5px 5px 0
-		}
-
-		#auditBox .auditCheckBox input {
-			display: none;
-		}
-
-		#auditBox .auditCheckBox input + span {
-			display: inline-block;
-			line-height: 24px;
-			padding: 1px 6px;
-			border: 1px solid #666;
-			border-radius: 5px;
-		}
-		.auditNote{
-			width: 250px;
-			height: 50px;
-			margin: 0 auto;
-		}
-		#auditBox .auditCheckBox input:checked + span {
-			background-color: #E6633A
-		}
-	</style>
-	<script type="text/javascript">
-		$(document).ready(function() {
-
-		});
-		function page(n,s){
-			$("#pageNo").val(n);
-			$("#pageSize").val(s);
-			$("#searchForm").submit();
-			return false;
-		}
-	</script>
+    <title>上架费记录</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        .table th {
+            text-align: center;
+        }
+
+        .table td {
+            text-align: center;
+        }
+    </style>
+    <style>
+        .modal {
+            width: 900px;
+            margin-left: -450px;
+        }
+
+        #medicalPracticeLicenseImg1Preview, #medicalPracticeLicenseImg2Preview, #medicalPracticeLicenseImg3Preview {
+            display: inline-block;
+        }
+
+        .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;
+            /* margin-right: 25px; */
+        }
+
+        .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;
+        }
+
+        .smed-option {
+            margin: 20px 0 20px 123px;
+            display: block;
+        }
+
+        .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;
+            /*height: 26px;*/
+            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 {
+            /*height: 32px;*/
+            line-height: 20px;
+            vertical-align: middle;
+            margin-bottom: 0;
+            vertical-align: top;
+        }
+
+        .reg-row .tags-area {
+            vertical-align: top;
+        }
+
+        .tag-add {
+            display: none;
+        }
+
+        #myModal2 {
+            display: none;
+        }
+
+        .modal-body {
+            max-height: 300px !important;
+        }
+
+        .modal.fade.in {
+            top: 0 !important;
+        }
+
+        #auditBox .auditCheckBox {
+            width: 250px;
+            margin: 0 auto;
+        }
+
+        #auditBox .auditCheckBox label {
+            margin: 0 5px 5px 0
+        }
+
+        #auditBox .auditCheckBox input {
+            display: none;
+        }
+
+        #auditBox .auditCheckBox input + span {
+            display: inline-block;
+            line-height: 24px;
+            padding: 1px 6px;
+            border: 1px solid #666;
+            border-radius: 5px;
+        }
+
+        .auditNote {
+            width: 250px;
+            height: 50px;
+            margin: 0 auto;
+        }
+
+        #auditBox .auditCheckBox input:checked + span {
+            background-color: #E6633A
+        }
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function () {
+
+        });
+
+        function page(n, s) {
+            $("#pageNo").val(n);
+            $("#pageSize").val(s);
+            $("#searchForm").submit();
+            return false;
+        }
+    </script>
 
 </head>
 <body>
 <ul class="nav nav-tabs">
-	<li><a href="${ctx}/user/newCmShop/">供应商信息列表</a></li>
-	<li class="active"><a href="${ctx}/user/newCmShop/maintenanceList?shopID=${cmDiscernReceipt.shopID}&shopName=${cmDiscernReceipt.shopName}">缴纳费用记录</a></li>
-	<%--		<shiro:hasPermission name="user:newCmShop:edit"><li><a href="${ctx}/user/newCmShop/form">供应商信息添加</a></li></shiro:hasPermission>--%>
+    <li><a href="${ctx}/user/newCmShop/">供应商信息列表</a></li>
+    <li class="active"><a
+            href="${ctx}/user/newCmShop/maintenanceList?shopID=${cmDiscernReceipt.shopID}&shopName=${cmDiscernReceipt.shopName}">缴纳费用记录</a>
+    </li>
+    <%--		<shiro:hasPermission name="user:newCmShop:edit"><li><a href="${ctx}/user/newCmShop/form">供应商信息添加</a></li></shiro:hasPermission>--%>
 </ul>
-<form:form id="searchForm" modelAttribute="newCmShop" action="${ctx}/user/newCmShop/maintenanceList?shopID=${cmDiscernReceipt.shopID}&shopName=${cmDiscernReceipt.shopName}" method="post" class="breadcrumb form-search">
-	<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-	<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-	<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});"/>
-
-			&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 id="searchForm" modelAttribute="newCmShop"
+           action="${ctx}/user/newCmShop/maintenanceList?shopID=${cmDiscernReceipt.shopID}&shopName=${cmDiscernReceipt.shopName}"
+           method="post" class="breadcrumb form-search">
+    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+    <div class="ul-form">
+        &nbsp;&nbsp;&nbsp;<strong>供应商:${CmDiscernReceipt.shopName}</strong>
+        <br/>
+        <br/>
+        <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});"/>
+
+            &nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+            &nbsp;&nbsp;<input class="btn btn-primary"
+                               onclick="offocea(${CmDiscernReceipt.receiptID},${CmDiscernReceipt.shopID},'${CmDiscernReceipt.shopName}','${CmDiscernReceipt.linkMan}')"
+                               type="button" value="免除上架费"/>
+        </div>
+    </div>
+    </div>
+    </div>
 </form:form>
 <sys:message content="${message}"/>
 <table id="contentTable" class="table table-striped table-bordered table-condensed">
-	<thead>
-	<tr>
-		<th>序号</th>
-		<th>金额</th>
-		<th>缴纳时间</th>
-		<th>生效时间</th>
-		<th>到期时间</th>
-		<th>操作</th>
-
-	</tr>
-	</thead>
-	<tbody>
-	<c:forEach items="${discernReceipt.list}" var="discernReceipt" varStatus="in">
-		<td>${in.index+1}</td>
-		<c:if test="${discernReceipt.receStatct eq 2}">
-			<td>免除上架费</td>
-			<td>${discernReceipt.receiptDate}</td>
-			<td>${discernReceipt.receiptDate}</td>
-			<td>--</td>
-			<td>
-				<a href="javascript:void(0);" onclick="offoceb(${discernReceipt.receiptID},'${CmDiscernReceipt.shopName}','${CmDiscernReceipt.linkMan}','${CmDiscernReceipt.shopID}')">取消</a>
-			</td>
-		</c:if>
-		<c:if test="${discernReceipt.receStatct eq 1}">
-			<td>免除上架费<span style="color: red">(已取消)</span></td>
-			<td>${discernReceipt.receiptDate}</td>
-			<td>${discernReceipt.receiptDate}</td>
-			<td>--</td>
-			<td>
-				--
-			</td>
-		</c:if>
-		<c:if test="${empty discernReceipt.receStatct || discernReceipt.receStatct eq 0}">
-			<td>${discernReceipt.receiptAmount}</td>
-			<td>${discernReceipt.receiptDate}</td>
-			<td>${discernReceipt.validityDate}</td>
-			<td>${discernReceipt.expirationDate}</td>
-			<td>
-				--
-			</td>
-		</c:if>
-
-		</tr>
-	</c:forEach>
-	</tbody>
+    <thead>
+    <tr>
+        <th>序号</th>
+        <th>金额</th>
+        <th>缴纳时间</th>
+        <th>生效时间</th>
+        <th>到期时间</th>
+        <th>操作</th>
+
+    </tr>
+    </thead>
+    <tbody>
+    <c:forEach items="${discernReceipt.list}" var="discernReceipt" varStatus="in">
+        <td>${in.index+1}</td>
+        <c:if test="${discernReceipt.receStatct eq 2}">
+            <td>免除上架费</td>
+            <td>${discernReceipt.receiptDate}</td>
+            <td>${discernReceipt.receiptDate}</td>
+            <td>--</td>
+            <td>
+                <a href="javascript:void(0);"
+                   onclick="offoceb(${discernReceipt.receiptID},'${CmDiscernReceipt.shopName}','${CmDiscernReceipt.linkMan}','${CmDiscernReceipt.shopID}')">取消</a>
+            </td>
+        </c:if>
+        <c:if test="${discernReceipt.receStatct eq 1}">
+            <td>免除上架费<span style="color: red">(已取消)</span></td>
+            <td>${discernReceipt.receiptDate}</td>
+            <td>${discernReceipt.receiptDate}</td>
+            <td>--</td>
+            <td>
+                --
+            </td>
+        </c:if>
+        <c:if test="${empty discernReceipt.receStatct || discernReceipt.receStatct eq 0}">
+            <td>${discernReceipt.receiptAmount}</td>
+            <td>${discernReceipt.receiptDate}</td>
+            <td>${discernReceipt.validityDate}</td>
+            <td>${discernReceipt.expirationDate}</td>
+            <td>
+                --
+            </td>
+        </c:if>
+
+        </tr>
+    </c:forEach>
+    </tbody>
 </table>
 <div class="pagination">${discernReceipt}</div>
 <script>
-	function offocea(shopID,shopName,linkMan) {
-		$.jBox.confirm("确定为该供应商免除上架费吗?","提示",function(v,h,f){
-
-			if(v === 1){
-				window.location.href="${ctx}/user/newCmShop/Removethelastfee?shopID="+shopID+"&shopName="+shopName+"&linkMan="+linkMan;
-			}
-		} ,{ buttons: {  '确定': 1,'取消':2}});
-	}
-	function offoceb(id,linkMan,shopName,shopID) {
-		$.jBox.confirm("确定取消免除该供应商上架费吗?","提示",function(v,h,f){
-			if(v === 1){
-				window.location.href="${ctx}/user/newCmShop/Removethelast?receiptID="+id+"&linkMan="+linkMan+"&shopName="+shopName+"&shopID="+shopID;
-			}
-		} ,{ buttons: {  '确定': 1,'取消':2}});
-	}
+    function offocea(shopID, shopName, linkMan) {
+        $.jBox.confirm("确定为该供应商免除上架费吗?", "提示", function (v, h, f) {
+
+            if (v === 1) {
+                window.location.href = "${ctx}/user/newCmShop/Removethelastfee?shopID=" + shopID + "&shopName=" + shopName + "&linkMan=" + linkMan;
+            }
+        }, {buttons: {'确定': 1, '取消': 2}});
+    }
+
+    function offoceb(id, linkMan, shopName, shopID) {
+        $.jBox.confirm("确定取消免除该供应商上架费吗?", "提示", function (v, h, f) {
+            if (v === 1) {
+                window.location.href = "${ctx}/user/newCmShop/Removethelast?receiptID=" + id + "&linkMan=" + linkMan + "&shopName=" + shopName + "&shopID=" + shopID;
+            }
+        }, {buttons: {'确定': 1, '取消': 2}});
+    }
 </script>
 </body>
 </html>