PDM更新数据结构后,基础数据查询和BOM初始查询等基本功能都已经OK,待完善和细化相关的上传和下载服务等。
This commit is contained in:
@@ -4,7 +4,7 @@ namespace app\admin\controller;
|
||||
|
||||
use app\AdminController;
|
||||
use Webman\Http\Request;
|
||||
use app\common\model\PdmMfgName as PdmMfgNameModel;
|
||||
use app\admin\model\PdmMfgName as PdmMfgNameModel;
|
||||
use support\Response;
|
||||
/**
|
||||
* pdm_mfg_name
|
||||
@@ -17,7 +17,7 @@ class PdmMfgName extends AdminController
|
||||
{
|
||||
/**
|
||||
* PdmMfgName模型对象
|
||||
* @var \app\common\model\PdmMfgName
|
||||
* @var \app\admin\model\PdmMfgName
|
||||
*/
|
||||
|
||||
public function __construct()
|
||||
@@ -31,6 +31,43 @@ class PdmMfgName extends AdminController
|
||||
* 当创建CURD的时候,DIY的函数体和模板为空,请自行编写代码
|
||||
*/
|
||||
|
||||
/**
|
||||
* 获取资源列表
|
||||
* return Response
|
||||
*/
|
||||
public function index(): Response
|
||||
{
|
||||
$params = request()->all();
|
||||
$where = array();
|
||||
if (!empty($params['mfgname'])) {
|
||||
$where[] = ['mfgname','like','%'.$params['mfgname'].'%'];
|
||||
// $where[] = ['mfgname','like','%'.'ABRACON'.'%'];
|
||||
}
|
||||
if (!empty($params['mfgsite'])) {
|
||||
$where[] = ['mfgsite','like','%'.$params['mfgsite'].'%'];
|
||||
}
|
||||
|
||||
// $where[] = ['mfgname','like','%'.'ABRACON'.'%'];
|
||||
$listtemp = $this->model->where($where)->select();
|
||||
// $listtemp = $this->model->where($where);
|
||||
// $listtemp = $this->model->find(1);
|
||||
// throw new \Exception(json_encode($listtemp));
|
||||
// $admin = $this->model->admin()->where($where)->select()->toArray();
|
||||
|
||||
// $admin = $listtemp->admin;
|
||||
// throw new \Exception(json_encode($admin));
|
||||
|
||||
if (request()->isAjax()) {
|
||||
list($count, $list) = PdmMfgName::dataList(request()->all());
|
||||
// $rules = list_to_tree($list,'id','pid','children',0);
|
||||
$lists = list_to_tree($list,'id','pid','children',0);
|
||||
|
||||
return $this->success('获取成功', '/',$lists, $count);
|
||||
// return $this->success('获取成功', '/');
|
||||
}
|
||||
|
||||
return view('/pdm_mfg_name/index');
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取资源列表
|
||||
@@ -46,47 +83,51 @@ class PdmMfgName extends AdminController
|
||||
if (!empty($params['mfgname'])) {
|
||||
$where[] = ['mfgname','like','%'.$params['mfgname'].'%'];
|
||||
}
|
||||
if (!empty($params['status'])) {
|
||||
$where[] = ['status','like','%'.$params['status'].'%'];
|
||||
if (!empty($params['mfgsite'])) {
|
||||
$where[] = ['mfgsite','like','%'.$params['mfgsite'].'%'];
|
||||
}
|
||||
$model = new PdmMfgNameModel();
|
||||
$count = $model->where($where)->count();
|
||||
$list = $model->where($where)->order('sort asc')->select()->toArray();
|
||||
// $list = $model->where($where)->order('sort asc')->select()->toArray();
|
||||
$list = $model->where($where)->order('sort asc')->select();
|
||||
foreach($list as $key => $value){
|
||||
// throw new \Exception(json_encode($value));
|
||||
// throw new \Exception(json_encode($lists[$key]->admin['nickname']));
|
||||
$list[$key]['creator'] =__($list[$key]->admin['nickname']);
|
||||
}
|
||||
|
||||
|
||||
// $pidlist = array();
|
||||
foreach ($list as $key => $value) {
|
||||
$list[$key]['mfgname'] = __($value['mfgname']);
|
||||
}
|
||||
|
||||
}
|
||||
// $users = array();
|
||||
$users = $model->usernames();
|
||||
// throw new \Exception(json_encode($users));
|
||||
foreach ($list as $key => $value) {
|
||||
foreach ($users as $keyuser => $valueuser) {
|
||||
if ($value['createrid'] == $valueuser['id']) {
|
||||
// $list[$key]['createrid'] = __($valueuser['name']);
|
||||
$list[$key]['createrid'] = __($valueuser['nickname']);
|
||||
break;
|
||||
}else{
|
||||
$list[$key]['createrid'] =$list[$key]['createrid'].'|'. __('未知用户');
|
||||
}
|
||||
}
|
||||
}
|
||||
return [$count, $list];
|
||||
// $users = $model->usernames();
|
||||
|
||||
// // throw new \Exception(json_encode($users));
|
||||
// foreach ($list as $key => $value) {
|
||||
// foreach ($users as $keyuser => $valueuser) {
|
||||
// // if ($users[$keyuser]['id'] == $list[$key]['id']){
|
||||
// // // $list[$key]['creatorid'] = __($users[$keyuser]['nickname']);
|
||||
// // $list[$key]['creatorid'] = __($users[$keyuser]['name']);
|
||||
// // break;
|
||||
// // }
|
||||
// if ($value['creatorid'] == $valueuser['id']) {
|
||||
// // $list[$key]['creatorid'] = __($valueuser['name']);
|
||||
// $list[$key]['creatorid'] = __($valueuser['nickname']);
|
||||
// break;
|
||||
// }else{
|
||||
// $list[$key]['creatorid'] =$list[$key]['creatorid'].'|'. __('未知用户');
|
||||
// }
|
||||
|
||||
// }
|
||||
// }
|
||||
|
||||
return [$count, $list->toArray()];
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取资源列表
|
||||
* return Response
|
||||
*/
|
||||
public function index(): Response
|
||||
{
|
||||
if (request()->isAjax()) {
|
||||
list($count, $list) = PdmMfgName::dataList(request()->all());
|
||||
$rules = list_to_tree($list,'id','pid','children',0);
|
||||
return $this->success('获取成功', '/',$rules, $count);
|
||||
}
|
||||
return view('/pdm_mfg_name/index');
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加节点数据
|
||||
* @return Response
|
||||
@@ -97,19 +138,21 @@ class PdmMfgName extends AdminController
|
||||
$post = \request()->post();
|
||||
// validate(\app\common\validate\system\AdminRules::class . '.add')->check($post);
|
||||
$userid = get_admin_id();
|
||||
$post['createrid'] = $userid ;
|
||||
|
||||
$post['creatorid'] = $userid ;
|
||||
// if(empty($userid)){
|
||||
// $post['creatorid'] = 'empty';
|
||||
// }else{
|
||||
// $post['creatorid'] = 'noneempty' ;
|
||||
// }
|
||||
if ($this->model->create($post)) {
|
||||
return $this->success('添加成功!');
|
||||
}else{
|
||||
return $this->error('添加失败!');
|
||||
return $this->success('添加分类成功!');
|
||||
}
|
||||
}
|
||||
|
||||
$data = $this->getTableFields();
|
||||
$data['pid'] = input('pid', 0);
|
||||
$data['auth'] = 1;
|
||||
$data['type'] = 1;
|
||||
// $data['auth'] = 1;
|
||||
// $data['type'] = 1;
|
||||
|
||||
list($count, $list) = PdmMfgName::dataList(request()->all());
|
||||
return view('/pdm_mfg_name/add', [
|
||||
@@ -118,54 +161,5 @@ class PdmMfgName extends AdminController
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑节点数据
|
||||
* @return Response
|
||||
* @throws DbException
|
||||
* @throws DataNotFoundException
|
||||
* @throws ModelNotFoundException
|
||||
*/
|
||||
public function edit(): Response
|
||||
{
|
||||
$id = input('id', 0);
|
||||
$data = $this->model->find($id);
|
||||
if (request()->isPost()) {
|
||||
$post = \request()->post();
|
||||
// validate(\app\common\validate\system\AdminRules::class . '.edit')->check($post);
|
||||
if ($this->model->update($post)) {
|
||||
return $this->success('更新成功!');
|
||||
}else{
|
||||
return $this->error('更新失败!');
|
||||
}
|
||||
}
|
||||
|
||||
list($count, $list) = PdmMfgName::dataList(request()->all());
|
||||
return view('/pdm_mfg_name/add', [
|
||||
'data' => $data,
|
||||
'rules' => json_encode( list_to_tree($list), JSON_UNESCAPED_UNICODE),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除节点数据
|
||||
* @return Response
|
||||
* @throws DbException
|
||||
*/
|
||||
public function del(): Response
|
||||
{
|
||||
$id = input('id');
|
||||
if (!empty($id)) {
|
||||
// 查询子节点
|
||||
if ($this->model->where('pid',$id)->count()) {
|
||||
return $this->error('当前菜单存在子菜单!');
|
||||
}
|
||||
|
||||
// 删除单个
|
||||
if ($this->model::destroy($id)) {
|
||||
return $this->success('删除菜单成功!');
|
||||
}
|
||||
}
|
||||
return $this->error('删除失败,请检查您的参数!');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user