项目概算模块功能完善
This commit is contained in:
weiz
parent
131f3ece72
commit
53b99e254f
@ -16,6 +16,11 @@ namespace app\adminapi\lists\project;
|
||||
|
||||
|
||||
use app\adminapi\lists\BaseAdminDataLists;
|
||||
use app\common\model\auth\Admin;
|
||||
use app\common\model\custom\Custom;
|
||||
use app\common\model\custom\CustomContacts;
|
||||
use app\common\model\custom\CustomerDemand;
|
||||
use app\common\model\project\Project;
|
||||
use app\common\model\project\ProjectEstimate;
|
||||
use app\common\lists\ListsSearchInterface;
|
||||
|
||||
@ -38,7 +43,8 @@ class ProjectEstimateLists extends BaseAdminDataLists implements ListsSearchInte
|
||||
public function setSearch(): array
|
||||
{
|
||||
return [
|
||||
'=' => ['project_id'],
|
||||
'=' => ['estimate_source','invoice_type'],
|
||||
'%like%' => ['create_user'],
|
||||
];
|
||||
}
|
||||
|
||||
@ -54,11 +60,56 @@ class ProjectEstimateLists extends BaseAdminDataLists implements ListsSearchInte
|
||||
*/
|
||||
public function lists(): array
|
||||
{
|
||||
return ProjectEstimate::where($this->searchWhere)
|
||||
->field(['id', 'org_id', 'department_id', 'project_id', 'customer_demand_id', 'estimate_source', 'create_user', 'quotation_date', 'invoice_type', 'technician', 'estimate_amount'])
|
||||
$params = $this->request->param();
|
||||
$where = [];
|
||||
if(isset($params['project_name']) && $params['project_name'] != ''){
|
||||
$projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
|
||||
$where[] = ['project_id','in',$projectIds];
|
||||
}
|
||||
if(isset($params['custom_name']) && $params['custom_name'] != ''){
|
||||
$customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
|
||||
$projectIds = Project::where('custom_id','in',$customIds)->column('id');
|
||||
$where[] = ['project_id','in',$projectIds];
|
||||
}
|
||||
if(isset($params['customer_demand_name']) && $params['customer_demand_name'] != ''){
|
||||
$demandIds = CustomerDemand::where('theme','like','%'.$params['customer_demand_name'].'%')->column('id');
|
||||
$where[] = ['customer_demand_id','in',$demandIds];
|
||||
}
|
||||
if(isset($params['contact_name']) && $params['contact_name'] != ''){
|
||||
$customIds = CustomContacts::where('name','like','%'.$params['contact_name'].'%')->column('custom_id');
|
||||
$projectIds = Project::where('custom_id','in',$customIds)->column('id');
|
||||
$where[] = ['project_id','in',$projectIds];
|
||||
}
|
||||
if(isset($params['contact_phone']) && $params['contact_phone'] != ''){
|
||||
$customIds = CustomContacts::where('phone','like','%'.$params['contact_phone'].'%')->column('custom_id');
|
||||
$projectIds = Project::where('custom_id','in',$customIds)->column('id');
|
||||
$where[] = ['project_id','in',$projectIds];
|
||||
}
|
||||
if(isset($params['technician_name']) && $params['technician_name'] != ''){
|
||||
$adminIds = Admin::where('name','like','%'.$params['technician_name'].'%')->column('id');
|
||||
$where[] = ['technician','in',$adminIds];
|
||||
}
|
||||
return ProjectEstimate::where($this->searchWhere)->where($where)
|
||||
->field(['id','project_id','customer_demand_id','contact_id','estimate_source','create_user','quotation_date','invoice_type','technician','estimate_amount'])
|
||||
->limit($this->limitOffset, $this->limitLength)
|
||||
->order(['id' => 'desc'])
|
||||
->select()
|
||||
->select()->each(function($item){
|
||||
$item['quotation_date'] = date('Y-m-d H:i:s',$item['quotation_date']);
|
||||
$item['estimate_source_text'] = $item->estimate_source_text;
|
||||
$item['invoice_type_text'] = $item->invoice_type_text;
|
||||
$project = Project::field('name,custom_id')->where('id',$item['project_id'])->findOrEmpty();
|
||||
$custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty();
|
||||
$demand = CustomerDemand::field('theme')->where('id',$item['customer_demand_id'])->findOrEmpty();
|
||||
$contract = CustomContacts::field('name,phone')->where('id',$item['contact_id'])->findOrEmpty();
|
||||
$technician = Admin::field('name')->where('id',$item['technician'])->findOrEmpty();
|
||||
$item['project_name'] = $project['name'];
|
||||
$item['custom_name'] = $custom['name'];
|
||||
$item['customer_demand_name'] = $demand['theme'];
|
||||
$item['contact_name'] = $contract['name'];
|
||||
$item['contact_phone'] = $contract['phone'];
|
||||
$item['technician_name'] = $technician['name'];
|
||||
return $item;
|
||||
})
|
||||
->toArray();
|
||||
}
|
||||
|
||||
@ -71,7 +122,36 @@ class ProjectEstimateLists extends BaseAdminDataLists implements ListsSearchInte
|
||||
*/
|
||||
public function count(): int
|
||||
{
|
||||
return ProjectEstimate::where($this->searchWhere)->count();
|
||||
$params = $this->request->param();
|
||||
$where = [];
|
||||
if(isset($params['project_name']) && $params['project_name'] != ''){
|
||||
$projectIds = Project::where('name','like','%'.$params['project_name'].'%')->column('id');
|
||||
$where[] = ['project_id','in',$projectIds];
|
||||
}
|
||||
if(isset($params['custom_name']) && $params['custom_name'] != ''){
|
||||
$customIds = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
|
||||
$projectIds = Project::where('custom_id','in',$customIds)->column('id');
|
||||
$where[] = ['project_id','in',$projectIds];
|
||||
}
|
||||
if(isset($params['customer_demand_name']) && $params['customer_demand_name'] != ''){
|
||||
$demandIds = CustomerDemand::where('theme','like','%'.$params['customer_demand_name'].'%')->column('id');
|
||||
$where[] = ['customer_demand_id','in',$demandIds];
|
||||
}
|
||||
if(isset($params['contact_name']) && $params['contact_name'] != ''){
|
||||
$customIds = CustomContacts::where('name','like','%'.$params['contact_name'].'%')->column('custom_id');
|
||||
$projectIds = Project::where('custom_id','in',$customIds)->column('id');
|
||||
$where[] = ['project_id','in',$projectIds];
|
||||
}
|
||||
if(isset($params['contact_phone']) && $params['contact_phone'] != ''){
|
||||
$customIds = CustomContacts::where('phone','like','%'.$params['contact_phone'].'%')->column('custom_id');
|
||||
$projectIds = Project::where('custom_id','in',$customIds)->column('id');
|
||||
$where[] = ['project_id','in',$projectIds];
|
||||
}
|
||||
if(isset($params['technician_name']) && $params['technician_name'] != ''){
|
||||
$adminIds = Admin::where('name','like','%'.$params['technician_name'].'%')->column('id');
|
||||
$where[] = ['technician','in',$adminIds];
|
||||
}
|
||||
return ProjectEstimate::where($this->searchWhere)->where($where)->count();
|
||||
}
|
||||
|
||||
}
|
||||
@ -15,6 +15,13 @@
|
||||
namespace app\adminapi\logic\project;
|
||||
|
||||
|
||||
use app\common\model\auth\Admin;
|
||||
use app\common\model\custom\Custom;
|
||||
use app\common\model\custom\CustomContacts;
|
||||
use app\common\model\custom\CustomerDemand;
|
||||
use app\common\model\dept\Dept;
|
||||
use app\common\model\dept\Orgs;
|
||||
use app\common\model\project\Project;
|
||||
use app\common\model\project\ProjectEstimate;
|
||||
use app\common\logic\BaseLogic;
|
||||
use think\facade\Db;
|
||||
@ -42,10 +49,11 @@ class ProjectEstimateLogic extends BaseLogic
|
||||
try {
|
||||
ProjectEstimate::create([
|
||||
'org_id' => $params['org_id'],
|
||||
'department_id' => $params['department_id'],
|
||||
'dept_id' => $params['dept_id'],
|
||||
'project_id' => $params['project_id'],
|
||||
'customer_demand_id' => $params['customer_demand_id'],
|
||||
'estimate_source' => $params['estimate_source'],
|
||||
'contact_id' => $params['contact_id'],
|
||||
'create_user' => $params['create_user'],
|
||||
'quotation_date' => strtotime($params['quotation_date']),
|
||||
'invoice_type' => $params['invoice_type'],
|
||||
@ -54,7 +62,6 @@ class ProjectEstimateLogic extends BaseLogic
|
||||
'ask' => $params['ask'],
|
||||
'annex' => $params['annex']
|
||||
]);
|
||||
|
||||
Db::commit();
|
||||
return true;
|
||||
} catch (\Exception $e) {
|
||||
@ -78,10 +85,11 @@ class ProjectEstimateLogic extends BaseLogic
|
||||
try {
|
||||
ProjectEstimate::where('id', $params['id'])->update([
|
||||
'org_id' => $params['org_id'],
|
||||
'department_id' => $params['department_id'],
|
||||
'dept_id' => $params['dept_id'],
|
||||
'project_id' => $params['project_id'],
|
||||
'customer_demand_id' => $params['customer_demand_id'],
|
||||
'estimate_source' => $params['estimate_source'],
|
||||
'contact_id' => $params['contact_id'],
|
||||
'create_user' => $params['create_user'],
|
||||
'quotation_date' => strtotime($params['quotation_date']),
|
||||
'invoice_type' => $params['invoice_type'],
|
||||
@ -90,7 +98,6 @@ class ProjectEstimateLogic extends BaseLogic
|
||||
'ask' => $params['ask'],
|
||||
'annex' => $params['annex']
|
||||
]);
|
||||
|
||||
Db::commit();
|
||||
return true;
|
||||
} catch (\Exception $e) {
|
||||
@ -123,6 +130,27 @@ class ProjectEstimateLogic extends BaseLogic
|
||||
*/
|
||||
public static function detail($params): array
|
||||
{
|
||||
return ProjectEstimate::findOrEmpty($params['id'])->toArray();
|
||||
$field = 'id,org_id,dept_id,project_id,customer_demand_id,contact_id,estimate_source,create_user,quotation_date,invoice_type,technician,estimate_amount,ask,annex';
|
||||
$data = ProjectEstimate::field($field)->findOrEmpty($params['id']);
|
||||
$data['quotation_date'] = date('Y-m-d H:i:s',$data['quotation_date']);
|
||||
$data['estimate_source_text'] = $data->estimate_source_text;
|
||||
$data['invoice_type_text'] = $data->invoice_type_text;
|
||||
$org = Orgs::field('name')->where('id',$data['org_id'])->findOrEmpty();
|
||||
$dept = Dept::field('name')->where('id',$data['dept_id'])->findOrEmpty();
|
||||
$project = Project::field('name,project_code,custom_id')->where('id',$data['project_id'])->findOrEmpty();
|
||||
$custom = Custom::field('name')->where('id',$project['custom_id'])->findOrEmpty();
|
||||
$demand = CustomerDemand::field('theme')->where('id',$data['customer_demand_id'])->findOrEmpty();
|
||||
$contract = CustomContacts::field('name,phone')->where('id',$data['contact_id'])->findOrEmpty();
|
||||
$technician = Admin::field('name')->where('id',$data['technician'])->findOrEmpty();
|
||||
$data['org_name'] = $org['name'];
|
||||
$data['dept_name'] = $dept['name'];
|
||||
$data['project_name'] = $project['name'];
|
||||
$data['project_code'] = $project['project_code'];
|
||||
$data['custom_name'] = $custom['name'];
|
||||
$data['customer_demand_name'] = $demand['theme'];
|
||||
$data['contact_name'] = $contract['name'];
|
||||
$data['contact_phone'] = $contract['phone'];
|
||||
$data['technician_name'] = $technician['name'];
|
||||
return $data->toArray();
|
||||
}
|
||||
}
|
||||
@ -122,7 +122,6 @@ class ProjectPreSalesMembersLogic extends BaseLogic
|
||||
$data['business_people'] = implode(',',$business_people);
|
||||
$data['cross_departmental_personnel'] = implode(',',$cross_departmental_personnel);
|
||||
$data['add_people'] = $add_people['name'];
|
||||
unset($data['technician_ids'],$data['business_people_ids'],$data['cross_departmental_personnel_ids']);
|
||||
return $data;
|
||||
}
|
||||
}
|
||||
@ -15,6 +15,14 @@
|
||||
namespace app\adminapi\validate\project;
|
||||
|
||||
|
||||
use app\common\model\auth\Admin;
|
||||
use app\common\model\custom\Custom;
|
||||
use app\common\model\custom\CustomContacts;
|
||||
use app\common\model\custom\CustomerDemand;
|
||||
use app\common\model\dept\Dept;
|
||||
use app\common\model\dept\Orgs;
|
||||
use app\common\model\dict\DictData;
|
||||
use app\common\model\project\Project;
|
||||
use app\common\validate\BaseValidate;
|
||||
|
||||
|
||||
@ -32,7 +40,26 @@ class ProjectEstimateValidate extends BaseValidate
|
||||
*/
|
||||
protected $rule = [
|
||||
'id' => 'require',
|
||||
'org_id' => 'require|checkOrg',
|
||||
'dept_id' => 'require|checkDept',
|
||||
'project_id' => 'require|checkProject',
|
||||
'customer_demand_id' => 'require|checkCustomerDemand',
|
||||
'estimate_source' => 'require|checkEstimateSource',
|
||||
'contact_id' => 'checkContact',
|
||||
'quotation_date' => 'date',
|
||||
'invoice_type' => 'checkInvoiceType',
|
||||
'technician' => 'checkTechnician',
|
||||
];
|
||||
|
||||
protected $message = [
|
||||
'id.require' => '缺少必要参数',
|
||||
'org_id.require' => '请选择组织',
|
||||
'dept_id.require' => '请选择部门',
|
||||
'project_id.require' => '请选择项目',
|
||||
'customer_demand_id.require' => '请选择客户需求',
|
||||
'estimate_source.require' => '请选择概算来源',
|
||||
'quotation_date.date' => '报价日期格式错误'
|
||||
];
|
||||
|
||||
|
||||
/**
|
||||
@ -63,9 +90,7 @@ class ProjectEstimateValidate extends BaseValidate
|
||||
* @date 2023/11/24 21:42
|
||||
*/
|
||||
public function sceneEdit()
|
||||
{
|
||||
return $this->only(['id']);
|
||||
}
|
||||
{}
|
||||
|
||||
|
||||
/**
|
||||
@ -90,5 +115,87 @@ class ProjectEstimateValidate extends BaseValidate
|
||||
{
|
||||
return $this->only(['id']);
|
||||
}
|
||||
|
||||
public function checkOrg($value): bool|string
|
||||
{
|
||||
$org = Orgs::where('id',$value)->findOrEmpty();
|
||||
if($org->isEmpty()) {
|
||||
return '组织不存在';
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public function checkDept($value,$rule,$data): bool|string
|
||||
{
|
||||
$dept = Dept::where('id',$value)->findOrEmpty();
|
||||
if($dept->isEmpty()){
|
||||
return '部门不存在';
|
||||
}
|
||||
if($dept['org_id'] != $data['org_id']){
|
||||
return '当前部门不属于所选择的组织';
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public function checkProject($value): bool|string
|
||||
{
|
||||
$project = Project::where('id',$value)->findOrEmpty();
|
||||
if($project->isEmpty()){
|
||||
return '项目不存在';
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public function checkCustomerDemand($value,$rule,$data): bool|string
|
||||
{
|
||||
$customDemand = CustomerDemand::where('id',$value)->findOrEmpty();
|
||||
if($customDemand->isEmpty()){
|
||||
return '客户需求不存在';
|
||||
}
|
||||
if($customDemand['project_id'] != $data['project_id']){
|
||||
return '客户需求与项目信息不一致';
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public function checkEstimateSource($value): bool|string
|
||||
{
|
||||
$dictDate = DictData::where('type_value','estimate_source')->column('value');
|
||||
if(!in_array($value,$dictDate)){
|
||||
return '概算来源数据值错误';
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public function checkContact($value,$rule,$data): bool|string
|
||||
{
|
||||
$customContract = CustomContacts::where('id',$value)->findOrEmpty();
|
||||
if($customContract->isEmpty()){
|
||||
return '联系人不存在';
|
||||
}
|
||||
$project = Project::field('custom_id')->where('id',$data['project_id'])->findOrEmpty();
|
||||
if($customContract['custom_id'] != $project['custom_id']){
|
||||
return '联系人不是当前客户的联系人';
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function checkInvoiceType($value): bool|string
|
||||
{
|
||||
$dictDate = DictData::where('type_value','invoice_type')->column('value');
|
||||
if(!in_array($value,$dictDate)){
|
||||
return '发票类型数据值错误';
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public function checkTechnician($value): bool|string
|
||||
{
|
||||
$admin = Admin::where('id',$value)->findOrEmpty();
|
||||
if($admin->isEmpty()){
|
||||
return '人员不存在';
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
@ -16,6 +16,7 @@ namespace app\common\model\project;
|
||||
|
||||
|
||||
use app\common\model\BaseModel;
|
||||
use app\common\model\dict\DictData;
|
||||
use think\model\concern\SoftDelete;
|
||||
|
||||
|
||||
@ -29,6 +30,15 @@ class ProjectEstimate extends BaseModel
|
||||
use SoftDelete;
|
||||
protected $name = 'project_estimate';
|
||||
protected $deleteTime = 'delete_time';
|
||||
|
||||
|
||||
|
||||
public function getEstimateSourceTextAttr($value,$data)
|
||||
{
|
||||
$dictData = DictData::where('type_value','estimate_source')->column('name','value');
|
||||
return $dictData[$data['estimate_source']];
|
||||
}
|
||||
public function getInvoiceTypeTextAttr($value,$data)
|
||||
{
|
||||
$dictData = DictData::where('type_value','invoice_type')->column('name','value');
|
||||
return $dictData[$data['invoice_type']];
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user