优化代码

include/traits/tlist.class.php

@@ -91,11 +91,7 @@ trait tlist
             }
             $search = trim(strtoupper($this->form[$vs]));
             if ($search != null) {
-                $val[$vs] = str_ireplace(
+                $val[$vs] = str_ireplace($search, '<font color="#FF0000">'.$search.'</font>', $val[$vs]);
-                  $search,
-                  '<font color="#FF0000">'.$search.'</font>',
-                  $val[$vs]
-                );
             }
         }
         //按钮组处理
@@ -105,12 +101,7 @@ trait tlist
         }
         
         //结果整合处理
-        return array_merge(
+        return array_merge($base, $key, array_intersect_key($val, $key), $operation);
-          $base,
-          $key,
-          array_intersect_key($val, $key),
-          $operation
-        );
     }
     
     // 到期通知计算【新的】
@@ -149,8 +140,7 @@ trait tlist
             $btngroup = '<div class="btn-group" role="group" >'.$btnstr.'</div>';
             // 下拉方式的组合按钮组
             $btngrouptoggle = '<div class="btn-group" role="group">
-                                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">'
+                                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">'.$this->btn_group_toggle.'
-              .$this->btn_group_toggle.'
                                     </button>
                                     <div class="dropdown-menu btn-group-toggle-menu">'.$btnstr.'</div>
                                 </div>';
@@ -227,7 +217,6 @@ trait tlist
     }
     
     //场所统计
-    
     protected function eaddress(&$val, $_address = 'e_address', $sign = false)
     {
         global $_M, $_YW;
@@ -285,9 +274,9 @@ trait tlist
             $val['e_aps'] = self::$para['e_aps'][$val['e_aps']];
         } else {
             if (array_key_exists('v_hcname', $val) || array_key_exists('v_vaddress', $val)) {
-                $evid     = $val['e_vid'];
+                $evid            = $val['e_vid'];
-                $v_hcname = self::$village[$evid]['v_hcname'];
+                $val['v_hcname'] = $v_hcname = self::$village[$evid]['v_hcname'];
-                $evidname = self::$village[$evid]['v_name'];
+                $evidname        = self::$village[$evid]['v_name'];
                 if ($v_hcname) {
                     $evidname .= "（".$v_hcname."）";
                 }
@@ -322,8 +311,7 @@ trait tlist
         
         $val['ltype']    = parent::state_color($s_type, ['已经结束', self::$para['ltype'][$val['l_schedule']]]);
         $val['h_cid']    = self::$customer[$val['h_cid']];
-        $val['e_enable'] = $val['e_enable'] == 0 || $this->bsign == false ? parent::state_color($val['e_enable'], ['禁用', '启用'])
+        $val['e_enable'] = $val['e_enable'] == 0 || $this->bsign == false ? parent::state_color($val['e_enable'], ['禁用', '启用']) : '';
-          : '';
         // 显示商圈
         $val['v_hcname'] = $val['v_vaddress'] = '';
         self::eaddress($val, 'l_address', $this->bsign);
@@ -332,7 +320,6 @@ trait tlist
     }
     
     //广告合同关联表
-    
     protected function contract($val, $checked = '')
     {
         global $_M, $_YW;
@@ -347,9 +334,7 @@ trait tlist
         //对字段处理
         //公司名称
         if (empty(self::$customer[$val['h_cid']])) {
-            self::$customer[$val['h_cid']] = parent::customerlist(
+            self::$customer[$val['h_cid']] = parent::customerlist($val['h_cid']);
-              $val['h_cid']
-            );
         }
         //投放媒介
         if (empty(self::$para['h_medium'])) {
@@ -374,23 +359,14 @@ trait tlist
         $launchurl = $this->own_name_table.'launch&l_hnumber='.$h_number;
         $curdate   = date('Y-m-d', time());
         
-        $val['h_number']    = '<a href="'.$launchurl.'"> '.$h_number
+        $val['h_number']    = '<a href="'.$launchurl.'"> '.$h_number.'</a>';
-          .'</a>';
         $val['h_cid']       = self::$customer[$val['h_cid']];
-        $val['h_wid']       = parent::tab_tokenfield(
+        $val['h_wid']       = parent::tab_tokenfield(arrayto_string($workersstr), 1);
-          arrayto_string($workersstr),
-          1
-        );
         $val['h_noticeday'] = parent::tab_tokenfield($val['h_noticeday'], 2);
-        $val['h_medium']    = parent::tab_tokenfield(
+        $val['h_medium']    = parent::tab_tokenfield(arrayto_string($hmediumid, ','));
-          arrayto_string($hmediumid, ',')
+        $val['h_starttime'] = strtotime($val['h_starttime']) > strtotime($curdate) ? parent::str_color(2, $val['h_starttime'], 600)
-        );
-        $val['h_starttime'] = strtotime($val['h_starttime']) > strtotime(
-          $curdate
-        ) ? parent::str_color(2, $val['h_starttime'], 600)
           : $val['h_starttime'];
-        $val['h_endtime']   = strtotime($val['h_endtime']) < strtotime($curdate)
+        $val['h_endtime']   = strtotime($val['h_endtime']) < strtotime($curdate) ? parent::str_color(0, $val['h_endtime'], 600) : $val['h_endtime'];
-          ? parent::str_color(0, $val['h_endtime'], 600) : $val['h_endtime'];
         
         //执行操作按钮
         if (empty($checked)) {
@@ -411,7 +387,6 @@ trait tlist
     }
     
     //合同归档
-    
     protected function customer($val, $checked = '')
     {
         global $_M, $_YW;
@@ -420,33 +395,26 @@ trait tlist
         
         //列表前段
         $base[] = '<span class="checkbox-custom checkbox-primary">
-                            <input class="selectable-item" type="checkbox" name="id" value="'
+                            <input class="selectable-item" type="checkbox" name="id" value="'.$val['id'].'">
-          .$val['id'].'">
                             <label></label>
                         </span>';
         //对字段处理
         
-        $hcidurl          = $this->own_name_table.'contract&h_cid='
+        $hcidurl          = $this->own_name_table.'contract&h_cid='.$val['id'];
-          .$val['id'];
+        $val['c_allname'] = '<a href="'.$hcidurl.'"> '.$val['c_allname'].'</a>';
-        $val['c_allname'] = '<a href="'.$hcidurl.'"> '.$val['c_allname']
-          .'</a>';
         $val['c_tel']     = parent::tab_tokenfield($val['c_tel'], 1);
-        $val['c_address'] = $val['c_province'].$val['c_city']
+        $val['c_address'] = $val['c_province'].$val['c_city'].$val['c_district'].$val['c_address'];
-          .$val['c_district'].$val['c_address'];
         
         //执行操作按钮
         if (empty($checked)) {
-            $addtourl    = $this->own_name_info.__FUNCTION__.'&id='
+            $addtourl    = $this->own_name_info.__FUNCTION__.'&id='.$val['id'];
-              .$val['id'];
+            $this->btn[] = '<a href="'.$addtourl.'" class="btn btn-success btn-sm">编辑</a>';
-            $this->btn[] = '<a href="'.$addtourl
-              .'" class="btn btn-success btn-sm">编辑</a>';
         }
         
         return self::assemble($key, $base, $val, $checked);
     }
     
     //公司资料
-    
     protected function workers($val, $checked = '')
     {
         global $_M, $_YW;
@@ -455,8 +423,7 @@ trait tlist
         
         //列表前段
         $base[] = '<span class="checkbox-custom checkbox-primary">
-                            <input class="selectable-item" type="checkbox" name="id" value="'
+                            <input class="selectable-item" type="checkbox" name="id" value="'.$val['id'].'">
-          .$val['id'].'">
                             <label></label>
                         </span>';
         
@@ -472,17 +439,14 @@ trait tlist
         
         //执行操作按钮
         if (empty($checked)) {
-            $addtourl    = $this->own_name_info.__FUNCTION__.'&id='
+            $addtourl    = $this->own_name_info.__FUNCTION__.'&id='.$val['id'];
-              .$val['id'];
+            $this->btn[] = '<a href="'.$addtourl.'" class="btn btn-success btn-sm">编辑</a>';
-            $this->btn[] = '<a href="'.$addtourl
-              .'" class="btn btn-success btn-sm">编辑</a>';
         }
         
         return self::assemble($key, $base, $val, $checked);
     }
     
     //企业联系人
-    
     protected function para($val, $checked = '')
     {
         global $_M, $_YW;
@@ -491,8 +455,7 @@ trait tlist
         
         //列表前段
         $base[] = '<span class="checkbox-custom checkbox-primary">
-                            <input class="selectable-item" type="checkbox" name="id" value="'
+                            <input class="selectable-item" type="checkbox" name="id" value="'.$val['id'].'" '.$checked.'>
-          .$val['id'].'" '.$checked.'>
                             <label></label>
                         </span>';
         
@@ -500,34 +463,22 @@ trait tlist
         //优先计算
         switch ($val['p_type']) {
             case 0:
-                $p_num = $this->tsql->table('elevator')->where(
+                $p_num = $this->tsql->table('elevator')->where(['e_aps' => $val['p_value']])->count();
-                  ['e_aps' => $val['p_value']]
-                )->count();
                 break;
             case 1:
-                $p_num = $this->tsql->table('workers')->where(
+                $p_num = $this->tsql->table('workers')->where(['w_jid' => $val['p_value']])->count();
-                  ['w_jid' => $val['p_value']]
-                )->count();
                 break;
             case 2:
-                $p_num = $this->tsql->table('launch')->where(
+                $p_num = $this->tsql->table('launch')->where(['l_schedule' => $val['p_value']])->count();
-                  ['l_schedule' => $val['p_value']]
-                )->count();
                 break;
             case 3:
-                $p_num = $this->tsql->table('elevator')->where(
+                $p_num = $this->tsql->table('elevator')->where(['e_bno' => $val['p_value']])->count();
-                  ['e_bno' => $val['p_value']]
-                )->count();
                 break;
             case 6:
-                $p_num = $this->tsql->table('village')->where(
+                $p_num = $this->tsql->table('village')->where(['v_type' => $val['p_value']])->count();
-                  ['v_type' => $val['p_value']]
-                )->count();
                 break;
             case 7:
-                $p_num = $this->tsql->table('launch')->where(
+                $p_num = $this->tsql->table('launch')->where(['l_type' => $val['p_value']])->count();
-                  ['l_type' => $val['p_value']]
-                )->count();
                 break;
             
             default:
@@ -539,12 +490,10 @@ trait tlist
             $readonly = ' readonly="readonly" ';
         }
         
-        $inputp_num     = '<input type="hidden" name="p_num-'.$val['id']
+        $inputp_num     = '<input type="hidden" name="p_num-'.$val['id'].'" value="'.$p_num.'">';
-          .'" value="'.$p_num.'">';
         $val['p_num']   = $checked ? $inputp_num : $p_num.' 条'.$inputp_num;
         $val['p_type']  = '<div class="form-group">
-                                    <select class="form-control" name="p_type-'
+                                    <select class="form-control" name="p_type-'.$val['id'].'" data-checked="'.$val['p_type'].'" required >
-          .$val['id'].'" data-checked="'.$val['p_type'].'" required >
                                         <option value="0">广告位置</option>
                                         <option value="1">企业职位</option>
                                         <option value="2">投放进度</option>
@@ -555,35 +504,22 @@ trait tlist
                                     </select>
                                 </div>';
         $val['p_order'] = '<div class="form-group">
-                                    <input type="text" name="p_order-'
+                                    <input type="text" name="p_order-'.$val['id'].'" value="'.$val['p_order'].'" placeholder="仅支持数字" data-fv-integer="true" data-fv-integer-message="请输入有效的整数数字" class="form-control">
-          .$val['id'].'" value="'.$val['p_order'].'" placeholder="仅支持数字" data-fv-integer="true" data-fv-integer-message="请输入有效的整数数字" class="form-control">
                                </div>';
         $val['p_name']  = '<div class="form-group">
-                                    <input type="text" name="p_name-'
+                                    <input type="text" name="p_name-'.$val['id'].'" value="'.$val['p_name'].'" required class="form-control">
-          .$val['id'].'" value="'.$val['p_name'].'" required class="form-control">
                                 </div>';
         $val['p_value'] = '<div class="form-group">
-                                    <input type="text" name="p_value-'
+                                    <input type="text" name="p_value-'.$val['id'].'" value="'.$val['p_value']
-          .$val['id'].'" value="'.$val['p_value']
+          .'" placeholder="仅支持数字" data-fv-integer="true" data-fv-integer-message="请输入有效的整数数字" class="form-control" '.$readonly.'>
-          .'" placeholder="仅支持数字" data-fv-integer="true" data-fv-integer-message="请输入有效的整数数字" class="form-control" '
-          .$readonly.'>
                                 </div>';
-        $val['p_text']  = '<input type="text" name="p_text-'.$val['id']
+        $val['p_text']  = '<input type="text" name="p_text-'.$val['id'].'" value="'.$val['p_text'].'" class="form-control">';
-          .'" value="'.$val['p_text']
-          .'" class="form-control">';
         
         //执行操作按钮
-        return self::assemble(
+        return self::assemble($key, $base, $val, $checked, $p_num > 0 ? false : []);
-          $key,
-          $base,
-          $val,
-          $checked,
-          $p_num > 0 ? false : []
-        );
     }
     
     //参数统计
-    
     protected function launch($val, $checked = '')
     {
         global $_M, $_YW;
@@ -592,8 +528,7 @@ trait tlist
         
         //列表前段
         $base[] = '<span class="checkbox-custom checkbox-primary ap-one">
-                            <input class="selectable-item" type="checkbox" name="id" value="'
+                            <input class="selectable-item" type="checkbox" name="id" value="'.$val['id'].'" '.$checked.'>
-          .$val['id'].'" '.$checked.'>
                             <label></label>
                         </span>';
         //对字段处理
@@ -604,40 +539,20 @@ trait tlist
             self::$para['l_type'] = parent::translate(7);
         }
         $enum    = count(array_filter(stringto_array($val['l_enumber'], ',')));
-        $snum    = count(
+        $snum    = count(array_filter(stringto_array($val['l_selectenum'], ',')));
-          array_filter(stringto_array($val['l_selectenum'], ','))
-        );
         $esstr   = " {$enum} / {$snum} ";
         $curdate = date('Y-m-d', time());
         
-        $l_titleurl        = $this->own_name_table.'schedule&l_id='
+        $l_titleurl        = $this->own_name_table.'schedule&l_id='.$val['id'];
-          .$val['id'];
+        $val['l_totalnum'] = $enum == $snum ? $esstr : parent::state_color(0, [$esstr]);    //放在最前面，防止后面对l_enumber 字段的处理
-        $val['l_totalnum'] = $enum == $snum
+        $val['l_title']    = '<a href="'.$l_titleurl.'"> '.$val['l_title'].'</a>';
-          ? $esstr
+        $val['l_enumber']  = parent::tab_tokenfield($val['l_enumber'], 1, ',', 6);
-          : parent::state_color(
+        $val['l_schedule'] = parent::tab_tokenfield(self::$para['l_schedule'][$val['l_schedule']], 1);
-            0,
-            [$esstr]
-          );    //放在最前面，防止后面对l_enumber 字段的处理
-        $val['l_title']    = '<a href="'.$l_titleurl.'"> '.$val['l_title']
-          .'</a>';
-        $val['l_enumber']  = parent::tab_tokenfield(
-          $val['l_enumber'],
-          1,
-          ',',
-          6
-        );
-        $val['l_schedule'] = parent::tab_tokenfield(
-          self::$para['l_schedule'][$val['l_schedule']],
-          1
-        );
         $val['l_type']     = self::$para['l_type'][$val['l_type']];
         
-        $val['l_starttime'] = strtotime($val['l_starttime']) > strtotime(
+        $val['l_starttime'] = strtotime($val['l_starttime']) > strtotime($curdate) ? parent::str_color(2, $val['l_starttime'], 600)
-          $curdate
-        ) ? parent::str_color(2, $val['l_starttime'], 600)
           : $val['l_starttime'];
-        $val['l_endtime']   = strtotime($val['l_endtime']) < strtotime($curdate)
+        $val['l_endtime']   = strtotime($val['l_endtime']) < strtotime($curdate) ? parent::str_color(0, $val['l_endtime'], 600) : $val['l_endtime'];
-          ? parent::str_color(0, $val['l_endtime'], 600) : $val['l_endtime'];
         
         //执行操作按钮
         if (empty($checked)) {
@@ -656,7 +571,6 @@ trait tlist
     }
     
     //投放计划
-    
     protected function applan($val, $checked = '')
     {
         global $_M, $_YW;
@@ -666,11 +580,7 @@ trait tlist
         //列表前段
         $e_number = $val['e_number'];
         //判断之前是否已经选中
-        $ebool = in_array(
+        $ebool = in_array($e_number, array_filter(stringto_array($this->form['l_selectenum'], ',')), true);
-          $e_number,
-          array_filter(stringto_array($this->form['l_selectenum'], ',')),
-          true
-        );
         //给予选中标识
         $class = ' checkbox-primary '; //刚选择默认颜色
         //$val['lanum'] 大于0 说明重复,不可投放
@@ -680,16 +590,10 @@ trait tlist
             //判断排期表内是否存在
             if ( ! empty($this->form['slid'])) {
                 if (empty(self::$para[$slid])) {
-                    self::$para[$slid] = $this->tsql->table('launch')->where(
+                    self::$para[$slid] = $this->tsql->table('launch')->where(['id' => $slid])->one();
-                      ['id' => $slid]
-                    )->one();
                 }
-                $l_hnumber = stringto_array(
+                $l_hnumber = stringto_array(self::$para[$slid]['l_enumber'], ',');
-                  self::$para[$slid]['l_enumber'],
+                $class     = in_array($e_number, $l_hnumber, true) ? ' checkbox-success ' : ' checkbox-danger '; //刚选择默认颜色
-                  ','
-                );
-                $class     = in_array($e_number, $l_hnumber, true)
-                  ? ' checkbox-success ' : ' checkbox-danger '; //刚选择默认颜色
             }
         }
         
@@ -704,9 +608,7 @@ trait tlist
         } else {
             $s_starttime = $_M['form']['l_starttime'];
             $s_endtime   = $_M['form']['l_endtime'];
-            if ($s_starttime && $s_endtime
+            if ($s_starttime && $s_endtime && strtotime($s_starttime) <= strtotime($s_endtime)) {
-              && strtotime($s_starttime) <= strtotime($s_endtime)
-            ) {
                 //判断是否可排期成功
                 if ($val['lanum'] > 0) {
                     $e_types = parent::str_color(0, '禁止投放');
@@ -725,8 +627,7 @@ trait tlist
         
         // checkbox-danger 没有在排期库的显示为红色 checkbox-primary 正常的显示蓝色 checkbox-success 绿色
         $base[] = '<span class="checkbox-custom '.$class.' ap-one">
-                            <input class="selectable-item" type="checkbox" name="id" value="'
+                            <input class="selectable-item" type="checkbox" name="id" value="'.$e_number.'" '.$apchecked.$disabled.'>
-          .$e_number.'" '.$apchecked.$disabled.'>
                             <label></label>
                         </span>';
         
@@ -734,22 +635,15 @@ trait tlist
         $curtime = strtotime(date('Y-m-d', time()));
         //上个排期
         if (strtotime($val['endetime']) < $curtime) {
-            $val['endtitle'] = '<span class="blue-grey-400">'.$val['endtitle']
+            $val['endtitle'] = '<span class="blue-grey-400">'.$val['endtitle'].'</span>';
-              .'</span>';
+            $val['endstime'] = '<span class="blue-grey-400">'.$val['endstime'].'</span>';
-            $val['endstime'] = '<span class="blue-grey-400">'.$val['endstime']
+            $val['endetime'] = '<span class="blue-grey-400">'.$val['endetime'].'</span>';
-              .'</span>';
-            $val['endetime'] = '<span class="blue-grey-400">'.$val['endetime']
-              .'</span>';
         }
         
-        $val['endtime']  = strtotime($val['endtime']) < $curtime
+        $val['endtime']  = strtotime($val['endtime']) < $curtime ? '<span class="line_through blue-grey-400">'.$val['endtime'].'</span>'
-          ? '<span class="line_through blue-grey-400">'.$val['endtime']
+          : $val['endtime'];
-          .'</span>' : $val['endtime'];
         $val['e_types']  = $e_types;
-        $val['e_enable'] = parent::state_color(
+        $val['e_enable'] = parent::state_color($val['e_enable'], ['禁用', '启用']);
-          $val['e_enable'],
-          ['禁用', '启用']
-        );
         self::eaddress($val, 'e_address');
         //比较每个广告位的结束时间 和 现在设置的投放订单的开始时间 大小
         //禁用最后的按钮
@@ -759,7 +653,6 @@ trait tlist
     }
     
     //广告位统计
-    
     protected function elevators($val, $checked = '')
     {
         global $_M, $_YW;
@@ -768,59 +661,38 @@ trait tlist
         
         //列表前段
         $base[] = '<span class="checkbox-custom checkbox-primary ap-one">
-                            <input class="selectable-item" type="checkbox" name="id" value="'
+                            <input class="selectable-item" type="checkbox" name="id" value="'.$val['e_number'].'" '.$checked.'>
-          .$val['e_number'].'" '.$checked.'>
                             <label></label>
                         </span>';
         //对字段处理
         $curtime     = strtotime(date('Y-m-d', time()));
-        $scheduleurl = $this->own_name_table.'schedule&e_number='
+        $scheduleurl = $this->own_name_table.'schedule&e_number='.$val['e_number'];
-          .$val['e_number'];
+        $uplaunchurl = $this->own_name_info.'uplaunch&e_number='.$val['e_number'];
-        $uplaunchurl = $this->own_name_info.'uplaunch&e_number='
-          .$val['e_number'];
         
-        $val['e_number'] = '<a href="'.$scheduleurl.'"> '.$val['e_number']
+        $val['e_number'] = '<a href="'.$scheduleurl.'"> '.$val['e_number'].'</a>';
-          .'</a>';
+        $val['etypes']   = parent::state_color($val['etypes'], [$val['e_enable'] ? '空位' : '已禁用', '排期中']);
-        $val['etypes']   = parent::state_color(
+        $val['e_enable'] = parent::state_color($val['e_enable'], ['禁用', '启用']);
-          $val['etypes'],
-          [$val['e_enable'] ? '空位' : '已禁用', '排期中']
-        );
-        $val['e_enable'] = parent::state_color(
-          $val['e_enable'],
-          ['禁用', '启用']
-        );
         
         $scheduleurlid    = $this->own_name_table.'schedule&l_id=';
-        $val['endtitle']  = $val['endtitle'] ? '<a href="'.$scheduleurlid
+        $val['endtitle']  = $val['endtitle'] ? '<a href="'.$scheduleurlid.$val['endid'].'">'.$val['endtitle'].'</a>' : '';
-          .$val['endid'].'">'
+        $val['nowtitle']  = $val['nowtitle'] ? '<a href="'.$scheduleurlid.$val['nowid'].'">'.$val['nowtitle'].'</a>' : '';
-          .$val['endtitle'].'</a>' : '';
+        $val['nexttitle'] = $val['nexttitle'] ? '<a href="'.$scheduleurlid.$val['nextid'].'">'.$val['nexttitle'].'</a>' : '';
-        $val['nowtitle']  = $val['nowtitle'] ? '<a href="'.$scheduleurlid
-          .$val['nowid'].'">'
-          .$val['nowtitle'].'</a>' : '';
-        $val['nexttitle'] = $val['nexttitle'] ? '<a href="'.$scheduleurlid
-          .$val['nextid'].'">'
-          .$val['nexttitle'].'</a>'
-          : '';
         // 显示商圈
         $val['v_hcname'] = '';
         self::eaddress($val, 'e_address');
         
-        $val['endtime'] = strtotime($val['endtime']) < $curtime
+        $val['endtime'] = strtotime($val['endtime']) < $curtime ? '<span class="line_through blue-grey-400">'.$val['endtime'].'</span>'
-          ? '<span class="line_through blue-grey-400">'.$val['endtime']
+          : $val['endtime'];
-          .'</span>' : $val['endtime'];
         //上个排期
         if (strtotime($val['endetime']) < $curtime) {
-            $val['endstime'] = '<span class="blue-grey-400">'.$val['endstime']
+            $val['endstime'] = '<span class="blue-grey-400">'.$val['endstime'].'</span>';
-              .'</span>';
+            $val['endetime'] = '<span class="blue-grey-400">'.$val['endetime'].'</span>';
-            $val['endetime'] = '<span class="blue-grey-400">'.$val['endetime']
-              .'</span>';
         }
         
         //执行操作按钮
         if (empty($checked)) {
             //            $this->btn[]  = '<a href="'.$uplaunchurl.'" class="btn btn-success btn-sm">调整排期</a>';
-            $this->btn[] = '<a href="'.$scheduleurl
+            $this->btn[] = '<a href="'.$scheduleurl.'" class="btn btn-primary btn-sm">查看排期</a>';
-              .'" class="btn btn-primary btn-sm">查看排期</a>';
         }
         //跳过标记突出处理
         $this->skip_field = ['e_number'];
@@ -829,7 +701,6 @@ trait tlist
     }
     
     //广告位统计
-    
     protected function villages($val, $checked = '')
     {
         global $_M, $_YW;
@@ -838,8 +709,7 @@ trait tlist
         
         //列表前段
         $base[] = '<span class="checkbox-custom checkbox-primary">
-                            <input class="selectable-item" type="checkbox" name="id" value="'
+                            <input class="selectable-item" type="checkbox" name="id" value="'.$val['id'].'">
-          .$val['id'].'">
                             <label></label>
                         </span>';
         
@@ -850,33 +720,20 @@ trait tlist
         //对字段处理
         $scheduleurl = $this->own_name_table.'schedule&e_vid='.$val['id'];
         
-        $val['v_name']   = '<a href="'.$scheduleurl.'" title="查看排期"> '
+        $val['v_name']   = '<a href="'.$scheduleurl.'" title="查看排期"> '.$val['v_name'].'</a>';
-          .$val['v_name'].'</a>';
         $val['v_type']   = self::$para['v_type'][$val['v_type']];
-        $val['v_free']   = $val['v_free']
+        $val['v_free']   = $val['v_free'] ? '<span class="tag tag-sm tag-pill tag-info">'.$val['v_free'].'</span>' : $val['v_free'];
-          ? '<span class="tag tag-sm tag-pill tag-info">'.$val['v_free']
+        $val['v_lease']  = $val['v_lease'] ? '<span class="tag tag-sm tag-pill tag-warning">'.$val['v_lease'].'</span>' : $val['v_lease'];
-          .'</span>' : $val['v_free'];
+        $val['v_endday'] = $val['v_endday'] ? '<span class="tag tag-sm tag-pill tag-success">'.$val['v_endday'].'</span>' : $val['v_endday'];
-        $val['v_lease']  = $val['v_lease']
+        $val['v_prerow'] = $val['v_prerow'] ? '<span class="tag tag-sm tag-pill tag-primary">'.$val['v_prerow'].'</span>' : $val['v_prerow'];
-          ? '<span class="tag tag-sm tag-pill tag-warning">'.$val['v_lease']
-          .'</span>' : $val['v_lease'];
-        $val['v_endday'] = $val['v_endday']
-          ? '<span class="tag tag-sm tag-pill tag-success">'
-          .$val['v_endday'].'</span>' : $val['v_endday'];
-        $val['v_prerow'] = $val['v_prerow']
-          ? '<span class="tag tag-sm tag-pill tag-primary">'
-          .$val['v_prerow'].'</span>' : $val['v_prerow'];
         if ($val['noban'] > 0) {
-            $val['v_enum'] = '<span class="tag tag-sm tag-pill tag-dark">'
+            $val['v_enum'] = '<span class="tag tag-sm tag-pill tag-dark">'.$val['v_enum'].'</span>';
-              .$val['v_enum'].'</span>';
             if ($this->bsign) {
                 $val['v_enum'] .= ' -- ';
             }
-            $val['v_enum'] .= '<span class="tag tag-sm tag-pill tag-danger m-l-10">'
+            $val['v_enum'] .= '<span class="tag tag-sm tag-pill tag-danger m-l-10">'.$val['noban'].'</span>';
-              .$val['noban'].'</span>';
         } else {
-            $val['v_enum'] = $val['v_enum']
+            $val['v_enum'] = $val['v_enum'] ?: '<span class="tag tag-sm tag-pill tag-danger">'.$val['v_enum'].'</span>';
-              ?: '<span class="tag tag-sm tag-pill tag-danger">'
-              .$val['v_enum'].'</span>';
         }
         // $val['v_province'].$val['v_city'] 去掉省市
         if ( ! $this->bsign) {
@@ -885,17 +742,14 @@ trait tlist
         
         //执行操作按钮
         if (empty($checked)) {
-            $addtourl    = $this->own_name_table.'elevators&e_vid='
+            $addtourl    = $this->own_name_table.'elevators&e_vid='.$val['id'];
-              .$val['id'];
+            $this->btn[] = '<a href="'.$addtourl.'" class="btn btn-primary btn-sm">广告位统计</a>';
-            $this->btn[] = '<a href="'.$addtourl
-              .'" class="btn btn-primary btn-sm">广告位统计</a>';
         }
         
         return self::assemble($key, $base, $val, $checked, false);
     }
     
     //场所统计展示
-    
     protected function noticeday($val, $checked = '', $base = [])
     {
         global $_M, $_YW;
@@ -906,9 +760,7 @@ trait tlist
         //对字段处理
         //公司
         if (empty(self::$customer[$val['h_cid']])) {
-            self::$customer[$val['h_cid']] = parent::customerlist(
+            self::$customer[$val['h_cid']] = parent::customerlist($val['h_cid']);
-              $val['h_cid']
-            );
         }
         
         //相关人员
@@ -927,16 +779,13 @@ trait tlist
         $val['h_cid'] = self::$customer[$val['h_cid']];
         $val['h_wid'] = parent::tab_tokenfield(arrayto_string($workersstr), 1);
         
-        $numberurl       = $this->own_name_table.'contract&h_number='
+        $numberurl       = $this->own_name_table.'contract&h_number='.$val['h_number'];
-          .$val['h_number'];
+        $val['h_number'] = '<a href="'.$numberurl.'" title="查看排期"> '.$val['h_number'].'</a>';
-        $val['h_number'] = '<a href="'.$numberurl.'" title="查看排期"> '
-          .$val['h_number'].'</a>';
         
         return self::assemble($key, $base, $val, $checked, false);
     }
     
     //场所统计展示
-    
     protected function noticestr($noticeday)
     {
         //首先判断当前这条信息是属于到期前台3天的 还是属于设置的提醒
@@ -954,11 +803,7 @@ trait tlist
                 $htypes = "{$str} 天后到期";
             } else {
                 //说明已经到期或者过期
-                $htypes = $noticeday == 0 ? parent::str_color(
+                $htypes = $noticeday == 0 ? parent::str_color(0, '今天到期', 800) : parent::str_color(5, "已过期 {$day} 天", 800);
-                  0,
-                  '今天到期',
-                  800
-                ) : parent::str_color(5, "已过期 {$day} 天", 800);
             }
         }
         
@@ -966,7 +811,6 @@ trait tlist
     }
     
     //前台巡查
-    
     protected function patrol($val, $checked = '')
     {
         global $_M, $_YW;
@@ -980,15 +824,9 @@ trait tlist
         $curdate  = strtotime(date('Y-m-d', time()));
         $day      = $val['nowetime'] ? abs(($nowetime - $curdate) / 86400) : 0;
         
-        $val['e_number'] = parent::state_color(
+        $val['e_number'] = parent::state_color($val['e_enable'], [$val['e_number'], $val['e_number']]);
-          $val['e_enable'],
-          [$val['e_number'], $val['e_number']]
-        );
         self::eaddress($val, 'e_address');
-        $val['nowtitle'] = parent::state_color(
+        $val['nowtitle'] = parent::state_color($curdate > $nowetime ? 0 : ($day > 2 ? 1 : 2), [$val['nowtitle'], $val['nowtitle'], $val['nowtitle']]);
-          $curdate > $nowetime ? 0 : ($day > 2 ? 1 : 2),
-          [$val['nowtitle'], $val['nowtitle'], $val['nowtitle']]
-        );
         
         return self::assemble($key, [], $val, $checked, false);
     }
@@ -1002,37 +840,24 @@ trait tlist
         
         //列表前段
         $base[] = '<span class="checkbox-custom checkbox-primary">
-                            <input class="selectable-item" type="checkbox" name="id" value="'
+                            <input class="selectable-item" type="checkbox" name="id" value="'.$val['id'].'" '.$checked.'>
-          .$val['id'].'" '.$checked.'>
                             <label></label>
                         </span>';
         
         //对字段处理
         if (empty(self::$workers[$val['k_wid']])) {
-            $k_wid                        = parent::workerslist(
+            $k_wid                        = parent::workerslist($val['k_wid'], false);
-              $val['k_wid'],
+            self::$workers[$val['k_wid']] = $k_wid['w_name'].','.$k_wid['w_tel'];
-              false
-            );
-            self::$workers[$val['k_wid']] = $k_wid['w_name'].','
-              .$k_wid['w_tel'];
         }
         
         $val['k_basekey'] = base64_decode($val['k_basekey']);
-        $val['k_state']   = parent::state_color(
+        $val['k_state']   = parent::state_color($val['k_state'], ['禁用', '启用']);
-          $val['k_state'],
+        $val['k_wid']     = parent::tab_tokenfield(self::$workers[$val['k_wid']], 1);
-          ['禁用', '启用']
-        );
-        $val['k_wid']     = parent::tab_tokenfield(
-          self::$workers[$val['k_wid']],
-          1
-        );
         
         //执行操作按钮
         if (empty($checked)) {
-            $addtourl    = $this->own_name_info.__FUNCTION__.'&id='
+            $addtourl    = $this->own_name_info.__FUNCTION__.'&id='.$val['id'];
-              .$val['id'];
+            $this->btn[] = '<a href="'.$addtourl.'" class="btn btn-success btn-sm">编辑</a>';
-            $this->btn[] = '<a href="'.$addtourl
-              .'" class="btn btn-success btn-sm">编辑</a>';
         }
         
         //执行操作按钮