소스 검색

导出搜索集成

qr 2 달 전
부모
커밋
951f53d970
2개의 변경된 파일7개의 추가작업 그리고 14개의 파일을 삭제
  1. 1 4
      webmain/flow/page/rock_page_sealapl.php
  2. 6 10
      webmain/model/flow/sealaplModel.php

+ 1 - 4
webmain/flow/page/rock_page_sealapl.php

@@ -398,10 +398,7 @@ $(document).ready(function(){
 			</div>
 		</td>
 		<td style="padding-left:10px"><div id="changatype{rand}" class="btn-group"></div></td>
-	
-<!--		<td align="right" id="tdright_{rand}" nowrap>-->
-<!---->
-<!--		</td>-->
+
 	</tr>
 	</table>
 </div>

+ 6 - 10
webmain/model/flow/sealaplModel.php

@@ -33,13 +33,10 @@ class flow_sealaplClassModel extends flowModel
     //单据判断条件从写$lx类型,$uid用户Id
     protected function flowbillwhere($lx, $uid){
         $where = '';
-//        $this->rock->post('key');
 
         $startDate = $this->rock->post("start_date");
         $stopDate = $this->rock->post("stop_date");
-//        $status = $this->rock->post("status") ?? null;
-//        $export_type = $this->rock->post("export_type");
-//
+
         if ($uid == 'all') {
             $where .= 'and '.$this->adminid.' in (1, 28)';
         }
@@ -47,12 +44,11 @@ class flow_sealaplClassModel extends flowModel
         if (!empty($startDate)) {
             $where .= " and office_date > '{$startDate}'";
         }
-//        // 结束时间
-//        if (!empty($stopDate)) {
-//            $where .= " and office_date < '{$stopDate}'";
-//        }
-//        // 审核完成
-//        $where .= " and status = 1";
+        // 结束时间
+        if (!empty($stopDate)) {
+            $where .= " and office_date < '{$stopDate}'";
+        }
+
 
         return [
             'where' 	=> $where,