educode_sales 0.9.43 → 0.9.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/educode_sales/customers_controller.rb +28 -27
- data/app/views/educode_sales/businesses/index.html.erb +1 -0
- data/app/views/educode_sales/businesses/index.json.jbuilder +13 -8
- data/app/views/educode_sales/customers/edit.html.erb +229 -165
- data/app/views/educode_sales/customers/index.html.erb +1 -12
- data/app/views/educode_sales/customers/index.json.jbuilder +15 -15
- data/lib/educode_sales/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e3b8eeaf96172e79bdd5ecd470826d1b1509e27aa51650992fea9573124c03a8
|
|
4
|
+
data.tar.gz: 448e73b86222666fa76163427cacf66d25dcb3afff0186dac870da2096f701ec
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d33d493129ce919f40d3ba640312a2b32b8965e269f013c9fac9cd8972576fd5cae0ce6c3099c691ff5b993263f36f61ab2f2f5298c6051c51df74c4c4d6c5dd
|
|
7
|
+
data.tar.gz: ab38c5526bec3b5eae9b4109b705298f8a5b8a2d932845bf70fc1b45b0d29ef9395b3d6865b840703bda9184b754ebc6411efee484d78160ea3b74dda998977b
|
|
@@ -39,6 +39,7 @@ module EducodeSales
|
|
|
39
39
|
format.html do
|
|
40
40
|
common = Common.find_by(clazz: 'staff_type', name: '销售')
|
|
41
41
|
@staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
|
|
42
|
+
gon.school_tags = SchoolTag.where(for_missions: true).map { |d| {value: d.id, name: d.name } }
|
|
42
43
|
end
|
|
43
44
|
format.json do
|
|
44
45
|
if @current_admin.is_admin?
|
|
@@ -73,34 +74,34 @@ module EducodeSales
|
|
|
73
74
|
@customers = @customers.where(id: school_ids)
|
|
74
75
|
end
|
|
75
76
|
if params[:q].present? && params[:q][:property].present?
|
|
76
|
-
school_property_ids = []
|
|
77
77
|
property = params[:q][:property].split(",").map(&:to_i)
|
|
78
|
-
property.each do |p|
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
end
|
|
103
|
-
@customers = @customers.where(
|
|
78
|
+
# property.each do |p|
|
|
79
|
+
# case p
|
|
80
|
+
# when 0
|
|
81
|
+
# school_property_ids += SchoolProperty.where(project_985: true).ids
|
|
82
|
+
# when 1
|
|
83
|
+
# school_property_ids += SchoolProperty.where(project_211: true).ids
|
|
84
|
+
# when 2
|
|
85
|
+
# school_property_ids += SchoolProperty.where(regular_college: true).ids
|
|
86
|
+
# when 3
|
|
87
|
+
# school_property_ids += SchoolProperty.where(junior_college: true).ids
|
|
88
|
+
# when 4
|
|
89
|
+
# school_property_ids += SchoolProperty.where(secondary_school: true).ids
|
|
90
|
+
# when 5
|
|
91
|
+
# school_property_ids += SchoolProperty.where(military_school: true).ids
|
|
92
|
+
# when 6
|
|
93
|
+
# school_property_ids += SchoolProperty.where(enterprise: true).ids
|
|
94
|
+
# when 7
|
|
95
|
+
# school_property_ids += SchoolProperty.where(mid_school: true).ids
|
|
96
|
+
# when 8
|
|
97
|
+
# school_property_ids += SchoolProperty.where(ele_school: true).ids
|
|
98
|
+
# when 9
|
|
99
|
+
# school_property_ids += SchoolProperty.where(other: true).ids
|
|
100
|
+
# else
|
|
101
|
+
# end
|
|
102
|
+
# end
|
|
103
|
+
@customers = @customers.joins(:school_tags).where("school_tags.id in (?)", property).distinct
|
|
104
|
+
# @customers = @customers.where(school_property_id: school_property_ids)
|
|
104
105
|
end
|
|
105
106
|
|
|
106
107
|
if params[:q].present? && params[:q][:date].present?
|
|
@@ -28,16 +28,21 @@ json.data do
|
|
|
28
28
|
json.divide_money d.divide_amount.to_f.round(2)
|
|
29
29
|
json.budget_amount d.budget_amount.to_f.round(2) #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
|
|
30
30
|
json.area d.department.school.province
|
|
31
|
-
school_property = d.department.school.school_property
|
|
32
|
-
property = []
|
|
31
|
+
# school_property = d.department.school.school_property
|
|
32
|
+
# property = []
|
|
33
33
|
|
|
34
|
-
if school_property.present?
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
34
|
+
# if school_property.present?
|
|
35
|
+
# property << '本科地方院校' if school_property.regular_college || school_property.project_985 || school_property.project_211
|
|
36
|
+
# property << '高职' if school_property.junior_college || school_property.secondary_school
|
|
37
|
+
# property << '本科军校' if school_property.military_school
|
|
38
|
+
# property << '企业' if school_property.enterprise
|
|
39
|
+
# end
|
|
40
|
+
if d.department.school
|
|
41
|
+
json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
|
|
42
|
+
else
|
|
43
|
+
json.property ''
|
|
39
44
|
end
|
|
40
|
-
json.property property.join("、")
|
|
45
|
+
# json.property d.school.school_property.school_tags.where(for_missions: true).pluck(:name).join("、")#property.join("、")
|
|
41
46
|
json.sale_way d.last_follow_up&.place&.name.present? ? '渠道' : '直销'
|
|
42
47
|
json.year d.last_follow_up&.year.to_s
|
|
43
48
|
json.total_amount d.last_follow_up&.total_amount.to_f.round(2)
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
<div class="layui-inline">
|
|
4
4
|
<label class="layui-form-label required">客户：</label>
|
|
5
5
|
<div class="layui-input-block" style="width: 500px;">
|
|
6
|
-
<input type="text" name="name" required
|
|
6
|
+
<input type="text" name="name" required lay-verify="required" value="<%= @school.name %>" placeholder="请输入客户" autocomplete="off"
|
|
7
7
|
class="layui-input" id="inputFocus">
|
|
8
8
|
</div>
|
|
9
9
|
</div>
|
|
@@ -11,22 +11,22 @@
|
|
|
11
11
|
<div class="layui-inline city_input">
|
|
12
12
|
<label class="layui-form-label ">省：</label>
|
|
13
13
|
<div class="layui-input-block" style="width: 500px;">
|
|
14
|
-
<select id="province" data-value="
|
|
14
|
+
<select id="province" data-value="<%= @school.province.to_s %>" class="province layui-input"></select>
|
|
15
15
|
</div>
|
|
16
16
|
</div>
|
|
17
17
|
<br>
|
|
18
18
|
<div class="layui-inline city_input">
|
|
19
19
|
<label class="layui-form-label ">市：</label>
|
|
20
20
|
<div class="layui-input-block" style="width: 500px;">
|
|
21
|
-
<select id="city" data-value="
|
|
21
|
+
<select id="city" data-value="<%= @school.city %>" class="city layui-input"></select>
|
|
22
22
|
</div>
|
|
23
23
|
</div>
|
|
24
24
|
<br>
|
|
25
25
|
<div class="layui-inline">
|
|
26
26
|
<label class="layui-form-label ">地址：</label>
|
|
27
27
|
<div class="layui-input-block" style="width: 500px;">
|
|
28
|
-
<input type="text" name="address"
|
|
29
|
-
class="layui-input" placeholder="请输入地址"
|
|
28
|
+
<input type="text" name="address" value="<%= @school.address %>" autocomplete="off"
|
|
29
|
+
class="layui-input" placeholder="请输入地址">
|
|
30
30
|
</div>
|
|
31
31
|
</div>
|
|
32
32
|
<div class="layui-form-item">
|
|
@@ -40,9 +40,9 @@
|
|
|
40
40
|
</div>
|
|
41
41
|
<div class="layui-form-item">
|
|
42
42
|
<div class="layui-input-block">
|
|
43
|
-
<input type="checkbox" name="secondary_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.secondary_school %> title="中职院校"
|
|
44
|
-
<input type="checkbox" name="mid_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.mid_school %> title="中学"
|
|
45
|
-
<input type="checkbox" name="ele_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.ele_school %> title="小学"
|
|
43
|
+
<input type="checkbox" name="secondary_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.secondary_school %> title="中职院校">
|
|
44
|
+
<input type="checkbox" name="mid_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.mid_school %> title="中学">
|
|
45
|
+
<input type="checkbox" name="ele_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.ele_school %> title="小学">
|
|
46
46
|
|
|
47
47
|
</div>
|
|
48
48
|
</div>
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
<div class="layui-form-item" style="display: none;">
|
|
56
56
|
<div class="layui-input-block">
|
|
57
57
|
<input type="checkbox" style="display: none;" name="project_985" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_985 %> title="985工程">
|
|
58
|
-
<input type="checkbox" style="display: none;" name="project_211" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_211 %> title="211工程"
|
|
58
|
+
<input type="checkbox" style="display: none;" name="project_211" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_211 %> title="211工程">
|
|
59
59
|
</div>
|
|
60
60
|
</div>
|
|
61
61
|
<div class="layui-inline" style="padding-left: 120px">
|
|
@@ -87,253 +87,253 @@
|
|
|
87
87
|
{
|
|
88
88
|
"n": "北京",
|
|
89
89
|
"s": [
|
|
90
|
-
{
|
|
91
|
-
{
|
|
92
|
-
{
|
|
93
|
-
{
|
|
94
|
-
{
|
|
95
|
-
{
|
|
96
|
-
{
|
|
97
|
-
{
|
|
98
|
-
{
|
|
99
|
-
{
|
|
100
|
-
{
|
|
101
|
-
{
|
|
102
|
-
{
|
|
103
|
-
{
|
|
104
|
-
{
|
|
105
|
-
{
|
|
90
|
+
{"n": "东城"},
|
|
91
|
+
{"n": "西城"},
|
|
92
|
+
{"n": "朝阳"},
|
|
93
|
+
{"n": "丰台"},
|
|
94
|
+
{"n": "石景山"},
|
|
95
|
+
{"n": "海淀"},
|
|
96
|
+
{"n": "门头沟"},
|
|
97
|
+
{"n": "房山"},
|
|
98
|
+
{"n": "通州"},
|
|
99
|
+
{"n": "顺义"},
|
|
100
|
+
{"n": "昌平"},
|
|
101
|
+
{"n": "大兴"},
|
|
102
|
+
{"n": "平谷"},
|
|
103
|
+
{"n": "怀柔"},
|
|
104
|
+
{"n": "密云"},
|
|
105
|
+
{"n": "延庆"}
|
|
106
106
|
]
|
|
107
107
|
},
|
|
108
108
|
{
|
|
109
109
|
"n": "上海",
|
|
110
110
|
"s": [
|
|
111
|
-
{
|
|
112
|
-
{
|
|
111
|
+
{"n": "崇明"}, {"n": "黄浦"}, {"n": "卢湾"}, {"n": "徐汇"}, {"n": "长宁"}, {"n": "静安"}, {"n": "普陀"}, {"n": "闸北"}, {"n": "虹口"}, {"n": "杨浦"}, {"n": "闵行"},
|
|
112
|
+
{"n": "宝山"}, {"n": "嘉定"}, {"n": "浦东"}, {"n": "金山"}, {"n": "松江"}, {"n": "青浦"}, {"n": "南汇"}, {"n": "奉贤"}
|
|
113
113
|
]
|
|
114
114
|
},
|
|
115
115
|
{
|
|
116
116
|
"n": "广东",
|
|
117
117
|
"s": [
|
|
118
|
-
{
|
|
119
|
-
{
|
|
118
|
+
{"n": "广州"}, {"n": "深圳"}, {"n": "珠海"}, {"n": "东莞"}, {"n": "中山"}, {"n": "佛山"}, {"n": "惠州"}, {"n": "河源"}, {"n": "潮州"}, {"n": "江门"}, {"n": "揭阳"}, {"n": "茂名"},
|
|
119
|
+
{"n": "梅州"}, {"n": "清远"}, {"n": "汕头"}, {"n": "汕尾"}, {"n": "韶关"}, {"n": "顺德"}, {"n": "阳江"}, {"n": "云浮"}, {"n": "湛江"}, {"n": "肇庆"}
|
|
120
120
|
]
|
|
121
121
|
},
|
|
122
122
|
{
|
|
123
123
|
"n": "江苏",
|
|
124
124
|
"s": [
|
|
125
|
-
{
|
|
126
|
-
{
|
|
127
|
-
{
|
|
125
|
+
{"n": "南京"}, {"n": "常熟"}, {"n": "常州"}, {"n": "海门"}, {"n": "淮安"}, {"n": "江都"}, {"n": "江阴"}, {"n": "昆山"}, {"n": "连云港"}, {"n": "南通"},
|
|
126
|
+
{"n": "启东"}, {"n": "沭阳"}, {"n": "宿迁"}, {"n": "苏州"}, {"n": "太仓"}, {"n": "泰州"}, {"n": "同里"}, {"n": "无锡"}, {"n": "徐州"}, {"n": "盐城"},
|
|
127
|
+
{"n": "扬州"}, {"n": "宜兴"}, {"n": "仪征"}, {"n": "张家港"}, {"n": "镇江"}, {"n": "周庄"}
|
|
128
128
|
]
|
|
129
129
|
},
|
|
130
130
|
{
|
|
131
131
|
"n": "浙江",
|
|
132
132
|
"s": [
|
|
133
|
-
{
|
|
134
|
-
{
|
|
135
|
-
{
|
|
133
|
+
{"n": "杭州"}, {"n": "安吉"}, {"n": "慈溪"}, {"n": "定海"}, {"n": "奉化"}, {"n": "海盐"}, {"n": "黄岩"}, {"n": "湖州"}, {"n": "嘉兴"}, {"n": "金华"}, {"n": "临安"},
|
|
134
|
+
{"n": "临海"}, {"n": "丽水"}, {"n": "宁波"}, {"n": "瓯海"}, {"n": "平湖"}, {"n": "千岛湖"}, {"n": "衢州"}, {"n": "江山"}, {"n": "瑞安"}, {"n": "绍兴"}, {"n": "嵊州"},
|
|
135
|
+
{"n": "台州"}, {"n": "温岭"}, {"n": "温州"}, {"n": "余姚"}, {"n": "舟山"}
|
|
136
136
|
]
|
|
137
137
|
},
|
|
138
138
|
{
|
|
139
139
|
"n": "重庆",
|
|
140
140
|
"s": [
|
|
141
|
-
{
|
|
142
|
-
{
|
|
143
|
-
{
|
|
144
|
-
{
|
|
141
|
+
{"n": "万州"}, {"n": "涪陵"}, {"n": "渝中"}, {"n": "大渡口"}, {"n": "江北"}, {"n": "沙坪坝"}, {"n": "九龙坡"}, {"n": "南岸"}, {"n": "北碚"}, {"n": "万盛"},
|
|
142
|
+
{"n": "双挢"}, {"n": "渝北"}, {"n": "巴南"}, {"n": "黔江"}, {"n": "长寿"}, {"n": "綦江"}, {"n": "潼南"}, {"n": "铜梁"}, {"n": "大足"}, {"n": "荣昌"}, {"n": "壁山"},
|
|
143
|
+
{"n": "梁平"}, {"n": "城口"}, {"n": "丰都"}, {"n": "垫江"}, {"n": "武隆"}, {"n": "忠县"}, {"n": "开县"}, {"n": "云阳"}, {"n": "奉节"}, {"n": "巫山"}, {"n": "巫溪"},
|
|
144
|
+
{"n": "石柱"}, {"n": "秀山"}, {"n": "酉阳"}, {"n": "彭水"}, {"n": "江津"}, {"n": "合川"}, {"n": "永川"}, {"n": "南川"}
|
|
145
145
|
]
|
|
146
146
|
},
|
|
147
147
|
{
|
|
148
148
|
"n": "安徽",
|
|
149
149
|
"s": [
|
|
150
|
-
{
|
|
151
|
-
{
|
|
150
|
+
{"n": "合肥"}, {"n": "安庆"}, {"n": "蚌埠"}, {"n": "亳州"}, {"n": "巢湖"}, {"n": "滁州"}, {"n": "阜阳"}, {"n": "贵池"}, {"n": "淮北"}, {"n": "淮化"}, {"n": "淮南"},
|
|
151
|
+
{"n": "黄山"}, {"n": "九华山"}, {"n": "六安"}, {"n": "马鞍山"}, {"n": "宿州"}, {"n": "铜陵"}, {"n": "屯溪"}, {"n": "芜湖"}, {"n": "宣城"}
|
|
152
152
|
]
|
|
153
153
|
},
|
|
154
154
|
{
|
|
155
155
|
"n": "福建",
|
|
156
156
|
"s": [
|
|
157
|
-
{
|
|
157
|
+
{"n": "福州"}, {"n": "厦门"}, {"n": "泉州"}, {"n": "漳州"}, {"n": "龙岩"}, {"n": "南平"}, {"n": "宁德"}, {"n": "莆田"}, {"n": "三明"}
|
|
158
158
|
]
|
|
159
159
|
},
|
|
160
160
|
{
|
|
161
161
|
"n": "甘肃",
|
|
162
162
|
"s": [
|
|
163
|
-
{
|
|
164
|
-
{
|
|
163
|
+
{"n": "兰州"}, {"n": "白银"}, {"n": "定西"}, {"n": "敦煌"}, {"n": "甘南"}, {"n": "金昌"}, {"n": "酒泉"}, {"n": "临夏"}, {"n": "平凉"}, {"n": "天水"},
|
|
164
|
+
{"n": "武都"}, {"n": "武威"}, {"n": "西峰"}, {"n": "张掖"}
|
|
165
165
|
]
|
|
166
166
|
},
|
|
167
167
|
{
|
|
168
168
|
"n": "广西",
|
|
169
169
|
"s": [
|
|
170
|
-
{
|
|
170
|
+
{"n": "南宁"}, {"n": "百色"}, {"n": "北海"}, {"n": "桂林"}, {"n": "防城港"}, {"n": "贵港"}, {"n": "河池"}, {"n": "贺州"}, {"n": "柳州"}, {"n": "钦州"}, {"n": "梧州"}, {"n": "玉林"}
|
|
171
171
|
]
|
|
172
172
|
},
|
|
173
173
|
{
|
|
174
174
|
"n": "贵州",
|
|
175
175
|
"s": [
|
|
176
|
-
{
|
|
176
|
+
{"n": "贵阳"}, {"n": "安顺"}, {"n": "毕节"}, {"n": "都匀"}, {"n": "凯里"}, {"n": "六盘水"}, {"n": "铜仁"}, {"n": "兴义"}, {"n": "玉屏"}, {"n": "遵义"}
|
|
177
177
|
]
|
|
178
178
|
},
|
|
179
179
|
{
|
|
180
180
|
"n": "海南",
|
|
181
181
|
"s": [
|
|
182
|
-
{
|
|
182
|
+
{"n": "海口"}, {"n": "儋县"}, {"n": "陵水"}, {"n": "琼海"}, {"n": "三亚"}, {"n": "通什"}, {"n": "万宁"}
|
|
183
183
|
]
|
|
184
184
|
},
|
|
185
185
|
{
|
|
186
186
|
"n": "河北",
|
|
187
187
|
"s": [
|
|
188
|
-
{
|
|
189
|
-
{
|
|
188
|
+
{"n": "石家庄"}, {"n": "保定"}, {"n": "北戴河"}, {"n": "沧州"}, {"n": "承德"}, {"n": "丰润"}, {"n": "邯郸"}, {"n": "衡水"}, {"n": "廊坊"}, {"n": "南戴河"}, {"n": "秦皇岛"},
|
|
189
|
+
{"n": "唐山"}, {"n": "新城"}, {"n": "邢台"}, {"n": "张家口"}
|
|
190
190
|
]
|
|
191
191
|
},
|
|
192
192
|
{
|
|
193
193
|
"n": "黑龙江",
|
|
194
194
|
"s": [
|
|
195
|
-
{
|
|
196
|
-
{
|
|
195
|
+
{"n": "哈尔滨"}, {"n": "北安"}, {"n": "大庆"}, {"n": "大兴安岭"}, {"n": "鹤岗"}, {"n": "黑河"}, {"n": "佳木斯"}, {"n": "鸡西"}, {"n": "牡丹江"}, {"n": "齐齐哈尔"},
|
|
196
|
+
{"n": "七台河"}, {"n": "双鸭山"}, {"n": "绥化"}, {"n": "伊春"}
|
|
197
197
|
]
|
|
198
198
|
},
|
|
199
199
|
{
|
|
200
200
|
"n": "河南",
|
|
201
201
|
"s": [
|
|
202
|
-
{
|
|
203
|
-
{
|
|
202
|
+
{"n": "郑州"}, {"n": "安阳"}, {"n": "鹤壁"}, {"n": "潢川"}, {"n": "焦作"}, {"n": "济源"}, {"n": "开封"}, {"n": "漯河"}, {"n": "洛阳"}, {"n": "南阳"}, {"n": "平顶山"},
|
|
203
|
+
{"n": "濮阳"}, {"n": "三门峡"}, {"n": "商丘"}, {"n": "新乡"}, {"n": "信阳"}, {"n": "许昌"}, {"n": "周口"}, {"n": "驻马店"}
|
|
204
204
|
]
|
|
205
205
|
},
|
|
206
206
|
{
|
|
207
207
|
"n": "湖北",
|
|
208
208
|
"s": [
|
|
209
|
-
{
|
|
210
|
-
{
|
|
209
|
+
{"n": "武汉"}, {"n": "恩施"}, {"n": "鄂州"}, {"n": "黄冈"}, {"n": "黄石"}, {"n": "荆门"}, {"n": "荆州"}, {"n": "潜江"}, {"n": "十堰"}, {"n": "随州"}, {"n": "武穴"},
|
|
210
|
+
{"n": "仙桃"}, {"n": "咸宁"}, {"n": "襄阳"}, {"n": "襄樊"}, {"n": "孝感"}, {"n": "宜昌"}
|
|
211
211
|
]
|
|
212
212
|
},
|
|
213
213
|
{
|
|
214
214
|
"n": "湖南",
|
|
215
215
|
"s": [
|
|
216
|
-
{
|
|
217
|
-
{
|
|
216
|
+
{"n": "长沙"}, {"n": "常德"}, {"n": "郴州"}, {"n": "衡阳"}, {"n": "怀化"}, {"n": "吉首"}, {"n": "娄底"}, {"n": "邵阳"}, {"n": "湘潭"}, {"n": "益阳"}, {"n": "岳阳"},
|
|
217
|
+
{"n": "永州"}, {"n": "张家界"}, {"n": "株洲"}
|
|
218
218
|
]
|
|
219
219
|
},
|
|
220
220
|
{
|
|
221
221
|
"n": "江西",
|
|
222
222
|
"s": [
|
|
223
|
-
{
|
|
224
|
-
{
|
|
223
|
+
{"n": "南昌"}, {"n": "抚州"}, {"n": "赣州"}, {"n": "吉安"}, {"n": "景德镇"}, {"n": "井冈山"}, {"n": "九江"}, {"n": "庐山"}, {"n": "萍乡"},
|
|
224
|
+
{"n": "上饶"}, {"n": "新余"}, {"n": "宜春"}, {"n": "鹰潭"}
|
|
225
225
|
]
|
|
226
226
|
},
|
|
227
227
|
{
|
|
228
228
|
"n": "吉林",
|
|
229
229
|
"s": [
|
|
230
|
-
{
|
|
230
|
+
{"n": "长春"}, {"n": "吉林"}, {"n": "白城"}, {"n": "白山"}, {"n": "珲春"}, {"n": "辽源"}, {"n": "梅河"}, {"n": "四平"}, {"n": "松原"}, {"n": "通化"}, {"n": "延吉"}
|
|
231
231
|
]
|
|
232
232
|
},
|
|
233
233
|
{
|
|
234
234
|
"n": "辽宁",
|
|
235
235
|
"s": [
|
|
236
|
-
{
|
|
237
|
-
{
|
|
236
|
+
{"n": "沈阳"}, {"n": "鞍山"}, {"n": "本溪"}, {"n": "朝阳"}, {"n": "大连"}, {"n": "丹东"}, {"n": "抚顺"}, {"n": "阜新"}, {"n": "葫芦岛"}, {"n": "锦州"},
|
|
237
|
+
{"n": "辽阳"}, {"n": "盘锦"}, {"n": "铁岭"}, {"n": "营口"}
|
|
238
238
|
]
|
|
239
239
|
},
|
|
240
240
|
{
|
|
241
241
|
"n": "内蒙古",
|
|
242
242
|
"s": [
|
|
243
|
-
{
|
|
244
|
-
{
|
|
243
|
+
{"n": "呼和浩特"}, {"n": "阿拉善盟"}, {"n": "包头"}, {"n": "赤峰"}, {"n": "东胜"}, {"n": "海拉尔"}, {"n": "集宁"}, {"n": "临河"}, {"n": "通辽"}, {"n": "乌海"},
|
|
244
|
+
{"n": "乌兰浩特"}, {"n": "锡林浩特"}
|
|
245
245
|
]
|
|
246
246
|
},
|
|
247
247
|
{
|
|
248
248
|
"n": "宁夏",
|
|
249
249
|
"s": [
|
|
250
|
-
{
|
|
250
|
+
{"n": "银川"}, {"n": "固源"}, {"n": "石嘴山"}, {"n": "吴忠"}
|
|
251
251
|
]
|
|
252
252
|
},
|
|
253
253
|
{
|
|
254
254
|
"n": "青海",
|
|
255
255
|
"s": [
|
|
256
|
-
{
|
|
256
|
+
{"n": "西宁"}, {"n": "德令哈"}, {"n": "格尔木"}, {"n": "共和"}, {"n": "海东"}, {"n": "海晏"}, {"n": "玛沁"}, {"n": "同仁"}, {"n": "玉树"}
|
|
257
257
|
]
|
|
258
258
|
},
|
|
259
259
|
{
|
|
260
260
|
"n": "山东",
|
|
261
261
|
"s": [
|
|
262
|
-
{
|
|
263
|
-
{
|
|
262
|
+
{"n": "济南"}, {"n": "滨州"}, {"n": "兖州"}, {"n": "德州"}, {"n": "东营"}, {"n": "菏泽"}, {"n": "济宁"}, {"n": "莱芜"}, {"n": "聊城"}, {"n": "临沂"},
|
|
263
|
+
{"n": "蓬莱"}, {"n": "青岛"}, {"n": "曲阜"}, {"n": "日照"}, {"n": "泰安"}, {"n": "潍坊"}, {"n": "威海"}, {"n": "烟台"}, {"n": "枣庄"}, {"n": "淄博"}
|
|
264
264
|
]
|
|
265
265
|
},
|
|
266
266
|
{
|
|
267
267
|
"n": "山西",
|
|
268
268
|
"s": [
|
|
269
|
-
{
|
|
270
|
-
{
|
|
269
|
+
{"n": "太原"}, {"n": "长治"}, {"n": "大同"}, {"n": "候马"}, {"n": "晋城"}, {"n": "离石"}, {"n": "临汾"}, {"n": "宁武"}, {"n": "朔州"}, {"n": "忻州"},
|
|
270
|
+
{"n": "阳泉"}, {"n": "榆次"}, {"n": "运城"}
|
|
271
271
|
]
|
|
272
272
|
},
|
|
273
273
|
{
|
|
274
274
|
"n": "陕西",
|
|
275
275
|
"s": [
|
|
276
|
-
{
|
|
276
|
+
{"n": "西安"}, {"n": "安康"}, {"n": "宝鸡"}, {"n": "汉中"}, {"n": "渭南"}, {"n": "商州"}, {"n": "绥德"}, {"n": "铜川"}, {"n": "咸阳"}, {"n": "延安"}, {"n": "榆林"}
|
|
277
277
|
]
|
|
278
278
|
},
|
|
279
279
|
{
|
|
280
280
|
"n": "四川",
|
|
281
281
|
"s": [
|
|
282
|
-
{
|
|
283
|
-
{
|
|
284
|
-
{
|
|
282
|
+
{"n": "成都"}, {"n": "巴中"}, {"n": "达川"}, {"n": "德阳"}, {"n": "都江堰"}, {"n": "峨眉山"}, {"n": "涪陵"}, {"n": "广安"}, {"n": "广元"}, {"n": "九寨沟"},
|
|
283
|
+
{"n": "康定"}, {"n": "乐山"}, {"n": "泸州"}, {"n": "马尔康"}, {"n": "绵阳"}, {"n": "眉山"}, {"n": "南充"}, {"n": "内江"}, {"n": "攀枝花"}, {"n": "遂宁"},
|
|
284
|
+
{"n": "汶川"}, {"n": "西昌"}, {"n": "雅安"}, {"n": "宜宾"}, {"n": "自贡"}, {"n": "资阳"}
|
|
285
285
|
]
|
|
286
286
|
},
|
|
287
287
|
{
|
|
288
288
|
"n": "天津",
|
|
289
289
|
"s": [
|
|
290
|
-
{
|
|
291
|
-
{
|
|
290
|
+
{"n": "天津"}, {"n": "和平"}, {"n": "东丽"}, {"n": "河东"}, {"n": "西青"}, {"n": "河西"}, {"n": "津南"}, {"n": "南开"}, {"n": "北辰"}, {"n": "河北"}, {"n": "武清"}, {"n": "红挢"},
|
|
291
|
+
{"n": "塘沽"}, {"n": "汉沽"}, {"n": "大港"}, {"n": "宁河"}, {"n": "静海"}, {"n": "宝坻"}, {"n": "蓟县"}
|
|
292
292
|
]
|
|
293
293
|
},
|
|
294
294
|
{
|
|
295
295
|
"n": "新疆",
|
|
296
296
|
"s": [
|
|
297
|
-
{
|
|
298
|
-
{
|
|
297
|
+
{"n": "乌鲁木齐"}, {"n": "阿克苏"}, {"n": "阿勒泰"}, {"n": "阿图什"}, {"n": "博乐"}, {"n": "昌吉"}, {"n": "东山"}, {"n": "哈密"}, {"n": "和田"}, {"n": "喀什"},
|
|
298
|
+
{"n": "克拉玛依"}, {"n": "库车"}, {"n": "库尔勒"}, {"n": "奎屯"}, {"n": "石河子"}, {"n": "塔城"}, {"n": "吐鲁番"}, {"n": "伊宁"}
|
|
299
299
|
]
|
|
300
300
|
},
|
|
301
301
|
{
|
|
302
302
|
"n": "西藏",
|
|
303
303
|
"s": [
|
|
304
|
-
{
|
|
304
|
+
{"n": "拉萨"}, {"n": "阿里"}, {"n": "昌都"}, {"n": "林芝"}, {"n": "那曲"}, {"n": "日喀则"}, {"n": "山南"}
|
|
305
305
|
]
|
|
306
306
|
},
|
|
307
307
|
{
|
|
308
308
|
"n": "云南",
|
|
309
309
|
"s": [
|
|
310
|
-
{
|
|
311
|
-
{
|
|
310
|
+
{"n": "昆明"}, {"n": "大理"}, {"n": "保山"}, {"n": "楚雄"}, {"n": "大理"}, {"n": "东川"}, {"n": "个旧"}, {"n": "景洪"}, {"n": "开远"}, {"n": "临沧"}, {"n": "丽江"},
|
|
311
|
+
{"n": "六库"}, {"n": "潞西"}, {"n": "曲靖"}, {"n": "思茅"}, {"n": "文山"}, {"n": "西双版纳"}, {"n": "玉溪"}, {"n": "中甸"}, {"n": "昭通"}
|
|
312
312
|
]
|
|
313
313
|
},
|
|
314
314
|
{
|
|
315
315
|
"n": "香港特别行政区",
|
|
316
316
|
"s": [
|
|
317
|
-
{
|
|
317
|
+
{"n": "香港"}, {"n": "九龙"}, {"n": "新界"}
|
|
318
318
|
]
|
|
319
319
|
},
|
|
320
320
|
{
|
|
321
321
|
"n": "澳门特别行政区",
|
|
322
322
|
"s": [
|
|
323
|
-
{
|
|
323
|
+
{"n": {"n": "澳门"}}
|
|
324
324
|
]
|
|
325
325
|
},
|
|
326
326
|
{
|
|
327
327
|
"n": "台湾",
|
|
328
328
|
"s": [
|
|
329
|
-
{
|
|
330
|
-
{
|
|
329
|
+
{"n": "台北"}, {"n": "基隆"}, {"n": "台南"}, {"n": "台中"}, {"n": "高雄"}, {"n": "屏东"}, {"n": "南投"}, {"n": "云林"}, {"n": "新竹"}, {"n": "彰化"}, {"n": "苗栗"},
|
|
330
|
+
{"n": "嘉义"}, {"n": "花莲"}, {"n": "桃园"}, {"n": "宜兰"}, {"n": "台东"}, {"n": "金门"}, {"n": "马祖"}, {"n": "澎湖"}
|
|
331
331
|
]
|
|
332
332
|
},
|
|
333
333
|
{
|
|
334
334
|
"n": "海外",
|
|
335
335
|
"s": [
|
|
336
|
-
{
|
|
336
|
+
{"n": "美国"}, {"n": "日本"}, {"n": "英国"}, {"n": "法国"}, {"n": "德国"}, {"n": "其他"}
|
|
337
337
|
]
|
|
338
338
|
}
|
|
339
339
|
]
|
|
@@ -349,12 +349,14 @@
|
|
|
349
349
|
data.field.province = $("#province option:selected").text(); //获取选中的项
|
|
350
350
|
data.field.city = $("#city option:selected").text(); //获取选中的项
|
|
351
351
|
if (data.field.enterprise == undefined && data.field.junior_college == undefined &&
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
352
|
+
data.field.military_school == undefined && data.field.project_211 == undefined && data.field.project_985 == undefined
|
|
353
|
+
&& data.field.regular_college == undefined && data.field.secondary_school == undefined
|
|
354
|
+
&& data.field.other == undefined && data.field.mid_school == undefined
|
|
355
|
+
&& data.field.ele_school == undefined) {
|
|
356
|
+
layer.alert("请选择学校性质");
|
|
357
|
+
return false;
|
|
356
358
|
}
|
|
357
|
-
|
|
359
|
+
|
|
358
360
|
request.authPut("missions/customers/" + <%= @school.id %>, data.field, function (res) {
|
|
359
361
|
if (res.success === false) {
|
|
360
362
|
layer.alert(res.msg)
|
|
@@ -378,14 +380,15 @@
|
|
|
378
380
|
* @site https://github.com/ciaoca/cxSelect
|
|
379
381
|
* @license Released under the MIT license
|
|
380
382
|
*/
|
|
381
|
-
(function(factory) {
|
|
383
|
+
(function (factory) {
|
|
382
384
|
if (typeof define === 'function' && define.amd) {
|
|
383
385
|
define(['jquery'], factory);
|
|
384
386
|
} else {
|
|
385
387
|
factory(window.jQuery || window.Zepto || window.$);
|
|
386
|
-
}
|
|
387
|
-
|
|
388
|
-
|
|
388
|
+
}
|
|
389
|
+
;
|
|
390
|
+
}(function ($) {
|
|
391
|
+
var cxSelect = function () {
|
|
389
392
|
var self = this;
|
|
390
393
|
var dom, settings, callback;
|
|
391
394
|
|
|
@@ -399,52 +402,61 @@
|
|
|
399
402
|
callback = arguments[i];
|
|
400
403
|
} else if (typeof arguments[i] === 'object') {
|
|
401
404
|
settings = arguments[i];
|
|
402
|
-
}
|
|
403
|
-
|
|
405
|
+
}
|
|
406
|
+
;
|
|
407
|
+
}
|
|
408
|
+
;
|
|
404
409
|
|
|
405
410
|
var api = new cxSelect.init(dom, settings);
|
|
406
411
|
|
|
407
412
|
if (typeof callback === 'function') {
|
|
408
413
|
callback(api);
|
|
409
|
-
}
|
|
414
|
+
}
|
|
415
|
+
;
|
|
410
416
|
|
|
411
417
|
return api;
|
|
412
418
|
};
|
|
413
419
|
|
|
414
|
-
cxSelect.isElement = function(o){
|
|
420
|
+
cxSelect.isElement = function (o) {
|
|
415
421
|
if (o && (typeof HTMLElement === 'function' || typeof HTMLElement === 'object') && o instanceof HTMLElement) {
|
|
416
422
|
return true;
|
|
417
423
|
} else {
|
|
418
424
|
return (o && o.nodeType && o.nodeType === 1) ? true : false;
|
|
419
|
-
}
|
|
425
|
+
}
|
|
426
|
+
;
|
|
420
427
|
};
|
|
421
428
|
|
|
422
|
-
cxSelect.isJquery = function(o){
|
|
429
|
+
cxSelect.isJquery = function (o) {
|
|
423
430
|
return (o && o.length && (typeof jQuery === 'function' || typeof jQuery === 'object') && o instanceof jQuery) ? true : false;
|
|
424
431
|
};
|
|
425
432
|
|
|
426
|
-
cxSelect.isZepto = function(o){
|
|
433
|
+
cxSelect.isZepto = function (o) {
|
|
427
434
|
return (o && o.length && (typeof Zepto === 'function' || typeof Zepto === 'object') && Zepto.zepto.isZ(o)) ? true : false;
|
|
428
435
|
};
|
|
429
436
|
|
|
430
|
-
cxSelect.getIndex = function(n, required) {
|
|
437
|
+
cxSelect.getIndex = function (n, required) {
|
|
431
438
|
return required ? n : n - 1;
|
|
432
439
|
};
|
|
433
440
|
|
|
434
|
-
cxSelect.getData = function(data, space) {
|
|
441
|
+
cxSelect.getData = function (data, space) {
|
|
435
442
|
if (typeof space === 'string' && space.length) {
|
|
436
443
|
space = space.split('.');
|
|
437
444
|
for (var i = 0, l = space.length; i < l; i++) {
|
|
438
445
|
data = data[space[i]];
|
|
439
|
-
}
|
|
440
|
-
|
|
446
|
+
}
|
|
447
|
+
;
|
|
448
|
+
}
|
|
449
|
+
;
|
|
441
450
|
return data;
|
|
442
451
|
};
|
|
443
452
|
|
|
444
|
-
cxSelect.init = function(dom, settings) {
|
|
453
|
+
cxSelect.init = function (dom, settings) {
|
|
445
454
|
var self = this;
|
|
446
455
|
|
|
447
|
-
if (!cxSelect.isJquery(dom) && !cxSelect.isZepto(dom)) {
|
|
456
|
+
if (!cxSelect.isJquery(dom) && !cxSelect.isZepto(dom)) {
|
|
457
|
+
return
|
|
458
|
+
}
|
|
459
|
+
;
|
|
448
460
|
|
|
449
461
|
var theSelect = {
|
|
450
462
|
dom: {
|
|
@@ -457,7 +469,7 @@
|
|
|
457
469
|
self.setOptions = cxSelect.setOptions.bind(theSelect);
|
|
458
470
|
self.clear = cxSelect.clear.bind(theSelect);
|
|
459
471
|
|
|
460
|
-
theSelect.changeEvent = function() {
|
|
472
|
+
theSelect.changeEvent = function () {
|
|
461
473
|
cxSelect.selectChange.call(theSelect, this.className);
|
|
462
474
|
};
|
|
463
475
|
|
|
@@ -477,7 +489,8 @@
|
|
|
477
489
|
|
|
478
490
|
if (typeof _dataSelects === 'string' && _dataSelects.length) {
|
|
479
491
|
theSelect.settings.selects = _dataSelects.split(',');
|
|
480
|
-
}
|
|
492
|
+
}
|
|
493
|
+
;
|
|
481
494
|
|
|
482
495
|
self.setOptions();
|
|
483
496
|
self.attach();
|
|
@@ -492,19 +505,21 @@
|
|
|
492
505
|
|
|
493
506
|
// 设置 URL，通过 Ajax 获取数据
|
|
494
507
|
} else if (typeof theSelect.settings.url === 'string' && theSelect.settings.url.length) {
|
|
495
|
-
$.getJSON(theSelect.settings.url, function(json) {
|
|
508
|
+
$.getJSON(theSelect.settings.url, function (json) {
|
|
496
509
|
cxSelect.start.call(theSelect, json);
|
|
497
510
|
});
|
|
498
|
-
}
|
|
511
|
+
}
|
|
512
|
+
;
|
|
499
513
|
};
|
|
500
514
|
|
|
501
515
|
// 设置参数
|
|
502
|
-
cxSelect.setOptions = function(opts) {
|
|
516
|
+
cxSelect.setOptions = function (opts) {
|
|
503
517
|
var self = this;
|
|
504
518
|
|
|
505
519
|
if (opts) {
|
|
506
520
|
$.extend(self.settings, opts);
|
|
507
|
-
}
|
|
521
|
+
}
|
|
522
|
+
;
|
|
508
523
|
|
|
509
524
|
// 初次或重设选择器组
|
|
510
525
|
if (!$.isArray(self.selectArray) || !self.selectArray.length || (opts && opts.selects)) {
|
|
@@ -516,49 +531,59 @@
|
|
|
516
531
|
for (var i = 0, l = self.settings.selects.length; i < l; i++) {
|
|
517
532
|
_tempSelect = self.dom.box.find('select.' + self.settings.selects[i]);
|
|
518
533
|
|
|
519
|
-
if (!_tempSelect || !_tempSelect.length) {
|
|
534
|
+
if (!_tempSelect || !_tempSelect.length) {
|
|
535
|
+
break
|
|
536
|
+
}
|
|
537
|
+
;
|
|
520
538
|
|
|
521
539
|
self.selectArray.push(_tempSelect);
|
|
522
|
-
}
|
|
523
|
-
|
|
524
|
-
|
|
540
|
+
}
|
|
541
|
+
;
|
|
542
|
+
}
|
|
543
|
+
;
|
|
544
|
+
}
|
|
545
|
+
;
|
|
525
546
|
|
|
526
547
|
if (opts) {
|
|
527
548
|
if (!$.isArray(opts.data) && typeof opts.url === 'string' && opts.url.length) {
|
|
528
|
-
$.getJSON(self.settings.url, function(json) {
|
|
549
|
+
$.getJSON(self.settings.url, function (json) {
|
|
529
550
|
cxSelect.start.call(self, json);
|
|
530
551
|
});
|
|
531
552
|
|
|
532
553
|
} else {
|
|
533
554
|
cxSelect.start.call(self, opts.data);
|
|
534
|
-
}
|
|
535
|
-
|
|
555
|
+
}
|
|
556
|
+
;
|
|
557
|
+
}
|
|
558
|
+
;
|
|
536
559
|
};
|
|
537
560
|
|
|
538
561
|
// 绑定
|
|
539
|
-
cxSelect.attach = function() {
|
|
562
|
+
cxSelect.attach = function () {
|
|
540
563
|
var self = this;
|
|
541
564
|
|
|
542
565
|
if (!self.attachStatus) {
|
|
543
566
|
self.dom.box.on('change', 'select', self.changeEvent);
|
|
544
|
-
}
|
|
567
|
+
}
|
|
568
|
+
;
|
|
545
569
|
|
|
546
570
|
if (typeof self.attachStatus === 'boolean') {
|
|
547
571
|
cxSelect.start.call(self);
|
|
548
|
-
}
|
|
572
|
+
}
|
|
573
|
+
;
|
|
549
574
|
|
|
550
575
|
self.attachStatus = true;
|
|
551
576
|
};
|
|
552
577
|
|
|
553
578
|
// 移除绑定
|
|
554
|
-
cxSelect.detach = function() {
|
|
579
|
+
cxSelect.detach = function () {
|
|
555
580
|
var self = this;
|
|
556
581
|
self.dom.box.off('change', 'select', self.changeEvent);
|
|
557
582
|
self.attachStatus = false;
|
|
558
583
|
};
|
|
559
584
|
|
|
560
585
|
// 清空选项
|
|
561
|
-
cxSelect.clear = function(index) {
|
|
586
|
+
cxSelect.clear = function (index) {
|
|
562
587
|
var self = this;
|
|
563
588
|
var _style = {
|
|
564
589
|
display: '',
|
|
@@ -575,27 +600,35 @@
|
|
|
575
600
|
_style.display = 'none';
|
|
576
601
|
} else if (self.settings.emptyStyle === 'hidden') {
|
|
577
602
|
_style.visibility = 'hidden';
|
|
578
|
-
}
|
|
603
|
+
}
|
|
604
|
+
;
|
|
579
605
|
|
|
580
606
|
self.selectArray[i].css(_style);
|
|
581
|
-
}
|
|
607
|
+
}
|
|
608
|
+
;
|
|
582
609
|
};
|
|
583
610
|
|
|
584
|
-
cxSelect.start = function(data) {
|
|
611
|
+
cxSelect.start = function (data) {
|
|
585
612
|
var self = this;
|
|
586
613
|
|
|
587
614
|
if ($.isArray(data)) {
|
|
588
615
|
self.settings.data = cxSelect.getData(data, self.settings.jsonSpace);
|
|
589
|
-
}
|
|
616
|
+
}
|
|
617
|
+
;
|
|
590
618
|
|
|
591
|
-
if (!self.selectArray.length) {
|
|
619
|
+
if (!self.selectArray.length) {
|
|
620
|
+
return
|
|
621
|
+
}
|
|
622
|
+
;
|
|
592
623
|
|
|
593
624
|
// 保存默认值
|
|
594
625
|
for (var i = 0, l = self.selectArray.length; i < l; i++) {
|
|
595
626
|
if (typeof self.selectArray[i].attr('data-value') !== 'string' && self.selectArray[i][0].options.length) {
|
|
596
627
|
self.selectArray[i].attr('data-value', self.selectArray[i].val());
|
|
597
|
-
}
|
|
598
|
-
|
|
628
|
+
}
|
|
629
|
+
;
|
|
630
|
+
}
|
|
631
|
+
;
|
|
599
632
|
|
|
600
633
|
if (self.settings.data || (typeof self.selectArray[0].data('url') === 'string' && self.selectArray[0].data('url').length)) {
|
|
601
634
|
cxSelect.getOptionData.call(self, 0);
|
|
@@ -604,14 +637,18 @@
|
|
|
604
637
|
'display': '',
|
|
605
638
|
'visibility': ''
|
|
606
639
|
});
|
|
607
|
-
}
|
|
640
|
+
}
|
|
641
|
+
;
|
|
608
642
|
};
|
|
609
643
|
|
|
610
644
|
// 获取选项数据
|
|
611
|
-
cxSelect.getOptionData = function(index) {
|
|
645
|
+
cxSelect.getOptionData = function (index) {
|
|
612
646
|
var self = this;
|
|
613
647
|
|
|
614
|
-
if (typeof index !== 'number' || isNaN(index) || index < 0 || index >= self.selectArray.length) {
|
|
648
|
+
if (typeof index !== 'number' || isNaN(index) || index < 0 || index >= self.selectArray.length) {
|
|
649
|
+
return
|
|
650
|
+
}
|
|
651
|
+
;
|
|
615
652
|
|
|
616
653
|
var _indexPrev = index - 1;
|
|
617
654
|
var _select = self.selectArray[index];
|
|
@@ -638,11 +675,14 @@
|
|
|
638
675
|
_query[_queryName] = _selectValue;
|
|
639
676
|
} else if (typeof _selectName === 'string' && _selectName.length) {
|
|
640
677
|
_query[_selectName] = _selectValue;
|
|
641
|
-
}
|
|
642
|
-
|
|
643
|
-
|
|
678
|
+
}
|
|
679
|
+
;
|
|
680
|
+
}
|
|
681
|
+
;
|
|
682
|
+
}
|
|
683
|
+
;
|
|
644
684
|
|
|
645
|
-
$.getJSON(_dataUrl, _query, function(json) {
|
|
685
|
+
$.getJSON(_dataUrl, _query, function (json) {
|
|
646
686
|
_selectData = cxSelect.getData(json, _jsonSpace);
|
|
647
687
|
|
|
648
688
|
cxSelect.buildOption.call(self, index, _selectData);
|
|
@@ -660,15 +700,18 @@
|
|
|
660
700
|
} else {
|
|
661
701
|
_selectData = null;
|
|
662
702
|
break;
|
|
663
|
-
}
|
|
664
|
-
|
|
703
|
+
}
|
|
704
|
+
;
|
|
705
|
+
}
|
|
706
|
+
;
|
|
665
707
|
|
|
666
708
|
cxSelect.buildOption.call(self, index, _selectData);
|
|
667
|
-
}
|
|
709
|
+
}
|
|
710
|
+
;
|
|
668
711
|
};
|
|
669
712
|
|
|
670
713
|
// 构建选项列表
|
|
671
|
-
cxSelect.buildOption = function(index, data) {
|
|
714
|
+
cxSelect.buildOption = function (index, data) {
|
|
672
715
|
var self = this;
|
|
673
716
|
|
|
674
717
|
var _select = self.selectArray[index];
|
|
@@ -678,7 +721,10 @@
|
|
|
678
721
|
var _jsonName = typeof _select.data('jsonName') === 'undefined' ? self.settings.jsonName : _select.data('jsonName');
|
|
679
722
|
var _jsonValue = typeof _select.data('jsonValue') === 'undefined' ? self.settings.jsonValue : _select.data('jsonValue');
|
|
680
723
|
|
|
681
|
-
if (!$.isArray(data)) {
|
|
724
|
+
if (!$.isArray(data)) {
|
|
725
|
+
return
|
|
726
|
+
}
|
|
727
|
+
;
|
|
682
728
|
|
|
683
729
|
var _html = !_required ? '<option value="' + String(_firstValue) + '">' + String(_firstTitle) + '</option>' : '';
|
|
684
730
|
|
|
@@ -687,18 +733,22 @@
|
|
|
687
733
|
// 无值字段时使用标题作为值
|
|
688
734
|
if (typeof _jsonValue !== 'string' || !_jsonValue.length) {
|
|
689
735
|
_jsonValue = _jsonName;
|
|
690
|
-
}
|
|
736
|
+
}
|
|
737
|
+
;
|
|
691
738
|
|
|
692
739
|
for (var i = 0, l = data.length; i < l; i++) {
|
|
693
740
|
_html += '<option value="' + String(data[i][_jsonValue]) + '">' + String(data[i][_jsonName]) + '</option>';
|
|
694
|
-
}
|
|
741
|
+
}
|
|
742
|
+
;
|
|
695
743
|
|
|
696
744
|
// 数组即为值的数据
|
|
697
745
|
} else {
|
|
698
746
|
for (var i = 0, l = data.length; i < l; i++) {
|
|
699
747
|
_html += '<option value="' + String(data[i]) + '">' + String(data[i]) + '</option>';
|
|
700
|
-
}
|
|
701
|
-
|
|
748
|
+
}
|
|
749
|
+
;
|
|
750
|
+
}
|
|
751
|
+
;
|
|
702
752
|
|
|
703
753
|
_select.html(_html).prop('disabled', false).css({
|
|
704
754
|
'display': '',
|
|
@@ -711,20 +761,26 @@
|
|
|
711
761
|
|
|
712
762
|
if (_select[0].selectedIndex < 0) {
|
|
713
763
|
_select[0].options[0].selected = true;
|
|
714
|
-
}
|
|
715
|
-
|
|
764
|
+
}
|
|
765
|
+
;
|
|
766
|
+
}
|
|
767
|
+
;
|
|
716
768
|
|
|
717
769
|
if (_required || _select[0].selectedIndex > 0) {
|
|
718
770
|
_select.trigger('change');
|
|
719
|
-
}
|
|
771
|
+
}
|
|
772
|
+
;
|
|
720
773
|
|
|
721
774
|
};
|
|
722
775
|
|
|
723
776
|
// 改变选择时的处理
|
|
724
|
-
cxSelect.selectChange = function(name) {
|
|
777
|
+
cxSelect.selectChange = function (name) {
|
|
725
778
|
var self = this;
|
|
726
779
|
|
|
727
|
-
if (typeof name !== 'string' || !name.length) {
|
|
780
|
+
if (typeof name !== 'string' || !name.length) {
|
|
781
|
+
return
|
|
782
|
+
}
|
|
783
|
+
;
|
|
728
784
|
|
|
729
785
|
var index;
|
|
730
786
|
|
|
@@ -736,16 +792,19 @@
|
|
|
736
792
|
if (name.indexOf(',' + self.settings.selects[i] + ',') > -1) {
|
|
737
793
|
index = i;
|
|
738
794
|
break;
|
|
739
|
-
}
|
|
740
|
-
|
|
795
|
+
}
|
|
796
|
+
;
|
|
797
|
+
}
|
|
798
|
+
;
|
|
741
799
|
|
|
742
800
|
if (typeof index === 'number' && index > -1) {
|
|
743
801
|
index += 1;
|
|
744
802
|
cxSelect.getOptionData.call(self, index);
|
|
745
|
-
}
|
|
803
|
+
}
|
|
804
|
+
;
|
|
746
805
|
};
|
|
747
806
|
|
|
748
|
-
$.cxSelect = function() {
|
|
807
|
+
$.cxSelect = function () {
|
|
749
808
|
return cxSelect.apply(this, arguments);
|
|
750
809
|
};
|
|
751
810
|
|
|
@@ -764,8 +823,8 @@
|
|
|
764
823
|
jsonSub: 's' // 子集数据字段名称
|
|
765
824
|
};
|
|
766
825
|
|
|
767
|
-
$.fn.cxSelect = function(settings, callback) {
|
|
768
|
-
this.each(function(i) {
|
|
826
|
+
$.fn.cxSelect = function (settings, callback) {
|
|
827
|
+
this.each(function (i) {
|
|
769
828
|
$.cxSelect(this, settings, callback);
|
|
770
829
|
});
|
|
771
830
|
return this;
|
|
@@ -775,15 +834,20 @@
|
|
|
775
834
|
</script>
|
|
776
835
|
<style>
|
|
777
836
|
.layui-form .city_input .layui-input {
|
|
778
|
-
display: none
|
|
837
|
+
display: none;
|
|
838
|
+
!important;
|
|
779
839
|
}
|
|
780
|
-
|
|
840
|
+
|
|
841
|
+
.layui-form .city_input .province {
|
|
781
842
|
display: block;
|
|
782
843
|
}
|
|
783
|
-
|
|
844
|
+
|
|
845
|
+
.layui-form .city_input .city {
|
|
784
846
|
display: block;
|
|
785
847
|
}
|
|
786
|
-
|
|
787
|
-
|
|
848
|
+
|
|
849
|
+
.layui-edge {
|
|
850
|
+
display: none;
|
|
851
|
+
!important;
|
|
788
852
|
}
|
|
789
853
|
</style>
|
|
@@ -102,18 +102,7 @@
|
|
|
102
102
|
|
|
103
103
|
var property_list = xmSelect.render({
|
|
104
104
|
el: '#property',
|
|
105
|
-
data:
|
|
106
|
-
// {value: 0, name: '985工程'},
|
|
107
|
-
// {value: 1, name: '211工程'},
|
|
108
|
-
{value: 2, name: '本科院校'},
|
|
109
|
-
{value: 5, name: '军事院校'},
|
|
110
|
-
{value: 3, name: '高职院校'},
|
|
111
|
-
{value: 4, name: '中职院校'},
|
|
112
|
-
{value: 7, name: '中学'},
|
|
113
|
-
{value: 8, name: '小学'},
|
|
114
|
-
{value: 6, name: '企业'},
|
|
115
|
-
{value: 9, name: '其他'},
|
|
116
|
-
]
|
|
105
|
+
data: gon.school_tags
|
|
117
106
|
})
|
|
118
107
|
|
|
119
108
|
laydate.render({
|
|
@@ -14,21 +14,21 @@ json.data do
|
|
|
14
14
|
json.id d.id
|
|
15
15
|
json.name d.name
|
|
16
16
|
json.area d.province
|
|
17
|
-
school_property = d.school_property
|
|
18
|
-
property = []
|
|
19
|
-
if school_property.present?
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
end
|
|
31
|
-
json.property
|
|
17
|
+
# school_property = d.school_property
|
|
18
|
+
# property = []
|
|
19
|
+
# if school_property.present?
|
|
20
|
+
# # property << '985工程' if school_property.project_985
|
|
21
|
+
# # property << '211工程' if school_property.project_211
|
|
22
|
+
# property << '本科院校' if school_property.regular_college
|
|
23
|
+
# property << '大专院校' if school_property.junior_college
|
|
24
|
+
# property << '中专学校' if school_property.secondary_school
|
|
25
|
+
# property << '军事院校' if school_property.military_school
|
|
26
|
+
# property << '企业' if school_property.enterprise
|
|
27
|
+
# property << '小学' if school_property.ele_school
|
|
28
|
+
# property << '中学' if school_property.mid_school
|
|
29
|
+
# property << '其他' if school_property.other
|
|
30
|
+
# end
|
|
31
|
+
json.property d.school_tags.where(for_missions: true).pluck(:name).join("、")
|
|
32
32
|
json.department d.departments.size
|
|
33
33
|
json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
|
|
34
34
|
json.follow follow_ups.size + customer_follows.size
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: educode_sales
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.9.
|
|
4
|
+
version: 0.9.44
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- anke1460
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2023-02-
|
|
11
|
+
date: 2023-02-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|