活动管理修改

renren-admin/src/main/resources/statics/js/modules/qmgj/activity.js

@@ -79,14 +79,14 @@ $(function () {
 		}
 	});
 	$.ajax({
-		type: "POST",
-		url: baseURL + "/api/region/list",
+		type: "post",
+		url: baseURL + "api/region/provinceList",
 		contentType: "application/json",
-		success: function(r){
-			if(r.code == 0){
-				vm.location2.city = r.data;
-				vm.location.city = r.data
-			}else{
+		success: function (r) {
+			if (r.code == 0) {
+				vm.location2.province = r.data;
+				vm.location.province = r.data
+			} else {
 				layer.alert("读取省失败");
 			}
 		}
@@ -216,7 +216,7 @@ var vm = new Vue({
 			input: null,
 			username: null,
 			phoneNumber: null,
-			city:null,
+			city:'',
 			staffId: null,
 			province: ''
 		},
@@ -282,6 +282,40 @@ var vm = new Vue({
 			// vm.location.city = {};
 			$("#mapIframe").attr("src","activity_map.html");
 		},
+		province: function (type, show = false) {
+			// var d = event.target.value;
+			// console.log(type, show);
+			let d = type == 1 ? vm.queryParam.province : vm.activity.province;
+			// console.log(d)
+			if (!show) {
+				if (type == 1) {
+					vm.location2.city = [];
+					vm.queryParam.city = '';
+				} else {
+					vm.location.city = [];
+					vm.activity.city = '';
+					vm.location.area = [];
+					vm.activity.area = '';
+				}
+			}
+			$.ajax({
+				type: "post",
+				url: baseURL + "api/region/childList",
+				contentType: "application/json",
+				data: JSON.stringify({ id: d }),
+				success: function (r) {
+					if (r.code == 0) {
+						if (type == 1) {
+							vm.location2.city = r.data;
+						} else {
+							vm.location.city = r.data;
+						}
+					} else {
+						layer.alert("读取市失败");
+					}
+				}
+			});
+		},
 		city: function (event) {
 			var d = event.target.value;
 			console.log(d)
@@ -289,12 +323,25 @@ var vm = new Vue({
 			vm.activity.area = '';
 			console.log(vm.location.city)
 			// vm.location.city
-			for (let i=0; i<=vm.location.city.length; i++) {
-				if(d == vm.location.city[i].id) {
-					return  vm.location.area = vm.location.city[i].childRegionList
+			// for (let i=0; i<=vm.location.city.length; i++) {
+			// 	if(d == vm.location.city[i].id) {
+			// 		return  vm.location.area = vm.location.city[i].childRegionList
 
+			// 	}
+			// }
+			$.ajax({
+				type: "post",
+				url: baseURL + "api/region/childList",
+				contentType: "application/json",
+				data: JSON.stringify({ id: d }),
+				success: function (r) {
+					if (r.code == 0) {
+						vm.location.area = r.data;
+					} else {
+						layer.alert("读取市失败");
+					}
 				}
-			}
+			});
 		},
 		update: function (event) {
 			var id = getSelectedRow();
@@ -393,7 +440,10 @@ var vm = new Vue({
 			$.ajaxSettings.async = false
 			$.get(baseURL + "qmgj/activity/info/"+id, function(r){
                 vm.activity = r.activity;
-				vm.activity.province = ''
+				// vm.activity.province = ''
+				if (vm.activity.province) {
+					vm.province(2, true)
+				}
 				console.log(vm.activity.city)
 				if(r.activity.isPublish == 1) {
 					vm.isDisabled = true
@@ -485,23 +535,23 @@ var vm = new Vue({
                 page:page
             }).trigger("reloadGrid");
 		},
-		province: function (event) {
-			var d = event.target.value;
-			vm.location.city = {};
-			vm.activity.city = '';
-			$.ajax({
-				type: "POST",
-				url: baseURL + "qmgj/productinfo/selectTwo/"+d,
-				contentType: "application/json",
-				success: function(r){
-					if(r.code == 0){
-						vm.location.city = r.decList;
-					}else{
-						layer.alert("读取市失败");
-					}
-				}
-			});
-		},
+		// province: function (event) {
+		// 	var d = event.target.value;
+		// 	vm.location.city = {};
+		// 	vm.activity.city = '';
+		// 	$.ajax({
+		// 		type: "POST",
+		// 		url: baseURL + "qmgj/productinfo/selectTwo/"+d,
+		// 		contentType: "application/json",
+		// 		success: function(r){
+		// 			if(r.code == 0){
+		// 				vm.location.city = r.decList;
+		// 			}else{
+		// 				layer.alert("读取市失败");
+		// 			}
+		// 		}
+		// 	});
+		// },
 		province2: function (event) {
 			var d = event.target.value;
 			vm.location2.city = {};

renren-admin/src/main/resources/statics/js/modules/qmgj/two.js

@@ -15,7 +15,7 @@ $(function () {
                 index: 'status',
                 width: 80,
                 formatter: function (cellvalue, options, rowObject) {
-                    return "<span style='color: #337ab7; cursor: pointer;margin-right: 10px;' onclick=\"handleEdit('" + rowObject.guid + "')\">编辑</span><span style='color: #337ab7; cursor: pointer;' onclick=\"handleDel('" + rowObject.guid + "',1)\">删除</span>"
+                    return "<span style='color: #337ab7; cursor: pointer;margin-right: 10px;' onclick=\"handleEdit('" + rowObject.id + "')\">编辑</span><span style='color: #337ab7; cursor: pointer;' onclick=\"handleDel('" + rowObject.id + "',1)\">删除</span>"
                 }
             },
         ],
@@ -107,20 +107,20 @@ layui.use(['layer', 'form'], function () {
     var $ = layui.jquery, layer = layui.layer, form = layui.form;
     form.on('submit(go)', function (data) {
         $('#btnSaveOrUpdate').button('loading').delay(1000).queue(function () {
-            var url = vm.formData.guid == null ? "qyh/serviceCity/save" : "qyh/serviceCity/update";
+            var url = vm.formData.id == null ? "qyh/serviceCity/save" : "qyh/serviceCity/update";
             if (!vm.formData.cityId) {
                 layer.alert("请选择市");
                 return false;
             }
-            console.log(vm.location.city);
-            // let obj = vm.location.city.find(v => v.id == vm.formData.cityId) || null;
+            // console.log(vm.location.city);
+            let obj = vm.location.city.find(v => v.id == vm.formData.cityId) || null;
             // console.log(obj);
-            // if (!obj) return false;
-            // vm.formData.name = obj.name;
-            // vm.formData.letter = obj.pinyin.slice(0, 1);
-            console.log(vm.formData);
+            if (!obj) return false;
+            vm.formData.name = obj.name;
+            vm.formData.letter = obj.pinyin.slice(0, 1);
+            // console.log(vm.formData);
             $.ajax({
-                type: vm.formData.guid != null ? 'POST' : "POST",
+                type: vm.formData.id != null ? 'POST' : "POST",
                 url: baseURL + url,
                 contentType: "application/json",
                 data: JSON.stringify(vm.formData),
@@ -179,7 +179,7 @@ var vm = new Vue({
             vm.showList = false;
             vm.title = "新增";
             vm.formData = {
-                province: '',
+                provinceId: '',
                 cityId: '',
                 isHot: ''
             };
@@ -196,7 +196,7 @@ var vm = new Vue({
         province: function (type, show = false) {
             // var d = event.target.value;
             // console.log(type, show);
-            let d = type == 1 ? vm.queryParam.PROVINCE : vm.formData.province;
+            let d = type == 1 ? vm.queryParam.PROVINCE : vm.formData.provinceId;
             // console.log(d)
             if (!show) {
                 if (type == 1) {
@@ -229,9 +229,9 @@ var vm = new Vue({
             $.get(baseURL + "qyh/serviceCity/info/" + id, function (r) {
                 // console.log(r);
                 if (r.code == 0) {
-                    vm.formData = r.schoolInfo || {};
+                    vm.formData = r.serviceCityEntity || {};
                     console.log(vm.formData);
-                    if (r.schoolInfo.province) {
+                    if (r.serviceCityEntity.provinceId) {
                         vm.province(2, true)
                     }
                 }
@@ -246,9 +246,7 @@ var vm = new Vue({
             }).trigger("reloadGrid");
         },
         init: function () {
-            vm.queryParam.REGION = '';
-            vm.queryParam.PROVINCE = '';
-            vm.queryParam.SCHOOLNAME = '';
+            vm.queryParam.name = '';
             vm.queryParam.isHot = '';
         },
         reset: function () {

renren-admin/src/main/resources/templates/modules/qmgj/activity.html

@@ -35,9 +35,10 @@
 <!--                    <input type="text" style="display: inline-block" class="form-control" v-model="queryParam.username" @keyup.enter="query" placeholder="真实姓名">-->
 <!--                    <input type="text" style="display: inline-block" class="form-control" v-model="queryParam.phoneNumber" @keyup.enter="query" placeholder="手机号">-->
 <!--                    @change="province2"-->
-                    <select class="form-control" v-model="queryParam.province">
-                        <option value="" disabled>湖北省</option>
-<!--                        <option v-for="item in location2.province" :value="item.code">{{item.codename}}</option>-->
+                    <select class="form-control" v-model="queryParam.province" @change="province(1)">
+                        <!-- <option value="" disabled>湖北省</option> -->
+                        <option value="" disabled hidden>--省--</option>
+                        <option v-for="item in location2.province" :value="item.id">{{item.name}}</option>
                     </select>
                     <select class="form-control" v-model="queryParam.city">
                         <option value="" disabled hidden>--市--</option>
@@ -103,8 +104,10 @@
                 <div class="col-sm-2 control-label"><span style="color: red">*</span>所属区域</div>
                 <div class="col-sm-3" style="width: 16.65%;">
 <!--                    @change="province"-->
-                    <select class="form-control" v-model="activity.province">
-                        <option value="" disabled hidden>湖北省</option>
+                    <select class="form-control" v-model="activity.province" @change="province(2)">
+                        <!-- <option value="" disabled hidden>湖北省</option> -->
+                        <option value="" disabled hidden>--省--</option>
+                        <option v-for="item in location.province" :value="item.id">{{item.name}}</option>
 <!--                        <option v-for="item in location.province" :value="item.code">{{item.codename}}</option>-->
                     </select>
                 </div>

renren-admin/src/main/resources/templates/modules/qmgj/two.html

@@ -15,15 +15,7 @@
             <div class="grid-btn">
                 <div>
                     <div style="padding-left: 0;" class="form-group col-sm-12 div-Gay">
-                        <select class="form-control" v-model="queryParam.PROVINCE" @change="province(1)">
-                            <option value="" disabled hidden>--省--</option>
-                            <!--<option value="" disabled>湖北省</option>-->
-                            <option v-for="item in location2.province" :value="item.id">{{item.name}}</option>
-                        </select>
-                        <select class="form-control" v-model="queryParam.REGION">
-                            <option value="" disabled hidden>--市--</option>
-                            <option v-for="item in location2.city" :value="item.id">{{item.name}}</option>
-                        </select>
+                        <input type="text" class="form-control" v-model="queryParam.name" placeholder="城市名称"/>
                         <select class="form-control" v-model="queryParam.isHot">
                             <option value="" disabled hidden>--是否热门--</option>
                             <option v-for="item in dict.yesno" :value="item.itemcode">{{item.itemname}}</option>
@@ -62,13 +54,13 @@
                     <div class="col-sm-3" style="width: 16.65%;">
                         <select class="form-control" v-model="formData.cityId">
                             <option value="" disabled hidden>--市--</option>
-                            <option v-for="item in location.city" :value="item.id + ''">{{item.name}}</option>
+                            <option v-for="item in location.city" :value="item.id">{{item.name}}</option>
                         </select>
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="col-sm-1 control-label">是否热门</div>
-                    <div class="col-sm-10">
+                    <div class="col-sm-4">
                         <select class="form-control" v-model="formData.isHot">
                             <option value="" disabled hidden>--是否热门--</option>
                             <option v-for="item in dict.yesno" :value="item.itemcode">{{item.itemname}}</option>
@@ -77,7 +69,7 @@
                 </div>
                 <div class="form-group">
                     <div class="col-sm-1 control-label">排序</div>
-                    <div class="col-sm-10">
+                    <div class="col-sm-4">
                         <input type="text" class="form-control" v-model="formData.sort" placeholder="排序"
                             lay-verify="required" />
                     </div>