GGican 8 年之前
父節點
當前提交
c944b81320

+ 3 - 3
app/Http/Controllers/Admin/IndexController.php

xqd
@@ -128,13 +128,13 @@ class IndexController extends CommonController
 
         $result = $result->where('status', '>', '0');
 
-        $result = $data['name'] != '' ? $result->where('bzc_name', $data['name']) : $result;
+        $result = $data['name'] != '' ? $result->where('bzc_name','like', '%'.$data['name'].'%') : $result;
 
         $result = $data['project_name'] != '' ? $result->where('project_name', $data['project_name']) : $result;
 
-        $result = $data['start_time'] != '' ? $result->where('table_time', '>', $data['start_time']) : $result;
+        $result = $data['start_time'] != '' ? $result->where('updated_at', '>', $data['start_time']) : $result;
 
-        $result = $data['end_time'] != '' ? $result->where('table_time', '<', $data['end_time']) : $result;
+        $result = $data['end_time'] != '' ? $result->where('updated_at', '<', $data['end_time']) : $result;
 
         return view('admin.search', ['re' => $result->get()]);
 

+ 7 - 2
resources/views/admin/edit_table/table_eight.blade.php

xqd
@@ -368,8 +368,13 @@
                                     </tbody>
                                 </table>
                                 <div class="row">
-                                    <div class="col-sm-4">复核:<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-8">提交说明:<textarea disabled name="sub_description">{{ $table->sub_description }}</textarea></div>
+                                    <div class="col-sm-4">核算:<input name="hesuan"  style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" placeholder=""></div>
+                                    <div class="col-sm-4">初审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                    <div class="col-sm-4">监审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                </div><br>
+                                <div class="row">
+                                    <div class="col-sm-4">复核:<input name="fuhe" style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" value="{{ $table->fuhe }}" placeholder=""></div>
+                                    <div class="col-sm-8">提交说明 : <label id="sub_description">{{ $table->sub_description }}</label></div>
                                 </div>
                             </div>
                         </div>

+ 7 - 2
resources/views/admin/edit_table/table_five.blade.php

xqd
@@ -162,8 +162,13 @@
                                     </tbody>
                                 </table>
                                 <div class="row">
-                                    <div class="col-sm-4">复核:<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-8">提交说明:<textarea disabled name="sub_description">{{ $table->sub_description }}</textarea></div>
+                                    <div class="col-sm-4">核算:<input name="hesuan"  style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" placeholder=""></div>
+                                    <div class="col-sm-4">初审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                    <div class="col-sm-4">监审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                </div><br>
+                                <div class="row">
+                                    <div class="col-sm-4">复核:<input name="fuhe" style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" value="{{ $table->fuhe }}" placeholder=""></div>
+                                    <div class="col-sm-8">提交说明 : <label id="sub_description">{{ $table->sub_description }}</label></div>
                                 </div>
                             </div>
                         </div>

+ 6 - 1
resources/views/admin/edit_table/table_four.blade.php

xqd
@@ -135,7 +135,12 @@
                                     </tbody>
                                 </table>
                                 <div class="row">
-                                    <div class="col-sm-4">复核:<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
+                                    <div class="col-sm-4">核算:<input name="hesuan"  style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" placeholder=""></div>
+                                    <div class="col-sm-4">初审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                    <div class="col-sm-4">监审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                </div><br>
+                                <div class="row">
+                                    <div class="col-sm-4">复核:<input name="fuhe" style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" value="{{ $table->fuhe }}" placeholder=""></div>
                                     <div class="col-sm-8">提交说明 : <label id="sub_description">{{ $table->sub_description }}</label></div>
                                 </div>
                             </div>

+ 6 - 2
resources/views/admin/edit_table/table_nine.blade.php

xqd
@@ -333,9 +333,13 @@
                                     </tr>
                                     </tbody>
                                 </table>
-
                                 <div class="row">
-                                    <div class="col-sm-4">复核:<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
+                                    <div class="col-sm-4">核算:<input name="hesuan"  style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" placeholder=""></div>
+                                    <div class="col-sm-4">初审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                    <div class="col-sm-4">监审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                </div><br>
+                                <div class="row">
+                                    <div class="col-sm-4">复核:<input name="fuhe" style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" value="{{ $table->fuhe }}" placeholder=""></div>
                                     <div class="col-sm-8">提交说明 : <label id="sub_description">{{ $table->sub_description }}</label></div>
                                 </div>
                             </div>

+ 9 - 4
resources/views/admin/edit_table/table_one.blade.php

xqd
@@ -174,10 +174,15 @@
                                 </tr>
                                 </tbody>
                             </table>
-                            <div class="row">
-                                <div class="col-sm-4">复核:<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                <div class="col-sm-8">提交说明 : <label id="sub_description">{{ $table->sub_description }}</label></div>
-                            </div>
+                                    <div class="row">
+                                        <div class="col-sm-4">核算:<input name="hesuan"  style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" placeholder=""></div>
+                                        <div class="col-sm-4">初审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                        <div class="col-sm-4">监审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                    </div><br>
+                                    <div class="row">
+                                        <div class="col-sm-4">复核:<input name="fuhe" style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" value="{{ $table->fuhe }}" placeholder=""></div>
+                                        <div class="col-sm-8">提交说明 : <label id="sub_description">{{ $table->sub_description }}</label></div>
+                                    </div>
                         </div>
                     </div>
                 </div>

