Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
d2a68af8 by lxs
Options

数据资产登记更新

1 parent 5e4ce3cc
Inline Side-by-side
Showing 3 changed files with 44 additions and 16 deletions
src/views/data_asset/registerDetail.vue
...@@ -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,7 +1170,10 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1154,7 +1170,10 @@ const rejectDialogBtnClick = (btn, info) => {
1154 } else { 1170 } else {
1155 ElMessage.error(res.msg); 1171 ElMessage.error(res.msg);
1156 } 1172 }
1157 }); 1173 }).catch(() => {
1174 rejectDialogInfo.value.footer.btns[1].loading = false;
1175 })
1176 ;
1158 } else if (btn.value == 'cancel') { 1177 } else if (btn.value == 'cancel') {
1159 rejectDialogInfo.value.visible = false; 1178 rejectDialogInfo.value.visible = false;
1160 } 1179 }
...@@ -1238,6 +1257,8 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1238,6 +1257,8 @@ const passCommonDialogBtnClick = (btn, info) => {
1238 } else { 1257 } else {
1239 ElMessage.error(res.msg); 1258 ElMessage.error(res.msg);
1240 } 1259 }
1260 }).catch(() => {
1261 passCommonDialogInfo.value.footer.btns[1].loading = false;
1241 }) 1262 })
1242 } else if (btn.value == 'cancel') { 1263 } else if (btn.value == 'cancel') {
1243 passCommonDialogInfo.value.visible = false; 1264 passCommonDialogInfo.value.visible = false;
...@@ -1807,7 +1828,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1807,7 +1828,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1807 <span class="item_label">产权期限:</span> 1828 <span class="item_label">产权期限:</span>
1808 <span class="item_value" v-if="assetDetailInfo.propertyTerm != 'Y'">无</span> 1829 <span class="item_value" v-if="assetDetailInfo.propertyTerm != 'Y'">无</span>
1809 <span class="item_value" v-else>{{ `${assetDetailInfo.propertyTermSdate ?? '--'} 至 1830 <span class="item_value" v-else>{{ `${assetDetailInfo.propertyTermSdate ?? '--'} 至
1810 ${assetDetailInfo.propertyTermEdate ?? '--'}`}}</span> 1831 ${assetDetailInfo.propertyTermEdate ?? '--'}` }}</span>
1811 </div> 1832 </div>
1812 <div class="list_item"> 1833 <div class="list_item">
1813 <span class="item_label">公司名称:</span> 1834 <span class="item_label">公司名称:</span>
......
src/views/data_asset/registerManagemant.vue
...@@ -417,14 +417,14 @@ const passDialogInfo = ref({ ...@@ -417,14 +417,14 @@ const passDialogInfo = ref({
417 footer: { 417 footer: {
418 btns: [ 418 btns: [
419 { type: "default", label: "取消", value: "cancel" }, 419 { type: "default", label: "取消", value: "cancel" },
420 { type: "primary", label: "确定", value: "submit" }, 420 { type: "primary", label: "确定", value: "submit", loading: false },
421 ], 421 ],
422 }, 422 },
423 }); 423 });
424 424
425 const passDialogBtnClick = (btn, info) => { 425 const passDialogBtnClick = (btn, info) => {
426 if (btn.value == 'submit') { 426 if (btn.value == 'submit') {
427 loading.value = true; 427 passDialogInfo.value.footer.btns[1].loading = true;
428 let params = { 428 let params = {
429 guid: currTableData.value.approveVO.approveGuid, 429 guid: currTableData.value.approveVO.approveGuid,
430 flowType: currTableData.value.approveVO.flowType, 430 flowType: currTableData.value.approveVO.flowType,
...@@ -432,7 +432,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -432,7 +432,7 @@ const passDialogBtnClick = (btn, info) => {
432 approveStaffGuid: userData.staffGuid, 432 approveStaffGuid: userData.staffGuid,
433 } 433 }
434 passFlowData(params, currTableData.value.tenantGuid).then((res: any) => { 434 passFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
435 loading.value = false; 435 passDialogInfo.value.footer.btns[1].loading = false;
436 if (res?.code == proxy.$passCode) { 436 if (res?.code == proxy.$passCode) {
437 if (res.data) { 437 if (res.data) {
438 ElMessage.success('审批成功'); 438 ElMessage.success('审批成功');
...@@ -445,7 +445,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -445,7 +445,7 @@ const passDialogBtnClick = (btn, info) => {
445 ElMessage.error(res.msg); 445 ElMessage.error(res.msg);
446 } 446 }
447 }).catch(() => { 447 }).catch(() => {
448 loading.value = false; 448 passDialogInfo.value.footer.btns[1].loading = false;
449 }); 449 });
450 } else if (btn.value == 'cancel') { 450 } else if (btn.value == 'cancel') {
451 passDialogInfo.value.visible = false; 451 passDialogInfo.value.visible = false;
...@@ -483,7 +483,7 @@ const rejectDialogInfo = ref({ ...@@ -483,7 +483,7 @@ const rejectDialogInfo = ref({
483 footer: { 483 footer: {
484 btns: [ 484 btns: [
485 { type: "default", label: "取消", value: "cancel" }, 485 { type: "default", label: "取消", value: "cancel" },
486 { type: "primary", label: "确定", value: "submit" }, 486 { type: "primary", label: "确定", value: "submit", loading: false },
487 ], 487 ],
488 }, 488 },
489 }); 489 });
...@@ -494,7 +494,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -494,7 +494,7 @@ const rejectDialogBtnClick = (btn, info) => {
494 ElMessage.error('请填写驳回理由'); 494 ElMessage.error('请填写驳回理由');
495 return 495 return
496 } 496 }
497 loading.value = true; 497 rejectDialogInfo.value.footer.btns[1].loading = true;
498 let params = { 498 let params = {
499 guid: currTableData.value.approveVO.approveGuid, 499 guid: currTableData.value.approveVO.approveGuid,
500 flowType: currTableData.value.approveVO.flowType, 500 flowType: currTableData.value.approveVO.flowType,
...@@ -502,7 +502,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -502,7 +502,7 @@ const rejectDialogBtnClick = (btn, info) => {
502 approveStaffGuid: userData.staffGuid, 502 approveStaffGuid: userData.staffGuid,
503 } 503 }
504 rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => { 504 rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
505 loading.value = false; 505 rejectDialogInfo.value.footer.btns[1].loading = false;
506 if (res?.code == proxy.$passCode) { 506 if (res?.code == proxy.$passCode) {
507 if (res.data) { 507 if (res.data) {
508 ElMessage.success('驳回成功'); 508 ElMessage.success('驳回成功');
...@@ -515,7 +515,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -515,7 +515,7 @@ const rejectDialogBtnClick = (btn, info) => {
515 ElMessage.error(res.msg); 515 ElMessage.error(res.msg);
516 } 516 }
517 }).catch(() => { 517 }).catch(() => {
518 loading.value = false; 518 rejectDialogInfo.value.footer.btns[1].loading = false;
519 }); 519 });
520 } else if (btn.value == 'cancel') { 520 } else if (btn.value == 'cancel') {
521 rejectDialogInfo.value.visible = false; 521 rejectDialogInfo.value.visible = false;
......
src/views/data_asset/valueEvaluate.vue
...@@ -991,16 +991,16 @@ const passDialogInfo = ref({ ...@@ -991,16 +991,16 @@ const passDialogInfo = ref({
991 footer: { 991 footer: {
992 btns: [ 992 btns: [
993 { type: "default", label: "取消", value: "cancel" }, 993 { type: "default", label: "取消", value: "cancel" },
994 { type: "primary", label: "确定", value: "submit" }, 994 { type: "primary", label: "确定", value: "submit", loading: false },
995 ], 995 ],
996 }, 996 },
997 }); 997 });
998 998
999 const passDialogBtnClick = (btn, info) => { 999 const passDialogBtnClick = (btn, info) => {
1000 let params: any = {} 1000 let params: any = {}
1001 console.log('btn', btn, info, currTableData.value); 1001 // console.log('btn', btn, info, currTableData.value);
1002 if (btn.value == 'submit') { 1002 if (btn.value == 'submit') {
1003 1003 passDialogInfo.value.footer.btns[1].loading = true;
1004 costAssessAllow({ 1004 costAssessAllow({
1005 guid: currTableData.value.approveVO.approveGuid, 1005 guid: currTableData.value.approveVO.approveGuid,
1006 bizGuid: currTableData.value.guid, 1006 bizGuid: currTableData.value.guid,
...@@ -1016,6 +1016,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1016,6 +1016,7 @@ const passDialogBtnClick = (btn, info) => {
1016 } 1016 }
1017 }) || [] 1017 }) || []
1018 }, currTableData.value.tenantGuid).then((res: any) => { 1018 }, currTableData.value.tenantGuid).then((res: any) => {
1019 passDialogInfo.value.footer.btns[1].loading = false;
1019 if (res?.code == proxy.$passCode) { 1020 if (res?.code == proxy.$passCode) {
1020 if (res.data) { 1021 if (res.data) {
1021 ElMessage.success('审批成功'); 1022 ElMessage.success('审批成功');
...@@ -1027,6 +1028,8 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1027,6 +1028,8 @@ const passDialogBtnClick = (btn, info) => {
1027 } else { 1028 } else {
1028 ElMessage.error(res.msg); 1029 ElMessage.error(res.msg);
1029 } 1030 }
1031 }).catch(() => {
1032 passDialogInfo.value.footer.btns[1].loading = false;
1030 }) 1033 })
1031 } else if (btn.value == 'cancel') { 1034 } else if (btn.value == 'cancel') {
1032 passDialogInfo.value.visible = false; 1035 passDialogInfo.value.visible = false;
...@@ -1113,7 +1116,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1113,7 +1116,7 @@ const rejectDialogBtnClick = (btn, info) => {
1113 ElMessage.error('请填写驳回理由'); 1116 ElMessage.error('请填写驳回理由');
1114 return 1117 return
1115 } 1118 }
1116 console.log('currTableData', currTableData.value, info); 1119 // console.log('currTableData', currTableData.value, info);
1117 rejectDialogInfo.value.footer.btns[1].loading = true; 1120 rejectDialogInfo.value.footer.btns[1].loading = true;
1118 let params = { 1121 let params = {
1119 guid: currTableData.value.approveVO.approveGuid, 1122 guid: currTableData.value.approveVO.approveGuid,
...@@ -1134,6 +1137,8 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1134,6 +1137,8 @@ const rejectDialogBtnClick = (btn, info) => {
1134 } else { 1137 } else {
1135 ElMessage.error(res.msg); 1138 ElMessage.error(res.msg);
1136 } 1139 }
1140 }).catch(() => {
1141 rejectDialogInfo.value.footer.btns[1].loading = false;
1137 }) 1142 })
1138 } else if (btn.value == 'cancel') { 1143 } else if (btn.value == 'cancel') {
1139 rejectDialogInfo.value.visible = false; 1144 rejectDialogInfo.value.visible = false;
...@@ -1162,6 +1167,8 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1162,6 +1167,8 @@ const passCommonDialogBtnClick = (btn, info) => {
1162 } else { 1167 } else {
1163 ElMessage.error(res.msg); 1168 ElMessage.error(res.msg);
1164 } 1169 }
1170 }).catch(() => {
1171 passCommonDialogInfo.value.footer.btns[1].loading = false;
1165 }) 1172 })
1166 } else if (btn.value == 'cancel') { 1173 } else if (btn.value == 'cancel') {
1167 passCommonDialogInfo.value.visible = false; 1174 passCommonDialogInfo.value.visible = false;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!