更新版本

src/main/java/com/caimei/modules/user/dao/NewCmShopDao.java

@@ -51,6 +51,8 @@ public interface NewCmShopDao extends CrudDao<NewCmShop> {
 
     void Removethelast(CmDiscernReceipt cmDiscernReceipt);
 
+    void addthelast(CmDiscernReceipt cmDiscernReceipt);
+
     void cmreceipt(CmDiscernReceipt cmDiscernReceipt);
 
     CmDiscernReceipt cmrectiptlist(Integer shopID);

src/main/java/com/caimei/modules/user/service/NewCmShopService.java

@@ -359,6 +359,11 @@ public class NewCmShopService extends CrudService<NewCmShopDao, NewCmShop> {
         newCmShopDao.Removethelast(cmDiscernReceipt);
     }
 
+    @Transactional(readOnly = false)
+    public void addthelast(CmDiscernReceipt cmDiscernReceipt) {
+        newCmShopDao.addthelast(cmDiscernReceipt);
+    }
+
     @Transactional(readOnly = false)
     public void cmreceipt(CmDiscernReceipt cmDiscernReceipt) {
         newCmShopDao.cmreceipt(cmDiscernReceipt);

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

@@ -231,7 +231,7 @@ public class NewCmShopController extends BaseController {
                 logger.info("dateStrings>>>>>"+dateStrings);
                 newCmShopService.cmreceipt(cmDiscernReceipt);
             }
-            if(null!=cmDiscern) {
+            if(null!=cmDiscern && cmDiscern.getReceStatct()!=2 && cmDiscern.getReceStatct()!=1) {
                 Integer count=newCmShopService.cmrectCount(discernReceipt.getList().get(i).getShopID());
                 System.out.println("count>>"+count+"size>>"+discernReceipt.getList().size());
                 String receipt=cmDiscern.getExpirationDate();
@@ -286,7 +286,7 @@ public class NewCmShopController extends BaseController {
         //获取操作时间
         sysLog.setOperationtime(new Date());
         newCmShopService.cmreceipt(cmDiscernReceipt);
-
+        newCmShopService.addthelast(cmDiscernReceipt);
         //获取操作员
         SystemAuthorizingRealm.Principal principal = UserUtils.getPrincipal();
         System.out.println("操作员" + principal.getName());

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

@@ -477,6 +477,13 @@
         where id = #{receiptID}
     </update>
 
+    <update id="addthelast">
+        update cm_discern_receipt
+        set newReceiptType=1,
+            receStatct    = 2
+        where id = #{receiptID}
+    </update>
+
     <insert id="cmreceipt">
         insert into cm_receipt
             (validityDate, dateStrings, receiptID)
@@ -485,7 +492,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

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

@@ -187,7 +187,7 @@
 							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.shopID},'${CmDiscernReceipt.shopName}','${CmDiscernReceipt.linkMan}')" type="button" value="免除上架费"/>
+			&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>
@@ -244,11 +244,11 @@
 </table>
 <div class="pagination">${discernReceipt}</div>
 <script>
-	function offocea(shopID,shopName,linkMan) {
+	function offocea(receiptID,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;
+				window.location.href="${ctx}/user/newCmShop/Removethelastfee?receiptID="+receiptID+"&shopID="+shopID+"&shopName="+shopName+"&linkMan="+linkMan;
 			}
 		} ,{ buttons: {  '确定': 1,'取消':2}});
 	}

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

@@ -373,7 +373,7 @@
             <td>
                 <a href="javascript:void(0)" onclick="auditShop(${list.reportId})">审核</a>
                 <a href="${ctx}/new/user/agency/cmRegistReportList?reportID=${list.reportId}">查看</a>
-                <a href="${ctx}/new/user/agency/form">删除</a>
+                <a href="javascript:void(0)" onclick="deleteReport(${list.reportId})">删除</a>
             </td>
         </tr>
     </c:forEach>
@@ -441,7 +441,25 @@
         $.jBox.confirm(html,"备注");
     }
 
-
+function deleteReport(reportId){
+    $.jBox.confirm("确定删除该报备吗？", "提示", function (v, h, f) {
+        <%--window.location.href="${ctx}/new/user/agency/DeleteRepor?reportId="+reportId;--%>
+        if(v==1){
+        $.post("${ctx}/new/user/agency/DeleteRepor", {
+            'reportId': reportId
+        }, function (data) {
+            console.log(data.success)
+            console.log(true == data.success)
+            if (true == data.success) {
+                location.reload()
+            }
+            if(false == data.success) {
+                $.jBox.confirm("请将该报备关联的全部咨询记录取消关联后再删除","提示");
+            }
+        }, "JSON");//这里返回的类型有：json,html,xml,text
+             }
+    },{ buttons: {  '确定': 1,'取消':2}});
+}
 
 
     // $(document).on("change", "#auditStatus", function () {

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

@@ -57,22 +57,35 @@
             $.jBox.confirm("确定取消该咨询记录与此报备的关联吗？","提示",function(v,h,f){
 
                 if(v === 1){
-                    window.location.href="${ctx}/new/user/agency/ClubRemarks?remarksId="+remarksId+"&type=1";
-                    // location.reload()
-                }
-            } ,{ buttons: {  '确定': 1,'取消':2}}),function(data){
-                if (true == data.success) {
-                    location.reload();
+                    <%--window.location.href="${ctx}/new/user/agency/ClubRemarks?remarksId="+remarksId+"&type=1";--%>
+                    $.post("${ctx}/new/user/agency/ClubRemarks", {
+                        'remarksId': remarksId,
+                        'type': 1
+                    }, function (data) {
+                        console.log(data.success)
+                        console.log(true == data.success)
+                        if (true == data.success) {
+                            location.reload()
+                        }
+                    }, "JSON");//这里返回的类型有：json,html,xml,text
                 }
-            };
+            } ,{ buttons: {  '确定': 1,'取消':2}})
         }
 
         function audits(remarksId){
             $.jBox.confirm("确定取消该咨询记录与此报备的关联吗？","提示",function(v,h,f){
 
                 if(v === 1){
-                    window.location.href="${ctx}/new/user/agency/ClubRemarks?remarksId="+remarksId+"&type=2";
-                    // location.reload()
+                    $.post("${ctx}/new/user/agency/ClubRemarks", {
+                        'remarksId': remarksId,
+                        'type': 2
+                    }, function (data) {
+                        console.log(data.success)
+                        console.log(true == data.success)
+                        if (true == data.success) {
+                            location.reload()
+                        }
+                    }, "JSON");//这里返回的类型有：json,html,xml,text
                 }
             } ,{ buttons: {  '确定': 1,'取消':2}});
         }