+ 6 - 1
resources/views/admin/edit_table/table_seven.blade.php

xqd
@@ -306,7 +306,12 @@
                                     </tbody>
                                 </table>
                                 <div class="row">
-                                    <div class="col-sm-4">复核:<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
+                                    <div class="col-sm-4">核算:<input name="hesuan"  style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" placeholder=""></div>
+                                    <div class="col-sm-4">初审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                    <div class="col-sm-4">监审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                </div><br>
+                                <div class="row">
+                                    <div class="col-sm-4">复核:<input name="fuhe" style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" value="{{ $table->fuhe }}" placeholder=""></div>
                                     <div class="col-sm-8">提交说明 : <label id="sub_description">{{ $table->sub_description }}</label></div>
                                 </div>
                             </div>

+ 1 - 1
resources/views/admin/edit_table/table_six.blade.php

xqd
@@ -140,7 +140,7 @@
                                 </table>
                                 <div class="row">
                                     <div class="col-sm-4">复核:<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-8">提交说明 : <label   id="sub_description">{{ $table->sub_description }}</label></div>
+                                    <div class="col-sm-8">提交说明 : <label id="sub_description">{{ $table->sub_description }}</label></div>
                                 </div>
                             </div>
                         </div>

+ 7 - 2
resources/views/admin/edit_table/table_three.blade.php

xqd
@@ -153,8 +153,13 @@
                                     </tbody>
                                 </table>
                                 <div class="row">
-                                    <div class="col-sm-4">复核:<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-8">提交说明 : <label   id="sub_description">{{ $table->sub_description }}</label></div>
+                                    <div class="col-sm-4">核算:<input name="hesuan"  style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" placeholder=""></div>
+                                    <div class="col-sm-4">初审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                    <div class="col-sm-4">监审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                </div><br>
+                                <div class="row">
+                                    <div class="col-sm-4">复核:<input name="fuhe" style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" value="{{ $table->fuhe }}" placeholder=""></div>
+                                    <div class="col-sm-8">提交说明 : <label id="sub_description">{{ $table->sub_description }}</label></div>
                                 </div>
                             </div>
                         </div>

+ 7 - 2
resources/views/admin/edit_table/table_two.blade.php

xqd
@@ -145,8 +145,13 @@
                                     </tbody>
                                 </table>
                                 <div class="row">
-                                    <div class="col-sm-4">复核:<input disabled value="{{ $table->fuhe }}" style="display: inline" class="form-control" type="text" placeholder=""></div>
-                                    <div class="col-sm-8">提交说明 : <label   id="sub_description">{{ $table->sub_description }}</label></div>
+                                    <div class="col-sm-4">核算:<input name="hesuan"  style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" placeholder=""></div>
+                                    <div class="col-sm-4">初审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                    <div class="col-sm-4">监审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
+                                </div><br>
+                                <div class="row">
+                                    <div class="col-sm-4">复核:<input name="fuhe" style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" value="{{ $table->fuhe }}" placeholder=""></div>
+                                    <div class="col-sm-8">提交说明 : <label id="sub_description">{{ $table->sub_description }}</label></div>
                                 </div>
                             </div>
                         </div>

+ 2 - 2
resources/views/admin/index.blade.php

xqd
@@ -46,10 +46,10 @@
                             </div>
 
                             <script type="text/javascript">
-                                $('#sub').click(function(){
+                               /* $('#sub').click(function(){
                                     $('#startTime').val( $('#startTime').val().replace(/-/g,''));
                                     $('#endTime').val( $('#endTime').val().replace(/-/g,''));
-                                })
+                                })*/
                                 $(".form_datetime").datetimepicker({
                                     language: 'zh',
                                     format: 'yyyy-mm-dd',

+ 2 - 2
resources/views/admin/table/table_eight.blade.php

xqd
@@ -349,12 +349,12 @@
                                     </tbody>
                                 </table>
                                 <div class="row">
-                                    <div class="col-sm-4">核算:<input   name="hesuan"  style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" placeholder=""></div>
+                                    <div class="col-sm-4">核算:<input name="hesuan"  style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" placeholder=""></div>
                                     <div class="col-sm-4">初审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
                                     <div class="col-sm-4">监审:<input disabled style="border: none #ffffff;border-bottom: #777777 solid 1px;" ></div>
                                 </div><br>
                                 <div class="row">
-                                    <div class="col-sm-4">复核:<input   name="fuhe"  style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" placeholder=""></div>
+                                    <div class="col-sm-4">复核:<input name="fuhe" style="border: none #ffffff;border-bottom: #777777 solid 1px;" type="text" placeholder=""></div>
                                 </div>
                             </div>
                         </div><br>