Commit 71927fdf by wenyi.chen

完成批量导入批量导出,pdf多文件列表

parent 7f9a4c95
......@@ -269,8 +269,8 @@ class Norm
$data['receivesList'][$index]['refer_type'] = '';
$data['receivesList'][$index]['remark'] = '';
$data['receivesList'][$index]['imgPath'] = '';
$data['receivesList'][$index]['fileListPdf'] = $collectsInfo['fileListPdf'];
$data['receivesList'][$index]['file_name'] = $collectsInfo['file_name'];
$data['receivesList'][$index]['fileListPdf'] = '';
$data['receivesList'][$index]['file_name'] ='';
$data['receivesList'][$index]['normCollectsExtend'] =$res;
}
}
......@@ -322,6 +322,7 @@ class Norm
$data['receivesList'][$index]['norm_list_extend'] = $NormListExtendBus->getConditionalQueryAll(['norm_list_id'=>$vlues['norm_list_id']]);
$NormCollectsBus = new CommonBus('NormCollectsBus'); // 通过公共业务初始化指标类
$collectsInfo = $NormCollectsBus->getConditionalQuery(['norm_receive_id'=>$vlues['id']]);
// 用户没有填写信息
if ($collectsInfo){
$NormCollectsExtendBus = new CommonBus('NormCollectsExtendBus'); // 通过公共业务初始化指标类
$normCollectsExtend = $NormCollectsExtendBus->getConditionalQueryAll(['norm_collects_id'=>$collectsInfo['id']]);
......@@ -337,8 +338,8 @@ class Norm
$data['receivesList'][$index]['refer_type'] = '';
$data['receivesList'][$index]['remark'] = '';
$data['receivesList'][$index]['imgPath'] = '';
$data['receivesList'][$index]['fileListPdf'] = $collectsInfo['fileListPdf'];
$data['receivesList'][$index]['file_name'] = $collectsInfo['file_name'];
$data['receivesList'][$index]['fileListPdf'] = '';
$data['receivesList'][$index]['file_name'] = '';
$data['receivesList'][$index]['normCollectsExtend'] =$res;
}
}
......
......@@ -349,7 +349,7 @@ class NormCollects extends AuthBase
}
/**
* 数据保存
* 获取用户保存的数据
* @return void
*/
public function getPreserve()
......@@ -363,4 +363,9 @@ class NormCollects extends AuthBase
exception($e,'NormCollects.getPreserve');
}
}
public function getPdfList()
{
}
}
\ No newline at end of file
......@@ -18,7 +18,7 @@ class System extends BaseController
{
$data = ['version'=>'v1.3.9','server'=>'DSIS','resource_address'=>config("config.resource_address")];
return returnResult(config("config.code.success"),'正式版本',$data);
}
}
public function menus()
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment