feat(testing): 增加质检报告独立编辑与详情页面,不再使用弹窗
这个提交包含在:
@@ -2,7 +2,8 @@
|
||||
|
||||
namespace app\admin\controller;
|
||||
|
||||
use app\common\controller\Backend;
|
||||
use app\common\controller\GranaryBackend;
|
||||
use app\common\library\GranarySite;
|
||||
use app\common\model\ContentModel;
|
||||
use think\Db;
|
||||
|
||||
@@ -11,7 +12,7 @@ use think\Db;
|
||||
* Class Content
|
||||
* @package app\admin\controller\Content
|
||||
*/
|
||||
class Content extends Backend
|
||||
class Content extends GranaryBackend
|
||||
{
|
||||
|
||||
/**
|
||||
@@ -49,20 +50,19 @@ class Content extends Backend
|
||||
$endTime = input('param.end_time', '');
|
||||
$rid = input('param.rid/d');
|
||||
$date = input('param.date');
|
||||
$result = $this->model->getLists([
|
||||
$this->scopeRecords($this->model);
|
||||
$result = $this->model->getLists([
|
||||
'keyword' => $key,
|
||||
'type' => $type,
|
||||
'status' => $status,
|
||||
'start_time' => $startTime,
|
||||
'end_time' => $endTime,
|
||||
'rid' => $rid,
|
||||
'gid' => $rid,
|
||||
'date' => $date,
|
||||
], $rows, $page);
|
||||
|
||||
// 仓库
|
||||
$result['granaryList'] = Db::name('granary')
|
||||
->field(['id', 'name'])
|
||||
->select();
|
||||
$result['granaryList'] = GranarySite::granaries($this->filterSites);
|
||||
|
||||
return json($result);
|
||||
}
|
||||
@@ -152,9 +152,7 @@ class Content extends Backend
|
||||
$data['content'] = json_decode($data['content'], true);
|
||||
}
|
||||
|
||||
$granaryList = Db::name('granary')
|
||||
->field(['id', 'name'])
|
||||
->select();;
|
||||
$granaryList = GranarySite::granaries($this->granarySites);
|
||||
|
||||
return json([
|
||||
'code' => 200,
|
||||
|
||||
在新工单中引用
屏蔽一个用户