|
@@ -199,9 +199,9 @@ class ApiController extends BaseController
|
|
$name = 'jxfzr';
|
|
$name = 'jxfzr';
|
|
}elseif($type == 4){//检修验收负责人
|
|
}elseif($type == 4){//检修验收负责人
|
|
$name = 'jxysfzr';
|
|
$name = 'jxysfzr';
|
|
- }elseif($type == 5){//待报废负责人
|
|
|
|
|
|
+ }elseif($type == 5){//鉴定识别(登记核实)负责人
|
|
$name = 'dbffzr';
|
|
$name = 'dbffzr';
|
|
- }elseif($type == 6){//报废负责人
|
|
|
|
|
|
+ }elseif($type == 6){//固定资产鉴定负责人
|
|
$name = 'bffzr';
|
|
$name = 'bffzr';
|
|
}
|
|
}
|
|
|
|
|
|
@@ -281,9 +281,9 @@ class ApiController extends BaseController
|
|
->leftJoin('uf_zhxx_sbgl_qygl as qygl','qygl.id','=','sbgl.ssdw')
|
|
->leftJoin('uf_zhxx_sbgl_qygl as qygl','qygl.id','=','sbgl.ssdw')
|
|
->where('sbgl.ID',$params['id'])->get();
|
|
->where('sbgl.ID',$params['id'])->get();
|
|
|
|
|
|
- // $sbzt = ['新设备到货验收中','完好','待修','检修中','待报废','已报废'];
|
|
|
|
|
|
+ // $sbzt = ['新设备到货验收中','完好','待修','检修中','检修验收中','鉴定识别(登记核实)中','已报废','代物资保管'];
|
|
// $sylx = ['在用','备用','拆除','检修','闲置'];
|
|
// $sylx = ['在用','备用','拆除','检修','闲置'];
|
|
- // $bflx = ['委外设备废品废件','废品','固定资产报废设备','代物资公司保管报废设备'];
|
|
|
|
|
|
+ // $bflx = ['委外设备废品废件','废品','设备待报废'];
|
|
|
|
|
|
foreach($data as $k=>$v){
|
|
foreach($data as $k=>$v){
|
|
$v->xsbfzr_list = [];
|
|
$v->xsbfzr_list = [];
|
|
@@ -324,7 +324,7 @@ class ApiController extends BaseController
|
|
'xm' => $val->xm
|
|
'xm' => $val->xm
|
|
];
|
|
];
|
|
}
|
|
}
|
|
- }elseif($v->sbzt == 5){//待报废负责人
|
|
|
|
|
|
+ }elseif($v->sbzt == 5){//鉴定识别(登记核实)负责人
|
|
$people_list = DB::connection('mysql_fwe10')->table('uf_zhxx_sbgl_rygl')->where('ssdw',$v->ssdw)->where('dbffzr',0)->where('is_delete',0)->get();
|
|
$people_list = DB::connection('mysql_fwe10')->table('uf_zhxx_sbgl_rygl')->where('ssdw',$v->ssdw)->where('dbffzr',0)->where('is_delete',0)->get();
|
|
foreach($people_list as $key => $val){
|
|
foreach($people_list as $key => $val){
|
|
$v->dbffzr_list[] = [
|
|
$v->dbffzr_list[] = [
|
|
@@ -332,7 +332,7 @@ class ApiController extends BaseController
|
|
'xm' => $val->xm
|
|
'xm' => $val->xm
|
|
];
|
|
];
|
|
}
|
|
}
|
|
- }elseif($v->sbzt == 6){//报废负责人
|
|
|
|
|
|
+ }elseif($v->sbzt == 6){//固定资产鉴定负责人
|
|
$people_list = DB::connection('mysql_fwe10')->table('uf_zhxx_sbgl_rygl')->where('ssdw',$v->ssdw)->where('bffzr',0)->where('is_delete',0)->get();
|
|
$people_list = DB::connection('mysql_fwe10')->table('uf_zhxx_sbgl_rygl')->where('ssdw',$v->ssdw)->where('bffzr',0)->where('is_delete',0)->get();
|
|
foreach($people_list as $key => $val){
|
|
foreach($people_list as $key => $val){
|
|
$v->bffzr_list[] = [
|
|
$v->bffzr_list[] = [
|