diff --git a/CHANGELOG.md b/CHANGELOG.md index 12feba6..675b80b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -108,4 +108,3 @@ 范围|描述|commitId --|--|-- - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49) - diff --git a/components/Reviewer/Reviewer.vue b/components/Reviewer/Reviewer.vue index 922acba..58de98b 100644 --- a/components/Reviewer/Reviewer.vue +++ b/components/Reviewer/Reviewer.vue @@ -6,8 +6,8 @@ - - {{ item.name }} + + {{ item.name }} ... @@ -18,7 +18,13 @@ - {{ item.name }} + {{ item.name }} @@ -36,9 +42,8 @@ const collapsed = ref(true); const checkers = computed(() => store.state.role.members); // 所有选中的审核人 -const checkedCheckers = computed(() => checkers.value.filter(item => item.checked)); +const checkedCheckers = computed(() => checkers.value.filter(item => item.checked) || []); + // 折叠状态 显示的选中的检查人 -const showCheckers = computed(() => { - return checkedCheckers.value.length > 3 ? checkedCheckers.value.slice(0, 3) : checkedCheckers.value; -}) +const showCheckers = computed(() => (checkedCheckers.value.length > 3 ? checkedCheckers.value.slice(0, 3) : checkedCheckers.value)); diff --git a/pages/checkerList/checkerList.vue b/pages/checkerList/checkerList.vue index 2ff8f65..a5fa664 100644 --- a/pages/checkerList/checkerList.vue +++ b/pages/checkerList/checkerList.vue @@ -18,7 +18,7 @@ - {{ item.score }} + {{ item.score }} @@ -41,7 +41,6 @@ onLoad(options => { const param = { deliverRecordId: options.deliverRecordId }; const data = await uni.$u.api.queryCheckLog(param); checkerList.value = data; - console.log(checkerList.value); } catch (error) { console.log('error: ', error); uni.$ui.showToast('获取检查交付物历史失败'); diff --git a/pages/submitlist/submitlist.vue b/pages/submitlist/submitlist.vue index fd77a70..5daf136 100644 --- a/pages/submitlist/submitlist.vue +++ b/pages/submitlist/submitlist.vue @@ -35,7 +35,7 @@ - {{ items.score }} + {{ items.score }} @@ -94,6 +94,7 @@ onLoad(options => { const data = await uni.$u.api.getDeliverHistory(param); name.value = data.deliverName; listRef.value = data.deliverRecordList; + console.log(data); } catch (error) { console.log('error: ', error); uni.$ui.showToast('获取交付物历史失败'); diff --git a/plugins/p-deliver-checker/p-deliver-checker.vue b/plugins/p-deliver-checker/p-deliver-checker.vue index 5114ff1..6f83009 100644 --- a/plugins/p-deliver-checker/p-deliver-checker.vue +++ b/plugins/p-deliver-checker/p-deliver-checker.vue @@ -1,171 +1,166 @@ - - + diff --git a/plugins/p-deliver/p-deliver.vue b/plugins/p-deliver/p-deliver.vue index e76bf73..c118f6a 100644 --- a/plugins/p-deliver/p-deliver.vue +++ b/plugins/p-deliver/p-deliver.vue @@ -14,7 +14,17 @@ - 提交 + + 提交 @@ -22,7 +32,9 @@ - + + + 粘贴 文件 @@ -80,8 +92,9 @@ const deliver = ref(); const submitState = computed(() => !linkValue.value); // 获取选中的审核人信息 +const projectId = computed(() => store.getters['project/projectId']); const delivers = computed(() => store.state.role.members); -const checkedDelivers = computed(() => delivers.value.filter(item => item.checked)); +const checkedCheckers = computed(() => delivers.value.filter(item => item.checked)); getDeliverData(); // 根据任务id获取交付物信息 async function getDeliverData() { @@ -95,7 +108,6 @@ async function getDeliverData() { console.log('error: ', error); } } - // 验证提交的交付物信息格式 function validateDeliverForm() { const reg = /^http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- ./?%&=]*)?$/; @@ -105,7 +117,7 @@ function validateDeliverForm() { return false; } // 没有检查人 提示选择检查人 - if (!checkedDelivers.value || !checkedDelivers.value.length) { + if (!checkedCheckers.value || !checkedCheckers.value.length) { uni.$ui.showToast('请选择检查人'); return false; } @@ -119,18 +131,19 @@ function submit() { // 验证成功后进行请求 try { const checkerList = []; - checkedDelivers.value.forEach(item => { + checkedCheckers.value.forEach(item => { checkerList.push(item.memberId); }); const param = { - projectId: store.state.project.project.id, + projectId: projectId.value, deliverId: deliver.value.deliverId, fileList: [linkValue.value], checkerList, }; + console.log(param); uni.$u.api.submitDeliverInfo(param); + store.commit('deliver/setDeliverRecordId', deliver.value.deliverRecordId); uBadgeShow.value = true; - store.state.project.deliverRecordId = deliver.value.deliverRecordId; } catch (error) { console.log('error: ', error); uni.$ui.showToast('提交交付物信息失败'); @@ -193,7 +206,7 @@ async function confirmEditDeliverName() { } try { const param = { - projectId: store.state.project.project.id, + projectId: projectId.value, taskId: props.task.id, deliverName: newInputRef.value, }; diff --git a/store/deliver/index.js b/store/deliver/index.js new file mode 100644 index 0000000..5096c61 --- /dev/null +++ b/store/deliver/index.js @@ -0,0 +1,18 @@ +export default { + namespaced: true, + state: { + deliverRecordId: '', // 交付物记录id + }, + getters: {}, + mutations: { + /** + * 设置交付物记录id + * @param {object} state + * @param {string} recordId + */ + setDeliverRecordId(state, recordId) { + state.deliverRecordId = recordId; + }, + }, + actions: {}, +}; diff --git a/store/index.js b/store/index.js index cf56fab..ddef20e 100644 --- a/store/index.js +++ b/store/index.js @@ -4,7 +4,7 @@ import role from './role/index.js'; import socket from './socket/index.js'; import task from './task/index.js'; import user from './user/index.js'; -import deliver from './user/index.js'; +import deliver from './deliver/index.js'; // 不属于具体模块的 应用级的 store内容 const state = {