diff --git a/src/App.vue b/src/App.vue
index 40e4be8..f0d2993 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -24,12 +24,13 @@ if (sessionProject && !projectInfo.value.id) {
store.commit('task/setBusinessCode', info && info.businessCode ? info.businessCode : '');
}
+if (projectInfo.value.id) {
+ getMemberList();
+}
+
watch(projectInfo, () => {
if (projectInfo.value.id) {
- const projectId = projectInfo.value.id;
- const { url } = projectInfo.value;
- const param = { projectId };
- store.dispatch('role/getAllMembers', { param, url });
+ getMemberList();
}
});
@@ -56,6 +57,14 @@ setInterval(() => {
getPlugins();
}, 60000);
+// 获取成员列表
+function getMemberList() {
+ const projectId = projectInfo.value.id;
+ const { url } = projectInfo.value;
+ const param = { projectId };
+ store.dispatch('role/getAllMembers', { param, url });
+}
+
/**
* 查询服务
*/
diff --git a/src/components/tall/Reviewer/Reviewer.vue b/src/components/tall/Reviewer/Reviewer.vue
index 187c1d9..6480d04 100644
--- a/src/components/tall/Reviewer/Reviewer.vue
+++ b/src/components/tall/Reviewer/Reviewer.vue
@@ -27,7 +27,7 @@
+
+
diff --git a/src/plugins/p-deliver/p-deliver-upload.vue b/src/plugins/p-deliver/p-deliver-upload.vue
index 20b8b2e..570095d 100644
--- a/src/plugins/p-deliver/p-deliver-upload.vue
+++ b/src/plugins/p-deliver/p-deliver-upload.vue
@@ -21,7 +21,7 @@
@@ -44,6 +44,7 @@ import Reviewer from '@/components/tall/Reviewer/Reviewer.vue';
const store = useStore();
const projectId = computed(() => store.getters['project/projectId']);
+const sessionProjectId = sessionStorage.getItem('projectId');
const roleId = computed(() => store.state.role.roleId);
const deliver = inject('deliver'); // 交付物初始值
@@ -71,6 +72,7 @@ function handleChange(info) {
// 提交交付物
async function submit() {
+ console.log(reviewerRef.value);
const { checkedCheckers } = reviewerRef.value; // 拿到选择检查人组件中选中的检查人
// 提交前的验证
if (!validateDeliverForm(checkedCheckers)) return;
@@ -85,21 +87,24 @@ async function submit() {
const { url } = store.state.projects.project;
- const param = {
- projectId: projectId.value,
- roleId: roleId.value,
- deliverId: deliver.value.deliverId,
- fileList: [linkValue.value],
- checkerList,
- msgId: task.msgId,
+ const params = {
+ param: {
+ projectId: projectId.value || sessionProjectId,
+ roleId: roleId.value,
+ deliverId: deliver.value.deliverId,
+ fileList: [linkValue.value],
+ checkerList,
+ msgId: task.msgId,
+ },
};
- const data = await submitDeliverInfo(param, url);
+ const data = await submitDeliverInfo(params, url);
message.info('提交交付物信息成功');
resetControlState(); // 重置控件的初始状态
emits('upload-success');
} catch (error) {
message.info('提交交付物信息失败');
+ submitBtnLoading.value = false; // 按钮loading
throw new Error(error);
}
}
diff --git a/src/plugins/p-deliver/p-deliver.vue b/src/plugins/p-deliver/p-deliver.vue
index b35f868..274d408 100644
--- a/src/plugins/p-deliver/p-deliver.vue
+++ b/src/plugins/p-deliver/p-deliver.vue
@@ -3,18 +3,23 @@