educode_sales 1.0.4 → 1.0.5
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/staffs_controller.rb +2 -2
- data/app/views/educode_sales/staffs/edit.html.erb +11 -3
- data/app/views/educode_sales/staffs/index.html.erb +6 -1
- data/app/views/educode_sales/staffs/index.json.jbuilder +2 -1
- data/app/views/educode_sales/staffs/new.html.erb +7 -2
- data/lib/educode_sales/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b94517f09287290104a7f5b99842db680f96336a78f7261a7478c4c9d8ca66af
|
|
4
|
+
data.tar.gz: 9dd809965284e5d22f39ebf18110ad1c54514391d1e2d75fef04c2a686f29ef9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 662c0d5a18f51954d831ce9d935b603d595a9b255325a44f56a2edeb6f7e018a10ee779e3b994a8a3903782a0d9367bc82d16b437eae21e6fa2736721ab419cb
|
|
7
|
+
data.tar.gz: 573ff431ba910018a90d61a568a4f1cc25ec4ff1667a8222918c560bcdf673e0f9521256f773959bdada669c4efa339d9827cf899ccf5dcef96849ed22ae4471
|
|
@@ -33,7 +33,7 @@ module EducodeSales
|
|
|
33
33
|
|
|
34
34
|
def create
|
|
35
35
|
user = User.find(params[:id])
|
|
36
|
-
staff = Staff.new(user_id: user.id)
|
|
36
|
+
staff = Staff.new(user_id: user.id, name: params[:name])
|
|
37
37
|
params[:current_admin] = @current_admin.id
|
|
38
38
|
if staff.save
|
|
39
39
|
impressionist(staff, params)
|
|
@@ -83,7 +83,7 @@ module EducodeSales
|
|
|
83
83
|
|
|
84
84
|
def update
|
|
85
85
|
staff = Staff.find(params[:id])
|
|
86
|
-
staff.assign_attributes(role_id: params[:role_id], job_type: params[:job_type], enabled_at: params[:enabled_at])
|
|
86
|
+
staff.assign_attributes(role_id: params[:role_id], job_type: params[:job_type], enabled_at: params[:enabled_at], name: params[:name])
|
|
87
87
|
staff.expired_at = staff.enabled_at.months_since(params[:month].to_i)
|
|
88
88
|
commons = []
|
|
89
89
|
params[:area_ids].to_s.split(",").each do |d|
|
|
@@ -3,9 +3,17 @@
|
|
|
3
3
|
<form class="layui-form " action="">
|
|
4
4
|
<h4>编辑人员</h4>
|
|
5
5
|
<div class="layui-form-item">
|
|
6
|
-
<
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
<div class="layui-inline">
|
|
7
|
+
<label class="layui-form-label">用户名</label>
|
|
8
|
+
<div class="layui-input-inline" style="line-height: 38px;">
|
|
9
|
+
<%= "#{@staff.user.real_name} - #{@staff.user.phone}" %>
|
|
10
|
+
</div>
|
|
11
|
+
</div>
|
|
12
|
+
<div class="layui-inline">
|
|
13
|
+
<label class="layui-form-label">姓名</label>
|
|
14
|
+
<div class="layui-input-inline">
|
|
15
|
+
<input type="text" name="name" class="layui-input" value="<%= @staff.name %>">
|
|
16
|
+
</div>
|
|
9
17
|
</div>
|
|
10
18
|
</div>
|
|
11
19
|
<div class="layui-form-item">
|
|
@@ -2,7 +2,8 @@ area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
|
|
|
2
2
|
json.data do
|
|
3
3
|
json.array! @staffs do |d|
|
|
4
4
|
json.id d.id
|
|
5
|
-
json.
|
|
5
|
+
json.user_name d.user.real_name
|
|
6
|
+
json.name d.name
|
|
6
7
|
json.role d.role&.name
|
|
7
8
|
json.schools d.staff_schools.map(&:school).map(&:name).join("、")
|
|
8
9
|
json.job_type EducodeSales::Common.job_type_name[d.job_type]
|
|
@@ -5,6 +5,12 @@
|
|
|
5
5
|
<label class="layui-form-label required">人员</label>
|
|
6
6
|
<div class="layui-input-block" id="user"></div>
|
|
7
7
|
</div>
|
|
8
|
+
<div class="layui-form-item">
|
|
9
|
+
<label class="layui-form-label required">姓名</label>
|
|
10
|
+
<div class="layui-input-block">
|
|
11
|
+
<input type="text" name="name" class="layui-input" value="" lay-verify="required">
|
|
12
|
+
</div>
|
|
13
|
+
</div>
|
|
8
14
|
<hr>
|
|
9
15
|
<div class="layui-form-item">
|
|
10
16
|
<div class="layui-input-block">
|
|
@@ -54,11 +60,10 @@
|
|
|
54
60
|
|
|
55
61
|
//监听提交
|
|
56
62
|
form.on('submit(saveBtn)', function (data) {
|
|
57
|
-
console.log(ins.getValue())
|
|
58
63
|
if (ins.getValue() == "") {
|
|
59
64
|
return layer.alert("请选择平台用户")
|
|
60
65
|
}
|
|
61
|
-
request.authPost("missions/staffs", {id: ins.getValue()}, function (res) {
|
|
66
|
+
request.authPost("missions/staffs", {id: ins.getValue(), name: data.field.name}, function (res) {
|
|
62
67
|
if (res.success == false) {
|
|
63
68
|
layer.alert(res.msg)
|
|
64
69
|
} else {
|