Home Explore Help
Sign In
caimei365
/
caimei365-manager
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

bugfix

Duan_xu 2 years ago
parent
574f7f94ca
commit
9956f8cad3
4 changed files with 704 additions and 9 deletions
Unified View Show Diff Stats
  1. 0 1
      src/main/java/com/caimei/modules/product/web/ProductNewController.java
  2. 686 0
      src/main/webapp/WEB-INF/views/modules/user/maintenanceList.jsp
  3. 8 8
      src/main/webapp/WEB-INF/views/modules/user/newCmShopForm.jsp
  4. 10 0
      src/main/webapp/WEB-INF/views/modules/user/newCmShopList.jsp

+ 0 - 1
src/main/java/com/caimei/modules/product/web/ProductNewController.java
View File 

@@ -100,7 +100,6 @@ public class ProductNewController extends BaseController {
 
     @RequiresPermissions("product:product:view")
 
     @RequiresPermissions("product:product:view")
 
     @RequestMapping(value = {"list", ""})
 
     @RequestMapping(value = {"list", ""})
 
     public String list(Product product, HttpServletRequest request, HttpServletResponse response, Model model) {
 
     public String list(Product product, HttpServletRequest request, HttpServletResponse response, Model model) {
 
-      Product pro=product;
 
         String id = product.getId();
 
         String id = product.getId();
 
         if (StringUtils.isEmpty(id)) {
 
         if (StringUtils.isEmpty(id)) {
 
             String shopName = product.getSearchShopName();
 
             String shopName = product.getSearchShopName();

+ 686 - 0
src/main/webapp/WEB-INF/views/modules/user/maintenanceList.jsp
View File 

@@ -0,0 +1,686 @@
 
+<%@ page contentType="text/html;charset=UTF-8" %>
 
+<%@ 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>
 
+
 
+</head>
 
+<body>
 
+<ul class="nav nav-tabs">
 
+	<li><a href="${ctx}/user/newCmShop/">供应商信息列表</a></li>
 
+	<li class="active"><a href="${ctx}/user/cmOperationalLogsShop/">缴纳费用记录</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/" 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});"/>
 
+			</div>
 
+			<div class="item">
 
+				&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 
+			</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>
 
+		<th>添加时间</th>
 
+		<th>操作</th>
 
+
 
+	</tr>
 
+	</thead>
 
+	<tbody>
 
+	<c:forEach items="${page.list}" var="newCmShop">
 
+
 
+	<td>
 
+		<a href="${ctx}/user/newCmShop/form?id=${newCmShop.shopID}&editStatus=1">编辑</a>
 
+
 
+
 
+		<a href="javascript:void(0)" > 删除</a>
 
+
 
+			</td>
 
+		</tr>
 
+	</c:forEach>
 
+	</tbody>
 
+</table>
 
+<div class="pagination">${page}</div>
 
+
 
+<script>
 
+	$(document).ready(function() {
 
+
 
+		//供应商默认主营内容
 
+		var html='';
 
+		html+='<span class="new-tag up-club-tag" data-typeName="产品">产品</span>',
 
+				html+='<span class="new-tag up-club-tag" data-typeName="仪器">仪器</span>',
 
+				html+='<span class="new-tag up-club-tag" data-typeName="服务">服务</span>';
 
+		$('#shopArea').html(html);
 
+		//供应商
 
+		$('.smedical-radio div input[name="firstShopType"]').on('click',function () {
 
+			var nameval = $(this).val();
 
+			if(nameval == '1'){
 
+				$('.smed-option').show();
 
+			}else if(nameval == '2'){
 
+				$('.smed-option,.squalification,.epart').hide();
 
+				$('input[name="secondShopType"]').attr('checked',false);
 
+			}
 
+		});
 
+		//医疗二级选择
 
+		$('input[name="secondShopType"]').on('click',function () {
 
+			var nameVal = $(this).val();
 
+			if(nameVal == '1'){
 
+				$('.squalification').hide()
 
+			}else if(nameVal == '2'){
 
+				$('.squalification').hide()
 
+			}else if(nameVal == '3'){
 
+				$('.squalification').show()
 
+			}else if(nameVal == '4'){
 
+				$('.squalification').hide()
 
+			}
 
+		});
 
+		//点击继续上传
 
+		var record ='';
 
+		$('.go-up').on('click',function () {
 
+			if(record == 1){
 
+				if($('#medicalPracticeLicenseImg2').val() != ''){
 
+					$('.there-up').css({'display':'inline-block'});
 
+					record = 2
 
+				}else {
 
+					alertx('请上传资质')
 
+					_util.hideTip($('.err-tip'));
 
+				}
 
+			}else if(record == 2){
 
+				alertx('只需要上传三张资质');
 
+//					$('.go-up').hide();
 
+			} else {
 
+				if($('#medicalPracticeLicenseImg1').val() != ''){
 
+					$('.two-up').css({'display':'inline-block'});
 
+					record = 1;
 
+				}else if($('#medicalPracticeLicenseImg2').val() != ''){
 
+					$('.there-up').css({'display':'inline-block'});
 
+					record = 2
 
+				}else {
 
+					alertx('请上传资质')
 
+					_util.hideTip($('.err-tip'));
 
+					record = ''
 
+				}
 
+			}
 
+		});
 
+		//供应商品项选择
 
+		var opts = {
 
+			$tag:$('.up-shop-tag'),
 
+			$tagArea:$('#shopArea'),
 
+			$mainPro:$('#sMainPro'),
 
+			$other:$('#shopOther'),
 
+			$input:$('#shopInput'),
 
+			$add:$('#shopAdd'),
 
+			$type:'shop'
 
+		};
 
+		_util.getTags(opts);
 
+		$('#confirm').on('click',function () {
 
+			//公司类型
 
+			if(!$('input[name="firstShopType"]').is(':checked')){
 
+				$('input[name="firstShopType"]').parents('.smedical-radio').next().show().html('请选择公司类型');
 
+				_util.hideTip($('.err-tip'));
 
+				return false
 
+			}else if($('input[name="firstShopType"]:checked').val() == 1){
 
+				if(!$('input[name="secondShopType"]').is(':checked')){
 
+					$('input[name="secondShopType"]').parents('.smed-option').find('.err-tip').show().html('请选择公司类型');
 
+					_util.hideTip($('.err-tip'));
 
+					return false
 
+				}
 
+			}
 
+			if($('input[name="secondShopType"]:checked').val() == 3){
 
+				// 会所资质
 
+				if($('#medicalPracticeLicenseImg1').val() == ''){
 
+					alertx('请上传资质')
 
+				}
 
+
 
+				if($('.two-up').css('display')!='none'){
 
+					if($('#medicalPracticeLicenseImg2').val() == ''){
 
+						alertx('请上传资质')
 
+						return false
 
+					}
 
+				}
 
+				if($('.there-up').css('display')!='none'){
 
+					if($('#medicalPracticeLicenseImg3').val() == ''){
 
+						alertx('请上传资质')
 
+						return false
 
+					}
 
+				}
 
+			}
 
+			if($('#sMainPro').val() == ''){
 
+				alertx('请选择主营内容')
 
+				return false
 
+			}
 
+			var params = {
 
+				mainpro:$('#sMainPro').val(),
 
+				shopID:$(this).attr('data-id'),
 
+				flagC:$(this).attr('data-flag')
 
+			};
 
+			if($('input[name="firstShopType"]:checked').val() == 1){
 
+				params.firstShopType = 1;//公司分类
 
+				params.secondShopType =$('input[name="secondShopType"]:checked').val();//二级分类
 
+				if($('input[name="secondShopType"]:checked').val() == 3){
 
+					if($('#medicalPracticeLicenseImg1').val() != ''){
 
+						params.medicalPracticeLicenseImg1 = $('#medicalPracticeLicenseImg1').val();//资质
 
+						// if($('#medicalPracticeLicenseImg2').val() != ''){
 
+						//     params.medicalPracticeLicenseImg2 = $('#qualification2').val();//资质
 
+						//     if($('#medicalPracticeLicenseImg3').val() != ''){
 
+						//         params.medicalPracticeLicenseImg3 = $('#qualification3').val();//资质
 
+						//     }
 
+						// }
 
+					}
 
+					if($('#medicalPracticeLicenseImg2').val() != '') {
 
+						params.medicalPracticeLicenseImg2 = $('#medicalPracticeLicenseImg2').val();//资质
 
+					}
 
+					if($('#medicalPracticeLicenseImg3').val() != '') {
 
+						params.medicalPracticeLicenseImg3 = $('#medicalPracticeLicenseImg3').val();//资质
 
+					}
 
+
 
+				}
 
+			}else {
 
+				params.firstShopType = 2;//公司分类
 
+			}
 
+			$.ajax({
 
+				type: "post",
 
+				url: "${ctx}/user/newCmShop/editShopType",
 
+				data: params,
 
+				success : function (res) {
 
+					if(res.errcode == '1') {
 
+						alertx(res.errmsg);
 
+					}
 
+					if(res.errcode == '0') {
 
+						console.log(res.data);
 
+						window.location.href = res.data;
 
+					}
 
+				},
 
+				error : function (res) {
 
+				}
 
+			});
 
+		})
 
+	});
 
+	var _util = {
 
+		// 隐藏输入错误提示（参数为提示元素）
 
+		hideTip : function($ele){
 
+			setTimeout(function () {
 
+				$ele.hide();
 
+			}, 5000);
 
+		},
 
+		setTags:function (opts) {
 
+			var tagArr = [];
 
+			opts.$tagArea.find('.new-tag.active').each(function(i,v){
 
+				var _typeName = $(v).attr('data-typeName');
 
+				tagArr.push(_typeName);
 
+				opts.$mainPro.val(tagArr.join('/'));
 
+			})
 
+		},
 
+		getTags:function (opts) {
 
+			opts.$tagArea.on('click','.new-tag',function(){
 
+				var $this = $(this);
 
+				$this.toggleClass('active');
 
+				_util.setTags(opts);
 
+			})
 
+			opts.$other.on('click',function(){
 
+				opts.$input.css('display','inline-block');
 
+				opts.$add.css('display','inline-block');
 
+			})
 
+			opts.$add.on('click',function(){
 
+				var _tag = $.trim(opts.$input.val());
 
+				if(_tag){
 
+					var flag = false;
 
+					opts.$tagArea.find('.new-tag').each(function(i,v){
 
+						var _name = $(v).attr('data-typeName');
 
+						if(_tag == _name){
 
+							flag=true;
 
+							return false;
 
+						}else{
 
+							if(i==opts.$tagArea.find('.new-tag').length){
 
+								flag=false;
 
+							}
 
+						}
 
+
 
+					})
 
+					if(flag){
 
+						opts.$tagArea.find('.new-tag').each(function(i,v){
 
+							var _name = $(v).attr('data-typeName');
 
+							if(_tag == _name){
 
+								$(v).addClass('active');
 
+//                                layer.tips('该类型已存在',opts.$add);
 
+								alertx('该类型已存在')
 
+								flag=true;
 
+								return false;
 
+							}
 
+
 
+						})
 
+					}else{
 
+						opts.$tagArea.append('<span class="new-tag up-'+opts.$type+'-tag active" data-typeName="'+_tag+'">'+_tag+'</span> ');
 
+						_util.setTags(opts);
 
+						opts.$input.val('');
 
+						return;
 
+					}
 
+				}
 
+			})
 
+		},
 
+	}
 
+</script>
 
+<script>
 
+	$(document).ready(function() {
 
+		$('.shopType').on('click',function () {
 
+			$('#confirm').attr('data-id',$(this).attr('data-shopID'))
 
+			$('#confirm').attr('data-flag',$(this).attr('data-flag'))
 
+			$('#myModal2').modal();
 
+			var that = $(this);
 
+			// var flag = that.attr("data-flag");
 
+			// $('#confirm').attr('data-flag',flag)
 
+			// var shopID = that.attr("data-shopID");
 
+			// var that = $(this);
 
+			var flag = that.attr("data-flag");
 
+			if ("0" == flag) {
 
+				$("#myModalLabel").html("设置分类");
 
+			}
 
+			if ("1" == flag) {
 
+				$("#myModalLabel").html("修改分类");
 
+				var json = JSON.parse($(this).attr('data-value'));
 
+				var firstShopType = json["firstShopType"];
 
+				var secondShopType = json["secondShopType"];
 
+				var medicalPracticeLicenseImg1 = json["medicalPracticeLicenseImg1"];
 
+				var medicalPracticeLicenseImg2 = json["medicalPracticeLicenseImg2"];
 
+				var medicalPracticeLicenseImg3 = json["medicalPracticeLicenseImg3"];
 
+				var mainpro = json["mainpro"];
 
+				if (firstShopType) {
 
+					$('input[name="firstShopType"]').parent('div').eq(firstShopType-1).find('input').attr("checked","checked")
 
+					$('input[name="firstShopType"]').parent('div').eq(firstShopType-1).find('input').click();
 
+					if(secondShopType){
 
+						$('input[name="secondShopType"]').parent('div').eq(secondShopType-1).find('input').attr("checked","checked")
 
+						$('input[name="secondShopType"]').parent('div').eq(secondShopType-1).find('input').click();
 
+					}
 
+					if(medicalPracticeLicenseImg1){
 
+						$('#medicalPracticeLicenseImg1').val(medicalPracticeLicenseImg1);
 
+						$('#medicalPracticeLicenseImg1Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="'+medicalPracticeLicenseImg1+'" />')
 
+					}
 
+					if(medicalPracticeLicenseImg2){
 
+						$('.two-up').css({'display':'inline-block'});
 
+						$('#medicalPracticeLicenseImg2').val(medicalPracticeLicenseImg2);
 
+						$('#medicalPracticeLicenseImg2Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="'+medicalPracticeLicenseImg2+'" />')
 
+					}
 
+					if(medicalPracticeLicenseImg3){
 
+						$('.there-up').css({'display':'inline-block'});
 
+						$('#medicalPracticeLicenseImg3').val(medicalPracticeLicenseImg3);
 
+						$('#medicalPracticeLicenseImg3Preview').find('li').html('<img style="max-width:100px;max-height:100px;_height:100px;border:0;padding:3px;" src="'+medicalPracticeLicenseImg3+'" />')
 
+					}
 
+
 
+					if(mainpro){
 
+						var span_ = $('#shopArea').find('span');
 
+						var mainpro_ = mainpro.split('/');
 
+						var html='';
 
+						var defaultVal = [];
 
+						var resArr = [];
 
+						var html='';
 
+						$('#shopArea').html('');
 
+						for(var i=0; i<span_.length;i++) {
 
+							defaultVal.push(span_[i].textContent);
 
+						}
 
+						var concatArr = defaultVal.concat(mainpro_);
 
+						for(var i=0; i<concatArr.length; i++) {
 
+							if(resArr.indexOf(concatArr[i]) == -1) {
 
+								resArr.push(concatArr[i]);
 
+								html += '<span class="new-tag up-club-tag '+concatArr[i]+'" data-typeName="'+concatArr[i]+'">'+concatArr[i]+'</span>';
 
+							}
 
+						}
 
+						$('#shopArea').append(html);
 
+						for(var i=0; i<mainpro_.length; i++) {
 
+							$('.'+mainpro_[i]).addClass('active');
 
+						}
 
+					}
 
+				}
 
+				var spanSp = $('#shopArea').find('span');
 
+				console.log(spanSp)
 
+				spanSp.each(function (i,l) {
 
+					if($(this).hasClass('active')){
 
+						$('#sMainPro').val($(this).text())
 
+					}
 
+				});
 
+
 
+			}
 
+		})
 
+	});
 
+
 
+	// 修改密码
 
+	function updatePwd(id) {
 
+		var regPwd = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/;
 
+		var html = "<div style='padding:20px;'><font color='red'>*</font> 新密码 ：" +
 
+				"<input type='password' id='newPwd' name='newPwd' rows='1' cols='12'/>" +
 
+				"</br><font color='red'>*</font>确认密码：" +
 
+				"<input type='password' id='surePwd' name='surePwd' rows='1' cols='12'/></div>";
 
+		var submit = function (v, h, f) {
 
+			// 密码
 
+			if (!regPwd.test(f.newPwd)) {
 
+				$.jBox.tip("密码需8-16位字母数字组合", 'error', {focusId: "newPwd"});
 
+				return false;
 
+			}
 
+			if (f.newPwd !== f.surePwd) {
 
+				$.jBox.tip("确认密码与登录密码不一致", 'error', {focusId: "surePwd"});
 
+				return false;
 
+			}
 
+			$.post("${ctx}/user/newCmShop/updatePwd", {'password': f.newPwd, 'id': id}, function (data) {
 
+				if (true == data.success) {
 
+					$.jBox.tip(data.msg, 'info');
 
+					$("#searchForm").submit();
 
+				} else {
 
+					$.jBox.tip(data.msg, 'error');
 
+				}
 
+			}, "JSON");//这里返回的类型有：json,html,xml,text
 
+		};
 
+		$.jBox(html, {title: "确定修改密码？", submit: submit});
 
+	}
 
+	//修改手机号码
 
+	function updateMobile(id) {
 
+		var regMobile = /^1[3,4,5,6,7,8,9]\d{9}$/;
 
+		var html = "<div style='padding:20px;'><font color='red'>*</font> 手机号码 ：" +
 
+				"<input type='text' id='newMobile' name='newMobile' rows='1' cols='12'/>" +
 
+				"</div>";
 
+		var submit = function (v, h, f) {
 
+			// 密码
 
+			if (!regMobile.test(f.newMobile)) {
 
+				$.jBox.tip("请输入正确的手机号码", 'error', {focusId: "newMobile"});
 
+				return false;
 
+			}
 
+			$.post("${ctx}/user/newCmShop/updateMobile", {'mobile': f.newMobile, 'id': id}, function (data) {
 
+				if (true == data.success) {
 
+					$.jBox.tip(data.msg, 'info');
 
+					$("#searchForm").submit();
 
+				} else {
 
+					$.jBox.tip(data.msg, 'error');
 
+				}
 
+			}, "JSON");//这里返回的类型有：json,html,xml,text
 
+		};
 
+		$.jBox(html, {title: "确定修改手机号码？", submit: submit});
 
+	}
 
+
 
+	function offline(userId) {
 
+		$.jBox.confirm("确定下线该供应商吗?","提示",function(v,h,f){
 
+			if(v === 1){
 
+				window.location.href="${ctx}/user/newCmShop/offline?userID="+userId;
 
+			}
 
+		} ,{ buttons: {  '确定': 1,'取消':2}});
 
+	}
 
+
 
+	function online(userId) {
 
+		$.jBox.confirm("确定上线该供应商吗？","提示",function(v,h,f){
 
+			if(v === 1){
 
+				window.location.href="${ctx}/user/newCmShop/online?userID="+userId;
 
+			}
 
+		} ,{ buttons: {  '确定': 1,'取消':2}});
 
+	}
 
+
 
+	/**
 
+	 * 供应商审核
 
+	 * */
 
+	function auditShop(shopId,userId,townID,address,name,linkMan,contractMobile) {
 
+		if(null == townID || "" == townID || "" == address || null == address){
 
+			alertx("地址尚未填写，请先编辑地址再进行审核");
 
+			return;
 
+		}
 
+		if(null == name || "" == name){
 
+			alertx("公司名称尚未填写，请先编辑公司名称再进行审核");
 
+			return;
 
+		}
 
+		if(null == linkMan || "" == linkMan){
 
+			alertx("联系人尚未尚未填写，请先编辑联系人再进行审核");
 
+			return;
 
+		}
 
+		if(null == contractMobile || "" == contractMobile){
 
+			alertx("手机号尚未填写，请先编辑手机号再进行审核");
 
+			return;
 
+		}
 
+		var html = "<div id='auditBox'>"
 
+				+ "   <div class='bd-row'>"
 
+				+ "       <span><font color='red'>*</font>审核：</span>"
 
+				+ "       <select name='auditStatus' id='auditStatus'>"
 
+				+ "           <option value='1'>审核通过</option>"
 
+				+ "           <option value='2'>审核未通过</option>"
 
+				+ "       <select/>"
 
+				+ "   </div>"
 
+				+ "   <div id='auditNopass' style='display: none;'>"
 
+				+ "       <div class='bd-row'>"
 
+				+ "           <span><font color='red'>*</font>原因：</span>"
 
+				+ "           <div class='auditCheckBox'>"
 
+				+ "               <label><input name='auditCheckBox' type='checkbox' value='入驻资质不达标'><span>入驻资质不达标</span></label>"
 
+				+ "               <label><input name='auditCheckBox' type='checkbox' value='品牌评估不通过'><span>品牌评估不通过</span></label>"
 
+				+ "               <label><input name='auditCheckBox' type='checkbox' value='相关证照不清晰'><span>相关证照不清晰</span></label>"
 
+				+ "               <label><input name='auditCheckBox' type='checkbox' value='企业经营异常'><span>企业经营异常</span></label>"
 
+				+ "               <label><input name='auditCheckBox' type='checkbox' value='其他'><span>其他</span></label>"
 
+				+ "           </div>"
 
+				+ "       </div>"
 
+				+ "       <div class='bd-row'>"
 
+				+ "           <span></span>"
 
+				+ "           <div class='auditNote'>"
 
+				+ "               <textarea name='auditNote' placeholder='可以补充其它原因，最多50个字'></textarea>"
 
+				+ "               <p class='err-tip' style='display:none;margin-left:-55px;color:red;'>请选择审核未通过的原因</p>"
 
+				+ "           </div>"
 
+				+ "       </div>"
 
+				+ "   </div>"
 
+				+ "</div>";
 
+		var submit = function (v, h, f) {
 
+			if (f.auditStatus == '') {
 
+				$.jBox.tip("请选择状态", 'error', {focusId: "auditStatus"});
 
+				return false;
 
+			} else if (f.auditStatus == 2 && f.auditNote == '' && !f.auditCheckBox) {
 
+				$.jBox.tip("请选择审核未通过的原因", 'error', {focusId: "auditNote"});
 
+				return false;
 
+			} else if (f.auditStatus == 2 && f.auditNote.length > 50) {
 
+				$.jBox.tip("内容过长", 'error', {focusId: "auditNote"});
 
+				return false;
 
+			}
 
+			var auditText = f.auditCheckBox ? (f.auditCheckBox.toString() + ',' + f.auditNote) : f.auditNote;
 
+
 
+			$.post("${ctx}/user/newCmShop/auditShopInfo", {
 
+				'auditStatus': f.auditStatus,
 
+				'shopId': shopId,
 
+				'userId': userId,
 
+				'auditNote': auditText
 
+			}, function (data) {
 
+				console.log( data.success)
 
+				console.log( true == data.success)
 
+				if (true == data.success) {
 
+					$.jBox.tip(data.msg, 'info');
 
+					// $("#searchForm").submit();
 
+					window.location.href = "${ctx}/user/newCmShop/";
 
+				} else {
 
+					$.jBox.tip(data.msg, 'error');
 
+				}
 
+			}, "JSON");//这里返回的类型有：json,html,xml,text
 
+		};
 
+		$.jBox(html, {title: "审核", submit: submit});
 
+	}
 
+
 
+	// 审核
 
+	$(document).on("change", "#auditStatus", function () {
 
+		if ($("#auditStatus").val() == 2) {
 
+			$("#auditNopass").show();
 
+		} else {
 
+			$("#auditNopass").hide();
 
+		}
 
+	});
 
+
 
+</script>
 
+</body>
 
+</html>

+ 8 - 8
src/main/webapp/WEB-INF/views/modules/user/newCmShopForm.jsp
View File 

@@ -768,14 +768,14 @@
 
                         <form:option value="0" label="未缴纳"/>
 
                         <form:option value="0" label="未缴纳"/>
 
                     </form:select>
 
                     </form:select>
 
                 </td>
 
                 </td>
 
-                <td>&nbsp;&nbsp;
 
-                    <span class="maintenanceDate1">
 
-							<span><b>缴纳时间：</b></span>
 
-							<form:input path="maintenanceDate" type="text" maxlength="21" class="input-medium Wdate"
 
-                                        value="${maintenanceDate}"
 
-                                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
 
-						</span>
 
-                </td>
 
+<%--                <td>&nbsp;&nbsp;--%>
 
+<%--                    <span class="maintenanceDate1">--%>
 
+<%--							<span><b>缴纳时间：</b></span>--%>
 
+<%--							<form:input path="maintenanceDate" type="text" maxlength="21" class="input-medium Wdate"--%>
 
+<%--                                        value="${maintenanceDate}"--%>
 
+<%--                                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>--%>
 
+<%--						</span>--%>
 
+<%--                </td>--%>
 
             </tr>
 
             </tr>
 
         </table>
 
         </table>
 
     </div>
 
     </div>

+ 10 - 0
src/main/webapp/WEB-INF/views/modules/user/newCmShopList.jsp
View File 

@@ -228,6 +228,7 @@
 
 		<th>手机号</th>
 
 		<th>手机号</th>
 
 		<th>邮箱</th>
 
 		<th>邮箱</th>
 
 		<th>注册来源</th>
 
 		<th>注册来源</th>
 
+		<th>缴纳维护费</th>
 
 		<th>供应商状态</th>
 
 		<th>供应商状态</th>
 
 		<th>审核人</th>
 
 		<th>审核人</th>
 
 		<th>注册时间</th>
 
 		<th>注册时间</th>
 
@@ -261,6 +262,14 @@
 
 					小程序
 
 					小程序
 
 				</c:if>
 
 				</c:if>
 
 			</td>
 
 			</td>
 
+			<td>
 
+				<c:if test="${newCmShop.maintenanceFee eq 0}">
 
+					未缴纳
 
+				</c:if>
 
+				<c:if test="${newCmShop.maintenanceFee eq 1}">
 
+					已缴纳
 
+				</c:if>
 
+			</td>
 
 			<td>
 
 			<td>
 
 				<c:if test="${newCmShop.status eq 3}">
 
 				<c:if test="${newCmShop.status eq 3}">
 
 					<font color="black">待审核</font>
 
 					<font color="black">待审核</font>
 
@@ -301,6 +310,7 @@
 
 					<a href="javascript:void(0);" onclick="updatePwd(${newCmShop.userID})">重置密码</a>
 
 					<a href="javascript:void(0);" onclick="updatePwd(${newCmShop.userID})">重置密码</a>
 
 				</c:if>
 
 				</c:if>
 
 				<a href="${ctx}/user/newCmShop/viewOperationUser?shopID=${newCmShop.shopID}&userID=${newCmShop.userID}&name=${newCmShop.name}">查看运营人员</a>
 
 				<a href="${ctx}/user/newCmShop/viewOperationUser?shopID=${newCmShop.shopID}&userID=${newCmShop.userID}&name=${newCmShop.name}">查看运营人员</a>
 
+				<a href="">缴纳费用记录</a>
 
 			</td></shiro:hasPermission>
 
 			</td></shiro:hasPermission>
 
 		</tr>
 
 		</tr>
 
 	</c:forEach>
 
 	</c:forEach>