From 6322d18325d15686665ad92f8be8ff4018deb8b5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Nov 2016 16:06:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E6=97=A5=E5=8E=86=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/versions/_edit.html.erb | 2 +-
 app/views/versions/edit.js.erb    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/versions/_edit.html.erb b/app/views/versions/_edit.html.erb
index 146d49ff5..f9ce5a8b1 100644
--- a/app/views/versions/_edit.html.erb
+++ b/app/views/versions/_edit.html.erb
@@ -23,7 +23,7 @@
             <li class="mb10 clear">
               <label class=" fl"><span class="c_red f12">*</span>&nbsp;日期&nbsp;&nbsp;:&nbsp;</label>
               <%= f.text_field :effective_date, :size => 10, :readonly => true,:class=>"issues_calendar_input fl", :id => "version_effective_date2", :placeholder=>"结束日期", :style=>"height:28px;", :no_label => true  %>
-              <%= calendar_for('version_effective_date2') %>
+              <%#= calendar_for('version_effective_date2') %>
               <!--<input type="text" placeholder="结束日期" class="issues_calendar_input fl ">-->
               <!--<a href="" class="issues_data_img fl"></a>-->
             </li>
diff --git a/app/views/versions/edit.js.erb b/app/views/versions/edit.js.erb
index 377dbeebd..baa20b6cd 100644
--- a/app/views/versions/edit.js.erb
+++ b/app/views/versions/edit.js.erb
@@ -1,3 +1,7 @@
 var htmlvalue = "<%= escape_javascript(render :partial => 'versions/edit') %>";
 pop_box_new(htmlvalue,820,316);
+var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: 0, showOn: 'button', buttonImageOnly: true, buttonImage: '/images/public_icon.png', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};
+$(function() { $('#version_effective_date2').datepicker(datepickerOptions);
+//    $('#evaluation_end_time').datepicker(datepickerOptions);
+});