解决冲突
This commit is contained in:
parent
aefcb78926
commit
c3a016607b
|
|
@ -63,7 +63,7 @@ module OrganizationsHelper
|
||||||
def subfield_status_option
|
def subfield_status_option
|
||||||
type = []
|
type = []
|
||||||
option1 = []
|
option1 = []
|
||||||
option1 << "左上"
|
option1 << "左一"
|
||||||
option1 << "1"
|
option1 << "1"
|
||||||
type << option1
|
type << option1
|
||||||
# option2 = []
|
# option2 = []
|
||||||
|
|
@ -71,27 +71,27 @@ module OrganizationsHelper
|
||||||
# option2 << "2"
|
# option2 << "2"
|
||||||
# type << option2
|
# type << option2
|
||||||
option3 = []
|
option3 = []
|
||||||
option3 << "中上"
|
option3 << "左二"
|
||||||
option3 << "3"
|
option3 << "3"
|
||||||
type << option3
|
type << option3
|
||||||
option4 = []
|
option4 = []
|
||||||
option4 << "中下"
|
option4 << "左三"
|
||||||
option4 << "4"
|
option4 << "4"
|
||||||
type << option4
|
type << option4
|
||||||
option5 = []
|
option5 = []
|
||||||
option5 << "左下"
|
option5 << "左四"
|
||||||
option5 << "5"
|
option5 << "5"
|
||||||
type << option5
|
type << option5
|
||||||
option6 = []
|
option6 = []
|
||||||
option6 << "右上"
|
option6 << "右一"
|
||||||
option6 << "6"
|
option6 << "6"
|
||||||
type << option6
|
type << option6
|
||||||
option7 = []
|
option7 = []
|
||||||
option7 << "右中"
|
option7 << "右二"
|
||||||
option7 << "7"
|
option7 << "7"
|
||||||
type << option7
|
type << option7
|
||||||
option8 = []
|
option8 = []
|
||||||
option8 << "右下"
|
option8 << "右三"
|
||||||
option8 << "8"
|
option8 << "8"
|
||||||
type << option8
|
type << option8
|
||||||
type
|
type
|
||||||
|
|
@ -101,19 +101,19 @@ module OrganizationsHelper
|
||||||
def subfield_status_option_default
|
def subfield_status_option_default
|
||||||
type = []
|
type = []
|
||||||
option1 = []
|
option1 = []
|
||||||
option1 << "左上"
|
option1 << "左一"
|
||||||
option1 << "1"
|
option1 << "1"
|
||||||
type << option1
|
type << option1
|
||||||
option3 = []
|
option3 = []
|
||||||
option3 << "中上"
|
option3 << "左二"
|
||||||
option3 << "3"
|
option3 << "3"
|
||||||
type << option3
|
type << option3
|
||||||
option4 = []
|
option4 = []
|
||||||
option4 << "中下"
|
option4 << "左三"
|
||||||
option4 << "4"
|
option4 << "4"
|
||||||
type << option4
|
type << option4
|
||||||
option6 = []
|
option6 = []
|
||||||
option6 << "右上"
|
option6 << "右一"
|
||||||
option6 << "6"
|
option6 << "6"
|
||||||
type << option6
|
type << option6
|
||||||
type
|
type
|
||||||
|
|
@ -122,21 +122,21 @@ module OrganizationsHelper
|
||||||
def subfield_list_type subfield
|
def subfield_list_type subfield
|
||||||
case subfield.to_i
|
case subfield.to_i
|
||||||
when 1
|
when 1
|
||||||
resulet = "左上"
|
resulet = "左一"
|
||||||
when 2
|
when 2
|
||||||
resulet = "中一"
|
resulet = "左二"
|
||||||
when 3
|
when 3
|
||||||
resulet = "中二"
|
resulet = "左二"
|
||||||
when 4
|
when 4
|
||||||
resulet = "中下"
|
resulet = "左三"
|
||||||
when 5
|
when 5
|
||||||
resulet = "左下"
|
resulet = "左四"
|
||||||
when 6
|
when 6
|
||||||
resulet = "右上"
|
resulet = "右一"
|
||||||
when 7
|
when 7
|
||||||
resulet = "右中"
|
resulet = "右二"
|
||||||
when 8
|
when 8
|
||||||
resulet = "右下"
|
resulet = "右三"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,11 +28,11 @@
|
||||||
默认
|
默认
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
|
<%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
|
||||||
<div class="update_status_class"><span class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
|
<div class="update_status_class"><span class="hidden"><%= subfield_list_type(field.status) %></span>
|
||||||
<a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
|
<a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
|
||||||
</div>
|
</div>
|
||||||
<%= select( :name,:group_id, subfield_status_option_default, { :include_blank => false,:selected => field.status},
|
<%= select( :name,:group_id, subfield_status_option_default, { :include_blank => false,:selected => field.status},
|
||||||
{ :onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
|
{ :onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
|
|
@ -63,7 +63,7 @@
|
||||||
列表
|
列表
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
|
<%= form_tag({:controller => 'org_subfields', :action => 'update_status', :id => field.id,},:remote=>'true', :method => 'post', :id=>"update_status_form_#{field.id}", :class => 'query_form') do %>
|
||||||
<div class="update_status_class"><span class="hidden"><%=field.status== 1 ? "列表" : "图片" %></span>
|
<div class="update_status_class"><span class="hidden"><%= subfield_list_type(field.status) %></span>
|
||||||
<a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
|
<a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2"></a>
|
||||||
</div>
|
</div>
|
||||||
<%= select( :name,:group_id, subfield_status_option,
|
<%= select( :name,:group_id, subfield_status_option,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue