d4bc7e00 by lxs

数据资产登记更新

1 parent 2e07bed9
...@@ -943,7 +943,7 @@ const passDialogInfo = ref({ ...@@ -943,7 +943,7 @@ const passDialogInfo = ref({
943 footer: { 943 footer: {
944 btns: [ 944 btns: [
945 { type: "default", label: "取消", value: "cancel" }, 945 { type: "default", label: "取消", value: "cancel" },
946 { type: "primary", label: "确定", value: "submit" }, 946 { type: "primary", label: "确定", value: "submit", loading: false },
947 ], 947 ],
948 }, 948 },
949 }); 949 });
...@@ -975,6 +975,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -975,6 +975,7 @@ const passDialogBtnClick = (btn, info) => {
975 if (submitPromise.value) { 975 if (submitPromise.value) {
976 return; 976 return;
977 } 977 }
978 passDialogInfo.value.footer.btns[1].loading = true;
978 let params = { 979 let params = {
979 guid: detailInfo.value.approveVO.approveGuid, 980 guid: detailInfo.value.approveVO.approveGuid,
980 flowType: detailInfo.value.approveVO.flowType, 981 flowType: detailInfo.value.approveVO.flowType,
...@@ -983,6 +984,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -983,6 +984,7 @@ const passDialogBtnClick = (btn, info) => {
983 } 984 }
984 submitPromise.value = passFlowData(params, tenantGuid).then((res: any) => { 985 submitPromise.value = passFlowData(params, tenantGuid).then((res: any) => {
985 submitPromise.value = null; 986 submitPromise.value = null;
987 passDialogInfo.value.footer.btns[1].loading = false;
986 if (res?.code == proxy.$passCode) { 988 if (res?.code == proxy.$passCode) {
987 if (res.data) { 989 if (res.data) {
988 ElMessage.success('审批成功'); 990 ElMessage.success('审批成功');
...@@ -995,11 +997,14 @@ const passDialogBtnClick = (btn, info) => { ...@@ -995,11 +997,14 @@ const passDialogBtnClick = (btn, info) => {
995 } else { 997 } else {
996 ElMessage.error(res.msg); 998 ElMessage.error(res.msg);
997 } 999 }
1000 }).catch(() => {
1001 passDialogInfo.value.footer.btns[1].loading = false;
998 }); 1002 });
999 } else if (detailType.value == 'qualityEvaluate') { 1003 } else if (detailType.value == 'qualityEvaluate') {
1000 if (submitPromise.value) { 1004 if (submitPromise.value) {
1001 return; 1005 return;
1002 } 1006 }
1007 passDialogInfo.value.footer.btns[1].loading = true;
1003 submitPromise.value = qualityAllow({ 1008 submitPromise.value = qualityAllow({
1004 bizGuid: detailInfo.value.guid, 1009 bizGuid: detailInfo.value.guid,
1005 flowType: detailInfo.value.approveVO.flowType, 1010 flowType: detailInfo.value.approveVO.flowType,
...@@ -1017,6 +1022,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1017,6 +1022,7 @@ const passDialogBtnClick = (btn, info) => {
1017 }) || [], 1022 }) || [],
1018 }, tenantGuid).then((res: any) => { 1023 }, tenantGuid).then((res: any) => {
1019 submitPromise.value = null; 1024 submitPromise.value = null;
1025 passDialogInfo.value.footer.btns[1].loading = false;
1020 if (res?.code == proxy.$passCode) { 1026 if (res?.code == proxy.$passCode) {
1021 if (res.data) { 1027 if (res.data) {
1022 ElMessage.success('审批成功'); 1028 ElMessage.success('审批成功');
...@@ -1029,11 +1035,14 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1029,11 +1035,14 @@ const passDialogBtnClick = (btn, info) => {
1029 } else { 1035 } else {
1030 ElMessage.error(res.msg); 1036 ElMessage.error(res.msg);
1031 } 1037 }
1038 }).catch(() => {
1039 passDialogInfo.value.footer.btns[1].loading = false;
1032 }); 1040 });
1033 } else if (detailType.value == 'costAssess') { 1041 } else if (detailType.value == 'costAssess') {
1034 if (submitPromise.value) { 1042 if (submitPromise.value) {
1035 return; 1043 return;
1036 } 1044 }
1045 passDialogInfo.value.footer.btns[1].loading = true;
1037 submitPromise.value = costAssessAllow({ 1046 submitPromise.value = costAssessAllow({
1038 bizGuid: detailInfo.value.guid, 1047 bizGuid: detailInfo.value.guid,
1039 flowType: detailInfo.value.approveVO.flowType, 1048 flowType: detailInfo.value.approveVO.flowType,
...@@ -1050,6 +1059,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1050,6 +1059,7 @@ const passDialogBtnClick = (btn, info) => {
1050 }) || [] 1059 }) || []
1051 }, tenantGuid).then((res: any) => { 1060 }, tenantGuid).then((res: any) => {
1052 submitPromise.value = null; 1061 submitPromise.value = null;
1062 passDialogInfo.value.footer.btns[1].loading = false;
1053 if (res?.code == proxy.$passCode) { 1063 if (res?.code == proxy.$passCode) {
1054 if (res.data) { 1064 if (res.data) {
1055 ElMessage.success('审批成功'); 1065 ElMessage.success('审批成功');
...@@ -1062,11 +1072,14 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1062,11 +1072,14 @@ const passDialogBtnClick = (btn, info) => {
1062 } else { 1072 } else {
1063 ElMessage.error(res.msg); 1073 ElMessage.error(res.msg);
1064 } 1074 }
1075 }).catch(() => {
1076 passDialogInfo.value.footer.btns[1].loading = false;
1065 }); 1077 });
1066 } else if (detailType.value == 'certificate') { 1078 } else if (detailType.value == 'certificate') {
1067 if (submitPromise.value) { 1079 if (submitPromise.value) {
1068 return; 1080 return;
1069 } 1081 }
1082 passDialogInfo.value.footer.btns[1].loading = true;
1070 submitPromise.value = updateCertificate({ 1083 submitPromise.value = updateCertificate({
1071 guid: certificateGuid.value, 1084 guid: certificateGuid.value,
1072 tenantGuid: userData.tenantGuid, 1085 tenantGuid: userData.tenantGuid,
...@@ -1075,6 +1088,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1075,6 +1088,7 @@ const passDialogBtnClick = (btn, info) => {
1075 documentFile: info.documentFile?.map(f => f.url) || [] 1088 documentFile: info.documentFile?.map(f => f.url) || []
1076 }).then((res: any) => { 1089 }).then((res: any) => {
1077 submitPromise.value = null; 1090 submitPromise.value = null;
1091 passDialogInfo.value.footer.btns[1].loading = false;
1078 if (res?.code == proxy.$passCode) { 1092 if (res?.code == proxy.$passCode) {
1079 ElMessage.success('该资产发证确认成功'); 1093 ElMessage.success('该资产发证确认成功');
1080 passDialogInfo.value.visible = false; 1094 passDialogInfo.value.visible = false;
...@@ -1083,7 +1097,9 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1083,7 +1097,9 @@ const passDialogBtnClick = (btn, info) => {
1083 } else { 1097 } else {
1084 ElMessage.error(res.msg); 1098 ElMessage.error(res.msg);
1085 } 1099 }
1086 }) 1100 }).catch(() => {
1101 passDialogInfo.value.footer.btns[1].loading = false;
1102 });
1087 } 1103 }
1088 } else if (btn.value == 'cancel') { 1104 } else if (btn.value == 'cancel') {
1089 passDialogInfo.value.visible = false; 1105 passDialogInfo.value.visible = false;
...@@ -1154,6 +1170,8 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1154,6 +1170,8 @@ const rejectDialogBtnClick = (btn, info) => {
1154 } else { 1170 } else {
1155 ElMessage.error(res.msg); 1171 ElMessage.error(res.msg);
1156 } 1172 }
1173 }).catch(() => {
1174 rejectDialogInfo.value.footer.btns[1].loading = false;
1157 }); 1175 });
1158 } else if (btn.value == 'cancel') { 1176 } else if (btn.value == 'cancel') {
1159 rejectDialogInfo.value.visible = false; 1177 rejectDialogInfo.value.visible = false;
...@@ -1238,7 +1256,9 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1238,7 +1256,9 @@ const passCommonDialogBtnClick = (btn, info) => {
1238 } else { 1256 } else {
1239 ElMessage.error(res.msg); 1257 ElMessage.error(res.msg);
1240 } 1258 }
1241 }) 1259 }).catch(() => {
1260 passCommonDialogInfo.value.footer.btns[1].loading = false;
1261 });
1242 } else if (btn.value == 'cancel') { 1262 } else if (btn.value == 'cancel') {
1243 passCommonDialogInfo.value.visible = false; 1263 passCommonDialogInfo.value.visible = false;
1244 } 1264 }
......
...@@ -436,14 +436,14 @@ const passDialogInfo = ref({ ...@@ -436,14 +436,14 @@ const passDialogInfo = ref({
436 footer: { 436 footer: {
437 btns: [ 437 btns: [
438 { type: "default", label: "取消", value: "cancel" }, 438 { type: "default", label: "取消", value: "cancel" },
439 { type: "primary", label: "确定", value: "submit" }, 439 { type: "primary", label: "确定", value: "submit", loading: false },
440 ], 440 ],
441 }, 441 },
442 }); 442 });
443 443
444 const passDialogBtnClick = (btn, info) => { 444 const passDialogBtnClick = (btn, info) => {
445 if (btn.value == 'submit') { 445 if (btn.value == 'submit') {
446 loading.value = true; 446 passDialogInfo.value.footer.btns[1].loading = true;
447 let params = { 447 let params = {
448 guid: currTableData.value.approveVO.approveGuid, 448 guid: currTableData.value.approveVO.approveGuid,
449 flowType: currTableData.value.approveVO.flowType, 449 flowType: currTableData.value.approveVO.flowType,
...@@ -451,7 +451,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -451,7 +451,7 @@ const passDialogBtnClick = (btn, info) => {
451 approveStaffGuid: userData.staffGuid, 451 approveStaffGuid: userData.staffGuid,
452 } 452 }
453 passFlowData(params, currTableData.value.tenantGuid).then((res: any) => { 453 passFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
454 loading.value = false; 454 passDialogInfo.value.footer.btns[1].loading = false;
455 if (res?.code == proxy.$passCode) { 455 if (res?.code == proxy.$passCode) {
456 if (res.data) { 456 if (res.data) {
457 ElMessage.success('审批成功'); 457 ElMessage.success('审批成功');
...@@ -464,7 +464,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -464,7 +464,7 @@ const passDialogBtnClick = (btn, info) => {
464 ElMessage.error(res.msg); 464 ElMessage.error(res.msg);
465 } 465 }
466 }).catch(() => { 466 }).catch(() => {
467 loading.value = false; 467 passDialogInfo.value.footer.btns[1].loading = false;
468 }); 468 });
469 } else if (btn.value == 'cancel') { 469 } else if (btn.value == 'cancel') {
470 passDialogInfo.value.visible = false; 470 passDialogInfo.value.visible = false;
...@@ -502,7 +502,7 @@ const rejectDialogInfo = ref({ ...@@ -502,7 +502,7 @@ const rejectDialogInfo = ref({
502 footer: { 502 footer: {
503 btns: [ 503 btns: [
504 { type: "default", label: "取消", value: "cancel" }, 504 { type: "default", label: "取消", value: "cancel" },
505 { type: "primary", label: "确定", value: "submit" }, 505 { type: "primary", label: "确定", value: "submit", loading: false },
506 ], 506 ],
507 }, 507 },
508 }); 508 });
...@@ -513,7 +513,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -513,7 +513,7 @@ const rejectDialogBtnClick = (btn, info) => {
513 ElMessage.error('请填写驳回理由'); 513 ElMessage.error('请填写驳回理由');
514 return 514 return
515 } 515 }
516 loading.value = true; 516 rejectDialogInfo.value.footer.btns[1].loading = true;
517 let params = { 517 let params = {
518 guid: currTableData.value.approveVO.approveGuid, 518 guid: currTableData.value.approveVO.approveGuid,
519 flowType: currTableData.value.approveVO.flowType, 519 flowType: currTableData.value.approveVO.flowType,
...@@ -521,7 +521,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -521,7 +521,7 @@ const rejectDialogBtnClick = (btn, info) => {
521 approveStaffGuid: userData.staffGuid, 521 approveStaffGuid: userData.staffGuid,
522 } 522 }
523 rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => { 523 rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
524 loading.value = false; 524 rejectDialogInfo.value.footer.btns[1].loading = false;
525 if (res?.code == proxy.$passCode) { 525 if (res?.code == proxy.$passCode) {
526 if (res.data) { 526 if (res.data) {
527 ElMessage.success('驳回成功'); 527 ElMessage.success('驳回成功');
...@@ -534,7 +534,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -534,7 +534,7 @@ const rejectDialogBtnClick = (btn, info) => {
534 ElMessage.error(res.msg); 534 ElMessage.error(res.msg);
535 } 535 }
536 }).catch(() => { 536 }).catch(() => {
537 loading.value = false; 537 rejectDialogInfo.value.footer.btns[1].loading = false;
538 }); 538 });
539 } else if (btn.value == 'cancel') { 539 } else if (btn.value == 'cancel') {
540 rejectDialogInfo.value.visible = false; 540 rejectDialogInfo.value.visible = false;
......
...@@ -976,16 +976,16 @@ const passDialogInfo = ref({ ...@@ -976,16 +976,16 @@ const passDialogInfo = ref({
976 footer: { 976 footer: {
977 btns: [ 977 btns: [
978 { type: "default", label: "取消", value: "cancel" }, 978 { type: "default", label: "取消", value: "cancel" },
979 { type: "primary", label: "确定", value: "submit" }, 979 { type: "primary", label: "确定", value: "submit", loading: false },
980 ], 980 ],
981 }, 981 },
982 }); 982 });
983 983
984 const passDialogBtnClick = (btn, info) => { 984 const passDialogBtnClick = (btn, info) => {
985 let params: any = {} 985 let params: any = {}
986 console.log('btn', btn, info, currTableData.value); 986 // console.log('btn', btn, info, currTableData.value);
987 if (btn.value == 'submit') { 987 if (btn.value == 'submit') {
988 988 passDialogInfo.value.footer.btns[1].loading = true;
989 costAssessAllow({ 989 costAssessAllow({
990 guid: currTableData.value.approveVO.approveGuid, 990 guid: currTableData.value.approveVO.approveGuid,
991 bizGuid: currTableData.value.guid, 991 bizGuid: currTableData.value.guid,
...@@ -1001,6 +1001,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1001,6 +1001,7 @@ const passDialogBtnClick = (btn, info) => {
1001 } 1001 }
1002 }) || [] 1002 }) || []
1003 }, currTableData.value.tenantGuid).then((res: any) => { 1003 }, currTableData.value.tenantGuid).then((res: any) => {
1004 passDialogInfo.value.footer.btns[1].loading = false;
1004 if (res?.code == proxy.$passCode) { 1005 if (res?.code == proxy.$passCode) {
1005 if (res.data) { 1006 if (res.data) {
1006 ElMessage.success('审批成功'); 1007 ElMessage.success('审批成功');
...@@ -1012,7 +1013,9 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1012,7 +1013,9 @@ const passDialogBtnClick = (btn, info) => {
1012 } else { 1013 } else {
1013 ElMessage.error(res.msg); 1014 ElMessage.error(res.msg);
1014 } 1015 }
1015 }) 1016 }).catch(() => {
1017 passDialogInfo.value.footer.btns[1].loading = false;
1018 });
1016 } else if (btn.value == 'cancel') { 1019 } else if (btn.value == 'cancel') {
1017 passDialogInfo.value.visible = false; 1020 passDialogInfo.value.visible = false;
1018 } 1021 }
...@@ -1098,7 +1101,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1098,7 +1101,7 @@ const rejectDialogBtnClick = (btn, info) => {
1098 ElMessage.error('请填写驳回理由'); 1101 ElMessage.error('请填写驳回理由');
1099 return 1102 return
1100 } 1103 }
1101 console.log('currTableData', currTableData.value, info); 1104 // console.log('currTableData', currTableData.value, info);
1102 rejectDialogInfo.value.footer.btns[1].loading = true; 1105 rejectDialogInfo.value.footer.btns[1].loading = true;
1103 let params = { 1106 let params = {
1104 guid: currTableData.value.approveVO.approveGuid, 1107 guid: currTableData.value.approveVO.approveGuid,
...@@ -1119,7 +1122,9 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1119,7 +1122,9 @@ const rejectDialogBtnClick = (btn, info) => {
1119 } else { 1122 } else {
1120 ElMessage.error(res.msg); 1123 ElMessage.error(res.msg);
1121 } 1124 }
1122 }) 1125 }).catch(() => {
1126 rejectDialogInfo.value.footer.btns[1].loading = false;
1127 });
1123 } else if (btn.value == 'cancel') { 1128 } else if (btn.value == 'cancel') {
1124 rejectDialogInfo.value.visible = false; 1129 rejectDialogInfo.value.visible = false;
1125 } 1130 }
...@@ -1147,7 +1152,9 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1147,7 +1152,9 @@ const passCommonDialogBtnClick = (btn, info) => {
1147 } else { 1152 } else {
1148 ElMessage.error(res.msg); 1153 ElMessage.error(res.msg);
1149 } 1154 }
1150 }) 1155 }).catch(() => {
1156 passCommonDialogInfo.value.footer.btns[1].loading = false;
1157 });
1151 } else if (btn.value == 'cancel') { 1158 } else if (btn.value == 'cancel') {
1152 passCommonDialogInfo.value.visible = false; 1159 passCommonDialogInfo.value.visible = false;
1153 } 1160 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!