Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
96bc17ea by lihua
Options

fix

1 parent 494600b6
Inline Side-by-side
Showing 5 changed files with 27 additions and 25 deletions
src/views/data_asset/qualityEvaluate.vue
...@@ -795,14 +795,14 @@ const passCommonDialogInfo = ref({ ...@@ -795,14 +795,14 @@ const passCommonDialogInfo = ref({
795 footer: { 795 footer: {
796 btns: [ 796 btns: [
797 { type: "default", label: "取消", value: "cancel" }, 797 { type: "default", label: "取消", value: "cancel" },
798 { type: "primary", label: "确定", value: "submit" }, 798 { type: "primary", label: "确定", value: "submit", loading: false },
799 ], 799 ],
800 }, 800 },
801 }); 801 });
802 802
803 const passCommonDialogBtnClick = (btn, info) => { 803 const passCommonDialogBtnClick = (btn, info) => {
804 if (btn.value == 'submit') { 804 if (btn.value == 'submit') {
805 tableInfo.value.loading = true; 805 passCommonDialogInfo.value.footer.btns[1].loading = true;
806 let params = { 806 let params = {
807 guid: currTableData.value.approveVO.approveGuid, 807 guid: currTableData.value.approveVO.approveGuid,
808 flowType: currTableData.value.approveVO.flowType, 808 flowType: currTableData.value.approveVO.flowType,
...@@ -810,7 +810,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -810,7 +810,7 @@ const passCommonDialogBtnClick = (btn, info) => {
810 approveStaffGuid: userData.staffGuid 810 approveStaffGuid: userData.staffGuid
811 } 811 }
812 passFlowData(params, currTableData.value.tenantGuid).then((res: any) => { 812 passFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
813 tableInfo.value.loading = false; 813 passCommonDialogInfo.value.footer.btns[1].loading = false;
814 if (res?.code == proxy.$passCode) { 814 if (res?.code == proxy.$passCode) {
815 if (res.data) { 815 if (res.data) {
816 ElMessage.success('审批成功'); 816 ElMessage.success('审批成功');
...@@ -822,9 +822,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -822,9 +822,7 @@ const passCommonDialogBtnClick = (btn, info) => {
822 } else { 822 } else {
823 ElMessage.error(res.msg); 823 ElMessage.error(res.msg);
824 } 824 }
825 }).catch(() => { 825 })
826 tableInfo.value.loading = false;
827 });
828 } else if (btn.value == 'cancel') { 826 } else if (btn.value == 'cancel') {
829 passCommonDialogInfo.value.visible = false; 827 passCommonDialogInfo.value.visible = false;
830 } 828 }
......
src/views/data_asset/registerCatalogDetail.vue
...@@ -752,7 +752,7 @@ const rejectDialogInfo = ref({ ...@@ -752,7 +752,7 @@ const rejectDialogInfo = ref({
752 footer: { 752 footer: {
753 btns: [ 753 btns: [
754 { type: "default", label: "取消", value: "cancel" }, 754 { type: "default", label: "取消", value: "cancel" },
755 { type: "primary", label: "确定", value: "submit" }, 755 { type: "primary", label: "确定", value: "submit", loading: false },
756 ], 756 ],
757 }, 757 },
758 }); 758 });
...@@ -770,7 +770,9 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -770,7 +770,9 @@ const rejectDialogBtnClick = (btn, info) => {
770 approveSuggest: info.approveSuggest, 770 approveSuggest: info.approveSuggest,
771 approveStaffGuid: userData.staffGuid, 771 approveStaffGuid: userData.staffGuid,
772 } 772 }
773 rejectDialogInfo.value.footer.btns[1].loading = true;
773 rejectFlowData(params, route.query.serviceTenantGuid).then((res: any) => { 774 rejectFlowData(params, route.query.serviceTenantGuid).then((res: any) => {
775 rejectDialogInfo.value.footer.btns[1].loading = false;
774 if (res?.code == proxy.$passCode) { 776 if (res?.code == proxy.$passCode) {
775 if (res.data) { 777 if (res.data) {
776 ElMessage.success('驳回成功'); 778 ElMessage.success('驳回成功');
...@@ -820,7 +822,7 @@ const passCommonDialogInfo = ref({ ...@@ -820,7 +822,7 @@ const passCommonDialogInfo = ref({
820 footer: { 822 footer: {
821 btns: [ 823 btns: [
822 { type: "default", label: "取消", value: "cancel" }, 824 { type: "default", label: "取消", value: "cancel" },
823 { type: "primary", label: "确定", value: "submit" }, 825 { type: "primary", label: "确定", value: "submit", loading: true },
824 ], 826 ],
825 }, 827 },
826 }); 828 });
...@@ -833,7 +835,9 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -833,7 +835,9 @@ const passCommonDialogBtnClick = (btn, info) => {
833 approveSuggest: info.approveSuggest, 835 approveSuggest: info.approveSuggest,
834 approveStaffGuid: userData.staffGuid, 836 approveStaffGuid: userData.staffGuid,
835 } 837 }
838 passCommonDialogInfo.value.footer.btns[1].loading = true;
836 passFlowData(params, route.query.serviceTenantGuid).then((res: any) => { 839 passFlowData(params, route.query.serviceTenantGuid).then((res: any) => {
840 passCommonDialogInfo.value.footer.btns[1].loading = false;
837 if (res?.code == proxy.$passCode) { 841 if (res?.code == proxy.$passCode) {
838 if (res.data) { 842 if (res.data) {
839 ElMessage.success('驳回成功'); 843 ElMessage.success('驳回成功');
......
src/views/data_asset/registerDetail.vue
...@@ -1116,7 +1116,7 @@ const rejectDialogInfo = ref({ ...@@ -1116,7 +1116,7 @@ const rejectDialogInfo = ref({
1116 footer: { 1116 footer: {
1117 btns: [ 1117 btns: [
1118 { type: "default", label: "取消", value: "cancel" }, 1118 { type: "default", label: "取消", value: "cancel" },
1119 { type: "primary", label: "确定", value: "submit" }, 1119 { type: "primary", label: "确定", value: "submit", loading: true },
1120 ], 1120 ],
1121 }, 1121 },
1122 }); 1122 });
...@@ -1127,6 +1127,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1127,6 +1127,7 @@ const rejectDialogBtnClick = (btn, info) => {
1127 ElMessage.error('请填写驳回理由'); 1127 ElMessage.error('请填写驳回理由');
1128 return 1128 return
1129 } 1129 }
1130 rejectDialogInfo.value.footer.btns[1].loading = true;
1130 //资产登记的驳回。 1131 //资产登记的驳回。
1131 let params = { 1132 let params = {
1132 guid: detailInfo.value.approveVO.approveGuid, 1133 guid: detailInfo.value.approveVO.approveGuid,
...@@ -1135,6 +1136,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1135,6 +1136,7 @@ const rejectDialogBtnClick = (btn, info) => {
1135 approveStaffGuid: userData.staffGuid 1136 approveStaffGuid: userData.staffGuid
1136 } 1137 }
1137 rejectFlowData(params, serviceTenantGuid.value).then((res: any) => { 1138 rejectFlowData(params, serviceTenantGuid.value).then((res: any) => {
1139 rejectDialogInfo.value.footer.btns[1].loading = false;
1138 if (res?.code == proxy.$passCode) { 1140 if (res?.code == proxy.$passCode) {
1139 if (res.data) { 1141 if (res.data) {
1140 ElMessage.success('驳回成功'); 1142 ElMessage.success('驳回成功');
...@@ -1202,7 +1204,7 @@ const passCommonDialogInfo = ref({ ...@@ -1202,7 +1204,7 @@ const passCommonDialogInfo = ref({
1202 footer: { 1204 footer: {
1203 btns: [ 1205 btns: [
1204 { type: "default", label: "取消", value: "cancel" }, 1206 { type: "default", label: "取消", value: "cancel" },
1205 { type: "primary", label: "确定", value: "submit" }, 1207 { type: "primary", label: "确定", value: "submit", loading: true },
1206 ], 1208 ],
1207 }, 1209 },
1208 }); 1210 });
...@@ -1215,7 +1217,9 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1215,7 +1217,9 @@ const passCommonDialogBtnClick = (btn, info) => {
1215 approveSuggest: info.approveSuggest, 1217 approveSuggest: info.approveSuggest,
1216 approveStaffGuid: userData.staffGuid 1218 approveStaffGuid: userData.staffGuid
1217 } 1219 }
1220 passCommonDialogInfo.value.footer.btns[1].loading = true;
1218 passFlowData(params, serviceTenantGuid.value).then((res: any) => { 1221 passFlowData(params, serviceTenantGuid.value).then((res: any) => {
1222 passCommonDialogInfo.value.footer.btns[1].loading = false;
1219 if (res?.code == proxy.$passCode) { 1223 if (res?.code == proxy.$passCode) {
1220 if (res.data) { 1224 if (res.data) {
1221 ElMessage.success('驳回成功'); 1225 ElMessage.success('驳回成功');
......
src/views/data_asset/valueEvaluate.vue
...@@ -1060,7 +1060,7 @@ const passCommonDialogInfo = ref({ ...@@ -1060,7 +1060,7 @@ const passCommonDialogInfo = ref({
1060 footer: { 1060 footer: {
1061 btns: [ 1061 btns: [
1062 { type: "default", label: "取消", value: "cancel" }, 1062 { type: "default", label: "取消", value: "cancel" },
1063 { type: "primary", label: "确定", value: "submit" }, 1063 { type: "primary", label: "确定", value: "submit", loading: true },
1064 ], 1064 ],
1065 }, 1065 },
1066 }); 1066 });
...@@ -1097,7 +1097,7 @@ const rejectDialogInfo = ref({ ...@@ -1097,7 +1097,7 @@ const rejectDialogInfo = ref({
1097 footer: { 1097 footer: {
1098 btns: [ 1098 btns: [
1099 { type: "default", label: "取消", value: "cancel" }, 1099 { type: "default", label: "取消", value: "cancel" },
1100 { type: "primary", label: "确定", value: "submit" }, 1100 { type: "primary", label: "确定", value: "submit", loading: true },
1101 ], 1101 ],
1102 }, 1102 },
1103 }); 1103 });
...@@ -1109,7 +1109,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1109,7 +1109,7 @@ const rejectDialogBtnClick = (btn, info) => {
1109 return 1109 return
1110 } 1110 }
1111 console.log('currTableData', currTableData.value, info); 1111 console.log('currTableData', currTableData.value, info);
1112 tableInfo.value.loading = true; 1112 rejectDialogInfo.value.footer.btns[1].loading = true;
1113 let params = { 1113 let params = {
1114 guid: currTableData.value.approveVO.approveGuid, 1114 guid: currTableData.value.approveVO.approveGuid,
1115 flowType: currTableData.value.approveVO.flowType, 1115 flowType: currTableData.value.approveVO.flowType,
...@@ -1117,7 +1117,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1117,7 +1117,7 @@ const rejectDialogBtnClick = (btn, info) => {
1117 approveStaffGuid: userData.staffGuid 1117 approveStaffGuid: userData.staffGuid
1118 } 1118 }
1119 rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => { 1119 rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
1120 tableInfo.value.loading = false; 1120 rejectDialogInfo.value.footer.btns[1].loading = true;
1121 if (res?.code == proxy.$passCode) { 1121 if (res?.code == proxy.$passCode) {
1122 if (res.data) { 1122 if (res.data) {
1123 ElMessage.success('驳回成功'); 1123 ElMessage.success('驳回成功');
...@@ -1129,9 +1129,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1129,9 +1129,7 @@ const rejectDialogBtnClick = (btn, info) => {
1129 } else { 1129 } else {
1130 ElMessage.error(res.msg); 1130 ElMessage.error(res.msg);
1131 } 1131 }
1132 }).catch(() => { 1132 })
1133 tableInfo.value.loading = false;
1134 });
1135 } else if (btn.value == 'cancel') { 1133 } else if (btn.value == 'cancel') {
1136 rejectDialogInfo.value.visible = false; 1134 rejectDialogInfo.value.visible = false;
1137 } 1135 }
...@@ -1139,7 +1137,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1139,7 +1137,7 @@ const rejectDialogBtnClick = (btn, info) => {
1139 1137
1140 const passCommonDialogBtnClick = (btn, info) => { 1138 const passCommonDialogBtnClick = (btn, info) => {
1141 if (btn.value == 'submit') { 1139 if (btn.value == 'submit') {
1142 tableInfo.value.loading = true; 1140 passCommonDialogInfo.value.footer.btns[1].loading = true;
1143 let params = { 1141 let params = {
1144 guid: currTableData.value.approveVO.approveGuid, 1142 guid: currTableData.value.approveVO.approveGuid,
1145 flowType: currTableData.value.approveVO.flowType, 1143 flowType: currTableData.value.approveVO.flowType,
...@@ -1147,7 +1145,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1147,7 +1145,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1147 approveStaffGuid: userData.staffGuid 1145 approveStaffGuid: userData.staffGuid
1148 } 1146 }
1149 passFlowData(params, currTableData.value.tenantGuid).then((res: any) => { 1147 passFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
1150 tableInfo.value.loading = false; 1148 passCommonDialogInfo.value.footer.btns[1].loading = false;
1151 if (res?.code == proxy.$passCode) { 1149 if (res?.code == proxy.$passCode) {
1152 if (res.data) { 1150 if (res.data) {
1153 ElMessage.success('审批成功'); 1151 ElMessage.success('审批成功');
...@@ -1159,9 +1157,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1159,9 +1157,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1159 } else { 1157 } else {
1160 ElMessage.error(res.msg); 1158 ElMessage.error(res.msg);
1161 } 1159 }
1162 }).catch(() => { 1160 })
1163 tableInfo.value.loading = false;
1164 });
1165 } else if (btn.value == 'cancel') { 1161 } else if (btn.value == 'cancel') {
1166 passCommonDialogInfo.value.visible = false; 1162 passCommonDialogInfo.value.visible = false;
1167 } 1163 }
......
src/views/data_meta/collectorTask.vue
...@@ -531,7 +531,9 @@ const dialogBtnClick = (btn, info) => { ...@@ -531,7 +531,9 @@ const dialogBtnClick = (btn, info) => {
531 if (btn.value == 'submit') { 531 if (btn.value == 'submit') {
532 let params = { ...info, } 532 let params = { ...info, }
533 // params.taskState = 1; 533 // params.taskState = 1;
534 params.databaseNameEn = databaseNameEn.value 534 let data: any = dataSourceList.value.find((item: any) => item.guid == params.dataSourceGuid)
535 databaseNameEn.value = data?.databaseNameEn;
536 params.databaseNameEn = data?.databaseNameEn;
535 if (dialogInfo.value.type == 'add') { 537 if (dialogInfo.value.type == 'add') {
536 let addTask = () => { 538 let addTask = () => {
537 params.taskState = 1; 539 params.taskState = 1;
...@@ -551,10 +553,8 @@ const dialogBtnClick = (btn, info) => { ...@@ -551,10 +553,8 @@ const dialogBtnClick = (btn, info) => {
551 } 553 }
552 }) 554 })
553 } 555 }
554 let data: any = dataSourceList.value.find((item: any) => item.guid == params.dataSourceGuid)
555 if (data) { 556 if (data) {
556 dialogInfo.value.footer.btns[1].loading = true; 557 dialogInfo.value.footer.btns[1].loading = true;
557 databaseNameEn.value = data.databaseNameEn;
558 checkDataSource({ 558 checkDataSource({
559 databaseNameEn: databaseNameEn.value, 559 databaseNameEn: databaseNameEn.value,
560 }).then((res: any) => { 560 }).then((res: any) => {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!