lizhen_gitee 5 月之前
父节点
当前提交
abe001266d

+ 10 - 13
application/admin/lang/zh-cn/votesubject.php

@@ -1,19 +1,16 @@
 <?php
 
 return [
-    'Id'             => 'ID',
-    'Title'          => '项目名',
-    'Image'          => '封面图',
-    'Zhuban'         => '主办',
-    'Chengban'       => '承办',
-    'Begintime'      => '开始时间',
-    'Endtime'        => '结束时间',
-    'Zhuti'          => '活动主题',
-    'Rules'          => '规则',
-    'Baomingfangshi' => '报名方式',
-    'Status'         => '状态',
-    'Status 0'       => '隐藏',
+    'Id'        => 'ID',
+    'Title'     => '项目名',
+    'Image'     => '封面图',
+    'Zhuban'    => '主办',
+    'Chengban'  => '承办',
+    'Startdate' => '活动时间',
+    'Rules'     => '规则',
+    'Status'    => '状态',
+    'Status 0'  => '隐藏',
     'Set status to 0'=> '设为隐藏',
-    'Status 1'       => '显示',
+    'Status 1'  => '显示',
     'Set status to 1'=> '设为显示'
 ];

+ 0 - 24
application/admin/model/Votesubject.php

@@ -25,8 +25,6 @@ class Votesubject extends Model
 
     // 追加属性
     protected $append = [
-        'begintime_text',
-        'endtime_text',
         'status_text'
     ];
     
@@ -38,20 +36,6 @@ class Votesubject extends Model
     }
 
 
-    public function getBegintimeTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['begintime']) ? $data['begintime'] : '');
-        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
-    }
-
-
-    public function getEndtimeTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['endtime']) ? $data['endtime'] : '');
-        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
-    }
-
-
     public function getStatusTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
@@ -59,15 +43,7 @@ class Votesubject extends Model
         return isset($list[$value]) ? $list[$value] : '';
     }
 
-    protected function setBegintimeAttr($value)
-    {
-        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
-    }
 
-    protected function setEndtimeAttr($value)
-    {
-        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
-    }
 
 
 }

+ 3 - 21
application/admin/view/votesubject/add.html

@@ -33,33 +33,15 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Begintime')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Startdate')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-begintime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[begintime]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Endtime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-endtime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[endtime]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Zhuti')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-zhuti" class="form-control" name="row[zhuti]" type="text" value="">
+            <input id="c-startdate" class="form-control" name="row[startdate]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Rules')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-rules" class="form-control" name="row[rules]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Baomingfangshi')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-baomingfangshi" class="form-control" name="row[baomingfangshi]" type="text" value="">
+            <textarea id="c-rules" class="form-control " rows="5" name="row[rules]" cols="50"></textarea>
         </div>
     </div>
     <div class="form-group">

+ 3 - 21
application/admin/view/votesubject/edit.html

@@ -33,33 +33,15 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Begintime')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Startdate')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-begintime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[begintime]" type="text" value="{:$row.begintime?datetime($row.begintime):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Endtime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-endtime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[endtime]" type="text" value="{:$row.endtime?datetime($row.endtime):''}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Zhuti')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-zhuti" class="form-control" name="row[zhuti]" type="text" value="{$row.zhuti|htmlentities}">
+            <input id="c-startdate" class="form-control" name="row[startdate]" type="text" value="{$row.startdate|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Rules')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-rules" class="form-control" name="row[rules]" type="text" value="{$row.rules|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Baomingfangshi')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-baomingfangshi" class="form-control" name="row[baomingfangshi]" type="text" value="{$row.baomingfangshi|htmlentities}">
+            <textarea id="c-rules" class="form-control " rows="5" name="row[rules]" cols="50">{$row.rules|htmlentities}</textarea>
         </div>
     </div>
     <div class="form-group">

+ 1 - 7
public/assets/js/backend/votesubject.js

@@ -22,8 +22,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
-                fixedColumns: true,
-                fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},
@@ -32,11 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'zhuban', title: __('Zhuban'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'chengban', title: __('Chengban'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'begintime', title: __('Begintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'endtime', title: __('Endtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'zhuti', title: __('Zhuti'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'rules', title: __('Rules'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'baomingfangshi', title: __('Baomingfangshi'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'startdate', title: __('Startdate'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]