hanshuang
/
QinGang_interested
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
hs 2026-04-30 11:07:43 +08:00
parent 51abf06654 047351bc6c
commit aed92c4bed
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/home/doorAndCar/car/doorArea_car_add_page.dart
View File

@ -577,7 +577,7 @@ class _DoorareaCarAddPageState extends State<DoorareaCarAddPage> {
for(int i=0;i<newList.length;i++){ for(int i=0;i<newList.length;i++){
newList[i]["dataId"] = newList[i]["userId"]; newList[i]["dataId"] = newList[i]["userId"];
newList[i]["dataName"] = newList[i]["userName"]; newList[i]["dataName"] = '${newList[i]["userName"]}(${newList[i]["corpName"]})(${newList[i]["deptName"]})' ;
} }
showModalBottomSheet( showModalBottomSheet(

2
lib/pages/home/doorAndCar/car/firstlevel_car_add_page.dart
View File

@ -559,7 +559,7 @@ class _FirstlevelCarAddPageState extends State<FirstlevelCarAddPage> {
for(int i=0;i<newList.length;i++){ for(int i=0;i<newList.length;i++){
newList[i]["dataId"] = newList[i]["userId"]; newList[i]["dataId"] = newList[i]["userId"];
newList[i]["dataName"] = newList[i]["userName"]; newList[i]["dataName"] ='${newList[i]["userName"]}(${newList[i]["corpName"]})(${newList[i]["deptName"]})' ;
} }
showModalBottomSheet( showModalBottomSheet(

2
lib/pages/home/doorAndCar/person/doorArea_person_add_page.dart
View File

@ -638,7 +638,7 @@ class _DoorareaPersonApplyPageState extends State<DoorareaPersonApplyPage> {
for(int i=0;i<newList.length;i++){ for(int i=0;i<newList.length;i++){
newList[i]["dataId"] = newList[i]["userId"]; newList[i]["dataId"] = newList[i]["userId"];
newList[i]["dataName"] = newList[i]["userName"]; newList[i]["dataName"] = '${newList[i]["userName"]}(${newList[i]["corpName"]})(${newList[i]["deptName"]})' ;
} }
showModalBottomSheet( showModalBottomSheet(

2
lib/pages/home/doorAndCar/person/firstlevel_person_add_page.dart
View File

@ -566,7 +566,7 @@ class _FirstlevelPersonAddPageState extends State<FirstlevelPersonAddPage> {
for(int i=0;i<newList.length;i++){ for(int i=0;i<newList.length;i++){
newList[i]["dataId"] = newList[i]["userId"]; newList[i]["dataId"] = newList[i]["userId"];
newList[i]["dataName"] = newList[i]["userName"]; newList[i]["dataName"] = '${newList[i]["userName"]}(${newList[i]["corpName"]})(${newList[i]["deptName"]})' ;
} }
showModalBottomSheet( showModalBottomSheet(

8
lib/pages/home/keyTasks/keyTasksDetail/key_taskes_check_confirm_page.dart
View File

@ -233,7 +233,7 @@ class _KeyTaskesCheckConfirmPageState extends State<KeyTaskesCheckConfirmPage> {
maxSizeInBytes: 20 * 1024 * 1024, maxSizeInBytes: 20 * 1024 * 1024,
allowedExtensions: ['pdf'], allowedExtensions: ['pdf'],
allowMultipleFiles: false, allowMultipleFiles: false,
// showPhotoSelect: false, showPhotoSelect: false,
); );
if (picked.isNotEmpty && picked.first.path != null) { if (picked.isNotEmpty && picked.first.path != null) {
@ -445,8 +445,10 @@ class _KeyTaskesCheckConfirmPageState extends State<KeyTaskesCheckConfirmPage> {
// checkData['status'] = 1; // checkData['status'] = 1;
checkData['signatureTime'] = signTimes.first; checkData['signatureTime'] = signTimes.first;
checkData['isDefend'] = chooseCheckType ? 0 : 1; checkData['isDefend'] = chooseCheckType ? 1 : 0;
checkData['inspectionId'] = widget.inspectionId; checkData['inspectionId'] = widget.inspectionId;
checkData['id'] = SessionService.instance.accountId;
try { try {
final result = await KeyTasksApi.setKeyTasksCheckConfirm(checkData); final result = await KeyTasksApi.setKeyTasksCheckConfirm(checkData);
if (result['success']) { if (result['success']) {
@ -504,7 +506,7 @@ class _KeyTaskesCheckConfirmPageState extends State<KeyTaskesCheckConfirmPage> {
await FileApi.uploadFiles([choosefile.path ?? ''], fileType, checkData['inspectionId'] ?? '').then((result) { await FileApi.uploadFiles([choosefile.path ?? ''], fileType, checkData['inspectionId'] ?? '').then((result) {
if (result['success']) { if (result['success']) {
// 检查人签字 // 检查人签字
checkData['fileUrl'] = result['data']['filePath'] ?? ''; checkData['fileUrl'] = result['data']['fileList'][0]['filePath'] ?? '';
isSuccess = true; isSuccess = true;
} else { } else {
LoadingDialogHelper.hide(); LoadingDialogHelper.hide();