|
@@ -2391,6 +2391,8 @@ class Orders extends Auth {
|
|
|
->select();
|
|
->select();
|
|
|
foreach ($lists as $k => $v) {
|
|
foreach ($lists as $k => $v) {
|
|
|
// $lists[$k] = $this->model->newFormatOrder($v);
|
|
// $lists[$k] = $this->model->newFormatOrder($v);
|
|
|
|
|
+ $content = removeEmojiChar($v['content']);
|
|
|
|
|
+ $lists[$k]['content'] = preg_replace('/[^\p{L}\p{N}\p{P}\p{Z}^\n]/u', '', $content);
|
|
|
$lists[$k]['priority'] = isset($this->model->priority[$v['priority']])?$this->model->priority[$v['priority']]:"";
|
|
$lists[$k]['priority'] = isset($this->model->priority[$v['priority']])?$this->model->priority[$v['priority']]:"";
|
|
|
$lists[$k]['task_priority'] = $v['priority']==3?2:0;
|
|
$lists[$k]['task_priority'] = $v['priority']==3?2:0;
|
|
|
$lists[$k]['source_type_text'] =$v['from']>0? isset($this->model->source_type[$v['from']])?$this->model->source_type[$v['from']]:'':$this->getTableField('work_type_mode', ['id' => $v['work_type_mode']], 'name');
|
|
$lists[$k]['source_type_text'] =$v['from']>0? isset($this->model->source_type[$v['from']])?$this->model->source_type[$v['from']]:'':$this->getTableField('work_type_mode', ['id' => $v['work_type_mode']], 'name');
|
|
@@ -2407,6 +2409,8 @@ class Orders extends Auth {
|
|
|
->order($order)->select();
|
|
->order($order)->select();
|
|
|
foreach ($lists as $k => $v) {
|
|
foreach ($lists as $k => $v) {
|
|
|
$lists[$k] = $this->model->newFormatOrder($v);
|
|
$lists[$k] = $this->model->newFormatOrder($v);
|
|
|
|
|
+ $content = removeEmojiChar($v['content']);
|
|
|
|
|
+ $lists[$k]['content'] = preg_replace('/[^\p{L}\p{N}\p{P}\p{Z}^\n]/u', '', $content);
|
|
|
$lists[$k]['priority'] = isset($this->model->priority[$v['priority']])?$this->model->priority[$v['priority']]:"";
|
|
$lists[$k]['priority'] = isset($this->model->priority[$v['priority']])?$this->model->priority[$v['priority']]:"";
|
|
|
if ($turnoff && $level1 && $v['order_mode'] == 1 && $v['is_deal'] == 1) {
|
|
if ($turnoff && $level1 && $v['order_mode'] == 1 && $v['is_deal'] == 1) {
|
|
|
$lists[$k]['order_mode_text'] = '已派发';
|
|
$lists[$k]['order_mode_text'] = '已派发';
|