From 95de4c22631f73baebf55dc36038901384c9d565 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 15 Jan 2022 21:26:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E6=A0=BC=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81Ym=E5=B9=B4=E6=9C=88=E9=80=89=E6=8B=A9=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/default/public/module/form_table.html   |  3 +++
 .../view/default/public/module/form_table.html   |  3 +++
 app/module/FormHandleModule.php                  | 16 ++++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/app/admin/view/default/public/module/form_table.html b/app/admin/view/default/public/module/form_table.html
index ca81aeabe..149febcfe 100644
--- a/app/admin/view/default/public/module/form_table.html
+++ b/app/admin/view/default/public/module/form_table.html
@@ -110,6 +110,9 @@
                                                 <input type="text" autocomplete="off" class="am-form-field am-input-sm am-radius am-inline-block Wdate" id="form-table-search-time-end-{{$t.form_key}}" name="{{$t.form_key}}_end" value="{{if !empty($form_params) and isset($form_params[$t['form_key'].'_end'])}}{{$form_params[$t['form_key'].'_end']}}{{/if}}" placeholder="{{if isset($t['search_config']['placeholder_end'])}}{{$t.search_config.placeholder_end}}{{/if}}" value="" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'form-table-search-time-start-{{$t.form_key}}\',{d:+1});}'})" autocomplete="off" {{if !empty($form_params) and isset($form_params[$t['form_key'].'_end'])}}data-am-popover="{theme: 'sm', content: '{{$form_params[$t['form_key'].'_end']}}', trigger: 'hover focus'}"{{/if}} />
                                             </div>
                                         {{/case}}
+                                        {{case ym}}
+                                            <input type="text" autocomplete="off" class="am-form-field am-input-sm am-radius Wdate" name="{{$t.form_key}}" value="{{if !empty($form_params) and isset($form_params[$t['form_key']])}}{{$form_params[$t['form_key']]}}{{/if}}" placeholder="{{if isset($t['search_config']['placeholder'])}}{{$t.search_config.placeholder}}{{/if}}" value="" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM'})" autocomplete="off" {{if !empty($form_params) and isset($form_params[$t['form_key']])}}data-am-popover="{theme: 'sm', content: '{{$form_params[$t['form_key']]}}', trigger: 'hover focus'}"{{/if}} />
+                                        {{/case}}
                                         {{case module}}
                                             <!-- 从模块加载自定义模块数据 -->
                                             {{if !empty($t['search_config']['template'])}}
diff --git a/app/index/view/default/public/module/form_table.html b/app/index/view/default/public/module/form_table.html
index ca81aeabe..149febcfe 100644
--- a/app/index/view/default/public/module/form_table.html
+++ b/app/index/view/default/public/module/form_table.html
@@ -110,6 +110,9 @@
                                                 <input type="text" autocomplete="off" class="am-form-field am-input-sm am-radius am-inline-block Wdate" id="form-table-search-time-end-{{$t.form_key}}" name="{{$t.form_key}}_end" value="{{if !empty($form_params) and isset($form_params[$t['form_key'].'_end'])}}{{$form_params[$t['form_key'].'_end']}}{{/if}}" placeholder="{{if isset($t['search_config']['placeholder_end'])}}{{$t.search_config.placeholder_end}}{{/if}}" value="" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'form-table-search-time-start-{{$t.form_key}}\',{d:+1});}'})" autocomplete="off" {{if !empty($form_params) and isset($form_params[$t['form_key'].'_end'])}}data-am-popover="{theme: 'sm', content: '{{$form_params[$t['form_key'].'_end']}}', trigger: 'hover focus'}"{{/if}} />
                                             </div>
                                         {{/case}}
+                                        {{case ym}}
+                                            <input type="text" autocomplete="off" class="am-form-field am-input-sm am-radius Wdate" name="{{$t.form_key}}" value="{{if !empty($form_params) and isset($form_params[$t['form_key']])}}{{$form_params[$t['form_key']]}}{{/if}}" placeholder="{{if isset($t['search_config']['placeholder'])}}{{$t.search_config.placeholder}}{{/if}}" value="" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM'})" autocomplete="off" {{if !empty($form_params) and isset($form_params[$t['form_key']])}}data-am-popover="{theme: 'sm', content: '{{$form_params[$t['form_key']]}}', trigger: 'hover focus'}"{{/if}} />
+                                        {{/case}}
                                         {{case module}}
                                             <!-- 从模块加载自定义模块数据 -->
                                             {{if !empty($t['search_config']['template'])}}
diff --git a/app/module/FormHandleModule.php b/app/module/FormHandleModule.php
index 63e555f0b..e4454d1b7 100644
--- a/app/module/FormHandleModule.php
+++ b/app/module/FormHandleModule.php
@@ -458,6 +458,15 @@ class FormHandleModule
                                 $v['search_config']['placeholder_end'] = '结束';
                             }
                             break;
+
+                        // 年月Ym
+                        case 'ym' :
+                            // 提示信息处理
+                            if(empty($v['search_config']['placeholder']))
+                            {
+                                $v['search_config']['placeholder'] = '请选择年月';
+                            }
+                            break;
                     }
 
                     // 搜索条件数据处理
@@ -469,6 +478,7 @@ class FormHandleModule
                     $where_type_default_arr = [
                         'input'     => '=',
                         'select'    => 'in',
+                        'ym'        => '=',
                     ];
                     if(array_key_exists($where_type, $where_type_default_arr))
                     {
@@ -510,6 +520,12 @@ class FormHandleModule
                                         $value = '%'.$value.'%';
                                     }
 
+                                    // 年月Ym、去掉横岗
+                                    if($v['search_config']['form_type'] == 'ym')
+                                    {
+                                        $value = str_replace(['-', '/', '|'], '', $value);
+                                    }
+
                                     // 条件
                                     $this->where[] = [$where_name, $where_symbol, $value];
                                 }